*: make exec failure message more consistent
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
diff --git a/miscutils/chrt.c b/miscutils/chrt.c
index cc5660b..e2b7f8a 100644
--- a/miscutils/chrt.c
+++ b/miscutils/chrt.c
@@ -115,9 +115,9 @@
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]);
}
diff --git a/miscutils/ionice.c b/miscutils/ionice.c
index 361c141..8393cd8 100644
--- a/miscutils/ionice.c
+++ b/miscutils/ionice.c
@@ -89,9 +89,9 @@
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]);
}
}
diff --git a/miscutils/setsid.c b/miscutils/setsid.c
index fd3283e..60ee062 100644
--- a/miscutils/setsid.c
+++ b/miscutils/setsid.c
@@ -44,6 +44,7 @@
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]);
}
diff --git a/miscutils/taskset.c b/miscutils/taskset.c
index a0bbf0a..2891003 100644
--- a/miscutils/taskset.c
+++ b/miscutils/taskset.c
@@ -129,9 +129,9 @@
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]);
}
diff --git a/miscutils/time.c b/miscutils/time.c
index 6946c86..f5d1e15 100644
--- a/miscutils/time.c
+++ b/miscutils/time.c
@@ -380,7 +380,7 @@
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). */
diff --git a/miscutils/timeout.c b/miscutils/timeout.c
index 83ae56e..273d269 100644
--- a/miscutils/timeout.c
+++ b/miscutils/timeout.c
@@ -111,5 +111,5 @@
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]);
}