From be9a0c66f5bc91c9180adc127b3e51686538da93 Mon Sep 17 00:00:00 2001
From: Collin Funk <collin.funk1@gmail.com>
Date: Thu, 2 May 2024 04:21:40 -0700
Subject: [PATCH] maint: Remove redundant 'environ' declarations.

* src/rexecd.c: Remove 'extern char **environ' and instead rely on the
gnulib declaration in unistd.h.
* src/rshd.c: Likewise.
* src/uucpd.c: Likewise.
* telnet/commands.c: Likewise.
* telnetd/pty.c: Likewise.
* tests/addrpeek.c: Likewise.
---
 src/rexecd.c      | 1 -
 src/rshd.c        | 1 -
 src/uucpd.c       | 2 --
 telnet/commands.c | 2 +-
 telnetd/pty.c     | 1 -
 tests/addrpeek.c  | 7 -------
 6 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/src/rexecd.c b/src/rexecd.c
index e9ed092d..f927e990 100644
--- a/src/rexecd.c
+++ b/src/rexecd.c
@@ -216,7 +216,6 @@ char *envinit[] = { homedir, shell, path, username,
   logname, remotehost, NULL
 };
 #endif
-extern char **environ;
 
 char *getstr (const char *);
 
diff --git a/src/rshd.c b/src/rshd.c
index b5a8472a..c3ba028b 100644
--- a/src/rshd.c
+++ b/src/rshd.c
@@ -417,7 +417,6 @@ char rhost[128 + sizeof ("RHOST=")] = "RHOST=";
 #ifndef WITH_PAM
 char *envinit[] = { homedir, shell, path, logname, username, rhost, NULL };
 #endif
-extern char **environ;
 
 void
 doit (int sockfd, struct sockaddr *fromp, socklen_t fromlen)
diff --git a/src/uucpd.c b/src/uucpd.c
index aad85f22..1dd89cf7 100644
--- a/src/uucpd.c
+++ b/src/uucpd.c
@@ -103,8 +103,6 @@ char *nenv[] = {
   NULL,
 };
 
-extern char **environ;
-
 static struct argp_option argp_options[] = {
 #define GRP 10
   {"uucico", 'u', "LOCATION", 0,
diff --git a/telnet/commands.c b/telnet/commands.c
index d5a3481d..1288fdbd 100644
--- a/telnet/commands.c
+++ b/telnet/commands.c
@@ -58,6 +58,7 @@
 #include <netinet/in.h>
 
 #include <fcntl.h>
+#include <unistd.h>
 
 #include <signal.h>
 #include <netdb.h>
@@ -1886,7 +1887,6 @@ env_find (const char *var)
 void
 env_init (void)
 {
-  extern char **environ;
   register char **epp, *cp;
   register struct env_lst *ep;
 #ifndef strchr
diff --git a/telnetd/pty.c b/telnetd/pty.c
index 91018175..18b9d759 100644
--- a/telnetd/pty.c
+++ b/telnetd/pty.c
@@ -83,7 +83,6 @@ startslave (char *host, int autologin, char *autoname)
   return master;
 }
 
-extern char **environ;
 /*
  * scrub_env()
  *
diff --git a/tests/addrpeek.c b/tests/addrpeek.c
index 9533e9e7..7102ad98 100644
--- a/tests/addrpeek.c
+++ b/tests/addrpeek.c
@@ -56,13 +56,6 @@
 # define SEPARATOR "\n"
 #endif
 
-/* TODO Develop some reliable test for the existence of ENVIRON.
- * It is detectable using HAVE_DECL_ENVIRON for GNU/Linux and
- * GNU/kFreeBSD. It is present, but not detectable for OpenBSD
- * and FreeBSD.
- */
-extern char **environ;
-
 static void
 write_address (int fd)
 {