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

diff --git a/lib/putenv.c b/lib/putenv.c
index 9ba55a70f..ee3ccc04a 100644
--- a/lib/putenv.c
+++ b/lib/putenv.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 1991 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1994 Free Software Foundation, Inc.
+
 
 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.
@@ -14,33 +15,60 @@ 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, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+along with this program; if not, write to the Free Software Foundation,
+Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-#include <ansidecl.h>
 #include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
 
-#ifndef	HAVE_GNU_LD
-#define	__environ	environ
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+/* Define-away any (possibly conflicting) prototype of putenv.
+   Many systems omit the `const' attribute on the argument.  */
+#define putenv _sys_putenv
+
+#if defined (__GNU_LIBRARY__) || defined (HAVE_STDLIB_H)
+# include <stdlib.h>
 #endif
+#if defined (__GNU_LIBRARY__) || defined (HAVE_STRING_H)
+# include <string.h>
+#endif
+#if defined (__GNU_LIBRARY__) || defined (HAVE_UNISTD_H)
+# include <unistd.h>
+#endif
+
+#undef putenv
+
+#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
-DEFUN(putenv, (string), CONST char *string)
+putenv (string)
+     const char *string;
 {
-  CONST char *CONST name_end = strchr(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)
 	      {
@@ -53,8 +81,8 @@ DEFUN(putenv, (string), CONST char *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
@@ -63,16 +91,17 @@ DEFUN(putenv, (string), CONST char *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) memcpy((PTR) new_environ, (PTR) __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((PTR) last_environ);
+	free ((void *) last_environ);
       last_environ = new_environ;
-      __environ = new_environ;
+      environ = new_environ;
     }
   else
     *ep = (char *) string;