Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/libbb/info_msg.c

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/libbb/info_msg.c (modified) (2 diffs)

branches/2.2.9/mindi-busybox/libbb/info_msg.c

@@ -5 +5 @@
  * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
-#include <syslog.h>
 #include "libbb.h"
+#if ENABLE_FEATURE_SYSLOG
+# include <syslog.h>
+#endif
 
-void bb_info_msg(const char *s, ...)
+void FAST_FUNC bb_info_msg(const char *s, ...)
 {
+#ifdef THIS_ONE_DOESNT_DO_SINGLE_WRITE
     va_list p;
     /* va_copy is used because it is not portable
@@ -24 +27 @@
         fputs(msg_eol, stdout);
     }
-    if (ENABLE_FEATURE_SYSLOG && (logmode & LOGMODE_SYSLOG))
+# if ENABLE_FEATURE_SYSLOG
+    if (logmode & LOGMODE_SYSLOG)
         vsyslog(LOG_INFO, s, p2);
+# endif
     va_end(p2);
     va_end(p);
+#else
+    int used;
+    char *msg;
+    va_list p;
+
+    if (logmode == 0)
+        return;
+
+    va_start(p, s);
+    used = vasprintf(&msg, s, p);
+    va_end(p);
+    if (used < 0)
+        return;
+
+# if ENABLE_FEATURE_SYSLOG
+    if (logmode & LOGMODE_SYSLOG)
+        syslog(LOG_INFO, "%s", msg);
+# endif
+    if (logmode & LOGMODE_STDIO) {
+        fflush_all();
+        /* used = strlen(msg); - must be true already */
+        msg[used++] = '\n';
+        full_write(STDOUT_FILENO, msg, used);
+    }
+
+    free(msg);
+#endif
 }