*: tidy up usage of char **environ

This commit is contained in:
Denis Vlasenko 2008-01-28 22:45:43 +00:00
parent 0effc2410b
commit 847fa779af
11 changed files with 12 additions and 17 deletions

View File

@ -30,7 +30,7 @@ int open_transformer(int src_fd,
if (pid == 0) { if (pid == 0) {
/* child process */ /* child process */
close(fd_pipe[0]); /* We don't wan't to read from the parent */ close(fd_pipe[0]); /* We don't want to read from the parent */
// FIXME: error check? // FIXME: error check?
#if BB_MMU #if BB_MMU
transformer(src_fd, fd_pipe[1]); transformer(src_fd, fd_pipe[1]);

View File

@ -30,8 +30,6 @@
*/ */
#include <getopt.h> /* struct option */ #include <getopt.h> /* struct option */
extern char **environ;
#include "libbb.h" #include "libbb.h"
#if ENABLE_FEATURE_ENV_LONG_OPTIONS #if ENABLE_FEATURE_ENV_LONG_OPTIONS

View File

@ -9,7 +9,6 @@
*/ */
#include "libbb.h" #include "libbb.h"
extern char **environ;
int printenv_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int printenv_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int printenv_main(int argc, char **argv) int printenv_main(int argc, char **argv)

View File

@ -10,7 +10,6 @@
#include "libbb.h" #include "libbb.h"
#include "xregex.h" #include "xregex.h"
#include <math.h> #include <math.h>
extern char **environ;
/* This is a NOEXEC applet. Be very careful! */ /* This is a NOEXEC applet. Be very careful! */

View File

@ -67,6 +67,9 @@
#include "shadow_.h" #include "shadow_.h"
#endif #endif
/* Some libc's don't declare it, help them */
extern char **environ;
#if defined(__GLIBC__) && __GLIBC__ < 2 #if defined(__GLIBC__) && __GLIBC__ < 2
int vdprintf(int d, const char *format, va_list ap); int vdprintf(int d, const char *format, va_list ap);
#endif #endif

View File

@ -172,9 +172,6 @@
#include <rpc/pmap_clnt.h> #include <rpc/pmap_clnt.h>
#endif #endif
extern char **environ;
#define _PATH_INETDPID "/var/run/inetd.pid" #define _PATH_INETDPID "/var/run/inetd.pid"
#define CNT_INTVL 60 /* servers in CNT_INTVL sec. */ #define CNT_INTVL 60 /* servers in CNT_INTVL sec. */

View File

@ -279,7 +279,7 @@ static unsigned custom(struct svdir *s, char c)
warn_cannot("setup stdout for control/?"); warn_cannot("setup stdout for control/?");
prog[0] = a; prog[0] = a;
prog[1] = NULL; prog[1] = NULL;
execve(a, prog, environ); execv(a, prog);
fatal_cannot("run control/?"); fatal_cannot("run control/?");
} }
while (safe_waitpid(pid, &w, 0) == -1) { while (safe_waitpid(pid, &w, 0) == -1) {

View File

@ -252,7 +252,7 @@ static unsigned processorstart(struct logdir *ld)
prog[1] = (char*)"-c"; prog[1] = (char*)"-c";
prog[2] = ld->processor; prog[2] = ld->processor;
prog[3] = NULL; prog[3] = NULL;
execve("/bin/sh", prog, environ); execv("/bin/sh", prog);
bb_perror_msg_and_die(FATAL"cannot %s processor %s", "run", ld->name); bb_perror_msg_and_die(FATAL"cannot %s processor %s", "run", ld->name);
} }
ld->ppid = pid; ld->ppid = pid;

View File

@ -60,7 +60,6 @@
#if JOBS || ENABLE_ASH_READ_NCHARS #if JOBS || ENABLE_ASH_READ_NCHARS
#include <termios.h> #include <termios.h>
#endif #endif
extern char **environ;
#if defined(__uClinux__) #if defined(__uClinux__)
#error "Do not even bother, ash will not run on uClinux" #error "Do not even bother, ash will not run on uClinux"

View File

@ -81,8 +81,6 @@
#include <getopt.h> /* should be pretty obvious */ #include <getopt.h> /* should be pretty obvious */
/* #include <dmalloc.h> */ /* #include <dmalloc.h> */
extern char **environ; /* This is in <unistd.h>, but protected with __USE_GNU */
#include "busybox.h" /* for APPLET_IS_NOFORK/NOEXEC */ #include "busybox.h" /* for APPLET_IS_NOFORK/NOEXEC */

View File

@ -84,7 +84,6 @@ static char *itoa(int n)
} }
#else #else
# include "busybox.h" /* for applet_names */ # include "busybox.h" /* for applet_names */
extern char **environ;
#endif #endif
/*#define MSHDEBUG 1*/ /*#define MSHDEBUG 1*/
@ -2825,11 +2824,13 @@ static int forkexec(struct op *t, int *pin, int *pout, int act, char **wp)
if (pin != NULL) { if (pin != NULL) {
xmove_fd(pin[0], 0); xmove_fd(pin[0], 0);
if (pin[1] != 0) close(pin[1]); if (pin[1] != 0)
close(pin[1]);
} }
if (pout != NULL) { if (pout != NULL) {
xmove_fd(pout[1], 1); xmove_fd(pout[1], 1);
if (pout[1] != 1) close(pout[0]); if (pout[1] != 1)
close(pout[0]);
} }
iopp = t->ioact; iopp = t->ioact;
@ -4181,7 +4182,8 @@ static int grave(int quoted)
* echo "$files" >zz * echo "$files" >zz
*/ */
xmove_fd(pf[1], 1); xmove_fd(pf[1], 1);
if (pf[0] != 1) close(pf[0]); if (pf[0] != 1)
close(pf[0]);
argument_list[0] = (char *) DEFAULT_SHELL; argument_list[0] = (char *) DEFAULT_SHELL;
argument_list[1] = (char *) "-c"; argument_list[1] = (char *) "-c";