Changes in uspace/app/bdsh/cmds/builtins/cd/cd.c [35a35651:36ab7c7] in mainline

File:

• uspace/app/bdsh/cmds/builtins/cd/cd.c (modified) (5 diffs)

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

@@ -41 +41 @@
 static const char *cmdname = "cd";
 
-/* Previous directory variables.
- *
- * Declaring them static to avoid many "== NULL" checks.
- * PATH_MAX is not that big to cause any problems with memory overhead.
- */
-static char previous_directory[PATH_MAX] = "";
-static char previous_directory_tmp[PATH_MAX];
-static bool previous_directory_valid = true;
-static bool previous_directory_set = false;
-
-static int chdir_and_remember(const char *new_dir) {
-
-        char *ok = getcwd(previous_directory_tmp, PATH_MAX);
-        previous_directory_valid = ok != NULL;
-        previous_directory_set = true;
-
-        int rc = chdir(new_dir);
-        if (rc != EOK) {
-                return rc;
-        }
-
-        str_cpy(previous_directory, PATH_MAX, previous_directory_tmp);
-        return EOK;
-}
-
 void help_cmd_cd(unsigned int level)
 {
@@ -80 +55 @@
 }
 
-
 /* This is a very rudamentary 'cd' command. It is not 'link smart' (yet) */
 
@@ -88 +62 @@
 
         argc = cli_count_args(argv);
-
-        /* Handle cd -- -. Override to switch to a directory named '-' */
-        bool hyphen_override = false;
-        char *target_directory = argv[1];
-        if (argc == 3) {
-                if (!str_cmp(argv[1], "--")) {
-                        hyphen_override = true;
-                        argc--;
-                        target_directory = argv[2];
-                }
-        }
 
         /* We don't yet play nice with whitespace, a getopt implementation should
@@ -116 +79 @@
         }
 
-        /* We have the correct # of arguments */
-        // TODO: handle tidle (~) expansion? */
+        /* We have the correct # of arguments
+     * TODO: handle tidle (~) expansion? */
 
-        /* Handle 'cd -' first. */
-        if (!str_cmp(target_directory, "-") && !hyphen_override) {
-                if (!previous_directory_valid) {
-                        cli_error(CL_EFAIL, "Cannot switch to previous directory");
-                        return CMD_FAILURE;
-                }
-                if (!previous_directory_set) {
-                        cli_error(CL_EFAIL, "No previous directory to switch to");
-                        return CMD_FAILURE;
-                }
-                char *prev_dup = str_dup(previous_directory);
-                if (prev_dup == NULL) {
-                        cli_error(CL_ENOMEM, "Cannot switch to previous directory");
-                        return CMD_FAILURE;
-                }
-                rc = chdir_and_remember(prev_dup);
-                free(prev_dup);
-        } else {
-                rc = chdir_and_remember(target_directory);
-        }
+        rc = chdir(argv[1]);
 
         if (rc == 0) {
@@ -149 +93 @@
                         break;
                 case ENOENT:
-                        cli_error(CL_ENOENT, "Invalid directory `%s'", target_directory);
+                        cli_error(CL_ENOENT, "Invalid directory `%s'", argv[1]);
                         break;
                 default:
-                        cli_error(CL_EFAIL, "Unable to change to `%s'", target_directory);
+                        cli_error(CL_EFAIL, "Unable to change to `%s'", argv[1]);
                         break;
                 }