*: make exec failure message more consistent

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

4 files changed, 10 insertions, 10 deletions

diff --git a/coreutils/chroot.c b/coreutils/chroot.c
index f7228a61a..bc0b1f82c 100644
--- a/coreutils/chroot.c
+++ b/coreutils/chroot.c
@@ -30,6 +30,6 @@ int chroot_main(int argc UNUSED_PARAM, char **argv)
                 argv[1] = (char *) "-i";
         }
 
-        BB_EXECVP(*argv, argv);
-        bb_perror_msg_and_die("can't execute '%s'", *argv);
+        BB_EXECVP(argv[0], argv);
+        bb_perror_msg_and_die("can't execute '%s'", argv[0]);
 }
diff --git a/coreutils/env.c b/coreutils/env.c
index 9635d2b22..c6ba04d35 100644
--- a/coreutils/env.c
+++ b/coreutils/env.c
@@ -76,11 +76,11 @@ int env_main(int argc UNUSED_PARAM, char **argv)
                 ++argv;
         }
 
-        if (*argv) {
-                BB_EXECVP(*argv, argv);
+        if (argv[0]) {
+                BB_EXECVP(argv[0], argv);
                 /* SUSv3-mandated exit codes. */
                 xfunc_error_retval = (errno == ENOENT) ? 127 : 126;
-                bb_simple_perror_msg_and_die(*argv);
+                bb_perror_msg_and_die("can't execute '%s'", argv[0]);
         }
 
         if (environ) { /* clearenv() may set environ == NULL! */
diff --git a/coreutils/nice.c b/coreutils/nice.c
index d24a95b45..0f70f1079 100644
--- a/coreutils/nice.c
+++ b/coreutils/nice.c
@@ -47,9 +47,8 @@ int nice_main(int argc, char **argv)
                 }
         }
 
-        BB_EXECVP(*argv, argv);         /* Now exec the desired program. */
-
+        BB_EXECVP(argv[0], argv);
         /* The exec failed... */
         xfunc_error_retval = (errno == ENOENT) ? 127 : 126; /* SUSv3 */
-        bb_simple_perror_msg_and_die(*argv);
+        bb_perror_msg_and_die("can't execute '%s'", argv[0]);
 }
diff --git a/coreutils/nohup.c b/coreutils/nohup.c
index 4f6385f8e..1027ada1c 100644
--- a/coreutils/nohup.c
+++ b/coreutils/nohup.c
@@ -75,6 +75,7 @@ int nohup_main(int argc UNUSED_PARAM, char **argv)
 
         signal(SIGHUP, SIG_IGN);
 
-        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]);
 }