Changeset d96d9bc in mainline for uspace/app/bdsh/cmds

Timestamp:

2017-04-02T20:38:50Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

c23275a

Parents:

1e2e5795

Message:

Rename chdir() to vfs_cwd_set() and getcwd() to vfs_cwd_get()

Location:

uspace/app/bdsh/cmds

Files:

• builtins/cd/cd.c (modified) (2 diffs)
• modules/ls/ls.c (modified) (2 diffs)
• modules/mkdir/mkdir.c (modified) (1 diff)
• modules/pwd/pwd.c (modified) (2 diffs)
• modules/rm/rm.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);

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

@@ -34 +34 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
 #include <dirent.h>
 #include <getopt.h>
@@ -387 +386 @@
 
         if (argc == 0) {
-                if (getcwd(de.name, PATH_MAX) == NULL) {
+                if (vfs_cwd_get(de.name, PATH_MAX) != EOK) {
                         cli_error(CL_EFAIL, "%s: Failed determining working "
                             "directory", cmdname);

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

@@ -208 +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);
         }

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

@@ -30 +30 @@
 #include <stdlib.h>
 #include <mem.h>
+#include <vfs/vfs.h>
+#include <abi/errno.h>
 
 #include "config.h"
@@ -57 +59 @@
         memset(buff, 0, PATH_MAX);
 
-        if (getcwd(buff, PATH_MAX) == NULL) {
+        if (vfs_cwd_get(buff, PATH_MAX) != EOK) {
                 cli_error(CL_EFAIL,
                         "Unable to determine the current working directory");

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

@@ -30 +30 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
 #include <dirent.h>
 #include <getopt.h>
@@ -110 +109 @@
         memset(rm->cwd, 0, PATH_MAX);
 
-        chdir(".");
-
-        if (NULL == (getcwd(rm->owd, PATH_MAX)))
+        vfs_cwd_set(".");
+
+        if (EOK != vfs_cwd_get(rm->owd, PATH_MAX))
                 return 0;