X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=main.c;h=6bd521a34b8fa5e5a4232c1b4ad211c3529af6b7;hb=8e4a99716364e92cef9d7870149d75a57163f537;hp=2d8e46b1b9d82bf3676af5cfaf603b4d76c04a85;hpb=9393ff39a8be91ad90d1392cc4e093aa859c5005;p=project%2Fnetifd.git

diff --git a/main.c b/main.c
index 2d8e46b..6bd521a 100644
--- a/main.c
+++ b/main.c
@@ -1,3 +1,16 @@
+/*
+ * netifd - network interface daemon
+ * Copyright (C) 2012 Felix Fietkau <nbd@openwrt.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -99,9 +112,13 @@ retry:
 
 	proc->log_buf_ofs += len;
 
-	cur = buf;
+	len = proc->log_buf_ofs;
 	buf = proc->log_buf;
-	while (len > 0 && (cur = memchr(cur, '\n', len))) {
+	while (len > 0) {
+		cur = memchr(buf, '\n', len);
+		if (!cur)
+			break;
+
 		*cur = 0;
 
 		if (!proc->log_overflow)
@@ -116,7 +133,7 @@ retry:
 	}
 
 	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) {