fix VIDIOC_DQEVENT (v4l2) ioctl fallback for pre-5.6 kernels

[musl] / src / misc / syslog.c

diff --git a/src/misc/syslog.c b/src/misc/syslog.c
index fdf90ba..7dc0c1b 100644 (file)
--- a/src/misc/syslog.c
+++ b/src/misc/syslog.c
@@ -9,20 +9,24 @@
 #include <pthread.h>
 #include <errno.h>
 #include <fcntl.h>
-#include "libc.h"
-#include "atomic.h"
+#include "lock.h"
+#include "fork_impl.h"
 
-static int lock[2];
+static volatile int lock[1];
 static char log_ident[32];
 static int log_opt;
 static int log_facility = LOG_USER;
 static int log_mask = 0xff;
 static int log_fd = -1;
+volatile int *const __syslog_lockptr = lock;
 
 int setlogmask(int maskpri)
 {
-       if (maskpri) return a_swap(&log_mask, maskpri);
-       else return log_mask;
+       LOCK(lock);
+       int ret = log_mask;
+       if (maskpri) log_mask = maskpri;
+       UNLOCK(lock);
+       return ret;
 }
 
 static const struct {
@@ -72,12 +76,17 @@ void openlog(const char *ident, int opt, int facility)
        pthread_setcancelstate(cs, 0);
 }
 
+static int is_lost_conn(int e)
+{
+       return e==ECONNREFUSED || e==ECONNRESET || e==ENOTCONN || e==EPIPE;
+}
+
 static void _vsyslog(int priority, const char *message, va_list ap)
 {
        char timebuf[16];
        time_t now;
        struct tm tm;
-       char buf[256];
+       char buf[1024];
        int errno_save = errno;
        int pid;
        int l, l2;
@@ -101,7 +110,10 @@ static void _vsyslog(int priority, const char *message, va_list ap)
                if (l2 >= sizeof buf - l) l = sizeof buf - 1;
                else l += l2;
                if (buf[l-1] != '\n') buf[l++] = '\n';
-               if (send(log_fd, buf, l, 0) < 0 && (log_opt & LOG_CONS)) {
+               if (send(log_fd, buf, l, 0) < 0 && (!is_lost_conn(errno)
+                   || connect(log_fd, (void *)&log_addr, sizeof log_addr) < 0
+                   || send(log_fd, buf, l, 0) < 0)
+                   && (log_opt & LOG_CONS)) {
                        fd = open("/dev/console", O_WRONLY|O_NOCTTY|O_CLOEXEC);
                        if (fd >= 0) {
                                dprintf(fd, "%.*s", l-hlen, buf+hlen);
@@ -112,7 +124,7 @@ static void _vsyslog(int priority, const char *message, va_list ap)
        }
 }
 
-void __vsyslog(int priority, const char *message, va_list ap)
+static void __vsyslog(int priority, const char *message, va_list ap)
 {
        int cs;
        if (!(log_mask & LOG_MASK(priority&7)) || (priority&~0x3ff)) return;