X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=main.c;h=bbec86005ece242888527c139d004e783d1b6f83;hp=3f16cd5d3bb56c364074972a1a491f4f19c8f4d2;hb=257bfc6392bf8a1c215f0bd6889db4694a405c1d;hpb=268149290fcd8a52f377b21226990d3bf0e9c226

diff --git a/main.c b/main.c
index 3f16cd5..bbec860 100644
--- a/main.c
+++ b/main.c
@@ -46,6 +46,10 @@ netifd_delete_process(struct netifd_process *proc)
 		uloop_process_delete(&proc->uloop);
 	list_del(&proc->list);
 	netifd_fd_delete(&proc->log_fd);
+	if (proc->log_buf) {
+		free(proc->log_buf);
+		proc->log_buf = NULL;
+	}
 }
 
 void
@@ -77,17 +81,16 @@ netifd_process_log_cb(struct uloop_fd *fd, unsigned int events)
 	if (!proc->log_buf)
 		proc->log_buf = malloc(LOG_BUF_SIZE + 1);
 
-	buf = proc->log_buf + proc->log_buf_ofs;
-	maxlen = LOG_BUF_SIZE - proc->log_buf_ofs;
-
 	log_prefix = proc->log_prefix;
 	if (!log_prefix)
 		log_prefix = "process";
 
 retry:
+	buf = proc->log_buf + proc->log_buf_ofs;
+	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;
@@ -96,9 +99,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)
@@ -113,7 +120,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) {
@@ -126,7 +133,7 @@ retry:
 	}
 	proc->log_buf_ofs = len;
 
-	if (read_len == maxlen)
+	if (read_len > 0)
 		goto retry;
 
 out:
@@ -196,6 +203,7 @@ netifd_start_process(const char **argv, char **env, struct netifd_process *proc)
 	uloop_process_add(&proc->uloop);
 	list_add_tail(&proc->list, &process_list);
 
+	proc->log_buf_ofs = 0;
 	proc->log_uloop.fd = proc->log_fd.fd = pfds[0];
 	proc->log_uloop.cb = netifd_process_log_cb;
 	netifd_fd_add(&proc->log_fd);
@@ -215,7 +223,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);
 }