X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=libbb%2Ferror_msg_and_die.c;h=10d953513079726675ba41500a5f1492ead2e88e;hb=621204bbf6750f1ba3977b43bb35375ddda6b5ae;hp=433f29d0f54ec626ca0dd35f9842f4416bbbf365;hpb=cb81e6484d1f50ec2761f6294722407b14add525;p=oweals%2Fbusybox.git

diff --git a/libbb/error_msg_and_die.c b/libbb/error_msg_and_die.c
index 433f29d0f..10d953513 100644
--- a/libbb/error_msg_and_die.c
+++ b/libbb/error_msg_and_die.c
@@ -2,21 +2,9 @@
 /*
  * Utility routines.
  *
- * Copyright (C) 1999-2003 by Erik Andersen <andersen@codepoet.org>
+ * 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,16 @@
 #include <stdlib.h>
 #include "libbb.h"
 
-extern void bb_error_msg_and_die(const char *s, ...)
+int die_sleep;
+
+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);
+	if (die_sleep)
+		sleep(die_sleep);
+	exit(xfunc_error_retval);
 }
-
-
-/* END CODE */
-/*
-Local Variables:
-c-file-style: "linux"
-c-basic-offset: 4
-tab-width: 4
-End:
-*/