diff options
| author | Andrey A. Chernov <ache@FreeBSD.org> | 2007-04-30 11:44:42 +0000 |
|---|---|---|
| committer | Andrey A. Chernov <ache@FreeBSD.org> | 2007-04-30 11:44:42 +0000 |
| commit | 7071e63df72ba6c878328e9356e0a88d3511d24c (patch) | |
| tree | 9a99b0f1a1d6b209300573fba5fa4221f813fe1a /bin | |
| parent | ad9cf5061503d211eef3a96024f0f32d02127354 (diff) | |
Notes
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/sh/var.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/bin/sh/var.c b/bin/sh/var.c index 54a0a84080c3..b86ecfbcaf81 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)) { - putenv(s); + (void) putenv((vp->flags & VTEXTFIXED) ? vp->text : savestr(vp->text)); (void) setlocale(LC_ALL, ""); } INTON; @@ -335,7 +335,7 @@ setvareq(char *s, int flags) INTOFF; *vpp = vp; if ((vp->flags & VEXPORT) && localevar(s)) { - putenv(s); + (void) putenv((vp->flags & VTEXTFIXED) ? vp->text : savestr(vp->text)); (void) setlocale(LC_ALL, ""); } INTON; @@ -596,7 +596,7 @@ exportcmd(int argc, char **argv) vp->flags |= flag; if ((vp->flags & VEXPORT) && localevar(vp->text)) { - putenv(vp->text); + (void) putenv((vp->flags & VTEXTFIXED) ? vp->text : savestr(vp->text)); (void) setlocale(LC_ALL, ""); } goto found; @@ -776,6 +776,7 @@ unsetcmd(int argc __unused, char **argv __unused) int unsetvar(char *s) { + char *eqp, *ss; struct var **vpp; struct var *vp; @@ -788,7 +789,11 @@ unsetvar(char *s) if (*(strchr(vp->text, '=') + 1) != '\0') setvar(s, nullstr, 0); if ((vp->flags & VEXPORT) && localevar(vp->text)) { - unsetenv(s); + ss = savestr(s); + if ((eqp = strchr(ss, '=')) != NULL) + *eqp = '\0'; + (void) unsetenv(ss); + ckfree(ss); setlocale(LC_ALL, ""); } vp->flags &= ~VEXPORT; |