readlink: uClibc supports automatic allocation too now

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

diff --git a/libbb/info_msg.c b/libbb/info_msg.c
index 78d5c8f32e56e4c07c319488ea487e826e9c5807..56ca2efd4d0039c5a3c05e67f001add824ff9bb9 100644 (file)
--- a/libbb/info_msg.c
+++ b/libbb/info_msg.c
@@ -4,20 +4,59 @@
  *
  * 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 <stdio.h>
-#include <errno.h>
-#include <string.h>
-#include <stdlib.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
+        * to use va_list p twice */
+       va_list p2;
 
        va_start(p, s);
-       bb_vinfo_msg(s, p);
+       va_copy(p2, p);
+       if (logmode & LOGMODE_STDIO) {
+               vprintf(s, p);
+               fputs(msg_eol, stdout);
+       }
+# 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
 }