logread: terminate after EOF

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

diff --git a/log/logd.c b/log/logd.c
index d778909..58abfad 100644 (file)
--- a/log/logd.c
+++ b/log/logd.c
@@ -75,7 +75,7 @@ log_fill_msg(struct blob_buf *b, struct log_head *l)
        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 * 1000LL);
+       blobmsg_add_u64(b, "time", (((__u64) l->ts.tv_sec) * 1000) + (l->ts.tv_nsec / 1000000));
 }
 
 static int
@@ -84,7 +84,7 @@ read_log(struct ubus_context *ctx, struct ubus_object *obj,
                struct blob_attr *msg)
 {
        struct client *cl;
-       struct blob_attr *tb[__READ_MAX];
+       struct blob_attr *tb[__READ_MAX] = {};
        struct log_head *l;
        int count = 0;
        int fds[2];
@@ -103,13 +103,13 @@ read_log(struct ubus_context *ctx, struct ubus_object *obj,
                        stream = blobmsg_get_bool(tb[READ_STREAM]);
        }
 
-       if (pipe(fds) == -1) {
-               fprintf(stderr, "logd: failed to create pipe: %s\n", strerror(errno));
-               return -1;
-       }
-
        l = log_list(count, NULL);
        if (stream) {
+               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_state = client_notify_state;