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

Timestamp:

2016-05-02T20:58:16Z (9 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

7c4b26c

Parents:

6adb775f (diff), 5035ba05 (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, which has dltest and fixes.

File:

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

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

@@ -165 +165 @@
                 const char byte = 0x00;
 
-                if ((rc2 = lseek(fd, file_size - 1, SEEK_SET)) < 0)
+                if ((rc2 = lseek(fd, file_size - 1, SEEK_SET)) < 0) {
+                        close(fd);
                         goto error;
+                }
 
                 rc2 = write(fd, &byte, sizeof(char));
-                if (rc2 < 0)
+                if (rc2 < 0) {
+                        close(fd);
                         goto error;
+                }
                 return CMD_SUCCESS;
         }
@@ -187 +191 @@
                         printf("%s: Error writing file (%d).\n", cmdname, errno);
                         close(fd);
+                        free(buffer);
                         return CMD_FAILURE;
                 }