Simplify previous fix and disallow VTEXTFIXED direct pass for putenv() too,
just use savestr()
This commit is contained in:
parent
0cf4488ab4
commit
c7368c3569
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=169133
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user