From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Sun, 27 Jun 2010 14:57:55 +0000 (+0200)
Subject: remove recently added erroneous _and_die()
X-Git-Tag: 1_17_0~22
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=31c3dad85142eac32d441f0f1140eda9884d7774;p=oweals%2Fbusybox.git

remove recently added erroneous _and_die()

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---

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(
 		 * 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 6d21e18f5..2b0e0069e 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)