From: Eric Blake <ebb9@byu.net>
Date: Mon, 26 Oct 2009 20:32:59 +0000 (-0600)
Subject: maint: let gnulib provide environ
X-Git-Tag: v8.1~75
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c6900474ef4e0acc02bf5ff41c933afeef4aae09;p=thirdparty%2Fcoreutils.git

maint: let gnulib provide environ

* bootstrap.conf (gnulib_modules): Add environ.
* src/env.c (environ): Delete declaration.
* src/printenv.c (environ): Likewise.
* src/stdbuf.c (environ): Likewise.
* src/su.c (environ): Likewise.
---

diff --git a/bootstrap.conf b/bootstrap.conf
index 1857489366..f26dfcb4b2 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -72,6 +72,7 @@ gnulib_modules="
   dirfd
   dirname
   dup2
+  environ
   error
   euidaccess
   exclude
diff --git a/src/env.c b/src/env.c
index b69a29a1bc..ee5e6b6ceb 100644
--- a/src/env.c
+++ b/src/env.c
@@ -91,8 +91,6 @@
   proper_name ("Richard Mlynarik"), \
   proper_name ("David MacKenzie")
 
-extern char **environ;
-
 static struct option const longopts[] =
 {
   {"ignore-environment", no_argument, NULL, 'i'},
diff --git a/src/printenv.c b/src/printenv.c
index 8185da6f8b..dcdcb83f39 100644
--- a/src/printenv.c
+++ b/src/printenv.c
@@ -45,8 +45,6 @@ enum { PRINTENV_FAILURE = 2 };
   proper_name ("David MacKenzie"), \
   proper_name ("Richard Mlynarik")
 
-extern char **environ;
-
 void
 usage (int status)
 {
diff --git a/src/stdbuf.c b/src/stdbuf.c
index 3930713544..885356bec8 100644
--- a/src/stdbuf.c
+++ b/src/stdbuf.c
@@ -39,8 +39,6 @@
 
 static char *program_path;
 
-extern char **environ;
-
 static struct
 {
   size_t size;
diff --git a/src/su.c b/src/su.c
index 0de67c95a1..add100aeb3 100644
--- a/src/su.c
+++ b/src/su.c
@@ -113,8 +113,6 @@
 
 char *crypt (char const *key, char const *salt);
 
-extern char **environ;
-
 static void run_shell (char const *, char const *, char **, size_t)
      ATTRIBUTE_NORETURN;