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

File:

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

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

@@ -71 +71 @@
         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 +104 @@
         }
 
-        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;