Remove largely unnecessary putenv() replacement

- only the lua posix extension "uses" this by providing putenv()
  to Lua, make it conditional and return error if not supported by
  the underlying operating system

5 files changed, 11 insertions, 120 deletions

diff --git a/configure.ac b/configure.ac
index d6da981b6..905f2efa4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -553,9 +553,10 @@ dnl AC_FUNC_MMAP
 
 AC_CHECK_FUNCS(mtrace)
 AC_CHECK_FUNCS(strndup)
+AC_CHECK_FUNCS(putenv)
 
 AC_REPLACE_FUNCS(basename getcwd getwd)
-AC_REPLACE_FUNCS(putenv realpath setenv)
+AC_REPLACE_FUNCS(realpath setenv)
 AC_REPLACE_FUNCS(stpcpy stpncpy)
 
 AC_CHECK_FUNCS(__secure_getenv)
diff --git a/luaext/lposix.c b/luaext/lposix.c
index ae407a1e2..5b26e0c8f 100644
--- a/luaext/lposix.c
+++ b/luaext/lposix.c
@@ -5,6 +5,10 @@
 * 05 Nov 2003 22:09:10
 */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>
@@ -360,10 +364,14 @@ static int Psleep(lua_State *L)			/** sleep(seconds) */
 
 static int Pputenv(lua_State *L)		/** putenv(string) */
 {
+#if HAVE_PUTENV
 	size_t l;
 	const char *s=luaL_checklstring(L, 1, &l);
 	char *e=malloc(++l);
 	return pushresult(L, (e==NULL) ? -1 : putenv(memcpy(e,s,l)), s);
+#else
+	return -1;
+#endif
 }
 
 
diff --git a/misc/Makefile.am b/misc/Makefile.am
index b84eea4ce..a45631306 100644
--- a/misc/Makefile.am
+++ b/misc/Makefile.am
@@ -8,8 +8,7 @@ EXTRA_DIST = \
 	fakefork.c	fnmatch.c	fnmatch.h \
 	getcwd.c	getmntent.c	\
 	getwd.c		glob.c		glob.h		\
-	putenv.c	realpath.c	\
-	setenv.c	stpcpy.c	stpncpy.c
+	realpath.c	setenv.c	stpcpy.c	stpncpy.c
 
 noinst_LTLIBRARIES = libmisc.la
 
diff --git a/misc/putenv.c b/misc/putenv.c
deleted file mode 100644
index 15ee03715..000000000
--- a/misc/putenv.c
+++ /dev/null
@@ -1,113 +0,0 @@
-/* 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.
-
-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 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.  */
-
-#include <errno.h>
-
-#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
-#elif defined (__APPLE__)
-# include <crt_externs.h>
-# define environ (*_NSGetEnviron())
-#else
-extern char **environ;
-#endif
-
-
-/* Put STRING, which is of the form "NAME=VALUE", in the environment.  */
-int
-putenv (string)
-     const char *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] == '=')
-	  {
-	    while (ep[1] != NULL)
-	      {
-		ep[0] = ep[1];
-		++ep;
-	      }
-	    *ep = NULL;
-	    return 0;
-	  }
-    }
-
-  size = 0;
-  for (ep = environ; *ep != NULL; ++ep)
-    if (!strncmp (*ep, string, name_end - string) &&
-	(*ep)[name_end - string] == '=')
-      break;
-    else
-      ++size;
-
-  if (*ep == NULL)
-    {
-      static char **last_environ = NULL;
-      char **new_environ = (char **) malloc ((size + 2) * sizeof (char *));
-      if (new_environ == NULL)
-	return -1;
-      (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 ((void *) last_environ);
-      last_environ = new_environ;
-      environ = new_environ;
-    }
-  else
-    *ep = (char *) string;
-
-  return 0;
-}
diff --git a/rpmio/stubs.c b/rpmio/stubs.c
index 68d6426c6..d2118bf62 100644
--- a/rpmio/stubs.c
+++ b/rpmio/stubs.c
@@ -18,10 +18,6 @@
 #include "misc/getwd.c"
 #endif
 
-#if !defined(HAVE_PUTENV)
-#include "misc/putenv.c"
-#endif
-
 #if defined(USE_GETMNTENT)
 #include "misc/getmntent.c"
 #endif