Loading...
--- Libc/Libc-320/gen/syslog.c
+++ Libc/Libc-825.26/gen/syslog.c
@@ -1,10 +1,8 @@
/*
- * Copyright (c) 1999 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 1999-2010 Apple Inc. All rights reserved.
*
* @APPLE_LICENSE_HEADER_START@
- *
- * Copyright (c) 1999-2003 Apple Computer, Inc. All Rights Reserved.
- *
+ *
* This file contains Original Code and/or Modifications of Original Code
* as defined in and that are subject to the Apple Public Source License
* Version 2.0 (the 'License'). You may not use this file except in
@@ -22,6 +20,7 @@
*
* @APPLE_LICENSE_HEADER_END@
*/
+
/*
* Copyright (c) 1993
* The Regents of the University of California. All rights reserved.
@@ -55,20 +54,13 @@
* SUCH DAMAGE.
*/
-#include <sys/types.h>
-#include <sys/socket.h>
#include <sys/syslog.h>
-#include <sys/uio.h>
-#include <sys/un.h>
-#include <netdb.h>
-
-#include <errno.h>
-#include <fcntl.h>
-#include <paths.h>
-#include <stdio.h>
+#include <stdlib.h>
#include <string.h>
-#include <time.h>
-#include <unistd.h>
+#include <stdint.h>
+#include <pthread.h>
+#include <asl.h>
+#include "asl_private.h"
#ifdef __STDC__
#include <stdarg.h>
@@ -76,14 +68,24 @@
#include <varargs.h>
#endif
-#include <crt_externs.h>
-
-static int LogFile = -1; /* fd for log */
-static int connected; /* have done connect */
-static int LogStat = 0; /* status bits, set by openlog() */
-static const char *LogTag = NULL; /* string to tag the entry with */
-static int LogFacility = LOG_USER; /* default facility code */
-static int LogMask = 0xff; /* mask of priorities to be logged */
+#define LOG_NO_NOTIFY 0x1000
+extern const char *asl_syslog_faciliy_num_to_name(int n);
+
+#ifdef BUILDING_VARIANT
+__private_extern__ pthread_mutex_t _sl_lock;
+__private_extern__ aslclient _sl_asl;
+__private_extern__ char *_sl_ident;
+__private_extern__ int _sl_fac;
+__private_extern__ int _sl_opts;
+__private_extern__ int _sl_mask;
+#else /* !BUILDING_VARIANT */
+__private_extern__ pthread_mutex_t _sl_lock = PTHREAD_MUTEX_INITIALIZER;
+__private_extern__ aslclient _sl_asl = NULL;
+__private_extern__ char *_sl_ident = NULL;
+__private_extern__ int _sl_fac = 0;
+__private_extern__ int _sl_opts = 0;
+__private_extern__ int _sl_mask = 0;
+#endif /* BUILDING_VARIANT */
/*
* syslog, vsyslog --
@@ -111,200 +113,95 @@
}
void
-vsyslog(pri, fmt, ap)
- int pri;
- register const char *fmt;
- va_list ap;
-{
- register int cnt;
- register char ch, *p, *t;
- time_t now;
- int fd, saved_errno;
-#define TBUF_LEN 2048
-#define FMT_LEN 1024
- char *stdp, tbuf[TBUF_LEN], fmt_cpy[FMT_LEN];
- int tbuf_left, fmt_left, prlen;
-
-#define INTERNALLOG LOG_ERR|LOG_CONS|LOG_PERROR|LOG_PID
- /* Check for invalid bits. */
- if (pri & ~(LOG_PRIMASK|LOG_FACMASK)) {
- syslog(INTERNALLOG,
- "syslog: unknown facility/priority: %x", pri);
- pri &= LOG_PRIMASK|LOG_FACMASK;
- }
-
- /* Check priority against setlogmask values. */
- if (!(LOG_MASK(LOG_PRI(pri)) & LogMask))
- return;
-
- saved_errno = errno;
-
- /* Set default facility if none specified. */
- if ((pri & LOG_FACMASK) == 0)
- pri |= LogFacility;
-
- /* Build the message. */
-
- /*
- * Although it's tempting, we can't ignore the possibility of
- * overflowing the buffer when assembling the "fixed" portion
- * of the message. Strftime's "%h" directive expands to the
- * locale's abbreviated month name, but if the user has the
- * ability to construct to his own locale files, it may be
- * arbitrarily long.
- */
- (void)time(&now);
-
- p = tbuf;
- tbuf_left = TBUF_LEN;
-
-#define DEC() \
- do { \
- if (prlen >= tbuf_left) \
- prlen = tbuf_left - 1; \
- p += prlen; \
- tbuf_left -= prlen; \
- } while (0)
-
- prlen = snprintf(p, tbuf_left, "<%d>", pri);
- DEC();
-
- prlen = strftime(p, tbuf_left, "%h %e %T ", localtime(&now));
- DEC();
-
- if (LogStat & LOG_PERROR)
- stdp = p;
- if (LogTag == NULL)
- LogTag = *(*_NSGetArgv());
- if (LogTag != NULL) {
- prlen = snprintf(p, tbuf_left, "%s", LogTag);
- DEC();
- }
- if (LogStat & LOG_PID) {
- prlen = snprintf(p, tbuf_left, "[%d]", getpid());
- DEC();
- }
- if (LogTag != NULL) {
- if (tbuf_left > 1) {
- *p++ = ':';
- tbuf_left--;
- }
- if (tbuf_left > 1) {
- *p++ = ' ';
- tbuf_left--;
+vsyslog(int pri, const char *fmt, va_list ap)
+{
+ int fac;
+ aslmsg facmsg;
+ const char *facility;
+
+ facmsg = NULL;
+ fac = pri & LOG_FACMASK;
+ if (fac != 0)
+ {
+ facility = asl_syslog_faciliy_num_to_name(fac);
+ if (facility != NULL)
+ {
+ facmsg = asl_new(ASL_TYPE_MSG);
+ asl_set(facmsg, ASL_KEY_FACILITY, facility);
}
}
- /*
- * We wouldn't need this mess if printf handled %m, or if
- * strerror() had been invented before syslog().
- */
- for (t = fmt_cpy, fmt_left = FMT_LEN; (ch = *fmt); ++fmt) {
- if (ch == '%' && fmt[1] == 'm') {
- ++fmt;
- prlen = snprintf(t, fmt_left, "%s",
- strerror(saved_errno));
- if (prlen >= fmt_left)
- prlen = fmt_left - 1;
- t += prlen;
- fmt_left -= prlen;
- } else {
- if (fmt_left > 1) {
- *t++ = ch;
- fmt_left--;
- }
- }
- }
- *t = '\0';
-
- prlen = vsnprintf(p, tbuf_left, fmt_cpy, ap);
- DEC();
- cnt = p - tbuf;
-
- /* Output to stderr if requested. */
- if (LogStat & LOG_PERROR) {
- struct iovec iov[2];
-
- iov[0].iov_base = stdp;
- iov[0].iov_len = cnt - (stdp - tbuf);
- iov[1].iov_base = "\n";
- iov[1].iov_len = 1;
- (void)writev(STDERR_FILENO, iov, 2);
- }
-
- /* Get connected, output the message to the local logger. */
- if (!connected)
- openlog(LogTag, LogStat | LOG_NDELAY, 0);
- if (send(LogFile, tbuf, cnt, 0) >= 0)
- return;
-
- /*
- * Output the message to the console; don't worry about blocking,
- * if console blocks everything will. Make sure the error reported
- * is the one from the syslogd failure.
- */
- if (LogStat & LOG_CONS &&
- (fd = open(_PATH_CONSOLE, O_WRONLY, 0)) >= 0) {
- struct iovec iov[2];
-
- p = strchr(tbuf, '>') + 1;
- iov[0].iov_base = p;
- iov[0].iov_len = cnt - (p - tbuf);
- iov[1].iov_base = "\r\n";
- iov[1].iov_len = 2;
- (void)writev(fd, iov, 2);
- (void)close(fd);
- }
-}
-
-static struct sockaddr_un SyslogAddr; /* AF_UNIX address of local logger */
-
-void
-openlog(ident, logstat, logfac)
- const char *ident;
- int logstat, logfac;
-{
- if (ident != NULL)
- LogTag = ident;
- LogStat = logstat;
- if (logfac != 0 && (logfac &~ LOG_FACMASK) == 0)
- LogFacility = logfac;
-
- if (LogFile == -1) {
- SyslogAddr.sun_family = AF_UNIX;
- (void)strncpy(SyslogAddr.sun_path, _PATH_LOG,
- sizeof(SyslogAddr.sun_path));
- if (LogStat & LOG_NDELAY) {
- if ((LogFile = socket(AF_UNIX, SOCK_DGRAM, 0)) == -1)
- return;
- (void)fcntl(LogFile, F_SETFD, 1);
- }
- }
- if (LogFile != -1 && !connected)
- if (connect(LogFile, (struct sockaddr *)&SyslogAddr, sizeof(SyslogAddr)) == -1) {
- (void)close(LogFile);
- LogFile = -1;
- } else
- connected = 1;
+ asl_vlog(_sl_asl, facmsg, LOG_PRI(pri), fmt, ap);
+ if (facmsg != NULL) asl_free(facmsg);
+}
+
+#ifndef BUILDING_VARIANT
+
+void
+openlog(const char *ident, int opts, int logfac)
+{
+ const char *facility;
+ uint32_t asl_opts;
+
+ pthread_mutex_lock(&_sl_lock);
+
+ /* close existing aslclient */
+ if (_sl_asl != NULL) asl_close(_sl_asl);
+ _sl_asl = NULL;
+
+ if (_sl_ident != NULL) free(_sl_ident);
+ _sl_ident = NULL;
+
+ /* open with specified parameters */
+
+ if (ident != NULL) _sl_ident = strdup(ident);
+ /* NB we allow the strdup to fail silently */
+
+ _sl_fac = logfac;
+ facility = asl_syslog_faciliy_num_to_name(_sl_fac);
+
+ _sl_opts = opts;
+ asl_opts = ASL_OPT_SYSLOG_LEGACY;
+
+ if (_sl_opts & LOG_NO_NOTIFY) asl_opts |= ASL_OPT_NO_REMOTE;
+ if (_sl_opts & LOG_PERROR) asl_opts |= ASL_OPT_STDERR;
+
+ _sl_mask = ASL_FILTER_MASK_UPTO(ASL_LEVEL_DEBUG);
+
+ _sl_asl = asl_open(_sl_ident, facility, asl_opts);
+ asl_set_filter(_sl_asl, _sl_mask);
+
+ pthread_mutex_unlock(&_sl_lock);
}
void
closelog()
{
- (void)close(LogFile);
- LogFile = -1;
- connected = 0;
+ pthread_mutex_lock(&_sl_lock);
+
+ if (_sl_asl != NULL) asl_close(_sl_asl);
+ _sl_asl = NULL;
+
+ if (_sl_ident != NULL) free(_sl_ident);
+ _sl_ident = NULL;
+
+ pthread_mutex_unlock(&_sl_lock);
}
/* setlogmask -- set the log mask level */
int
-setlogmask(pmask)
- int pmask;
-{
- int omask;
-
- omask = LogMask;
- if (pmask != 0)
- LogMask = pmask;
- return (omask);
-}
+setlogmask(int mask)
+{
+ int oldmask;
+
+ pthread_mutex_lock(&_sl_lock);
+
+ _sl_mask = mask;
+ oldmask = asl_set_filter(_sl_asl, mask);
+
+ pthread_mutex_unlock(&_sl_lock);
+
+ return oldmask;
+}
+
+#endif /* !BUILDING_VARIANT */