ifupdown: do not print and/or execute empty commands ("").
diff --git a/networking/ifupdown.c b/networking/ifupdown.c
index 90c0544..b53d233 100644
--- a/networking/ifupdown.c
+++ b/networking/ifupdown.c
@@ -291,9 +291,11 @@
out = parse(command, ifd);
if (!out) {
+ /* parse error? */
return 0;
}
- ret = (*exec)(out);
+ /* out == "": parsed ok but not all needed variables known, skip */
+ ret = out[0] ? (*exec)(out) : 1;
free(out);
if (ret != 1) {
@@ -903,15 +905,13 @@
if (option_mask32 & (OPT_no_act|OPT_verbose)) {
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)) {
pid_t child;
int status;
fflush(NULL);
- switch (child = fork()) {
+ child = fork();
+ switch (child) {
case -1: /* failure */
return 0;
case 0: /* child */
@@ -939,10 +939,8 @@
}
buf = xasprintf("run-parts /etc/network/if-%s.d", opt);
- if (doit(buf) != 1) {
- return 0;
- }
- return 1;
+ /* heh, we don't bother free'ing it */
+ return doit(buf);
}
static int check(char *str)