d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Put some safeguards:

Browse Source 
1) Under POSIX unsetenv("foo=bar") is explicit error and not equal
to unsetenv("foo")
2) Prepare for upcomig POSIXed putenv() rewrite: make putenv() calls
portable and conforming to standard.
This commit is contained in:
ache 2007-04-30 11:44:42 +00:00
parent 3f3de6c767
commit ac682a1ec2
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
bin/sh/var.c
View File

@ -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;