Changes in uspace/app/bdsh/cmds/modules/cp/cp.c [6348376:2815505] in mainline

File:

• uspace/app/bdsh/cmds/modules/cp/cp.c (modified) (3 diffs)

uspace/app/bdsh/cmds/modules/cp/cp.c

@@ -1 @@
-/*
- * Copyright (c) 2008 Tim Post
+/* Copyright (c) 2008, Tim Post <tinkertim@gmail.com>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * - Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * - Redistributions in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * - The name of the author may not be used to endorse or promote products
- *   derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * Neither the name of the original program's authors nor the names of its
+ * contributors may be used to endorse or promote products derived from this
+ * software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
  */
 
@@ -71 +73 @@
         size_t blen, int vb)
 {
-        int fd1, fd2, bytes;
-        off64_t total;
+        int fd1, fd2, bytes = 0;
+        off64_t total = 0;
         int64_t copied = 0;
         char *buff = NULL;
@@ -104 +106 @@
         }
 
-        while ((bytes = read_all(fd1, buff, blen)) > 0) {
-                if ((bytes = write_all(fd2, buff, bytes)) < 0)
+        for (;;) {
+                ssize_t res;
+                size_t written = 0;
+
+                bytes = read(fd1, buff, blen);
+                if (bytes <= 0)
                         break;
                 copied += bytes;
+                res = bytes;
+                do {
+                        /*
+                         * Theoretically, it may not be enough to call write()
+                         * only once. Also the previous read() may have
+                         * returned less data than requested.
+                         */
+                        bytes = write(fd2, buff + written, res);
+                        if (bytes < 0)
+                                goto err;
+                        written += bytes;
+                        res -= bytes;
+                } while (res > 0);
+
+                /* TODO: re-insert assert() once this is stand alone,
+                 * removed as abort() exits the entire shell
+                 */
+                if (res != 0) {
+                        printf("\n%zd more bytes than actually exist were copied\n", res);
+                        goto err;
+                }
         }
 
         if (bytes < 0) {
+err:
                 printf("\nError copying %s, (%d)\n", src, bytes);
                 copied = bytes;