summaryrefslogtreecommitdiff
path: root/networking
diff options
context:
space:
mode:
authorDenys Vlasenko2010-06-25 01:46:53 +0200
committerDenys Vlasenko2010-06-25 01:46:53 +0200
commit41ddd9f60604cd994eeb37eb5708e9d3d5c8484b (patch)
treea2c7b5e6ea0d26715bac8c1f9f4b4e1fbad22534 /networking
parent2b46fd49b14b2ac30e0c767c65ac2b29f6922a45 (diff)
downloadbusybox-41ddd9f60604cd994eeb37eb5708e9d3d5c8484b.zip
busybox-41ddd9f60604cd994eeb37eb5708e9d3d5c8484b.tar.gz
*: make exec failure message more consistent
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'networking')
-rw-r--r--networking/httpd.c2
-rw-r--r--networking/ifupdown.c2
-rw-r--r--networking/inetd.c2
-rw-r--r--networking/nc_bloaty.c2
-rw-r--r--networking/tcpudp.c2
5 files changed, 5 insertions, 5 deletions
diff --git a/networking/httpd.c b/networking/httpd.c
index 6dbc219..bab7b99 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 2f3dd1d..714d2a1 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 7aa6b7b..6d21e18 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 e14d512..8d27e96 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 b32fad6..4e47567 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]);
}
/*