remove recently added erroneous _and_die()
authorDenys Vlasenko <vda.linux@googlemail.com>
Sun, 27 Jun 2010 14:57:55 +0000 (16:57 +0200)
committerDenys Vlasenko <vda.linux@googlemail.com>
Sun, 27 Jun 2010 14:57:55 +0000 (16:57 +0200)
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
networking/httpd.c
networking/inetd.c

index bab7b99cb47ff42100c1bef2b03cdcbef492c7d2..8ad7e88b1d74c5e31992895309371067bd88adf0 100644 (file)
@@ -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) */
index 6d21e18f52208c858b7d1164efae0da9bca2fda3..2b0e0069e728c0c128272affefe02d9c232e42a2 100644 (file)
@@ -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)