summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Andersen2003-07-29 07:05:40 +0000
committerEric Andersen2003-07-29 07:05:40 +0000
commit2a186890ee664be41b8f9ea572a9ae3498f06eca (patch)
tree13ec20ed6ec7dd51ab4ffe84530d9dd37b77b091
parent81fe123040b53490b239b3d2abc8cc93d6d462ae (diff)
downloadbusybox-2a186890ee664be41b8f9ea572a9ae3498f06eca.zip
busybox-2a186890ee664be41b8f9ea572a9ae3498f06eca.tar.gz
Bruno Randolf writes:
this patch fixes run_parts when it's called by ifupdown. 1) argv has to be a NULL terminated char* array, not just a string. 2) run_parts now explicitly sets the environment. this environment is populated from the /etc/network/interfaces config file and is needed by the scripts in /etc/network/if-pre-up.d/. when run-parts is called from the command line the environment is taken from the current process. Vladimir Oleynik then wrote: You can simplify this if use: + bb_xasprintf(&buf[0], "/etc/network/if-%s.d", opt); + buf[1] = NULL; + + run_parts(&buf, 2, environ); + free(buf[0]); --w vodz
-rw-r--r--debianutils/run_parts.c4
-rw-r--r--include/libbb.h2
-rw-r--r--libbb/run_parts.c4
-rw-r--r--networking/ifupdown.c11
4 files changed, 12 insertions, 9 deletions
diff --git a/debianutils/run_parts.c b/debianutils/run_parts.c
index 98fd588..53d33ce 100644
--- a/debianutils/run_parts.c
+++ b/debianutils/run_parts.c
@@ -61,6 +61,8 @@ static const struct option runparts_long_options[] = {
{ 0, 0, 0, 0 }
};
+extern char **environ;
+
/* run_parts_main */
/* Process options */
int run_parts_main(int argc, char **argv)
@@ -108,5 +110,5 @@ int run_parts_main(int argc, char **argv)
args[0] = argv[optind];
args[argcount] = 0;
- return(run_parts(args, test_mode));
+ return(run_parts(args, test_mode, environ));
}
diff --git a/include/libbb.h b/include/libbb.h
index 6b75b8a..ddc93c1 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -405,7 +405,7 @@ extern void run_shell ( const char *shell, int loginshell, const char *command,
, security_id_t sid
#endif
);
-extern int run_parts(char **args, const unsigned char test_mode);
+extern int run_parts(char **args, const unsigned char test_mode, char **env);
extern int restricted_shell ( const char *shell );
extern void setup_environment ( const char *shell, int loginshell, int changeenv, const struct passwd *pw );
extern int correct_password ( const struct passwd *pw );
diff --git a/libbb/run_parts.c b/libbb/run_parts.c
index 5864566..171d937 100644
--- a/libbb/run_parts.c
+++ b/libbb/run_parts.c
@@ -47,7 +47,7 @@ static int valid_name(const struct dirent *d)
* test_mode = 2 means to fail siliently on missing directories
*/
-extern int run_parts(char **args, const unsigned char test_mode)
+extern int run_parts(char **args, const unsigned char test_mode, char **env)
{
struct dirent **namelist = 0;
struct stat st;
@@ -92,7 +92,7 @@ extern int run_parts(char **args, const unsigned char test_mode)
bb_perror_msg_and_die("failed to fork");
} else if (!pid) {
args[0] = filename;
- execv(filename, args);
+ execve(filename, args, env);
exec_errno = errno;
_exit(1);
}
diff --git a/networking/ifupdown.c b/networking/ifupdown.c
index 818bec2..f91edda 100644
--- a/networking/ifupdown.c
+++ b/networking/ifupdown.c
@@ -1019,7 +1019,7 @@ static int doit(char *str)
static int execute_all(struct interface_defn_t *ifd, execfn *exec, const char *opt)
{
int i;
- char *buf;
+ char *buf[2];
for (i = 0; i < ifd->n_options; i++) {
if (strcmp(ifd->option[i].name, opt) == 0) {
@@ -1029,10 +1029,11 @@ static int execute_all(struct interface_defn_t *ifd, execfn *exec, const char *o
}
}
- buf = xmalloc(bb_strlen(opt) + 19);
- sprintf(buf, "/etc/network/if-%s.d", opt);
- run_parts(&buf, 2);
- free(buf);
+ bb_xasprintf(&buf[0], "/etc/network/if-%s.d", opt);
+ buf[1] = NULL;
+
+ run_parts(&buf, 2, environ);
+ free(buf[0]);
return (1);
}