Changeset 3b10e07b in mainline

Timestamp:

2008-11-28T10:02:36Z (16 years ago)

Author:

Tim Post <echo@…>

Branches:

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

Children:

c3c5640

Parents:

ee02922

Message:

make copy_file() deal with files with zero length

File:

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

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

@@ -70 +70 @@
 }
 
-static size_t copy_file(const char *src, const char *dest, size_t blen, int vb)
+static int64_t copy_file(const char *src, const char *dest, size_t blen, int vb)
 {
         int fd1, fd2, bytes = 0;
         off_t total = 0;
-        size_t copied = 0;
+        int copied = -1;
         char *buff = NULL;
 
@@ -82 +82 @@
         if (-1 == (fd1 = open(src, O_RDONLY))) {
                 printf("Unable to open source file %s\n", src);
-                return 0;
+                return copied;
         }
 
         if (-1 == (fd2 = open(dest, O_CREAT))) {
                 printf("Unable to open destination file %s\n", dest);
-                return 0;
+                return copied;
         }
 
@@ -112 +112 @@
         if (bytes == -1) {
                 printf("Error copying %s\n", src);
-                copied = 0;
+                copied = bytes;
                 goto out;
         }
@@ -149 +149 @@
 {
         unsigned int argc, buffer = CP_DEFAULT_BUFLEN, verbose = 0;
-        int c, opt_ind, ret = 0;
+        int c, opt_ind;
+        int64_t ret;
 
         argc = cli_count_args(argv);