#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"
-static int lock;
-static const char *log_ident;
+static volatile int lock[2];
+static char log_ident[32];
static int log_opt;
static int log_facility = LOG_USER;
static int log_mask = 0xff;
-static FILE *log_f;
+static int log_fd = -1;
int setlogmask(int maskpri)
{
- int old = log_mask;
+ LOCK(lock);
+ int ret = log_mask;
if (maskpri) log_mask = maskpri;
- return old;
+ UNLOCK(lock);
+ return ret;
}
static const struct {
void closelog(void)
{
- LOCK(&lock);
- if (log_f) fclose(log_f);
- log_f = NULL;
- UNLOCK(&lock);
+ int cs;
+ pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cs);
+ LOCK(lock);
+ close(log_fd);
+ log_fd = -1;
+ UNLOCK(lock);
+ pthread_setcancelstate(cs, 0);
}
-static void __openlog(const char *ident, int opt, int facility)
+static void __openlog()
{
- int fd;
-
- log_ident = ident;
- log_opt = opt;
- log_facility = facility;
-
- if (!(opt & LOG_NDELAY) || log_f) return;
-
- fd = socket(AF_UNIX, SOCK_DGRAM, 0);
- fcntl(fd, F_SETFD, FD_CLOEXEC);
- if (connect(fd, (void *)&log_addr, sizeof(short) + sizeof "/dev/log") < 0)
+ int fd = socket(AF_UNIX, SOCK_DGRAM|SOCK_CLOEXEC, 0);
+ if (fd < 0) return;
+ if (connect(fd, (void *)&log_addr, sizeof log_addr) < 0)
close(fd);
- else log_f = fdopen(fd, "wb");
+ else
+ log_fd = fd;
}
void openlog(const char *ident, int opt, int facility)
{
- LOCK(&lock);
- __openlog(ident, opt, facility);
- UNLOCK(&lock);
+ 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) __openlog();
+
+ UNLOCK(lock);
+ pthread_setcancelstate(cs, 0);
}
-void syslog(int priority, const char *message, ...)
+static void _vsyslog(int priority, const char *message, va_list ap)
{
- va_list ap;
char timebuf[16];
time_t now;
struct tm tm;
- //const char *fmt, *ident, *sep;
- //int i;
-
- if (!(log_mask & LOG_MASK(priority&7)) || (priority&~0x3ff)) return;
+ char buf[1024];
+ int errno_save = errno;
+ int pid;
+ int l, l2;
+ int hlen;
+ int fd;
- LOCK(&lock);
+ if (log_fd < 0) __openlog();
- if (!log_f) __openlog(log_ident, log_opt | LOG_NDELAY, log_facility);
- if (!log_f) {
- 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);
- fprintf(log_f, "<%d>%s ", priority, timebuf);
- if (log_ident) fprintf(log_f, "%s", log_ident);
- if (log_opt & LOG_PID) fprintf(log_f, "[%d]", getpid());
- if (log_ident) fprintf(log_f, ": ");
+ pid = (log_opt & LOG_PID) ? getpid() : 0;
+ 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) {
+ 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)) {
+ 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);
+ }
+}
+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, ...)
+{
+ va_list ap;
va_start(ap, message);
- vfprintf(log_f, message, ap);
+ __vsyslog(priority, message, ap);
va_end(ap);
- fputc(0, log_f);
- fflush(log_f);
-
- // Note: LOG_CONS is not supported because it is annoying!!
- // syslogd will send messages to console if it deems them appropriate!
-
- UNLOCK(&lock);
}
+
+weak_alias(__vsyslog, vsyslog);