1 files changed, 29 insertions, 46 deletions

diff --git a/src/lib/libc/stdlib/setenv.c b/src/lib/libc/stdlib/setenv.c
index a36669888d..36540ebb0c 100644
--- a/src/lib/libc/stdlib/setenv.c
+++ b/src/lib/libc/stdlib/setenv.c
@@ -1,3 +1,4 @@
+/*      $OpenBSD: setenv.c,v 1.9 2005/08/08 08:05:37 espie Exp $ */
 /*
  * Copyright (c) 1987 Regents of the University of California.
  * All rights reserved.
@@ -10,11 +11,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.
  *
@@ -31,30 +28,24 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-/*static char *sccsid = "from: @(#)setenv.c     5.6 (Berkeley) 6/4/91";*/
-static char *rcsid = "$Id: setenv.c,v 1.1.1.1 1995/10/18 08:42:19 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
-
 #include <stdlib.h>
 #include <string.h>
 
+char *__findenv(const char *name, int *offset);
+
+extern char **environ;
+
 /*
  * setenv --
  *      Set the value of the environmental variable "name" to be
  *      "value".  If rewrite is set, replace any current value.
  */
 int
-setenv(name, value, rewrite)
-        register const char *name;
-        register const char *value;
-        int rewrite;
+setenv(const char *name, const char *value, int rewrite)
 {
-        extern char **environ;
-        static int alloced;                     /* if allocated space before */
-        register char *C;
+        static char **lastenv;                  /* last value of environ */
+        char *C;
         int l_value, offset;
-        char *__findenv();
 
         if (*value == '=')                      /* no `=' in value */
                 ++value;
@@ -63,39 +54,34 @@ setenv(name, value, rewrite)
                 if (!rewrite)
                         return (0);
                 if (strlen(C) >= l_value) {     /* old larger; copy over */
-                        while (*C++ = *value++);
+                        while ((*C++ = *value++))
+                                ;
                         return (0);
                 }
         } else {                                        /* create new slot */
-                register int    cnt;
-                register char   **P;
+                size_t cnt;
+                char **P;
 
-                for (P = environ, cnt = 0; *P; ++P, ++cnt);
-                if (alloced) {                  /* just increase size */
-                        environ = (char **)realloc((char *)environ,
-                            (size_t)(sizeof(char *) * (cnt + 2)));
-                        if (!environ)
-                                return (-1);
-                }
-                else {                          /* get new space */
-                        alloced = 1;            /* copy old entries into it */
-                        P = (char **)malloc((size_t)(sizeof(char *) *
-                            (cnt + 2)));
-                        if (!P)
-                                return (-1);
-                        bcopy(environ, P, cnt * sizeof(char *));
-                        environ = P;
-                }
-                environ[cnt + 1] = NULL;
+                for (P = environ; *P != NULL; P++)
+                        ;
+                cnt = P - environ;
+                P = (char **)realloc(lastenv, sizeof(char *) * (cnt + 2));
+                if (!P)
+                        return (-1);
+                if (lastenv != environ)
+                        memcpy(P, environ, cnt * sizeof(char *));
+                lastenv = environ = P;
                 offset = cnt;
+                environ[cnt + 1] = NULL;
         }
-        for (C = (char *)name; *C && *C != '='; ++C);   /* no `=' in name */
+        for (C = (char *)name; *C && *C != '='; ++C)
+                ;                               /* no `=' in name */
         if (!(environ[offset] =                 /* name + `=' + value */
             malloc((size_t)((int)(C - name) + l_value + 2))))
                 return (-1);
         for (C = environ[offset]; (*C = *name++) && *C != '='; ++C)
                 ;
-        for (*C++ = '='; *C++ = *value++; )
+        for (*C++ = '='; (*C++ = *value++); )
                 ;
         return (0);
 }
@@ -105,15 +91,12 @@ setenv(name, value, rewrite)
  *      Delete environmental variable "name".
  */
 void
-unsetenv(name)
-        const char      *name;
+unsetenv(const char *name)
 {
-        extern char **environ;
-        register char **P;
+        char **P;
         int offset;
-        char *__findenv();
 
-        while (__findenv(name, &offset))                /* if set multiple times */
+        while (__findenv(name, &offset))        /* if set multiple times */
                 for (P = &environ[offset];; ++P)
                         if (!(*P = *(P + 1)))
                                 break;