Bash-like "cd -"

tihirvon · Apr 26, 2014 · a948b7f · a948b7f
1 parent d76f485
commit a948b7f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/Documentation/dex.txt b/Documentation/dex.txt
@@ -112,7 +112,8 @@ case [-lu]
 	-u upper case
 
 cd <directory>
-	Change directory. Updates $PWD and $OLDPWD.
+	Change directory. Updates $PWD and $OLDPWD. "cd -" changes to
+	previous directory ($OLDPWD).
 
 center-view
 	Center view to cursor.

diff --git a/commands.c b/commands.c
@@ -87,12 +87,20 @@ static void cmd_case(const char *pf, char **args)
 
 static void cmd_cd(const char *pf, char **args)
 {
+	char *dir = args[0];
 	char cwd[8192];
 	char *cwdp = NULL;
 	bool got_cwd = !!getcwd(cwd, sizeof(cwd));
 	int i;
 
-	if (chdir(args[0])) {
+	if (streq(dir, "-")) {
+		dir = getenv("OLDPWD");
+		if (dir == NULL || dir[0] == 0) {
+			error_msg("cd: OLDPWD not set");
+			return;
+		}
+	}
+	if (chdir(dir)) {
 		error_msg("cd: %s", strerror(errno));
 		return;
 	}