aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2010-06-27 16:57:55 +0200
committerDenys Vlasenko <vda.linux@googlemail.com>2010-06-27 16:57:55 +0200
commit31c3dad85142eac32d441f0f1140eda9884d7774 (patch)
tree3b18aaa62baba6cd6f8a8e14cccfa062374db295
parentfa1b3705a336f2ff4b6b841e12ae1edaba742d18 (diff)
downloadbusybox-w32-31c3dad85142eac32d441f0f1140eda9884d7774.tar.gz
busybox-w32-31c3dad85142eac32d441f0f1140eda9884d7774.tar.bz2
busybox-w32-31c3dad85142eac32d441f0f1140eda9884d7774.zip
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 bab7b99cb..8ad7e88b1 100644
--- a/networking/httpd.c
+++ b/networking/httpd.c
@@ -1474,7 +1474,7 @@ static void send_cgi_and_exit(
1474 * in the current directory */ 1474 * in the current directory */
1475 execv(argv[0], argv); 1475 execv(argv[0], argv);
1476 if (verbose) 1476 if (verbose)
1477 bb_perror_msg_and_die("can't execute '%s'", argv[0]); 1477 bb_perror_msg("can't execute '%s'", argv[0]);
1478 error_execing_cgi: 1478 error_execing_cgi:
1479 /* send to stdout 1479 /* send to stdout
1480 * (we are CGI here, our stdout is pumped to the net) */ 1480 * (we are CGI here, our stdout is pumped to the net) */
diff --git a/networking/inetd.c b/networking/inetd.c
index 6d21e18f5..2b0e0069e 100644
--- a/networking/inetd.c
+++ b/networking/inetd.c
@@ -1380,7 +1380,7 @@ int inetd_main(int argc UNUSED_PARAM, char **argv)
1380 sigaction_set(SIGPIPE, &saved_pipe_handler); 1380 sigaction_set(SIGPIPE, &saved_pipe_handler);
1381 restore_sigmask(&omask); 1381 restore_sigmask(&omask);
1382 BB_EXECVP(sep->se_program, sep->se_argv); 1382 BB_EXECVP(sep->se_program, sep->se_argv);
1383 bb_perror_msg_and_die("can't execute '%s'", sep->se_program); 1383 bb_perror_msg("can't execute '%s'", sep->se_program);
1384 do_exit1: 1384 do_exit1:
1385 /* eat packet in udp case */ 1385 /* eat packet in udp case */
1386 if (sep->se_socktype != SOCK_STREAM) 1386 if (sep->se_socktype != SOCK_STREAM)