trylink: automatically use custom link script if user provides one

vinfo_msg: one user (info_msg), incorporate in it
*: style fixes

1 files changed, 12 insertions, 1 deletions

diff --git a/libbb/info_msg.c b/libbb/info_msg.c
index c763ce60c..b0ce64338 100644
--- a/libbb/info_msg.c
+++ b/libbb/info_msg.c
@@ -7,13 +7,24 @@
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
+#include <syslog.h>
 #include "libbb.h"
 
 void bb_info_msg(const char *s, ...)
 {
         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 && (logmode & LOGMODE_SYSLOG))
+                vsyslog(LOG_INFO, s, p2);
+        va_end(p2);
         va_end(p);
 }