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 185748936697d02a82ab3fb961d88cf26d0ee039..f26dfcb4b2132db11d2fa87ff7dbb60a3071d0eb 100644 (file)
--- 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 b69a29a1bcdbc26228eed1fbb15dbe9534c9bc79..ee5e6b6ceb9a4d8085a4869eb6e563c09e4729f5 100644 (file)
--- 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 8185da6f8b62471e9a0bda4af193184847534306..dcdcb83f392b34f55fa6f5e805ffa1c5d0afeed7 100644 (file)
--- 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 3930713544d9fd4b0e7664b30f2bf75cc38cfab6..885356bec8bd00d0585fd277653ff3ed7fd2e3ca 100644 (file)
--- 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 0de67c95a1cbc08b2f37f5e132f52db9b75359fb..add100aeb30ae950fc2c61a8628ba8dd53e1d020 100644 (file)
--- 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;