Changeset 8b655705 in mainline for uspace/app/bdsh/cmds/modules/cp/cp.c

Timestamp:

2011-04-15T19:38:07Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

9dd730d1

Parents:

6b9e85b (diff), b2fb47f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

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

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

@@ -108 +108 @@
         for (;;) {
                 ssize_t res;
+                size_t written = 0;
 
                 bytes = read(fd1, buff, blen);
@@ -120 +121 @@
                          * returned less data than requested.
                          */
-                        bytes = write(fd2, buff, res);
+                        bytes = write(fd2, buff + written, res);
                         if (bytes < 0)
                                 goto err;
+                        written += bytes;
                         res -= bytes;
                 } while (res > 0);