uloop: fix a regression in timeout handling

[project/libubox.git] / ulog.c

diff --git a/ulog.c b/ulog.c
index 776a0c4..b7300e7 100644 (file)
--- a/ulog.c
+++ b/ulog.c
@@ -35,12 +35,13 @@ static const char *ulog_default_ident(void)
        FILE *self;
        static char line[64];
        char *p = NULL;
+       char *sbuf;
 
        if ((self = fopen("/proc/self/status", "r")) != NULL) {
                while (fgets(line, sizeof(line), self)) {
                        if (!strncmp(line, "Name:", 5)) {
-                               strtok(line, "\t\n");
-                               p = strtok(NULL, "\t\n");
+                               strtok_r(line, "\t\n", &sbuf);
+                               p = strtok_r(NULL, "\t\n", &sbuf);
                                break;
                        }
                }
@@ -90,7 +91,7 @@ static void ulog_kmsg(int priority, const char *fmt, va_list ap)
 {
        FILE *kmsg;
 
-       if ((kmsg = fopen("/dev/kmsg", "w")) != NULL) {
+       if ((kmsg = fopen("/dev/kmsg", "r+")) != NULL) {
                fprintf(kmsg, "<%u>", priority);
 
                if (_ulog_ident)
@@ -105,9 +106,6 @@ static void ulog_stdio(int priority, const char *fmt, va_list ap)
 {
        FILE *out = stderr;
 
-       if (priority == LOG_INFO || priority == LOG_NOTICE)
-               out = stdout;
-
        if (_ulog_ident)
                fprintf(out, "%s: ", _ulog_ident);