From 11e2a974c41a5484effe5f6067f856b458e732b9 Mon Sep 17 00:00:00 2001 From: Jack Halford Date: Wed, 22 Mar 2017 12:45:03 +0100 Subject: [PATCH] close issue #145 --- 42sh/src/builtin/builtin_export.c | 2 +- 42sh/src/builtin/builtin_setenv.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/42sh/src/builtin/builtin_export.c b/42sh/src/builtin/builtin_export.c index 4eee266a..85e87f63 100644 --- a/42sh/src/builtin/builtin_export.c +++ b/42sh/src/builtin/builtin_export.c @@ -57,7 +57,7 @@ int builtin_export( else equal = ft_getenv(data_singleton()->local_var, *av); 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); av++; } diff --git a/42sh/src/builtin/builtin_setenv.c b/42sh/src/builtin/builtin_setenv.c index 4cfda406..1c006c93 100644 --- a/42sh/src/builtin/builtin_setenv.c +++ b/42sh/src/builtin/builtin_setenv.c @@ -12,7 +12,7 @@ #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) { @@ -59,7 +59,7 @@ int builtin_setenv(const char *path, ret = word_is_assignment((char *[]){av[1], (esc + 1)}); ft_strdel(&esc); if (!ret && ft_strcmp(av[1], "?")) - return (SH_ERR(SETERR_0)); + return (SH_ERR(SETERR_0, av[0], av[1])); assign_var(av, env); } return (envp ? builtin_return_status(0, 0) : 0);