properly handle return codes

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

diff --git a/log/logread.c b/log/logread.c
index 28c9462..06dda62 100644 (file)
--- a/log/logread.c
+++ b/log/logread.c
@@ -79,7 +79,7 @@ static void log_handle_reconnect(struct uloop_timeout *timeout)
                uloop_timeout_set(&retry, 1000);
        } else {
                uloop_fd_add(&sender, ULOOP_READ);
-               syslog(0, "Logread connected to %s:%s\n", log_ip, log_port);
+               syslog(LOG_INFO, "Logread connected to %s:%s\n", log_ip, log_port);
        }
 }
 
@@ -102,6 +102,7 @@ static int log_notify(struct blob_attr *msg)
        char *str;
        time_t t;
        char *c, *m;
+       int ret = 0;
 
        if (sender.fd < 0)
                return 0;
@@ -135,23 +136,26 @@ static int log_notify(struct blob_attr *msg)
        if (log_type == LOG_NET) {
                int err;
 
-               *buf = '\0';
-               if (hostname)
-                       snprintf(buf, sizeof(buf), "%s ", hostname);
+               snprintf(buf, sizeof(buf), "<%u>", p);
+               strncat(buf, c + 4, 16);
+               if (hostname) {
+                       strncat(buf, hostname, sizeof(buf) - strlen(buf) - 1);
+                       strncat(buf, " ", sizeof(buf) - strlen(buf) - 1);
+               }
                if (log_prefix) {
-                       strncat(buf, log_prefix, sizeof(buf));
-                       strncat(buf, ": ", sizeof(buf));
+                       strncat(buf, log_prefix, sizeof(buf) - strlen(buf) - 1);
+                       strncat(buf, ": ", sizeof(buf) - strlen(buf) - 1);
                }
                if (blobmsg_get_u32(tb[LOG_SOURCE]) == SOURCE_KLOG)
-                       strncat(buf, "kernel: ", sizeof(buf));
-               strncat(buf, m, sizeof(buf));
+                       strncat(buf, "kernel: ", sizeof(buf) - strlen(buf) - 1);
+               strncat(buf, m, sizeof(buf) - strlen(buf) - 1);
                if (log_udp)
                        err = write(sender.fd, buf, strlen(buf));
                else
                        err = send(sender.fd, buf, strlen(buf), 0);
 
                if (err < 0) {
-                       syslog(0, "failed to send log data to %s:%s via %s\n",
+                       syslog(LOG_INFO, "failed to send log data to %s:%s via %s\n",
                                log_ip, log_port, (log_udp) ? ("udp") : ("tcp"));
                        uloop_fd_delete(&sender);
                        close(sender.fd);
@@ -162,14 +166,14 @@ static int log_notify(struct blob_attr *msg)
                snprintf(buf, sizeof(buf), "%s %s.%s%s %s\n",
                        c, getcodetext(LOG_FAC(p) << 3, facilitynames), getcodetext(LOG_PRI(p), prioritynames),
                        (blobmsg_get_u32(tb[LOG_SOURCE])) ? ("") : (" kernel:"), m);
-               write(sender.fd, buf, strlen(buf));
+               ret = write(sender.fd, buf, strlen(buf));
        }
 
        free(str);
        if (log_type == LOG_FILE)
                fsync(sender.fd);
 
-       return 0;
+       return ret;
 }
 
 static int usage(const char *prog)