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

diff --git a/main.c b/main.c
index b7d660e..4ee86eb 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>
@@ -46,6 +59,7 @@ netifd_delete_process(struct netifd_process *proc)
 		uloop_process_delete(&proc->uloop);
 	list_del(&proc->list);
 	netifd_fd_delete(&proc->log_fd);
+	close(proc->log_fd.fd);
 	if (proc->log_buf) {
 		free(proc->log_buf);
 		proc->log_buf = NULL;
@@ -73,7 +87,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 +113,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 +124,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)