- improve wording

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

diff --git a/libbb/verror_msg.c b/libbb/verror_msg.c
index d0fbb05c6fbc97bfbb647cee371cfacd3b95fc88..0f018c5171382ae0831d4b29324111f98579fc85 100644 (file)
--- a/libbb/verror_msg.c
+++ b/libbb/verror_msg.c
@@ -4,40 +4,43 @@
  *
  * 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>
-#include <errno.h>
-#include <string.h>
-#include <stdlib.h>
 #include "libbb.h"
+#include <syslog.h>
 
-void bb_verror_msg(const char *s, va_list p)
-{
-       fflush(stdout);
-       fprintf(stderr, "%s: ", bb_applet_name);
-       vfprintf(stderr, s, p);
-}
+int logmode = LOGMODE_STDIO;
+const char *msg_eol = "\n";
 
+void bb_verror_msg(const char *s, va_list p, const char* strerr)
+{
+       /* va_copy is used because it is not portable
+        * to use va_list p twice */
+       va_list p2;
+       va_copy(p2, p);
 
-/* END CODE */
-/*
-Local Variables:
-c-file-style: "linux"
-c-basic-offset: 4
-tab-width: 4
-End:
-*/
+       if (logmode & LOGMODE_STDIO) {
+               fflush(stdout);
+               fprintf(stderr, "%s: ", applet_name);
+               vfprintf(stderr, s, p);
+               if (!strerr)
+                       fputs(msg_eol, stderr);
+               else
+                       fprintf(stderr, "%s%s%s",
+                                       s ? ": " : "",
+                                       strerr, msg_eol);
+       }
+       if (ENABLE_FEATURE_SYSLOG && (logmode & LOGMODE_SYSLOG)) {
+               if (!strerr)
+                       vsyslog(LOG_ERR, s, p2);
+               else  {
+                       char *msg;
+                       if (vasprintf(&msg, s, p2) < 0)
+                               bb_error_msg_and_die(bb_msg_memory_exhausted);
+                       syslog(LOG_ERR, "%s: %s", msg, strerr);
+                       free(msg);
+               }
+       }
+       va_end(p2);
+}