5b3408300
Denis Vlasenko
2007-05-17
Subject
several *.c files: move 'extern environ' up to the location of #includes
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
coreutils/env.c +1 -1coreutils/printenv.c +1 -1editors/awk.c +1 -2networking/inetd.c +3 -2shell/ash.c +1 -1
coreutils/env.c+1 -1
| @@ -32,6 +32,7 @@ | |
| #include "busybox.h" | |
| #include <errno.h> | |
| #include <getopt.h> /* struct option */ | |
| + | extern char **environ; |
| #if ENABLE_FEATURE_ENV_LONG_OPTIONS | |
| static const struct option env_long_options[] = { | |
| @@ -49,7 +50,6 @@ int env_main(int argc, char** argv) | |
| char **ep; | |
| unsigned opt; | |
| llist_t *unset_env = NULL; | |
| - | extern char **environ; |
| opt_complementary = "u::"; | |
| #if ENABLE_FEATURE_ENV_LONG_OPTIONS | |
coreutils/printenv.c+1 -1
| @@ -12,11 +12,11 @@ | |
| #include <string.h> | |
| #include <stdlib.h> | |
| #include "busybox.h" | |
| + | extern char **environ; |
| int printenv_main(int argc, char **argv); | |
| int printenv_main(int argc, char **argv) | |
| { | |
| - | extern char **environ; |
| int e = 0; | |
| /* no variables specified, show whole env */ | |
editors/awk.c+1 -2
| @@ -10,6 +10,7 @@ | |
| #include "busybox.h" | |
| #include "xregex.h" | |
| #include <math.h> | |
| + | extern char **environ; |
| /* This is a NOEXEC applet. Be very careful! */ | |
| @@ -393,8 +394,6 @@ enum { NPRIMES = sizeof(PRIMES) / sizeof(unsigned) }; | |
| /* globals */ | |
| - | extern char **environ; |
| - | |
| static var * V[_intvarcount_]; | |
| static chain beginseq, mainseq, endseq, *seq; | |
| static int nextrec, nextfile; | |
networking/inetd.c+3 -2
| @@ -172,8 +172,10 @@ | |
| #include <rpc/pmap_clnt.h> | |
| #endif | |
| - | #define _PATH_INETDPID "/var/run/inetd.pid" |
| + | extern char **environ; |
| + | |
| + | #define _PATH_INETDPID "/var/run/inetd.pid" |
| #define CNT_INTVL 60 /* servers in CNT_INTVL sec. */ | |
| #define RETRYTIME (60*10) /* retry after bind or server fail */ | |
| @@ -1263,7 +1265,6 @@ int inetd_main(int argc, char **argv) | |
| sigset_t omask, wait_mask; | |
| #ifdef INETD_SETPROCTITLE | |
| - | extern char **environ; |
| char **envp = environ; | |
| Argv = argv; | |
shell/ash.c+1 -1
| @@ -60,6 +60,7 @@ | |
| #if JOBS || ENABLE_ASH_READ_NCHARS | |
| #include <termios.h> | |
| #endif | |
| + | extern char **environ; |
| #if defined(__uClinux__) | |
| #error "Do not even bother, ash will not run on uClinux" | |
| @@ -1747,7 +1748,6 @@ struct redirtab { | |
| static struct redirtab *redirlist; | |
| static int nullredirs; | |
| - | extern char **environ; |
| static int preverrout_fd; /* save fd2 before print debug if xflag is set. */ | |
| #define VTABSIZE 39 | |