diff options
| author | Andrey A. Chernov <ache@FreeBSD.org> | 2007-05-01 16:02:44 +0000 |
|---|---|---|
| committer | Andrey A. Chernov <ache@FreeBSD.org> | 2007-05-01 16:02:44 +0000 |
| commit | ba174a5e38b1ab764c4a36ef4dd83e80c4add148 (patch) | |
| tree | e3e0b3658b8df3a905b3117d8535bb15f42c9e80 /bin/sh | |
| parent | 8d497697b2ae8684e3ac94eff8bb9ce60dc14a3e (diff) | |
Notes
Diffstat (limited to 'bin/sh')
| -rw-r--r-- | bin/sh/var.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/bin/sh/var.c b/bin/sh/var.c index afb144afd636..54a0a84080c3 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; |