1 files changed, 9 insertions, 7 deletions

diff --git a/src/lib/libc/stdlib/setenv.c b/src/lib/libc/stdlib/setenv.c
index a36669888d..044f01b1c9 100644
--- a/src/lib/libc/stdlib/setenv.c
+++ b/src/lib/libc/stdlib/setenv.c
@@ -32,13 +32,14 @@
  */
 
 #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 $";
+static char *rcsid = "$OpenBSD: setenv.c,v 1.5 2002/12/10 22:44:13 mickey Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdlib.h>
 #include <string.h>
 
+char *__findenv(const char *name, int *offset);
+
 /*
  * setenv --
  *      Set the value of the environmental variable "name" to be
@@ -54,7 +55,6 @@ setenv(name, value, rewrite)
         static int alloced;                     /* if allocated space before */
         register char *C;
         int l_value, offset;
-        char *__findenv();
 
         if (*value == '=')                      /* no `=' in value */
                 ++value;
@@ -63,7 +63,8 @@ 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 */
@@ -72,10 +73,11 @@ setenv(name, value, rewrite)
 
                 for (P = environ, cnt = 0; *P; ++P, ++cnt);
                 if (alloced) {                  /* just increase size */
-                        environ = (char **)realloc((char *)environ,
+                        P = (char **)realloc((void *)environ,
                             (size_t)(sizeof(char *) * (cnt + 2)));
-                        if (!environ)
+                        if (!P)
                                 return (-1);
+                        environ = P;
                 }
                 else {                          /* get new space */
                         alloced = 1;            /* copy old entries into it */
@@ -95,7 +97,7 @@ setenv(name, value, rewrite)
                 return (-1);
         for (C = environ[offset]; (*C = *name++) && *C != '='; ++C)
                 ;
-        for (*C++ = '='; *C++ = *value++; )
+        for (*C++ = '='; (*C++ = *value++); )
                 ;
         return (0);
 }