f09f4e015
Denis Vlasenko
2009-02-26
Subject
runsv: small optimization *: more paranoia around passing NULL to execl[e]
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
miscutils/crond.c +2 -2networking/ifupdown.c +1 -1runit/runsv.c +2 -5runit/runsvdir.c +1 -1util-linux/script.c +1 -1
miscutils/crond.c+2 -2
| @@ -775,7 +775,7 @@ ForkJob(const char *user, CronLine *line, int mailFd, | |
| } | |
| /* crond 3.0pl1-100 puts tasks in separate process groups */ | |
| bb_setpgrp(); | |
| - | execlp(prog, prog, cmd, arg, NULL); |
| + | execlp(prog, prog, cmd, arg, (char *) NULL); |
| crondlog(ERR20 "can't exec, user %s cmd %s %s %s", user, prog, cmd, arg); | |
| if (mail_filename) { | |
| fdprintf(1, "Exec failed: %s -c %s\n", prog, arg); | |
| @@ -912,7 +912,7 @@ static void RunJob(const char *user, CronLine *line) | |
| } | |
| /* crond 3.0pl1-100 puts tasks in separate process groups */ | |
| bb_setpgrp(); | |
| - | execl(DEFAULT_SHELL, DEFAULT_SHELL, "-c", line->cl_Shell, NULL); |
| + | execl(DEFAULT_SHELL, DEFAULT_SHELL, "-c", line->cl_Shell, (char *) NULL); |
| crondlog(ERR20 "can't exec, user %s cmd %s %s %s", user, | |
| DEFAULT_SHELL, "-c", line->cl_Shell); | |
| _exit(EXIT_SUCCESS); | |
networking/ifupdown.c+1 -1
| @@ -982,7 +982,7 @@ static int doit(char *str) | |
| case -1: /* failure */ | |
| return 0; | |
| case 0: /* child */ | |
| - | execle(DEFAULT_SHELL, DEFAULT_SHELL, "-c", str, NULL, my_environ); |
| + | execle(DEFAULT_SHELL, DEFAULT_SHELL, "-c", str, (char *) NULL, my_environ); |
| _exit(127); | |
| } | |
| safe_waitpid(child, &status, 0); | |
runit/runsv.c+2 -5
| @@ -251,7 +251,6 @@ static unsigned custom(struct svdir *s, char c) | |
| int w; | |
| char a[10]; | |
| struct stat st; | |
| - | char *prog[2]; |
| if (s->islog) return 0; | |
| strcpy(a, "control/?"); | |
| @@ -267,13 +266,11 @@ static unsigned custom(struct svdir *s, char c) | |
| /* child */ | |
| if (haslog && dup2(logpipe.wr, 1) == -1) | |
| warn_cannot("setup stdout for control/?"); | |
| - | prog[0] = a; |
| - | prog[1] = NULL; |
| - | execv(a, prog); |
| + | execl(a, a, (char *) NULL); |
| fatal_cannot("run control/?"); | |
| } | |
| /* parent */ | |
| - | while (safe_waitpid(pid, &w, 0) == -1) { |
| + | if (safe_waitpid(pid, &w, 0) == -1) { |
| warn_cannot("wait for child control/?"); | |
| return 0; | |
| } | |
runit/runsvdir.c+1 -1
| @@ -119,7 +119,7 @@ static NOINLINE pid_t runsv(const char *name) | |
| | (1 << SIGTERM) | |
| , SIG_DFL); | |
| #endif | |
| - | execlp("runsv", "runsv", name, NULL); |
| + | execlp("runsv", "runsv", name, (char *) NULL); |
| fatal2_cannot("start runsv ", name); | |
| } | |
| return pid; | |
util-linux/script.c+1 -1
| @@ -181,6 +181,6 @@ int script_main(int argc UNUSED_PARAM, char **argv) | |
| /* Non-ignored signals revert to SIG_DFL on exec anyway */ | |
| /*signal(SIGCHLD, SIG_DFL);*/ | |
| - | execl(shell, shell, shell_opt, shell_arg, NULL); |
| + | execl(shell, shell, shell_opt, shell_arg, (char *) NULL); |
| bb_simple_perror_msg_and_die(shell); | |
| } | |