Bump to version 1.22.1

[platform/upstream/busybox.git] / libbb / perror_msg.c

diff --git a/libbb/perror_msg.c b/libbb/perror_msg.c
index 8ba0531..fa1f0d3 100644 (file)
--- a/libbb/perror_msg.c
+++ b/libbb/perror_msg.c
@@ -4,42 +4,37 @@
  *
  * 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 <stdio.h>
-#include <errno.h>
-#include <string.h>
-#include <stdlib.h>
 #include "libbb.h"
 
-extern void bb_perror_msg(const char *s, ...)
+void FAST_FUNC bb_perror_msg(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);
 }
 
+void FAST_FUNC bb_perror_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);
+       /* Guard against "<error message>: Success" */
+       bb_verror_msg(s, p, errno ? strerror(errno) : NULL);
+       va_end(p);
+       xfunc_die();
+}
+
+void FAST_FUNC bb_simple_perror_msg(const char *s)
+{
+       bb_perror_msg("%s", s);
+}
+
+void FAST_FUNC bb_simple_perror_msg_and_die(const char *s)
+{
+       bb_perror_msg_and_die("%s", s);
+}