X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=libbb%2Ferror_msg_and_die.c;h=7c5a4ebe93eeee5679782e6933417bb6029ec20c;hb=9af7c9d6b62ceb07a9ba24cee0cf4a08c689235e;hp=0937658a38efb512ec17a72d0de7e820e868b78e;hpb=c7bda1ce659294d6e22c06e087f6f265983c7578;p=oweals%2Fbusybox.git

diff --git a/libbb/error_msg_and_die.c b/libbb/error_msg_and_die.c
index 0937658a3..7c5a4ebe9 100644
--- a/libbb/error_msg_and_die.c
+++ b/libbb/error_msg_and_die.c
@@ -4,19 +4,7 @@
  *
  * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
 #include <stdio.h>
@@ -25,23 +13,21 @@
 #include <stdlib.h>
 #include "libbb.h"
 
-extern void bb_error_msg_and_die(const char *s, ...)
+int die_sleep;
+
+void sleep_and_die(void)
+{
+	if (die_sleep)
+		sleep(die_sleep);
+	exit(xfunc_error_retval);
+}
+
+void bb_error_msg_and_die(const char *s, ...)
 {
 	va_list p;
 
 	va_start(p, s);
-	bb_verror_msg(s, p);
+	bb_verror_msg(s, p, NULL);
 	va_end(p);
-	putc('\n', stderr);
-	exit(bb_default_error_retval);
+	sleep_and_die();
 }
-
-
-/* END CODE */
-/*
-Local Variables:
-c-file-style: "linux"
-c-basic-offset: 4
-tab-width: 4
-End:
-*/