emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

*: tidy up usage of char **environ

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
archival/libunarchive/open_transformer.c
View File

@ -30,7 +30,7 @@ int open_transformer(int src_fd,
if (pid == 0) {
/* 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?
#if BB_MMU
transformer(src_fd, fd_pipe[1]);

2
coreutils/env.c
View File

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

1
coreutils/printenv.c
View File

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

1
editors/awk.c
View File

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

3
include/libbb.h
View File

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

3
networking/inetd.c
View File

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

2
runit/runsv.c
View File

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

2
runit/svlogd.c
View File

@ -252,7 +252,7 @@ static unsigned processorstart(struct logdir *ld)
prog[1] = (char*)"-c";
prog[2] = ld->processor;
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);
}
ld->ppid = pid;

1
shell/ash.c
View File

@ -60,7 +60,6 @@
#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"

2
shell/hush.c
View File

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

10
shell/msh.c
View File

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