X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=main.c;h=4ee86ebe642530ef2f6d605e10bc000eb38e224b;hp=bed0edd4167c2e25a2e5465cb798bb3c741d81d4;hb=e7ac4074bf497cd19e38adbb49e2b3eb275eeb05;hpb=26486b46eada232ef807f3d969ffdec33d5e4858

diff --git a/main.c b/main.c
index bed0edd..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;
@@ -90,7 +104,7 @@ retry:
 	maxlen = LOG_BUF_SIZE - proc->log_buf_ofs;
 	read_len = len = read(fd->fd, buf, maxlen);
 	if (len < 0) {
-		if (errno == EAGAIN)
+		if (errno == EINTR)
 			goto retry;
 
 		goto out;
@@ -99,9 +113,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 +134,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) {
@@ -219,7 +237,7 @@ netifd_kill_process(struct netifd_process *proc)
 	if (!proc->uloop.pending)
 		return;
 
-	kill(proc->uloop.pid, SIGTERM);
+	kill(proc->uloop.pid, SIGKILL);
 	netifd_delete_process(proc);
 }