Backported syslogd fix.

diff --git a/busybox/sysklogd/syslogd.c b/busybox/sysklogd/syslogd.c
index 14219eb541f2b8710d91951abc3362966841f4cc..25bc68f20e2a3eb02a0bf90e9bff142aaf8675a8 100644 (file)
--- a/busybox/sysklogd/syslogd.c
+++ b/busybox/sysklogd/syslogd.c
@@ -394,16 +394,17 @@ static int serveConnection (int conn)
 {
        RESERVE_BB_BUFFER(tmpbuf, BUFSIZE + 1);
        int    n_read;
+       char *p = tmpbuf;
 
        n_read = read (conn, tmpbuf, BUFSIZE );
 
-       if (n_read > 0) {
+       while (p < tmpbuf + n_read) {
 
                int           pri = (LOG_USER | LOG_NOTICE);
                char          line[ BUFSIZE + 1 ];
                unsigned char c;
 
-               char *p = tmpbuf, *q = line;
+               char *q = line;
 
                tmpbuf[ n_read - 1 ] = '\0';
 
@@ -428,6 +429,7 @@ static int serveConnection (int conn)
                        p++;
                }
                *q = '\0';
+               p++;
                /* Now log it */
                logMessage (pri, line);
        }

diff --git a/busybox/syslogd.c b/busybox/syslogd.c
index 14219eb541f2b8710d91951abc3362966841f4cc..25bc68f20e2a3eb02a0bf90e9bff142aaf8675a8 100644 (file)
--- a/busybox/syslogd.c
+++ b/busybox/syslogd.c
@@ -394,16 +394,17 @@ static int serveConnection (int conn)
 {
        RESERVE_BB_BUFFER(tmpbuf, BUFSIZE + 1);
        int    n_read;
+       char *p = tmpbuf;
 
        n_read = read (conn, tmpbuf, BUFSIZE );
 
-       if (n_read > 0) {
+       while (p < tmpbuf + n_read) {
 
                int           pri = (LOG_USER | LOG_NOTICE);
                char          line[ BUFSIZE + 1 ];
                unsigned char c;
 
-               char *p = tmpbuf, *q = line;
+               char *q = line;
 
                tmpbuf[ n_read - 1 ] = '\0';
 
@@ -428,6 +429,7 @@ static int serveConnection (int conn)
                        p++;
                }
                *q = '\0';
+               p++;
                /* Now log it */
                logMessage (pri, line);
        }