X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=main.c;h=bbec86005ece242888527c139d004e783d1b6f83;hp=b7d660efa0703f2fb531ccf1b2dc77b51ec31e64;hb=c7a52ed70eaae0207d7f7e6c4a31035f5ec3757e;hpb=17f3e46961723c1ae512dee4492d809c505260dc diff --git a/main.c b/main.c index b7d660e..bbec860 100644 --- 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, *start, *cur; + char *buf, *cur; int maxlen, len, read_len; proc = container_of(fd, struct netifd_process, log_uloop); @@ -99,10 +99,10 @@ retry: proc->log_buf_ofs += len; - cur = buf; - start = proc->log_buf; + len = proc->log_buf_ofs; + buf = proc->log_buf; while (len > 0) { - cur = memchr(cur, '\n', len); + cur = memchr(buf, '\n', len); if (!cur) break; @@ -110,13 +110,13 @@ retry: if (!proc->log_overflow) netifd_log_message(L_NOTICE, "%s (%d): %s\n", - log_prefix, proc->uloop.pid, start); + log_prefix, proc->uloop.pid, buf); else proc->log_overflow = false; cur++; len -= cur - buf; - buf = start = cur; + buf = cur; } if (buf > proc->log_buf && len > 0)