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

diff --git a/lib/putenv.c b/lib/putenv.c
index c39d1b71e..58a498fda 100644
--- a/lib/putenv.c
+++ b/lib/putenv.c
@@ -1,64 +1,69 @@
-/* Copyright (C) 1991 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
+/* Copyright (C) 1991, 1994, 1997, 1998, 2000 Free Software Foundation, Inc.
 
-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,
-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.
+   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.
 
-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.  */
+   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 General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+#if HAVE_CONFIG_H
+# include <config.h>
+#endif
 
 #include <sys/types.h>
+
+/* Include errno.h *after* sys/types.h to work around header problems
+   on AIX 3.2.5.  */
 #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.  */
+/* Don't include stdlib.h because some (e.g., Solaris 2.7) declare putenv
+   with a non-const argument.  That would conflict with the declaration of
+   rpl_putenv below (due to the #define putenv rpl_putenv from config.h).  */
 
-#ifndef STDC_HEADERS
-extern int errno;
-#endif
+char *malloc ();
+void free ();
 
-#if defined(STDC_HEADERS) || defined(HAVE_STRING_H)
-#include <string.h>
-#ifndef index
-#define index strchr
+#if defined (__GNU_LIBRARY__) || defined (HAVE_STRING_H)
+# include <string.h>
 #endif
-#ifndef bcopy
-#define bcopy(s, d, n) memcpy((d), (s), (n))
+#if defined (__GNU_LIBRARY__) || defined (HAVE_UNISTD_H)
+# include <unistd.h>
 #endif
-#else
-#include <strings.h>
+
+#if !defined (__GNU_LIBRARY__) && !defined (HAVE_STRCHR)
+# define strchr index
+#endif
+#if !defined (__GNU_LIBRARY__) && !defined (HAVE_MEMCPY)
+# define memcpy(d,s,n) bcopy ((s), (d), (n))
 #endif
 
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
+#if HAVE_GNU_LD
+# define environ __environ
+#else
+extern char **environ;
 #endif
 
 #ifndef NULL
-#define NULL 0
+# define NULL 0
 #endif
 
-extern char **environ;
 
 /* Put STRING, which is of the form "NAME=VALUE", in the environment.  */
 int
-putenv (string)
-     const char *string;
+rpl_putenv (const char *string)
 {
-  char *name_end = index (string, '=');
+  const char *const name_end = strchr (string, '=');
   register size_t size;
   register char **ep;
 
@@ -93,11 +98,12 @@ putenv (string)
       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 ((void *) new_environ, (void *) environ,
+		     size * sizeof (char *));
       new_environ[size] = (char *) string;
       new_environ[size + 1] = NULL;
       if (last_environ != NULL)
-	free ((char *) last_environ);
+	free ((void *) last_environ);
       last_environ = new_environ;
       environ = new_environ;
     }