*: make exec failure message more consistent

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

5 files changed, 5 insertions, 5 deletions

diff --git a/networking/httpd.c b/networking/httpd.c
index 6dbc219e7..bab7b99cb 100644
--- a/networking/httpd.c
+++ b/networking/httpd.c
@@ -1474,7 +1474,7 @@ static void send_cgi_and_exit(
                  * in the current directory */
                 execv(argv[0], argv);
                 if (verbose)
-                        bb_perror_msg("exec %s", argv[0]);
+                        bb_perror_msg_and_die("can't execute '%s'", argv[0]);
  error_execing_cgi:
                 /* send to stdout
                  * (we are CGI here, our stdout is pumped to the net) */
diff --git a/networking/ifupdown.c b/networking/ifupdown.c
index 2f3dd1d7b..714d2a107 100644
--- a/networking/ifupdown.c
+++ b/networking/ifupdown.c
@@ -1053,7 +1053,7 @@ static int popen2(FILE **in, FILE **out, char *command, char *param)
                 xmove_fd(infd.rd, 0);
                 xmove_fd(outfd.wr, 1);
                 BB_EXECVP(command, argv);
-                _exit(127);
+                bb_perror_msg_and_die("can't execute '%s'", command);
         }
         /* parent */
         close(infd.rd);
diff --git a/networking/inetd.c b/networking/inetd.c
index 7aa6b7b19..6d21e18f5 100644
--- a/networking/inetd.c
+++ b/networking/inetd.c
@@ -1380,7 +1380,7 @@ int inetd_main(int argc UNUSED_PARAM, char **argv)
                         sigaction_set(SIGPIPE, &saved_pipe_handler);
                         restore_sigmask(&omask);
                         BB_EXECVP(sep->se_program, sep->se_argv);
-                        bb_perror_msg("exec %s", sep->se_program);
+                        bb_perror_msg_and_die("can't execute '%s'", sep->se_program);
  do_exit1:
                         /* eat packet in udp case */
                         if (sep->se_socktype != SOCK_STREAM)
diff --git a/networking/nc_bloaty.c b/networking/nc_bloaty.c
index e14d512ed..8d27e9682 100644
--- a/networking/nc_bloaty.c
+++ b/networking/nc_bloaty.c
@@ -230,7 +230,7 @@ static int doexec(char **proggie)
         /* dup2(0, 2); - do we *really* want this? NO!
          * exec'ed prog can do it yourself, if needed */
         execvp(proggie[0], proggie);
-        bb_perror_msg_and_die("exec");
+        bb_perror_msg_and_die("can't execute '%s'", proggie[0]);
 }
 
 /* connect_w_timeout:
diff --git a/networking/tcpudp.c b/networking/tcpudp.c
index b32fad624..4e4756738 100644
--- a/networking/tcpudp.c
+++ b/networking/tcpudp.c
@@ -504,7 +504,7 @@ int tcpudpsvd_main(int argc UNUSED_PARAM, char **argv)
 #else
         BB_EXECVP(argv[0], argv);
 #endif
-        bb_perror_msg_and_die("exec '%s'", argv[0]);
+        bb_perror_msg_and_die("can't execute '%s'", argv[0]);
 }
 
 /*