X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fputenv.c;h=9ba55a70ff01d210125b60a5e70d0e70b79895a1;hb=2c5d56e26027133aaef449e8b7219fec2e543430;hp=c39d1b71e1d655b6156d4a04af7c79e80a02aa91;hpb=65eb90523786b69dc0a52b2dfcf1b0f2822f25ab;p=gnulib.git

diff --git a/lib/putenv.c b/lib/putenv.c
index c39d1b71e..9ba55a70f 100644
--- a/lib/putenv.c
+++ b/lib/putenv.c
@@ -1,73 +1,46 @@
 /* Copyright (C) 1991 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
 
-The GNU C Library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
+NOTE: The canonical source of this file is maintained with the GNU C Library.
+Bugs can be reported to bug-glibc@prep.ai.mit.edu.
 
-The GNU C Library is distributed in the hope that it will be useful,
+This program is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation; either version 2, or (at your option) any
+later version.
+
+This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Library General Public License for more details.
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
 
-You should have received a copy of the GNU Library General Public
-License along with the GNU C Library; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA.  */
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
-#include <sys/types.h>
+#include <ansidecl.h>
 #include <errno.h>
-
-/* This needs to come after some library #include
-   to get __GNU_LIBRARY__ defined.  */
-#ifdef	__GNU_LIBRARY__
-/* Don't include stdlib.h for non-GNU C libraries because some of them
-   contain conflicting prototypes for getopt.  */
 #include <stdlib.h>
-#endif	/* GNU C library.  */
-
-#ifndef STDC_HEADERS
-extern int errno;
-#endif
-
-#if defined(STDC_HEADERS) || defined(HAVE_STRING_H)
 #include <string.h>
-#ifndef index
-#define index strchr
-#endif
-#ifndef bcopy
-#define bcopy(s, d, n) memcpy((d), (s), (n))
-#endif
-#else
-#include <strings.h>
-#endif
-
-#ifdef HAVE_UNISTD_H
 #include <unistd.h>
-#endif
 
-#ifndef NULL
-#define NULL 0
+#ifndef	HAVE_GNU_LD
+#define	__environ	environ
 #endif
 
-extern char **environ;
-
 /* Put STRING, which is of the form "NAME=VALUE", in the environment.  */
 int
-putenv (string)
-     const char *string;
+DEFUN(putenv, (string), CONST char *string)
 {
-  char *name_end = index (string, '=');
+  CONST char *CONST name_end = strchr(string, '=');
   register size_t size;
   register char **ep;
 
   if (name_end == NULL)
     {
       /* Remove the variable from the environment.  */
-      size = strlen (string);
-      for (ep = environ; *ep != NULL; ++ep)
-	if (!strncmp (*ep, string, size) && (*ep)[size] == '=')
+      size = strlen(string);
+      for (ep = __environ; *ep != NULL; ++ep)
+	if (!strncmp(*ep, string, size) && (*ep)[size] == '=')
 	  {
 	    while (ep[1] != NULL)
 	      {
@@ -80,8 +53,8 @@ putenv (string)
     }
 
   size = 0;
-  for (ep = environ; *ep != NULL; ++ep)
-    if (!strncmp (*ep, string, name_end - string) &&
+  for (ep = __environ; *ep != NULL; ++ep)
+    if (!strncmp(*ep, string, name_end - string) &&
 	(*ep)[name_end - string] == '=')
       break;
     else
@@ -90,16 +63,16 @@ putenv (string)
   if (*ep == NULL)
     {
       static char **last_environ = NULL;
-      char **new_environ = (char **) malloc ((size + 2) * sizeof (char *));
+      char **new_environ = (char **) malloc((size + 2) * sizeof(char *));
       if (new_environ == NULL)
 	return -1;
-      (void) bcopy ((char *) environ, (char *) new_environ, size * sizeof (char *));
+      (void) memcpy((PTR) new_environ, (PTR) __environ, size * sizeof(char *));
       new_environ[size] = (char *) string;
       new_environ[size + 1] = NULL;
       if (last_environ != NULL)
-	free ((char *) last_environ);
+	free((PTR) last_environ);
       last_environ = new_environ;
-      environ = new_environ;
+      __environ = new_environ;
     }
   else
     *ep = (char *) string;