BSD 4_3_Net_2 release

[unix-history] / usr / src / lib / libc / stdlib / setenv.c

diff --git a/usr/src/lib/libc/stdlib/setenv.c b/usr/src/lib/libc/stdlib/setenv.c
index b042912..14efac3 100644 (file)
--- a/usr/src/lib/libc/stdlib/setenv.c
+++ b/usr/src/lib/libc/stdlib/setenv.c
@@ -2,27 +2,42 @@
  * Copyright (c) 1987 Regents of the University of California.
  * All rights reserved.
  *
  * Copyright (c) 1987 Regents of the University of California.
  * All rights reserved.
  *

- * Redistribution and use in source and binary forms are permitted
- * provided that: (1) source distributions retain this entire copyright
- * notice and comment, and (2) distributions including binaries display
- * the following acknowledgement:  ``This product includes software
- * developed by the University of California, Berkeley and its contributors''
- * in the documentation or other materials provided with the distribution
- * and in all advertising materials mentioning features or use of this
- * software. 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.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 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
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.

  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)

-static char sccsid[] = "@(#)setenv.c   5.4 (Berkeley) 6/1/90";
+static char sccsid[] = "@(#)setenv.c   5.6 (Berkeley) 6/4/91";

 #endif /* LIBC_SCCS and not lint */
 
 #include <stddef.h>
 #include <stdlib.h>
 #endif /* LIBC_SCCS and not lint */
 
 #include <stddef.h>
 #include <stdlib.h>

+#include <string.h>

 
 /*
  * setenv --
 
 /*
  * setenv --


@@ -30,7 +45,8 @@ static char sccsid[] = "@(#)setenv.c  5.4 (Berkeley) 6/1/90";
  *     "value".  If rewrite is set, replace any current value.
  */
 setenv(name, value, rewrite)
  *     "value".  If rewrite is set, replace any current value.
  */
 setenv(name, value, rewrite)

-       register char *name, *value;
+       register const char *name;
+       register const char *value;

        int rewrite;
 {
        extern char **environ;
        int rewrite;
 {
        extern char **environ;


@@ -44,13 +60,12 @@ setenv(name, value, rewrite)
        l_value = strlen(value);
        if ((C = _findenv(name, &offset))) {    /* find if already exists */
                if (!rewrite)
        l_value = strlen(value);
        if ((C = _findenv(name, &offset))) {    /* find if already exists */
                if (!rewrite)

-                       return(0);
+                       return (0);

                if (strlen(C) >= l_value) {     /* old larger; copy over */
                        while (*C++ = *value++);
                if (strlen(C) >= l_value) {     /* old larger; copy over */
                        while (*C++ = *value++);

-                       return(0);
+                       return (0);

                }
                }

-       }
-       else {                                  /* create new slot */
+       } else {                                        /* create new slot */

                register int    cnt;
                register char   **P;
 
                register int    cnt;
                register char   **P;
 


@@ -59,27 +74,29 @@ setenv(name, value, rewrite)
                        environ = (char **)realloc((char *)environ,
                            (size_t)(sizeof(char *) * (cnt + 2)));
                        if (!environ)
                        environ = (char **)realloc((char *)environ,
                            (size_t)(sizeof(char *) * (cnt + 2)));
                        if (!environ)

-                               return(-1);
+                               return (-1);

                }
                else {                          /* get new space */
                        alloced = 1;            /* copy old entries into it */
                        P = (char **)malloc((size_t)(sizeof(char *) *
                            (cnt + 2)));
                        if (!P)
                }
                else {                          /* get new space */
                        alloced = 1;            /* copy old entries into it */
                        P = (char **)malloc((size_t)(sizeof(char *) *
                            (cnt + 2)));
                        if (!P)

-                               return(-1);
+                               return (-1);

                        bcopy(environ, P, cnt * sizeof(char *));
                        environ = P;
                }
                environ[cnt + 1] = NULL;
                offset = cnt;
        }
                        bcopy(environ, P, cnt * sizeof(char *));
                        environ = P;
                }
                environ[cnt + 1] = NULL;
                offset = cnt;
        }

-       for (C = 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))))
        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++;);
-       return(0);
+               return (-1);
+       for (C = environ[offset]; (*C = *name++) && *C != '='; ++C)
+               ;
+       for (*C++ = '='; *C++ = *value++; )
+               ;
+       return (0);

 }
 
 /*
 }
 
 /*


@@ -88,7 +105,7 @@ setenv(name, value, rewrite)
  */
 void
 unsetenv(name)
  */
 void
 unsetenv(name)

-       char    *name;
+       const char      *name;

 {
        extern char **environ;
        register char **P;
 {
        extern char **environ;
        register char **P;