X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=main.c;h=eeefd52e5ccac02bb6b1439807e64d21c3951e22;hp=b17f053bb3ea351853d2855d94a41b3728da684f;hb=3ff220f1861f76ddfeb1aebc61ffbaf14b6d60df;hpb=cb9d7370302cb0ffc0c750e928f5413089cbca4c diff --git a/main.c b/main.c index b17f053..eeefd52 100644 --- a/main.c +++ b/main.c @@ -23,14 +23,6 @@ static struct list_head fds = LIST_HEAD_INIT(fds); #define DEFAULT_LOG_LEVEL L_NOTICE -enum { - L_CRIT, - L_WARNING, - L_NOTICE, - L_INFO, - L_DEBUG -}; - static int log_level = DEFAULT_LOG_LEVEL; static const int log_class[] = { [L_CRIT] = LOG_CRIT, @@ -94,12 +86,14 @@ netifd_process_log_cb(struct uloop_fd *fd, unsigned int events) retry: read_len = len = read(fd->fd, buf, maxlen); - if (len <= 0) { - if (errno == EINTR) + if (len < 0) { + if (errno == EAGAIN) goto retry; goto out; - } + } else if (len == 0) + goto out; + proc->log_buf_ofs += len; cur = buf;