Changes in uspace/app/bdsh/cmds/modules/mkfile/mkfile.c [bc41f3a3:9d58539] in mainline

File:

• uspace/app/bdsh/cmds/modules/mkfile/mkfile.c (modified) (6 diffs)

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

@@ -27 +27 @@
  */
 
-#include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -34 +33 @@
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <fcntl.h>
 #include <macros.h>
 #include <getopt.h>
@@ -126 +126 @@
         argc = cli_count_args(argv);
 
-        for (c = 0, optreset = 1, optind = 0, opt_ind = 0; c != -1;) {
+        for (c = 0, optind = 0, opt_ind = 0; c != -1;) {
                 c = getopt_long(argc, argv, "ps:h", long_options, &opt_ind);
                 switch (c) {
@@ -165 +165 @@
                 const char byte = 0x00;
 
-                if ((rc2 = lseek(fd, file_size - 1, SEEK_SET)) < 0) {
-                        close(fd);
-                        goto error;
-                }
+                if ((rc2 = lseek(fd, file_size - 1, SEEK_SET)) < 0)
+                        goto exit;
 
                 rc2 = write(fd, &byte, sizeof(char));
-                if (rc2 < 0) {
-                        close(fd);
-                        goto error;
-                }
-                return CMD_SUCCESS;
+                goto exit;
         }
 
@@ -189 +183 @@
                 rc = write(fd, buffer, to_write);
                 if (rc <= 0) {
-                        printf("%s: Error writing file (%d).\n", cmdname, errno);
+                        printf("%s: Error writing file (%zd).\n", cmdname, rc);
                         close(fd);
-                        free(buffer);
                         return CMD_FAILURE;
                 }
@@ -198 +191 @@
 
         free(buffer);
-
-        if (close(fd) < 0)
-                goto error;
+exit:
+        rc = close(fd);
+
+        if (rc != 0 || rc2 < 0) {
+                printf("%s: Error writing file (%zd).\n", cmdname, rc);
+                return CMD_FAILURE;
+        }
 
         return CMD_SUCCESS;
-error:
-        printf("%s: Error writing file (%d).\n", cmdname, errno);
-        return CMD_FAILURE;
 }