diff options
| author | ache <ache@FreeBSD.org> | 2007-05-01 16:02:44 +0000 |
|---|---|---|
| committer | ache <ache@FreeBSD.org> | 2007-05-01 16:02:44 +0000 |
| commit | 6ccaf050cc62bc9d81ac3acb71ce640739caa0f7 (patch) | |
| tree | e3e0b3658b8df3a905b3117d8535bb15f42c9e80 /bin | |
| parent | 61e9800ad7707590037d6868c703475f36cf7058 (diff) | |
| download | FreeBSD-src-6ccaf050cc62bc9d81ac3acb71ce640739caa0f7.zip FreeBSD-src-6ccaf050cc62bc9d81ac3acb71ce640739caa0f7.tar.gz | |
Back out all POSIXified *env() changes.
Not because I admit they are technically wrong and not because of bug
reports (I receive nothing). But because I surprisingly meets so
strong opposition and resistance so lost any desire to continue that.
Anyone who interested in POSIX can dig out what changes and how
through cvs diffs.
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/df/df.c | 8 | ||||
| -rw-r--r-- | bin/sh/var.c | 13 |
2 files changed, 8 insertions, 13 deletions
diff --git a/bin/df/df.c b/bin/df/df.c index 0350d98..5420da9 100644 --- a/bin/df/df.c +++ b/bin/df/df.c @@ -131,14 +131,14 @@ main(int argc, char *argv[]) */ if (kflag) break; - putenv(strdup("BLOCKSIZE=512")); + putenv("BLOCKSIZE=512"); hflag = 0; break; case 'c': cflag = 1; break; case 'g': - putenv(strdup("BLOCKSIZE=1g")); + putenv("BLOCKSIZE=1g"); hflag = 0; break; case 'H': @@ -152,7 +152,7 @@ main(int argc, char *argv[]) break; case 'k': kflag++; - putenv(strdup("BLOCKSIZE=1024")); + putenv("BLOCKSIZE=1024"); hflag = 0; break; case 'l': @@ -162,7 +162,7 @@ main(int argc, char *argv[]) lflag = 1; break; case 'm': - putenv(strdup("BLOCKSIZE=1m")); + putenv("BLOCKSIZE=1m"); hflag = 0; break; case 'n': diff --git a/bin/sh/var.c b/bin/sh/var.c index afb144a..54a0a84 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; |
