aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2011-09-16 13:28:52 +0200
committerDenys Vlasenko <vda.linux@googlemail.com>2011-09-16 13:28:52 +0200
commit514cbfc593aaccda22b376e5cc84d3387db2025a (patch)
tree6baa762efe194d2371403abf1ea27eccb4462d0d
parentc74a79f28824b634d621c572c079614a8c227479 (diff)
downloadbusybox-w32-514cbfc593aaccda22b376e5cc84d3387db2025a.tar.gz
busybox-w32-514cbfc593aaccda22b376e5cc84d3387db2025a.tar.bz2
busybox-w32-514cbfc593aaccda22b376e5cc84d3387db2025a.zip
syslogd: fix missing newline problen in memory log buffer. Closes 4159
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--sysklogd/syslogd.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sysklogd/syslogd.c b/sysklogd/syslogd.c
index 2f0ca6ac5..d36d09caf 100644
--- a/sysklogd/syslogd.c
+++ b/sysklogd/syslogd.c
@@ -278,7 +278,7 @@ static void parse_syslogdcfg(const char *file)
278 parser_t *parser; 278 parser_t *parser;
279 279
280 parser = config_open2(file ? file : "/etc/syslog.conf", 280 parser = config_open2(file ? file : "/etc/syslog.conf",
281 file ? xfopen_for_read : fopen_or_warn_stdin); 281 file ? xfopen_for_read : fopen_for_read);
282 if (!parser) 282 if (!parser)
283 /* didn't find default /etc/syslog.conf */ 283 /* didn't find default /etc/syslog.conf */
284 /* proceed as if we built busybox without config support */ 284 /* proceed as if we built busybox without config support */
@@ -678,7 +678,7 @@ static void timestamp_and_log(int pri, char *msg, int len)
678 if (LOG_PRI(pri) < G.logLevel) { 678 if (LOG_PRI(pri) < G.logLevel) {
679#if ENABLE_FEATURE_IPC_SYSLOG 679#if ENABLE_FEATURE_IPC_SYSLOG
680 if ((option_mask32 & OPT_circularlog) && G.shbuf) { 680 if ((option_mask32 & OPT_circularlog) && G.shbuf) {
681 log_to_shmem(msg); 681 log_to_shmem(G.printbuf);
682 return; 682 return;
683 } 683 }
684#endif 684#endif