Changeset 1202

Timestamp:

Feb 7, 2004, 3:59:57 AM (22 years ago)

Author:

bird

Message:

Syslog stuff.

Location:

trunk/src/emx/include

Files:

• sys/syslog.h (modified) (5 diffs, 1 prop)
• syslog.h (added)

trunk/src/emx/include/sys/syslog.h

@@ -1 +1 @@
 /*
- * Copyright (c) 1998-2000 Carnegie Mellon University.  All rights reserved.
+ * Copyright (c) 1982, 1986, 1988, 1993
+ *      The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
- *
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
+ *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. The name "Carnegie Mellon University" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For permission or any other legal
- *    details, please contact  
- *      Office of Technology Transfer
- *      Carnegie Mellon University
- *      5000 Forbes Avenue
- *      Pittsburgh, PA  15213-3890
- *      (412) 268-4387, fax: (412) 268-7395
- *      tech-transfer@andrew.cmu.edu
- *
- * 4. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by Computing Services
- *     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
- *
- * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
- * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
- * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- */
-
-/* $Revision: 1.2 $
- * Copyright (c) 1982, 1986, 1988 Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution is only permitted until one year after the first shipment
- * of 4.4BSD by the Regents.  Otherwise, redistribution and use in source and
- * binary forms are permitted provided that: (1) source distributions retain
- * this entire copyright notice and comment, and (2) distributions including
- * binaries display the following acknowledgement:  This product includes
- * software developed by the University of California, Berkeley and its
- * contributors'' in the documentation or other materials provided with the
- * distribution and in all advertising materials mentioning features or use
- * of this software.  Neither the name of the University nor the names of
- * its contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- *
- *      @(#)syslog.h    7.16 (Berkeley) 6/28/90
- */
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *      This product includes software developed by the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *      @(#)syslog.h    8.1 (Berkeley) 6/2/93
+ * $FreeBSD: src/sys/sys/syslog.h,v 1.23 2002/08/21 16:20:01 mike Exp $
+ */
+
+/** @file
+ * FreeBSD 5.1
+ */
+
+#ifndef _SYS_SYSLOG_H_
+#define _SYS_SYSLOG_H_
+
+#define _PATH_LOG       "/var/run/log"
+#define _PATH_OLDLOG    "/dev/log"      /* backward compatibility */
 
 /*
@@ -80 +63 @@
 #define LOG_DEBUG       7       /* debug-level messages */
 
-#define LOG_PRIMASK     0x007   /* mask to extract priority part (internal) */
+#define LOG_PRIMASK     0x07    /* mask to extract priority part (internal) */
                                 /* extract priority */
 #define LOG_PRI(p)      ((p) & LOG_PRIMASK)
-#define LOG_MAKEPRI(fac, pri)   (((fac) << 3) | (pri))
+#define LOG_MAKEPRI(fac, pri)   ((fac) | (pri))
 
 #ifdef SYSLOG_NAMES
 #define INTERNAL_NOPRI  0x10    /* the "no priority" priority */
                                 /* mark "facility" */
-#define INTERNAL_MARK   LOG_MAKEPRI(LOG_NFACILITIES, 0)
+#define INTERNAL_MARK   LOG_MAKEPRI((LOG_NFACILITIES<<3), 0)
 typedef struct _code {
-        char    *c_name;
-        int     c_val;
+        const char      *c_name;
+        int             c_val;
 } CODE;
 
 CODE prioritynames[] = {
-        "alert",        LOG_ALERT,
-        "crit",         LOG_CRIT,
-        "debug",        LOG_DEBUG,
-        "emerg",        LOG_EMERG,
-        "err",          LOG_ERR,
-        "error",        LOG_ERR,                /* DEPRECATED */
-        "info",         LOG_INFO,
-        "none",         INTERNAL_NOPRI,         /* INTERNAL */
-        "notice",       LOG_NOTICE,
-        "panic",        LOG_EMERG,              /* DEPRECATED */
-        "warn",         LOG_WARNING,            /* DEPRECATED */
-        "warning",      LOG_WARNING,
-        NULL,           -1,
+        { "alert",      LOG_ALERT,      },
+        { "crit",       LOG_CRIT,       },
+        { "debug",      LOG_DEBUG,      },
+        { "emerg",      LOG_EMERG,      },
+        { "err",        LOG_ERR,        },
+        { "error",      LOG_ERR,        },      /* DEPRECATED */
+        { "info",       LOG_INFO,       },
+        { "none",       INTERNAL_NOPRI, },      /* INTERNAL */
+        { "notice",     LOG_NOTICE,     },
+        { "panic",      LOG_EMERG,      },      /* DEPRECATED */
+        { "warn",       LOG_WARNING,    },      /* DEPRECATED */
+        { "warning",    LOG_WARNING,    },
+        { NULL,         -1,             }
 };
 #endif
@@ -116 +99 @@
 #define LOG_MAIL        (2<<3)  /* mail system */
 #define LOG_DAEMON      (3<<3)  /* system daemons */
-#define LOG_AUTH        (4<<3)  /* security/authorization messages */
+#define LOG_AUTH        (4<<3)  /* authorization messages */
 #define LOG_SYSLOG      (5<<3)  /* messages generated internally by syslogd */
 #define LOG_LPR         (6<<3)  /* line printer subsystem */
 #define LOG_NEWS        (7<<3)  /* network news subsystem */
 #define LOG_UUCP        (8<<3)  /* UUCP subsystem */
-#define LOG_CRON        (15<<3) /* clock daemon */
+#define LOG_CRON        (9<<3)  /* clock daemon */
+#define LOG_AUTHPRIV    (10<<3) /* authorization messages (private) */
+                                /* Facility #10 clashes in DEC UNIX, where */
+                                /* it's defined as LOG_MEGASAFE for AdvFS  */
+                                /* event logging.                          */
+#define LOG_FTP         (11<<3) /* ftp daemon */
+#define LOG_NTP         (12<<3) /* NTP subsystem */
+#define LOG_SECURITY    (13<<3) /* security subsystems (firewalling, etc.) */
+#define LOG_CONSOLE     (14<<3) /* /dev/console output */
+
         /* other codes through 15 reserved for system use */
 #define LOG_LOCAL0      (16<<3) /* reserved for local use */
@@ -139 +131 @@
 #ifdef SYSLOG_NAMES
 CODE facilitynames[] = {
-        "auth",         LOG_AUTH,
-        "cron",         LOG_CRON,
-        "daemon",       LOG_DAEMON,
-        "kern",         LOG_KERN,
-        "lpr",          LOG_LPR,
-        "mail",         LOG_MAIL,
-        "mark",         INTERNAL_MARK,          /* INTERNAL */
-        "news",         LOG_NEWS,
-        "security",     LOG_AUTH,               /* DEPRECATED */
-        "syslog",       LOG_SYSLOG,
-        "user",         LOG_USER,
-        "uucp",         LOG_UUCP,
-        "local0",       LOG_LOCAL0,
-        "local1",       LOG_LOCAL1,
-        "local2",       LOG_LOCAL2,
-        "local3",       LOG_LOCAL3,
-        "local4",       LOG_LOCAL4,
-        "local5",       LOG_LOCAL5,
-        "local6",       LOG_LOCAL6,
-        "local7",       LOG_LOCAL7,
-        NULL,           -1,
+        { "auth",       LOG_AUTH,       },
+        { "authpriv",   LOG_AUTHPRIV,   },
+        { "console",    LOG_CONSOLE,    },
+        { "cron",       LOG_CRON,       },
+        { "daemon",     LOG_DAEMON,     },
+        { "ftp",        LOG_FTP,        },
+        { "kern",       LOG_KERN,       },
+        { "lpr",        LOG_LPR,        },
+        { "mail",       LOG_MAIL,       },
+        { "mark",       INTERNAL_MARK,  },      /* INTERNAL */
+        { "news",       LOG_NEWS,       },
+        { "ntp",        LOG_NTP,        },
+        { "security",   LOG_SECURITY,   },
+        { "syslog",     LOG_SYSLOG,     },
+        { "user",       LOG_USER,       },
+        { "uucp",       LOG_UUCP,       },
+        { "local0",     LOG_LOCAL0,     },
+        { "local1",     LOG_LOCAL1,     },
+        { "local2",     LOG_LOCAL2,     },
+        { "local3",     LOG_LOCAL3,     },
+        { "local4",     LOG_LOCAL4,     },
+        { "local5",     LOG_LOCAL5,     },
+        { "local6",     LOG_LOCAL6,     },
+        { "local7",     LOG_LOCAL7,     },
+        { NULL,         -1,             }
 };
 #endif
 
-#ifdef KERNEL
+#ifdef _KERNEL
 #define LOG_PRINTF      -1      /* pseudo-priority to indicate use of printf */
 #endif
@@ -185 +181 @@
 #define LOG_NOWAIT      0x10    /* don't wait for console forks: DEPRECATED */
 #define LOG_PERROR      0x20    /* log to stderr as well */
+
+#ifdef _KERNEL
+
+#else /* not _KERNEL */
+
+/*
+ * Don't use va_list in the vsyslog() prototype.   Va_list is typedef'd in two
+ * places (<machine/varargs.h> and <machine/stdarg.h>), so if we include one
+ * of them here we may collide with the utility's includes.  It's unreasonable
+ * for utilities to have to include one of them to include syslog.h, so we get
+ * __va_list from <sys/_types.h> and use it.
+ */
+#include <sys/cdefs.h>
+#include <sys/_types.h>
+
+__BEGIN_DECLS
+void    closelog(void);
+void    openlog(const char *, int, int);
+int     setlogmask(int);
+void    syslog(int, const char *, ...) __printflike(2, 3);
+void    vsyslog(int, const char *, __va_list) __printflike(2, 0);
+__END_DECLS
+
+#endif /* !_KERNEL */
+
+#endif