summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2010-06-27 14:57:55 (GMT)
committer Denys Vlasenko <vda.linux@googlemail.com>2010-06-27 14:57:55 (GMT)
commit31c3dad85142eac32d441f0f1140eda9884d7774 (patch)
tree3b18aaa62baba6cd6f8a8e14cccfa062374db295
parentfa1b3705a336f2ff4b6b841e12ae1edaba742d18 (diff)
downloadbusybox-31c3dad85142eac32d441f0f1140eda9884d7774.tar.gz
busybox-31c3dad85142eac32d441f0f1140eda9884d7774.tar.bz2
remove recently added erroneous _and_die()
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--networking/httpd.c2
-rw-r--r--networking/inetd.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/networking/httpd.c b/networking/httpd.c
index bab7b99..8ad7e88 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_and_die("can't execute '%s'", argv[0]);
+ bb_perror_msg("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/inetd.c b/networking/inetd.c
index 6d21e18..2b0e006 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_and_die("can't execute '%s'", sep->se_program);
+ bb_perror_msg("can't execute '%s'", sep->se_program);
do_exit1:
/* eat packet in udp case */
if (sep->se_socktype != SOCK_STREAM)