X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=libbb%2Fherror_msg.c;h=d041076e00001385bb04cc06a1a1693812faf9b7;hb=556ac3633ce3e7bd51c93b78827ae3874d856257;hp=1081a56b1a85762dd915da96c1ff1aec533de8ae;hpb=bdfd0d78bc44e73d693510e70087857785b3b521;p=oweals%2Fbusybox.git

diff --git a/libbb/herror_msg.c b/libbb/herror_msg.c
index 1081a56b1..d041076e0 100644
--- a/libbb/herror_msg.c
+++ b/libbb/herror_msg.c
@@ -2,43 +2,27 @@
 /*
  * Utility routines.
  *
- * Copyright (C) 1999,2000,2001 by Erik Andersen <andersee@debian.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 source tree.
  */
-
-#include <stdarg.h>
-#include <stdlib.h>
-
 #include "libbb.h"
 
-extern void herror_msg(const char *s, ...)
+void FAST_FUNC bb_herror_msg(const char *s, ...)
 {
 	va_list p;
 
 	va_start(p, s);
-	vherror_msg(s, p);
+	bb_verror_msg(s, p, hstrerror(h_errno));
 	va_end(p);
 }
 
+void FAST_FUNC bb_herror_msg_and_die(const char *s, ...)
+{
+	va_list p;
 
-/* END CODE */
-/*
-Local Variables:
-c-file-style: "linux"
-c-basic-offset: 4
-tab-width: 4
-End:
-*/
+	va_start(p, s);
+	bb_verror_msg(s, p, hstrerror(h_errno));
+	va_end(p);
+	xfunc_die();
+}