fix log buffer splitting

diff --git a/main.c b/main.c
index 3fe38bf225b3a2dc93e02112e145119dbf0df584..b7d660efa0703f2fb531ccf1b2dc77b51ec31e64 100644 (file)
--- a/main.c
+++ b/main.c
@@ -73,7 +73,7 @@ netifd_process_log_cb(struct uloop_fd *fd, unsigned int events)
 {
        struct netifd_process *proc;
        const char *log_prefix;
-       char *buf, *cur;
+       char *buf, *start, *cur;
        int maxlen, len, read_len;
 
        proc = container_of(fd, struct netifd_process, log_uloop);
@@ -100,19 +100,23 @@ retry:
        proc->log_buf_ofs += len;
 
        cur = buf;
-       buf = proc->log_buf;
-       while (len > 0 && (cur = memchr(cur, '\n', len))) {
+       start = proc->log_buf;
+       while (len > 0) {
+               cur = memchr(cur, '\n', len);
+               if (!cur)
+                       break;
+
                *cur = 0;
 
                if (!proc->log_overflow)
                        netifd_log_message(L_NOTICE, "%s (%d): %s\n",
-                               log_prefix, proc->uloop.pid, buf);
+                               log_prefix, proc->uloop.pid, start);
                else
                        proc->log_overflow = false;
 
                cur++;
                len -= cur - buf;
-               buf = cur;
+               buf = start = cur;
        }
 
        if (buf > proc->log_buf && len > 0)