X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fmisc%2Fsyslog.c;h=fdf90ba9fb074ddecb4353496dc12d579d84f601;hb=546f6b322bcafa2452925c19f9607d9689c75f95;hp=0f7576407e4945f9ab86dc33691661ea2e3d757a;hpb=19c1830eaaab05652d87b5ee9557d0d7a40c2f06;p=oweals%2Fmusl.git

diff --git a/src/misc/syslog.c b/src/misc/syslog.c
index 0f757640..fdf90ba9 100644
--- a/src/misc/syslog.c
+++ b/src/misc/syslog.c
@@ -1,16 +1,19 @@
 #include <stdarg.h>
 #include <sys/socket.h>
 #include <stdio.h>
-#include <fcntl.h>
 #include <unistd.h>
 #include <syslog.h>
 #include <time.h>
 #include <signal.h>
 #include <string.h>
+#include <pthread.h>
+#include <errno.h>
+#include <fcntl.h>
 #include "libc.h"
+#include "atomic.h"
 
-static int lock;
-static const char *log_ident;
+static int lock[2];
+static char log_ident[32];
 static int log_opt;
 static int log_facility = LOG_USER;
 static int log_mask = 0xff;
@@ -18,9 +21,8 @@ static int log_fd = -1;
 
 int setlogmask(int maskpri)
 {
-	int old = log_mask;
-	if (maskpri) log_mask = maskpri;
-	return old;
+	if (maskpri) return a_swap(&log_mask, maskpri);
+	else return log_mask;
 }
 
 static const struct {
@@ -33,69 +35,92 @@ static const struct {
 
 void closelog(void)
 {
-	LOCK(&lock);
+	int cs;
+	pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cs);
+	LOCK(lock);
 	close(log_fd);
 	log_fd = -1;
-	UNLOCK(&lock);
+	UNLOCK(lock);
+	pthread_setcancelstate(cs, 0);
+}
+
+static void __openlog()
+{
+	log_fd = socket(AF_UNIX, SOCK_DGRAM|SOCK_CLOEXEC, 0);
+	if (log_fd >= 0) connect(log_fd, (void *)&log_addr, sizeof log_addr);
 }
 
-static void __openlog(const char *ident, int opt, int facility)
+void openlog(const char *ident, int opt, int facility)
 {
-	log_ident = ident;
+	int cs;
+	pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cs);
+	LOCK(lock);
+
+	if (ident) {
+		size_t n = strnlen(ident, sizeof log_ident - 1);
+		memcpy(log_ident, ident, n);
+		log_ident[n] = 0;
+	} else {
+		log_ident[0] = 0;
+	}
 	log_opt = opt;
 	log_facility = facility;
 
-	if (!(opt & LOG_NDELAY) || log_fd>=0) return;
+	if ((opt & LOG_NDELAY) && log_fd<0) __openlog();
 
-	log_fd = socket(AF_UNIX, SOCK_DGRAM, 0);
-	fcntl(log_fd, F_SETFD, FD_CLOEXEC);
+	UNLOCK(lock);
+	pthread_setcancelstate(cs, 0);
 }
 
-void openlog(const char *ident, int opt, int facility)
-{
-	LOCK(&lock);
-	__openlog(ident, opt, facility);
-	UNLOCK(&lock);
-}
-
-void __vsyslog(int priority, const char *message, va_list ap)
+static void _vsyslog(int priority, const char *message, va_list ap)
 {
 	char timebuf[16];
 	time_t now;
 	struct tm tm;
 	char buf[256];
+	int errno_save = errno;
 	int pid;
 	int l, l2;
+	int hlen;
+	int fd;
 
-	if (!(log_mask & LOG_MASK(priority&7)) || (priority&~0x3ff)) return;
-
-	LOCK(&lock);
+	if (log_fd < 0) __openlog();
 
-	if (log_fd < 0) {
-		__openlog(log_ident, log_opt | LOG_NDELAY, log_facility);
-		if (log_fd < 0) {
-			UNLOCK(&lock);
-			return;
-		}
-	}
+	if (!(priority & LOG_FACMASK)) priority |= log_facility;
 
 	now = time(NULL);
 	gmtime_r(&now, &tm);
 	strftime(timebuf, sizeof timebuf, "%b %e %T", &tm);
 
 	pid = (log_opt & LOG_PID) ? getpid() : 0;
-	l = snprintf(buf, sizeof buf, "<%d>%s %s%s%.0d%s: ",
-		priority, timebuf,
-		log_ident ? log_ident : "",
-		"["+!pid, pid, "]"+!pid);
+	l = snprintf(buf, sizeof buf, "<%d>%s %n%s%s%.0d%s: ",
+		priority, timebuf, &hlen, log_ident, "["+!pid, pid, "]"+!pid);
+	errno = errno_save;
 	l2 = vsnprintf(buf+l, sizeof buf - l, message, ap);
 	if (l2 >= 0) {
-		l += l2;
+		if (l2 >= sizeof buf - l) l = sizeof buf - 1;
+		else l += l2;
 		if (buf[l-1] != '\n') buf[l++] = '\n';
-		sendto(log_fd, buf, l, 0, (void *)&log_addr, 11);
+		if (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);
+				close(fd);
+			}
+		}
+		if (log_opt & LOG_PERROR) dprintf(2, "%.*s", l-hlen, buf+hlen);
 	}
+}
 
-	UNLOCK(&lock);
+void __vsyslog(int priority, const char *message, va_list ap)
+{
+	int cs;
+	if (!(log_mask & LOG_MASK(priority&7)) || (priority&~0x3ff)) return;
+	pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cs);
+	LOCK(lock);
+	_vsyslog(priority, message, ap);
+	UNLOCK(lock);
+	pthread_setcancelstate(cs, 0);
 }
 
 void syslog(int priority, const char *message, ...)