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

Timestamp:

2010-07-25T10:11:13Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

377cce8

Parents:

24a2517 (diff), a2da43c (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 with mainline.

File:

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

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

@@ -33 +33 @@
 #include <unistd.h>
 #include <getopt.h>
-#include <string.h>
+#include <str.h>
 #include <fcntl.h>
 #include "config.h"
@@ -74 +74 @@
 {
         int fd1, fd2, bytes = 0;
-        off_t total = 0;
+        off64_t total = 0;
         int64_t copied = 0;
         char *buff = NULL;