*: make exec failure message more consistent

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko
2010-06-25 01:46:53 +02:00
parent 2b46fd49b1
commit 41ddd9f606
24 changed files with 40 additions and 40 deletions

View File

@@ -115,9 +115,9 @@ int chrt_main(int argc UNUSED_PARAM, char **argv)
if (sched_setscheduler(pid, policy, &sp) < 0)
bb_perror_msg_and_die("can't %cet pid %d's policy", 's', pid);
if (!*argv) /* "-p <priority> <pid> [...]" */
if (!argv[0]) /* "-p <priority> <pid> [...]" */
goto print_rt_info;
BB_EXECVP(*argv, argv);
bb_simple_perror_msg_and_die(*argv);
BB_EXECVP(argv[0], argv);
bb_perror_msg_and_die("can't execute '%s'", argv[0]);
}

View File

@@ -89,9 +89,9 @@ int ionice_main(int argc UNUSED_PARAM, char **argv)
pri |= (ioclass << IOPRIO_CLASS_SHIFT);
if (ioprio_set(IOPRIO_WHO_PROCESS, pid, pri) == -1)
bb_perror_msg_and_die("ioprio_%cet", 's');
if (*argv) {
BB_EXECVP(*argv, argv);
bb_simple_perror_msg_and_die(*argv);
if (argv[0]) {
BB_EXECVP(argv[0], argv);
bb_perror_msg_and_die("can't execute '%s'", argv[0]);
}
}

View File

@@ -44,6 +44,7 @@ int setsid_main(int argc UNUSED_PARAM, char **argv)
setsid();
}
BB_EXECVP(argv[1], argv + 1);
bb_simple_perror_msg_and_die(argv[1]);
argv++;
BB_EXECVP(argv[0], argv);
bb_perror_msg_and_die("can't execute '%s'", argv[0]);
}

View File

@@ -129,9 +129,9 @@ int taskset_main(int argc UNUSED_PARAM, char **argv)
if (sched_setaffinity(pid, sizeof(mask), &mask))
bb_perror_msg_and_die("can't %cet pid %d's affinity", 's', pid);
if (!*argv) /* "-p <aff> <pid> [...ignored...]" */
if (!argv[0]) /* "-p <aff> <pid> [...ignored...]" */
goto print_aff; /* print new affinity and exit */
BB_EXECVP(*argv, argv);
bb_simple_perror_msg_and_die(*argv);
BB_EXECVP(argv[0], argv);
bb_perror_msg_and_die("can't execute '%s'", argv[0]);
}

View File

@@ -380,7 +380,7 @@ static void run_command(char *const *cmd, resource_t *resp)
versus merely warnings if the cast is left off. */
BB_EXECVP(cmd[0], cmd);
xfunc_error_retval = (errno == ENOENT ? 127 : 126);
bb_error_msg_and_die("can't run '%s'", cmd[0]);
bb_perror_msg_and_die("can't execute '%s'", cmd[0]);
}
/* Have signals kill the child but not self (if possible). */

View File

@@ -111,5 +111,5 @@ int timeout_main(int argc UNUSED_PARAM, char **argv)
argv[1] = sv2;
#endif
BB_EXECVP(argv[0], argv);
bb_perror_msg_and_die("exec '%s'", argv[0]);
bb_perror_msg_and_die("can't execute '%s'", argv[0]);
}