reduce stack usage

[project/netifd.git] / main.c

diff --git a/main.c b/main.c
index 02fd9ff..3f16cd5 100644 (file)
--- 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,17 +86,19 @@ 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;
 
-               return;
-       }
+               goto out;
+       } else if (len == 0)
+               goto out;
+
        proc->log_buf_ofs += len;
 
        cur = buf;
        buf = proc->log_buf;
-       while ((cur = memchr(cur, '\n', len))) {
+       while (len > 0 && (cur = memchr(cur, '\n', len))) {
                *cur = 0;
 
                if (!proc->log_overflow)
@@ -134,6 +128,10 @@ retry:
 
        if (read_len == maxlen)
                goto retry;
+
+out:
+       if (fd->eof)
+               uloop_fd_delete(fd);
 }
 
 static void
@@ -240,7 +238,7 @@ static void netifd_do_restart(struct uloop_timeout *timeout)
 
 static void netifd_do_reload(struct uloop_timeout *timeout)
 {
-       config_init_interfaces(NULL);
+       config_init_all();
 }
 
 static struct uloop_timeout main_timer;
@@ -360,7 +358,7 @@ int main(int argc, char **argv)
                return 1;
        }
 
-       config_init_interfaces(NULL);
+       config_init_all();
 
        uloop_run();
        netifd_kill_processes();