Changeset 089385e8 in mainline for uspace/app/bdsh/cmds/builtins/cd/cd.c

Timestamp:

2012-04-07T17:08:06Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

2662a1e9

Parents:

85d2fe2e

git-author:

Ketan Singh <> (2012-04-07 17:08:06)

git-committer:

Vojtech Horky <vojtechhorky@…> (2012-04-07 17:08:06)

Message:

Change to previous directory with `cd -' in bdsh

File:

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

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

@@ -63 +63 @@
         argc = cli_count_args(argv);
 
+        /* Handle cd -- -. Override to switch to a directory named '-' */
+        bool hyphen_override = false;
+        if (argc == 3) {
+                if(!str_cmp(argv[1], "--")) {
+                        hyphen_override = true;
+                        argc--;
+                }
+        }
+
         /* We don't yet play nice with whitespace, a getopt implementation should
          * protect "quoted\ destination" as a single argument. Its not our job to
@@ -79 +88 @@
         }
 
-        /* We have the correct # of arguments
-     * TODO: handle tidle (~) expansion? */
+        /* We have the correct # of arguments */
+        // TODO: handle tidle (~) expansion? */
 
-        rc = chdir(argv[1]);
+        /* Handle 'cd -' first. */
+        if (!str_cmp(argv[1], "-") && !hyphen_override) {
+                char *buffer = (char *) malloc(PATH_MAX);
+                if (!buffer) {
+                        cli_error(CL_ENOMEM, "Cannot switch to previous directory");
+                        return CMD_FAILURE;
+                }
+                memset(buffer, 0, PATH_MAX);
+                getprevwd(buffer, PATH_MAX);
+                if (*buffer == '\0') {
+                        cli_error(CL_EFAIL, "No previous directory to switch to");
+                        free(buffer);
+                        return CMD_FAILURE;
+                } else {
+                        rc = chdir(buffer);
+                        free(buffer);
+                }
+        } else if (hyphen_override) {
+                /* Handles 'cd -- <dirname>'.
+                 * Override for directory named '-'.
+                 */
+                rc = chdir(argv[2]);
+        } else {
+                rc = chdir(argv[1]);
+        }
 
         if (rc == 0) {