patch to Vanilla Tomato 1.28

1 files changed, 56 insertions, 0 deletions

diff --git a/release/src/router/busybox/libbb/info_msg.c b/release/src/router/busybox/libbb/info_msg.c
new file mode 100644
index 00000000..8b8a1fcc
--- /dev/null
+++ b/release/src/router/busybox/libbb/info_msg.c
@@ -0,0 +1,56 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * Utility routines.
+ *
+ * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
+ *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ */
+
+#include "libbb.h"
+#include <syslog.h>
+
+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);
+	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);
+#else
+	int used;
+	char *msg;
+	va_list p;
+
+	if (logmode == 0)
+		return;
+
+	va_start(p, s);
+	used = vasprintf(&msg, s, p);
+	if (used < 0)
+		return;
+
+	if (ENABLE_FEATURE_SYSLOG && (logmode & LOGMODE_SYSLOG))
+		syslog(LOG_INFO, "%s", msg);
+	if (logmode & LOGMODE_STDIO) {
+		fflush(stdout);
+		/* used = strlen(msg); - must be true already */
+		msg[used++] = '\n';
+		full_write(STDOUT_FILENO, msg, used);
+	}
+
+	free(msg);
+	va_end(p);
+#endif
+}