projects
/
project
/
netifd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
889a60c
)
fix log buffer splitting
author
Felix Fietkau
<nbd@openwrt.org>
Mon, 19 Mar 2012 19:37:34 +0000
(20:37 +0100)
committer
Felix Fietkau
<nbd@openwrt.org>
Mon, 19 Mar 2012 19:37:34 +0000
(20:37 +0100)
main.c
patch
|
blob
|
history
diff --git
a/main.c
b/main.c
index
3fe38bf
..
b7d660e
100644
(file)
--- 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;
{
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);
int maxlen, len, read_len;
proc = container_of(fd, struct netifd_process, log_uloop);
@@
-100,19
+100,23
@@
retry:
proc->log_buf_ofs += len;
cur = buf;
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",
*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;
else
proc->log_overflow = false;
cur++;
len -= cur - buf;
- buf = cur;
+ buf =
start =
cur;
}
if (buf > proc->log_buf && len > 0)
}
if (buf > proc->log_buf && len > 0)