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

Timestamp:

2010-12-16T16:38:49Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

7837101

Parents:

8e58f94 (diff), eb221e5 (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) (4 diffs)

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

@@ -95 +95 @@
 
         if (vb)
-                printf("%d bytes to copy\n", total);
+                printf("%" PRIu64 " bytes to copy\n", total);
 
         lseek(fd1, 0, SEEK_SET);
@@ -130 +130 @@
                  */
                 if (res != 0) {
-                        printf("\n%d more bytes than actually exist were copied\n", res);
+                        printf("\n%zd more bytes than actually exist were copied\n", res);
                         goto err;
                 }
@@ -187 +187 @@
                         return CMD_SUCCESS;
                 case 'v':
-                        printf("%d\n", CP_VERSION);
+                        printf("%s\n", CP_VERSION);
                         return CMD_SUCCESS;
                 case 'V':
@@ -223 +223 @@
 
         if (verbose)
-                printf("%d bytes copied\n", ret);
+                printf("%" PRId64 " bytes copied\n", ret);
 
         if (ret >= 0)