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

Timestamp:

2015-11-02T20:54:19Z (10 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d8513177

Parents:

3feeab2 (diff), 5265eea4 (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) (4 diffs)

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

@@ -27 +27 @@
  */
 
+#include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -166 +167 @@
 
                 if ((rc2 = lseek(fd, file_size - 1, SEEK_SET)) < 0)
-                        goto exit;
+                        goto error;
 
                 rc2 = write(fd, &byte, sizeof(char));
-                goto exit;
+                if (rc2 < 0)
+                        goto error;
+                return CMD_SUCCESS;
         }
 
@@ -183 +186 @@
                 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);
                         return CMD_FAILURE;
@@ -191 +194 @@
 
         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;
 }