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

ifupdown: do not print and/or execute empty commands ("").

Browse Source
This commit is contained in:
Denis Vlasenko 2006-12-19 23:15:46 +00:00
parent 8cd1a288fa
commit 2375d75f32
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
networking/ifupdown.c
View File

@ -291,9 +291,11 @@ static int execute(const char *command, struct interface_defn_t *ifd, execfn *ex
out = parse(command, ifd); out = parse(command, ifd);
if (!out) { if (!out) {
/* parse error? */
return 0; return 0;
} }
ret = (*exec)(out); /* out == "": parsed ok but not all needed variables known, skip */
ret = out[0] ? (*exec)(out) : 1;
free(out); free(out);
if (ret != 1) { if (ret != 1) {
@ -903,15 +905,13 @@ static int doit(char *str)
if (option_mask32 & (OPT_no_act|OPT_verbose)) { if (option_mask32 & (OPT_no_act|OPT_verbose)) {
puts(str); puts(str);
} }
/* FIXME: is it true that we can reach this place with str = ""? */
/* how? in execute() parse() may return "", then we do (*exec)(""); */
/* Please add a comment... */
if (!(option_mask32 & OPT_no_act)) { if (!(option_mask32 & OPT_no_act)) {
pid_t child; pid_t child;
int status; int status;
fflush(NULL); fflush(NULL);
switch (child = fork()) { child = fork();
switch (child) {
case -1: /* failure */ case -1: /* failure */
return 0; return 0;
case 0: /* child */ case 0: /* child */
@ -939,10 +939,8 @@ static int execute_all(struct interface_defn_t *ifd, const char *opt)
} }
buf = xasprintf("run-parts /etc/network/if-%s.d", opt); buf = xasprintf("run-parts /etc/network/if-%s.d", opt);
if (doit(buf) != 1) { /* heh, we don't bother free'ing it */
return 0; return doit(buf);
}
return 1;
} }
static int check(char *str) static int check(char *str)