mirror of
https://github.com/zoriya/ash.git
synced 2026-06-01 10:15:10 +00:00
Making cd exit on errors when no window is here
This commit is contained in:
@@ -47,9 +47,9 @@ int builtin_cd(char **argv, env_t *env)
|
||||
char *old = getcwd(NULL, 0);
|
||||
|
||||
if (get_argc(argv) > 2) {
|
||||
write(2, "cd: Too many arguments.\n", 25);
|
||||
dprintf(2, "cd: Too many arguments.\n");
|
||||
env->vars = my_setenv(env->vars, "?", "1");
|
||||
return (0);
|
||||
return (-1 * !env->window);
|
||||
}
|
||||
env->vars = my_setenv(env->vars, "?", "0");
|
||||
if (!argv[1])
|
||||
@@ -59,6 +59,7 @@ int builtin_cd(char **argv, env_t *env)
|
||||
if (chdir(path) < 0) {
|
||||
printf("%s: %s.\n", path, strerror(errno));
|
||||
env->vars = my_setenv(env->vars, "?", "1");
|
||||
return (-1 * !env->window);
|
||||
} else
|
||||
env->env = my_setenv(env->env, "OLDPWD", old);
|
||||
free(old);
|
||||
|
||||
@@ -289,16 +289,6 @@ TESTS=
|
||||
echo 'echo "$"'
|
||||
[928-END]
|
||||
|
||||
[929]
|
||||
NAME="929"
|
||||
SETUP=""
|
||||
CLEAN=""
|
||||
TESTS=
|
||||
echo 'echo "\t"'
|
||||
echo 'echo $'
|
||||
echo 'echo $?'
|
||||
[929-END]
|
||||
|
||||
[930]
|
||||
NAME="930"
|
||||
SETUP=""
|
||||
|
||||
Reference in New Issue
Block a user