From ba174a5e38b1ab764c4a36ef4dd83e80c4add148 Mon Sep 17 00:00:00 2001 From: "Andrey A. Chernov" Date: Tue, 1 May 2007 16:02:44 +0000 Subject: 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. --- lib/libc/stdlib/getenv.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'lib/libc/stdlib/getenv.c') diff --git a/lib/libc/stdlib/getenv.c b/lib/libc/stdlib/getenv.c index 9ff18d8b7784..306b6a19f8be 100644 --- a/lib/libc/stdlib/getenv.c +++ b/lib/libc/stdlib/getenv.c @@ -43,7 +43,7 @@ inline char *__findenv(const char *, int *); * __findenv -- * Returns pointer to value associated with name, if any, else NULL. * Sets offset to be the offset of the name/value combination in the - * environmental array, for use by putenv(3), setenv(3) and unsetenv(3). + * environmental array, for use by setenv(3) and unsetenv(3). * Explicitly removes '=' in argument name. * * This routine *should* be a static; don't use it. @@ -58,7 +58,7 @@ __findenv(name, offset) const char *np; char **p, *cp; - if (environ == NULL) + if (name == NULL || environ == NULL) return (NULL); for (np = name; *np && *np != '='; ++np) continue; @@ -85,8 +85,5 @@ getenv(name) { int offset; - if (name == NULL || !*name || strchr(name, '=') != NULL) - return (NULL); - return (__findenv(name, &offset)); } -- cgit v1.2.3