emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove recently added erroneous _and_die()

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko
2010-06-27 16:57:55 +02:00
parent fa1b3705a3
commit 31c3dad851
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
networking/httpd.c
View File

@@ -1474,7 +1474,7 @@ static void send_cgi_and_exit(
* in the current directory */ * in the current directory */
execv(argv[0], argv); execv(argv[0], argv);
if (verbose) 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: error_execing_cgi:
/* send to stdout /* send to stdout
* (we are CGI here, our stdout is pumped to the net) */ * (we are CGI here, our stdout is pumped to the net) */

2
networking/inetd.c
View File

@@ -1380,7 +1380,7 @@ int inetd_main(int argc UNUSED_PARAM, char **argv)
sigaction_set(SIGPIPE, &saved_pipe_handler); sigaction_set(SIGPIPE, &saved_pipe_handler);
restore_sigmask(&omask); restore_sigmask(&omask);
BB_EXECVP(sep->se_program, sep->se_argv); 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: do_exit1:
/* eat packet in udp case */ /* eat packet in udp case */
if (sep->se_socktype != SOCK_STREAM) if (sep->se_socktype != SOCK_STREAM)