Changeset 89c57b6 in mainline for uspace/app/bdsh/cmds/modules/mkfile/mkfile.c

Timestamp:

2011-04-13T14:45:41Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

88634420

Parents:

cefb126 (diff), 17279ead (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/mkfile/mkfile.c (modified) (3 diffs)

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

@@ -125 +125 @@
 
         for (c = 0, optind = 0, opt_ind = 0; c != -1;) {
-                c = getopt_long(argc, argv, "pvhVfm:", long_options, &opt_ind);
+                c = getopt_long(argc, argv, "s:h", long_options, &opt_ind);
                 switch (c) {
                 case 'h':
@@ -168 +168 @@
                 rc = write(fd, buffer, to_write);
                 if (rc <= 0) {
-                        printf("%s: Error writing file (%d).\n", cmdname, rc);
+                        printf("%s: Error writing file (%zd).\n", cmdname, rc);
                         close(fd);
                         return CMD_FAILURE;
@@ -177 +177 @@
         rc = close(fd);
         if (rc != 0) {
-                printf("%s: Error writing file (%d).\n", cmdname, rc);
+                printf("%s: Error writing file (%zd).\n", cmdname, rc);
                 return CMD_FAILURE;
         }