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

fix setenv #105'

Browse source
This commit is contained in:
gwojda 2017-03-15 10:48:08 +01:00
parent af97e96d60
commit 26583e9027
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -6,7 +6,7 @@
/* By: jhalford <jhalford@student.42.fr> +#+ +:+ +#+ */ /* By: jhalford <jhalford@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2016/11/28 14:25:17 by jhalford #+# #+# */ /* Created: 2016/11/28 14:25:17 by jhalford #+# #+# */
/* Updated: 2017/03/15 02:12:56 by ariard ### ########.fr */ /* Updated: 2017/03/15 10:47:33 by gwojda ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -21,17 +21,24 @@ int builtin_setenv(const char *path, char *const av[], char *const envp[])
(void)envp; (void)envp;
(void)path; (void)path;
i = 0; i = 0;
env = ft_strcmp(av[0], "local") == 0 ? if (ft_strcmp(av[0], "local") == 0)
&data_singleton()->local_var : &data_singleton()->env; {
env = &data_singleton()->local_var;
av++;
}
else
env = &data_singleton()->env;
av++; av++;
if (!av[0]) if (!av[0])
{ {
ft_sstrprint(*env, '\n'); ft_sstrprint(*env, '\n');
ft_putchar('\n'); ft_putchar('\n');
} }
else if (!av[1])
ft_putendl_fd("usage : name [space] value", 2);
else else
{ {
str = ft_str3join(av[0], "=", av[2]); str = ft_str3join(av[0], "=", av[1]);
while ((*env) && (*env)[i]) while ((*env) && (*env)[i])
{ {
if (ft_strcmp((*env)[i], av[0]) == '=') if (ft_strcmp((*env)[i], av[0]) == '=')