Changeset 4c4ddbe9 in mainline

Timestamp:

2008-11-28T11:20:04Z (16 years ago)

Author:

Tim Post <echo@…>

Branches:

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

Children:

3e53ab7

Parents:

9dbe035

Message:

cp: Fix counter if verbose, remove debug printfs

File:

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

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

@@ -106 +106 @@
                 if (-1 == (bytes = read(fd1, buff, blen)))
                         break;
+                /* We read a terminating NULL */
+                if (0 == bytes) {
+                        copied ++;
+                        break;
+                }
                 copied += bytes;
                 write(fd2, buff, blen);
@@ -148 +153 @@
 int cmd_cp(char **argv)
 {
-        unsigned int argc, buffer = CP_DEFAULT_BUFLEN, verbose = 0;
+        unsigned int argc, buffer = 0, verbose = 0;
         int c, opt_ind;
         int64_t ret;
@@ -177 +182 @@
                                 return CMD_FAILURE;
                         }
+                        if (verbose)
+                                printf("Buffer = %d\n", buffer);
                         break;
                 }
         }
+
+        if (buffer == 0)
+                buffer = CP_DEFAULT_BUFLEN;
 
         argc -= optind;
@@ -192 +202 @@
 
         if (verbose)
-                printf("%d bytes copied (buffer = %d)\n", ret, buffer);
+                printf("%d bytes copied\n", ret);
 
         if (ret <= 0)