summaryrefslogtreecommitdiffstats
path: root/bin/sh/var.c
diff options
context:
space:
mode:
Diffstat (limited to 'bin/sh/var.c')
-rw-r--r--bin/sh/var.c13
1 files changed, 4 insertions, 9 deletions
diff --git a/bin/sh/var.c b/bin/sh/var.c
index afb144a..54a0a84 100644
--- a/bin/sh/var.c
+++ b/bin/sh/var.c
@@ -319,7 +319,7 @@ setvareq(char *s, int flags)
if (vp == &vmpath || (vp == &vmail && ! mpathset()))
chkmail(1);
if ((vp->flags & VEXPORT) && localevar(s)) {
- (void) putenv(savestr(s));
+ putenv(s);
(void) setlocale(LC_ALL, "");
}
INTON;
@@ -335,7 +335,7 @@ setvareq(char *s, int flags)
INTOFF;
*vpp = vp;
if ((vp->flags & VEXPORT) && localevar(s)) {
- (void) putenv(savestr(s));
+ putenv(s);
(void) setlocale(LC_ALL, "");
}
INTON;
@@ -596,7 +596,7 @@ exportcmd(int argc, char **argv)
vp->flags |= flag;
if ((vp->flags & VEXPORT) && localevar(vp->text)) {
- (void) putenv(savestr(vp->text));
+ putenv(vp->text);
(void) setlocale(LC_ALL, "");
}
goto found;
@@ -776,7 +776,6 @@ unsetcmd(int argc __unused, char **argv __unused)
int
unsetvar(char *s)
{
- char *eqp, *ss;
struct var **vpp;
struct var *vp;
@@ -789,11 +788,7 @@ unsetvar(char *s)
if (*(strchr(vp->text, '=') + 1) != '\0')
setvar(s, nullstr, 0);
if ((vp->flags & VEXPORT) && localevar(vp->text)) {
- ss = savestr(s);
- if ((eqp = strchr(ss, '=')) != NULL)
- *eqp = '\0';
- (void) unsetenv(ss);
- ckfree(ss);
+ unsetenv(s);
setlocale(LC_ALL, "");
}
vp->flags &= ~VEXPORT;
OpenPOWER on IntegriCloud