Merge pull request #55 from AnonymusRaccoon/separator

builtin correct return value
This commit is contained in:
Arthi-chaud
2020-05-22 15:10:39 +02:00
committed by GitHub
5 changed files with 14 additions and 3 deletions
+5 -2
View File
@@ -14,10 +14,13 @@
int builtin_alias(char **argv, env_t *env)
{
if (!argv[1])
if (!argv[1]) {
print_aliases(env->alias);
if (argv[1])
env->vars = my_setenv(env->vars, "?", "0");
} else if (argv[1]) {
env->vars = my_setenv(env->vars, "?", "0");
return (add_alias(&(env->alias), argv[1], &argv[2]));
}
return (0);
}
+3
View File
@@ -17,6 +17,7 @@ int builtin_env(char **argv, env_t *env)
write(1, env->env[i], strlen(env->env[i]));
write(1, "\n", 1);
}
env->vars = my_setenv(env->vars, "?", "0");
free(argv);
return (0);
}
@@ -37,6 +38,7 @@ int builtin_setenv(char **argv, env_t *env)
return (0);
}
env->env = my_setenv(env->env, argv[1], argv[2]);
env->vars = my_setenv(env->vars, "?", "0");
free(argv);
return (0);
}
@@ -52,6 +54,7 @@ int builtin_unsetenv(char **argv, env_t *env)
for (int i = 1; argv[i]; i++)
if (!strchr(argv[i], '='))
env->env = my_unsetenv(env->env, argv[i]);
env->vars = my_setenv(env->vars, "?", "0");
free(argv);
return (0);
}
+2
View File
@@ -33,6 +33,7 @@ int show_history(env_t *env)
printf("%6d\t%d:%02d\t%s\n", tmp->index, tmp->hour,
tmp->minute, tmp->command);
}
env->vars = my_setenv(env->vars, "?", "0");
return (0);
}
@@ -42,5 +43,6 @@ int clear_history(env_t *env)
for (tmp = env->history; tmp; tmp = tmp->next)
tmp->print = 0;
env->vars = my_setenv(env->vars, "?", "0");
return (0);
}
+3 -1
View File
@@ -50,6 +50,7 @@ int builtin_cd(char **argv, env_t *env)
env->vars = my_setenv(env->vars, "?", "1");
return (0);
}
env->vars = my_setenv(env->vars, "?", "0");
if (!argv[1])
path = my_getenv(env->env, "HOME");
else if (argv[1] && !strcmp(argv[1], "-"))
@@ -66,7 +67,8 @@ int builtin_cd(char **argv, env_t *env)
int builtin_exit(char **argv, env_t *env)
{
if (argv[1])
env->vars = my_setenv(env->vars, "?", "1");
free(argv);
(void)env;
return (-1);
}
+1
View File
@@ -20,6 +20,7 @@ int builtin_unalias(char **argv, env_t *env)
}
for (int i = 1; argv[i]; i++)
remove_alias(argv[i], &(env->alias));
env->vars = my_setenv(env->vars, "?", "0");
return (0);
}