*: make GNU licensing statement forms more regular

[oweals/busybox.git] / libbb / herror_msg.c

diff --git a/libbb/herror_msg.c b/libbb/herror_msg.c
index f4210edade3f5d2aa963523ad9a665f410ea1042..d041076e00001385bb04cc06a1a1693812faf9b7 100644 (file)
--- a/libbb/herror_msg.c
+++ b/libbb/herror_msg.c
@@ -2,49 +2,27 @@
 /*
  * Utility routines.
  *
- * Copyright (C) tons of folks.  Tracking down who wrote what
- * isn't something I'm going to worry about...  If you wrote something
- * here, please feel free to acknowledge your work.
- *
- * 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
- *
- * Based in part on code from sash, Copyright (c) 1999 by David I. Bell 
- * Permission has been granted to redistribute this code under the GPL.
+ * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
  *
+ * 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();
+}