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

File:

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

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

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