properly handle return code of pipe() syscall

[project/ubox.git] / log / logd.c

diff --git a/log/logd.c b/log/logd.c
index 5dd9932..8cebeb8 100644 (file)
--- a/log/logd.c
+++ b/log/logd.c
@@ -14,6 +14,7 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <syslog.h>
+#include <unistd.h>
 
 #include <linux/types.h>
 
@@ -57,12 +58,11 @@ client_close(struct ustream *s)
 static void
 client_notify_write(struct ustream *s, int bytes)
 {
-       client_close(s);
 }
 
 static void client_notify_state(struct ustream *s)
 {
-       return client_close(s);
+       client_close(s);
 }
 
 static int
@@ -82,7 +82,10 @@ read_log(struct ubus_context *ctx, struct ubus_object *obj,
                        count = blobmsg_get_u32(tb);
        }
 
-       pipe(fds);
+       if (pipe(fds) == -1) {
+               fprintf(stderr, "logd: failed to create pipe: %s\n", strerror(errno));
+               return -1;
+       }
        ubus_request_set_fd(ctx, req, fds[0]);
        cl = calloc(1, sizeof(*cl));
        cl->s.stream.notify_write = client_notify_write;
@@ -97,7 +100,7 @@ read_log(struct ubus_context *ctx, struct ubus_object *obj,
                blobmsg_add_u32(&b, "id", l->id);
                blobmsg_add_u32(&b, "priority", l->priority);
                blobmsg_add_u32(&b, "source", l->source);
-               blobmsg_add_u64(&b, "time", l->ts.tv_sec);
+               blobmsg_add_u64(&b, "time", l->ts.tv_sec * 1000LL);
                l = log_list(count, l);
                if (ustream_write(&cl->s.stream, (void *) b.head, blob_len(b.head) + sizeof(struct blob_attr), false) <= 0)
                        break;
@@ -164,18 +167,32 @@ ubus_connect_handler(struct ubus_context *ctx)
        int ret;
 
        ret = ubus_add_object(ctx, &log_object);
-       if (ret)
+       if (ret) {
                fprintf(stderr, "Failed to add object: %s\n", ubus_strerror(ret));
+               exit(1);
+       }
        fprintf(stderr, "log: connected to ubus\n");
 }
 
 int
 main(int argc, char **argv)
 {
+       int ch, log_size = 16;
+
        signal(SIGPIPE, SIG_IGN);
+       while ((ch = getopt(argc, argv, "S:")) != -1) {
+               switch (ch) {
+               case 'S':
+                       log_size = atoi(optarg);
+                       if (log_size < 1)
+                               log_size = 16;
+                       break;
+               }
+       }
+       log_size *= 1024;
 
        uloop_init();
-       log_init();
+       log_init(log_size);
        conn.cb = ubus_connect_handler;
        ubus_auto_connect(&conn);
        uloop_run();