aboutsummaryrefslogtreecommitdiff
path: root/coreutils
diff options
context:
space:
mode:
Diffstat (limited to 'coreutils')
-rw-r--r--coreutils/chroot.c4
-rw-r--r--coreutils/env.c6
-rw-r--r--coreutils/nice.c5
-rw-r--r--coreutils/nohup.c5
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)
30 argv[1] = (char *) "-i"; 30 argv[1] = (char *) "-i";
31 } 31 }
32 32
33 BB_EXECVP(*argv, argv); 33 BB_EXECVP(argv[0], argv);
34 bb_perror_msg_and_die("can't execute '%s'", *argv); 34 bb_perror_msg_and_die("can't execute '%s'", argv[0]);
35} 35}
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)
76 ++argv; 76 ++argv;
77 } 77 }
78 78
79 if (*argv) { 79 if (argv[0]) {
80 BB_EXECVP(*argv, argv); 80 BB_EXECVP(argv[0], argv);
81 /* SUSv3-mandated exit codes. */ 81 /* SUSv3-mandated exit codes. */
82 xfunc_error_retval = (errno == ENOENT) ? 127 : 126; 82 xfunc_error_retval = (errno == ENOENT) ? 127 : 126;
83 bb_simple_perror_msg_and_die(*argv); 83 bb_perror_msg_and_die("can't execute '%s'", argv[0]);
84 } 84 }
85 85
86 if (environ) { /* clearenv() may set environ == NULL! */ 86 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)
47 } 47 }
48 } 48 }
49 49
50 BB_EXECVP(*argv, argv); /* Now exec the desired program. */ 50 BB_EXECVP(argv[0], argv);
51
52 /* The exec failed... */ 51 /* The exec failed... */
53 xfunc_error_retval = (errno == ENOENT) ? 127 : 126; /* SUSv3 */ 52 xfunc_error_retval = (errno == ENOENT) ? 127 : 126; /* SUSv3 */
54 bb_simple_perror_msg_and_die(*argv); 53 bb_perror_msg_and_die("can't execute '%s'", argv[0]);
55} 54}
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)
75 75
76 signal(SIGHUP, SIG_IGN); 76 signal(SIGHUP, SIG_IGN);
77 77
78 BB_EXECVP(argv[1], argv+1); 78 argv++;
79 bb_simple_perror_msg_and_die(argv[1]); 79 BB_EXECVP(argv[0], argv);
80 bb_perror_msg_and_die("can't execute '%s'", argv[0]);
80} 81}