1 files changed, 37 insertions, 35 deletions

diff --git a/src/lib/libc/stdlib/getenv.c b/src/lib/libc/stdlib/getenv.c
index 09d47f2149..c597e468a9 100644
--- a/src/lib/libc/stdlib/getenv.c
+++ b/src/lib/libc/stdlib/getenv.c
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 1987 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1987, 1993
+ *      The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -10,11 +10,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -32,26 +28,13 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-/*static char *sccsid = "from: @(#)getenv.c     5.8 (Berkeley) 2/23/91";*/
-static char *rcsid = "$Id: getenv.c,v 1.1.1.1 1995/10/18 08:42:17 deraadt Exp $";
+static char *rcsid = "$OpenBSD: getenv.c,v 1.6 2003/06/02 20:18:37 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdlib.h>
 #include <string.h>
 
-/*
- * getenv --
- *      Returns ptr to value associated with name, if any, else NULL.
- */
-char *
-getenv(name)
-        const char *name;
-{
-        int offset;
-        char *__findenv();
-
-        return(__findenv(name, &offset));
-}
+char *__findenv(const char *name, int *offset);
 
 /*
  * __findenv --
@@ -63,20 +46,39 @@ getenv(name)
  *      This routine *should* be a static; don't use it.
  */
 char *
-__findenv(name, offset)
-        register char *name;
-        int *offset;
+__findenv(const char *name, int *offset)
 {
         extern char **environ;
-        register int len;
-        register char **P, *C;
+        register int len, i;
+        register const char *np;
+        register char **p, *cp;
+
+        if (name == NULL || environ == NULL)
+                return (NULL);
+        for (np = name; *np && *np != '='; ++np)
+                ;
+        len = np - name;
+        for (p = environ; (cp = *p) != NULL; ++p) {
+                for (np = name, i = len; i && *cp; i--)
+                        if (*cp++ != *np++)
+                                break;
+                if (i == 0 && *cp++ == '=') {
+                        *offset = p - environ;
+                        return (cp);
+                }
+        }
+        return (NULL);
+}
+
+/*
+ * getenv --
+ *      Returns ptr to value associated with name, if any, else NULL.
+ */
+char *
+getenv(name)
+        const char *name;
+{
+        int offset;
 
-        for (C = name, len = 0; *C && *C != '='; ++C, ++len);
-        for (P = environ; *P; ++P)
-                if (!strncmp(*P, name, len))
-                        if (*(C = *P + len) == '=') {
-                                *offset = P - environ;
-                                return(++C);
-                        }
-        return(NULL);
+        return (__findenv(name, &offset));
 }