Changeset 368ee04 in mainline for uspace/app/bdsh/cmds/builtins/cd/cd.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/bdsh/cmds/builtins/cd/cd.c (modified) (2 diffs)

uspace/app/bdsh/cmds/builtins/cd/cd.c

@@ -29 +29 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
 #include <str.h>
 #include <errno.h>
+#include <vfs/vfs.h>
 
 #include "util.h"
@@ -51 +51 @@
 static bool previous_directory_set = false;
 
-static int chdir_and_remember(const char *new_dir) {
+static int chdir_and_remember(const char *new_dir)
+{
 
-        char *ok = getcwd(previous_directory_tmp, PATH_MAX);
-        previous_directory_valid = ok != NULL;
+        int rc = vfs_cwd_get(previous_directory_tmp, PATH_MAX);
+        previous_directory_valid = (rc == EOK);
         previous_directory_set = true;
 
-        if (chdir(new_dir) != 0)
-                return errno;
+        rc = vfs_cwd_set(new_dir);
+        if (rc != EOK)
+                return rc;
 
         str_cpy(previous_directory, PATH_MAX, previous_directory_tmp);