diff options
| author | ache <ache@FreeBSD.org> | 2007-04-30 15:01:33 +0000 |
|---|---|---|
| committer | ache <ache@FreeBSD.org> | 2007-04-30 15:01:33 +0000 |
| commit | 4d05f6527a4147faafcf78f1155960ea78989153 (patch) | |
| tree | 35aa4c4d0db9870366bf1de0a183afadcebaf5aa /bin/sh/var.c | |
| parent | 042e9b5d41bac05194e97718e264f65dfea49699 (diff) | |
| download | FreeBSD-src-4d05f6527a4147faafcf78f1155960ea78989153.zip FreeBSD-src-4d05f6527a4147faafcf78f1155960ea78989153.tar.gz | |
Simplify previous fix and disallow VTEXTFIXED direct pass for putenv() too,
just use savestr()
Diffstat (limited to 'bin/sh/var.c')
| -rw-r--r-- | bin/sh/var.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bin/sh/var.c b/bin/sh/var.c index b86ecfb..afb144a 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((vp->flags & VTEXTFIXED) ? vp->text : savestr(vp->text)); + (void) putenv(savestr(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((vp->flags & VTEXTFIXED) ? vp->text : savestr(vp->text)); + (void) putenv(savestr(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((vp->flags & VTEXTFIXED) ? vp->text : savestr(vp->text)); + (void) putenv(savestr(vp->text)); (void) setlocale(LC_ALL, ""); } goto found; |
