X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=libbb%2Fperror_msg_and_die.c;h=15615fa22f6e7a34668e4229fd927947e4262705;hb=0939f2ebd25a0f9905d0c50276f796497a57fa93;hp=2303ba211298cc2ace4ca7f244db253a25b0b4c2;hpb=40920825d59874cf285390434486e88c8498d2d8;p=oweals%2Fbusybox.git

diff --git a/libbb/perror_msg_and_die.c b/libbb/perror_msg_and_die.c
index 2303ba211..15615fa22 100644
--- a/libbb/perror_msg_and_die.c
+++ b/libbb/perror_msg_and_die.c
@@ -7,20 +7,20 @@
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#include <stdio.h>
-#include <errno.h>
-#include <string.h>
-#include <stdlib.h>
 #include "libbb.h"
 
-void bb_perror_msg_and_die(const char *s, ...)
+void FAST_FUNC bb_perror_msg_and_die(const char *s, ...)
 {
 	va_list p;
 
 	va_start(p, s);
-	bb_vperror_msg(s, p);
+	/* Guard against "<error message>: Success" */
+	bb_verror_msg(s, p, errno ? strerror(errno) : NULL);
 	va_end(p);
-	if (die_sleep)
-		sleep(die_sleep);
-	exit(xfunc_error_retval);
+	xfunc_die();
+}
+
+void FAST_FUNC bb_simple_perror_msg_and_die(const char *s)
+{
+	bb_perror_msg_and_die("%s", s);
 }