#include <signal.h>
#include <string.h>
#include <pthread.h>
+#include <errno.h>
+#include <fcntl.h>
#include "libc.h"
-#include "atomic.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;
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 {
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;
+ int hlen;
+ int fd;
- if (log_fd < 0) {
- __openlog();
- if (log_fd < 0) return;
- }
+ if (log_fd < 0) __openlog();
if (!(priority & LOG_FACMASK)) priority |= log_facility;
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, "["+!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) {
if (l2 >= sizeof buf - l) l = sizeof buf - 1;
else l += l2;
if (buf[l-1] != '\n') buf[l++] = '\n';
- send(log_fd, buf, l, 0);
+ 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);
+ close(fd);
+ }
+ }
+ if (log_opt & LOG_PERROR) dprintf(2, "%.*s", l-hlen, buf+hlen);
}
}