X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=main.c;h=b7d660efa0703f2fb531ccf1b2dc77b51ec31e64;hp=2d8e46b1b9d82bf3676af5cfaf603b4d76c04a85;hb=17f3e46961723c1ae512dee4492d809c505260dc;hpb=9393ff39a8be91ad90d1392cc4e093aa859c5005;ds=sidebyside

diff --git a/main.c b/main.c
index 2d8e46b..b7d660e 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, *cur;
+	char *buf, *start, *cur;
 	int maxlen, len, read_len;
 
 	proc = container_of(fd, struct netifd_process, log_uloop);
@@ -100,23 +100,27 @@ 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)
-		memmove(buf, proc->log_buf, len);
+		memmove(proc->log_buf, buf, len);
 
 	if (len == LOG_BUF_SIZE) {
 		if (!proc->log_overflow) {