- don't free user-supplied string (via -e)

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

diff --git a/libbb/perror_msg.c b/libbb/perror_msg.c
index 7fb0830be35d80d41948193c44d3493e2132fc69..6c8e1b51ef8cfca1cf984f4301b2783644eb5141 100644 (file)
--- a/libbb/perror_msg.c
+++ b/libbb/perror_msg.c
@@ -7,17 +7,19 @@
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#include <stdio.h>
-#include <errno.h>
-#include <string.h>
-#include <stdlib.h>
 #include "libbb.h"
 
-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_simple_perror_msg(const char *s)
+{
+       bb_perror_msg("%s", s);
+}