X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fputenv.c;h=4c161a420d3796c45244771f494029c67e71c4cb;hb=87346956de5c7c632b885c1fb300b37f537b013b;hp=47f7256e581ef1f012c256e29824ce87bcd05259;hpb=86464e344f97667276bdc3b11fab107ddde63893;p=gnulib.git

diff --git a/lib/putenv.c b/lib/putenv.c
index 47f7256e5..4c161a420 100644
--- a/lib/putenv.c
+++ b/lib/putenv.c
@@ -1,77 +1,59 @@
-/* Copyright (C) 1991 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
+/* Copyright (C) 1991, 1994 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.
 
-The GNU C Library is distributed in the hope that it will be useful,
+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.
+
+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 <errno.h>
 
 #ifdef HAVE_CONFIG_H
-#if defined (CONFIG_BROKETS)
-/* We use <config.h> instead of "config.h" so that a compilation
-   using -I. -I$srcdir will use ./config.h rather than $srcdir/config.h
-   (which it would do because it found this file in $srcdir).  */
 #include <config.h>
-#else
-#include "config.h"
 #endif
-#endif
-
-#include <sys/types.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.  */
+#if defined (__GNU_LIBRARY__) || defined (HAVE_STDLIB_H)
 #include <stdlib.h>
-#else
-char *malloc ();
-#endif	/* GNU C library.  */
-
-#ifndef STDC_HEADERS
-extern int errno;
 #endif
-
-#if defined(STDC_HEADERS) || defined(HAVE_STRING_H)
+#if defined (__GNU_LIBRARY__) || 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
+#if defined (__GNU_LIBRARY__) || defined (HAVE_UNISTD_H)
 #include <unistd.h>
 #endif
 
-#ifndef NULL
-#define NULL 0
+#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
 
+#if HAVE_GNU_LD
+#define environ __environ
+#else
 extern char **environ;
+#endif
+
 
 /* Put STRING, which is of the form "NAME=VALUE", in the environment.  */
 int
 putenv (string)
      const char *string;
 {
-  char *name_end = index (string, '=');
+  const char *const name_end = strchr (string, '=');
   register size_t size;
   register char **ep;
 
@@ -106,12 +88,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;
     }