RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 04:27:43 +00:00
Code Issues Activity Actions

Shell: Fix cd' history (and cdh')

Browse source 
Previously, `cd` would push relative paths (and possibly nonexistent
ones too) into its history, so `cdh' would fail everywhere else.
This commit is contained in:
AnotherTest 2020-10-26 02:37:43 +03:30 • committed by Andreas Kling
parent 6d7b01a3cf
commit 76a2c6e44d
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Shell/Builtin.cpp
View file

@ -127,11 +127,7 @@ int Shell::builtin_cd(int argc, const char** argv)
if (!arg_path) {
new_path = home;
if (cd_history.is_empty() || cd_history.last() != home)
cd_history.enqueue(home);
} else {
if (cd_history.is_empty() || cd_history.last() != arg_path)
cd_history.enqueue(arg_path);
if (strcmp(arg_path, "-") == 0) {
char* oldpwd = getenv("OLDPWD");
if (oldpwd == nullptr)
@ -153,6 +149,10 @@ int Shell::builtin_cd(int argc, const char** argv)
fprintf(stderr, "Invalid path '%s'\n", new_path.characters());
return 1;
}
if (cd_history.is_empty() || cd_history.last() != real_path)
cd_history.enqueue(real_path);
const char* path = real_path.characters();
int rc = chdir(path);