aboutsummaryrefslogtreecommitdiff
path: root/sysklogd
diff options
context:
space:
mode:
authorGravatar Denis Vlasenko <vda.linux@googlemail.com>2007-11-06 11:34:03 +0000
committerGravatar Denis Vlasenko <vda.linux@googlemail.com>2007-11-06 11:34:03 +0000
commitcb12cb240714f2599addd4ec61ef336ab87482cd (patch)
treeeb218e0c85ceb81753cb3a27535b93069d4ebb7a /sysklogd
parent52816302299854ba1644fce98b5d19db526e6c29 (diff)
downloadbusybox-cb12cb240714f2599addd4ec61ef336ab87482cd.tar.gz
busybox-cb12cb240714f2599addd4ec61ef336ab87482cd.tar.bz2
modprobe: fix a bug where we were entering endless loop
syslogd: strip trailing '\n' too, not only NULs
Diffstat (limited to 'sysklogd')
-rw-r--r--sysklogd/syslogd.c12
1 files changed, 11 insertions, 1 deletions
diff --git a/sysklogd/syslogd.c b/sysklogd/syslogd.c
index 2bf5b5c80..da63ced42 100644
--- a/sysklogd/syslogd.c
+++ b/sysklogd/syslogd.c
@@ -536,10 +536,20 @@ static void do_syslogd(void)
while (1) {
if (sz == 0)
goto read_again;
- if (G.recvbuf[sz-1])
+ /* man 3 syslog says: "A trailing newline is added when needed".
+ * However, neither glibc nor uclibc do this:
+ * syslog(prio, "test") sends "test\0" to /dev/log,
+ * syslog(prio, "test\n") sends "test\n\0",
+ * IOW: newline is passed verbatim!
+ * I take it to mean that it's syslogd's job
+ * to make those look identical in the log files */
+ if (G.recvbuf[sz-1] && G.recvbuf[sz-1] != '\n')
break;
sz--;
}
+ /* Maybe we need to add '\n' here, not later?
+ * It looks like stock syslogd does send '\n' over network,
+ * but we do not (see sendto below) */
G.recvbuf[sz] = '\0'; /* make sure it *is* NUL terminated */
/* TODO: maybe suppress duplicates? */