jack/42-archive
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

close issue #145

Browse source
This commit is contained in:
Jack Halford 2017-03-22 12:45:03 +01:00
parent 06b2ad21ba
commit 11e2a974c4
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
42sh/src/builtin/builtin_export.c
View file

@ -57,7 +57,7 @@ int builtin_export(
else else
equal = ft_getenv(data_singleton()->local_var, *av); equal = ft_getenv(data_singleton()->local_var, *av);
equal ? equal++ : equal; equal ? equal++ : equal;
builtin_setenv("internal", (char*[]){"global", *av, equal}, NULL); builtin_setenv("internal", (char*[]){"export", *av, equal}, NULL);
builtin_unsetenv("internal", (char*[]){"local", *av, NULL}, NULL); builtin_unsetenv("internal", (char*[]){"local", *av, NULL}, NULL);
av++; av++;
} }

4
42sh/src/builtin/builtin_setenv.c
View file

@ -12,7 +12,7 @@
#include "minishell.h" #include "minishell.h"
#define SETERR_0 "setenv: invalid variable name" #define SETERR_0 "%s: %s: invalid variable name"
static int assign_var(char *const av[], char ***env) static int assign_var(char *const av[], char ***env)
{ {
@ -59,7 +59,7 @@ int builtin_setenv(const char *path,
ret = word_is_assignment((char *[]){av[1], (esc + 1)}); ret = word_is_assignment((char *[]){av[1], (esc + 1)});
ft_strdel(&esc); ft_strdel(&esc);
if (!ret && ft_strcmp(av[1], "?")) if (!ret && ft_strcmp(av[1], "?"))
return (SH_ERR(SETERR_0)); return (SH_ERR(SETERR_0, av[0], av[1]));
assign_var(av, env); assign_var(av, env);
} }
return (envp ? builtin_return_status(0, 0) : 0); return (envp ? builtin_return_status(0, 0) : 0);