Changeset ff381a7 in mainline for uspace/app/untar/main.c

Timestamp:

2015-11-02T20:54:19Z (8 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/untar/main.c (modified) (1 diff)

uspace/app/untar/main.c

@@ -103 +103 @@
 static int handle_directory(const tar_header_t *header, FILE *tarfile)
 {
-        int rc = mkdir(header->filename, 0755);
-        if ((rc == EEXIST) || (rc == EEXISTS)) {
-                // printf("Note: directory %s already exists.\n", header->filename);
-                rc = EOK;
-        }
-        if (rc != EOK) {
-                fprintf(stderr, "Failed to create directory %s: %s.\n",
-                    header->filename, str_error(rc));
-                return rc;
+        if (mkdir(header->filename, 0755) != 0) {
+                if (errno != EEXIST) {
+                        fprintf(stderr, "Failed to create directory %s: %s.\n",
+                            header->filename, str_error(errno));
+                        return errno;
+                }
         }