Changeset 368ee04 in mainline for uspace/app/bdsh/cmds/modules/mkdir/mkdir.c

Timestamp:

2017-04-05T18:10:39Z (8 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/bdsh/cmds/modules/mkdir/mkdir.c (modified) (5 diffs)

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

@@ -30 +30 @@
 #include <stdlib.h>
 #include <dirent.h>
-#include <fcntl.h>
 #include <sys/types.h>
-#include <sys/stat.h>
 #include <getopt.h>
 #include <stdarg.h>
@@ -98 +96 @@
 
         if (!create_parents) {
-                if (mkdir(path, 0) != 0) {
+                ret = vfs_link_path(path, KIND_DIRECTORY, NULL);
+                if (ret != EOK) {
                         cli_error(CL_EFAIL, "%s: could not create %s (%s)",
-                            cmdname, path, str_error(errno));
+                            cmdname, path, str_error(ret));
                         ret = 1;
                 }
@@ -136 +135 @@
                         path[prev_off] = 0;
 
-                        if (mkdir(path, 0) != 0 && errno != EEXIST) {
+                        ret = vfs_link_path(path, KIND_DIRECTORY, NULL);
+                        if (ret != EOK && ret != EEXIST) {
                                 cli_error(CL_EFAIL, "%s: could not create %s (%s)",
-                                    cmdname, path, str_error(errno));
+                                    cmdname, path, str_error(ret));
                                 ret = 1;
                                 goto leave;
@@ -146 +146 @@
                 }
                 /* Create the final directory. */
-                if (mkdir(path, 0) != 0) {
+                ret = vfs_link_path(path, KIND_DIRECTORY, NULL);
+                if (ret != EOK) {
                         cli_error(CL_EFAIL, "%s: could not create %s (%s)",
-                            cmdname, path, str_error(errno));
+                            cmdname, path, str_error(ret));
                         ret = 1;
                 }
@@ -207 +208 @@
 
         if (follow && (argv[optind] != NULL)) {
-                if (chdir(argv[optind]) != 0)
+                if (vfs_cwd_set(argv[optind]) != EOK)
                         printf("%s: Error switching to directory.", cmdname);
         }