emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

syslogd: fix missing newline problen in memory log buffer. Closes 4159

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2011-09-16 13:28:52 +02:00
parent c74a79f288
commit 514cbfc593
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sysklogd/syslogd.c
View File

@ -278,7 +278,7 @@ static void parse_syslogdcfg(const char *file)
parser_t *parser; parser_t *parser;
parser = config_open2(file ? file : "/etc/syslog.conf", 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) if (!parser)
/* didn't find default /etc/syslog.conf */ /* didn't find default /etc/syslog.conf */
/* proceed as if we built busybox without config support */ /* 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 (LOG_PRI(pri) < G.logLevel) {
#if ENABLE_FEATURE_IPC_SYSLOG #if ENABLE_FEATURE_IPC_SYSLOG
if ((option_mask32 & OPT_circularlog) && G.shbuf) { if ((option_mask32 & OPT_circularlog) && G.shbuf) {
log_to_shmem(msg); log_to_shmem(G.printbuf);
return; return;
} }
#endif #endif