Changeset 368ee04 in mainline for uspace/app/untar/main.c

Timestamp:

2017-04-05T18:10:39Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

93ad8166

Parents:

39f892a9 (diff), 2166728 (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 from lp:~jakub/helenos/vfs-2.5-cherrypick

This merge cherry-picks some of the changesets from Jiri Zarevucky's:

lp:~zarevucky-jiri/helenos/vfs-2.5

and then continues independently, yet sometime in a similar vein.

Roughly speaking, Jiri's branch is merged entirely up to its revision
1926 and then cherry-picked on and off until its revision 1965. Among
these changes are:

• relativization of the API,
• client-side roots,
• server-side mounts,
• inbox for passing arbitrary files from parent to child,
• some streamlining and cleanup.

Additional changes include:

• addressing issues introduced by the above changes,
• client-side I/O cursors (file positions),
• all HelenOS file system APIs begin with the vfs_ prefix and can be used after including vfs/vfs.h,
• removal of some POSIX-ish headers and definitions,
• additional cleanup.

File:

• uspace/app/untar/main.c (modified) (2 diffs)

uspace/app/untar/main.c

@@ -35 +35 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <sys/stat.h>
 #include <errno.h>
 #include <str_error.h>
+#include <vfs/vfs.h>
 #include "tar.h"
 
@@ -103 +103 @@
 static int handle_directory(const tar_header_t *header, FILE *tarfile)
 {
-        if (mkdir(header->filename, 0755) != 0) {
-                if (errno != EEXIST) {
+        int rc;
+
+        rc = vfs_link_path(header->filename, KIND_DIRECTORY, NULL);
+        if (rc != EOK) {
+                if (rc != EEXIST) {
                         fprintf(stderr, "Failed to create directory %s: %s.\n",
-                            header->filename, str_error(errno));
-                        return errno;
+                            header->filename, str_error(rc));
+                        return rc;
                 }
         }