[git commit] syslogd: fix missing newline problen in memory log buffer. Closes 4159

Denys Vlasenko vda.linux at googlemail.com
Fri Sep 16 11:28:52 UTC 2011


commit: http://git.busybox.net/busybox/commit/?id=514cbfc593aaccda22b376e5cc84d3387db2025a
branch: http://git.busybox.net/busybox/commit/?id=refs/heads/master

Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 sysklogd/syslogd.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sysklogd/syslogd.c b/sysklogd/syslogd.c
index 2f0ca6a..d36d09c 100644
--- a/sysklogd/syslogd.c
+++ b/sysklogd/syslogd.c
@@ -278,7 +278,7 @@ static void parse_syslogdcfg(const char *file)
 	parser_t *parser;
 
 	parser = config_open2(file ? file : "/etc/syslog.conf",
-				file ? xfopen_for_read : fopen_or_warn_stdin);
+				file ? xfopen_for_read : fopen_for_read);
 	if (!parser)
 		/* didn't find default /etc/syslog.conf */
 		/* proceed as if we built busybox without config support */
@@ -678,7 +678,7 @@ static void timestamp_and_log(int pri, char *msg, int len)
 	if (LOG_PRI(pri) < G.logLevel) {
 #if ENABLE_FEATURE_IPC_SYSLOG
 		if ((option_mask32 & OPT_circularlog) && G.shbuf) {
-			log_to_shmem(msg);
+			log_to_shmem(G.printbuf);
 			return;
 		}
 #endif
-- 
1.7.3.4



More information about the busybox-cvs mailing list