204 lines
6.5 KiB
Diff
204 lines
6.5 KiB
Diff
From: Tias Guns <tias@ulyssis.org>
|
|
Date: Tue, 20 Mar 2012 21:30:10 +0000
|
|
Subject: [PATCH] fix syslogd, logread: add syslog.h, semop shmdt-at
|
|
|
|
patch from 'no-sys-shm,msg,sem' and 'sys-syslog' by Dan Drown
|
|
"sys/syslog.h header for syslogd"
|
|
http://dan.drown.org/android/src/busybox/
|
|
---
|
|
include/sys/syslog.h | 138 +++++++++++++++++++++++++++++++++++++++++
|
|
sysklogd/logread.c | 4 +-
|
|
sysklogd/syslogd.c | 4 +-
|
|
sysklogd/syslogd_and_logger.c | 1 +
|
|
4 files changed, 143 insertions(+), 4 deletions(-)
|
|
create mode 100644 include/sys/syslog.h
|
|
|
|
diff --git a/include/sys/syslog.h b/include/sys/syslog.h
|
|
new file mode 100644
|
|
index 0000000..3c749a0
|
|
--- /dev/null
|
|
+++ b/include/sys/syslog.h
|
|
@@ -0,0 +1,138 @@
|
|
+/*
|
|
+ * 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.
|
|
+ * 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.
|
|
+ * 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
|
|
+ *
|
|
+ * 2011/7/5 - DD - modified to fit android Bionic environment
|
|
+ */
|
|
+
|
|
+#ifndef _SYS_SYSLOG_H
|
|
+#define _SYS_SYSLOG_H 1
|
|
+
|
|
+#include <features.h>
|
|
+#define __need___va_list
|
|
+#include <stdarg.h>
|
|
+
|
|
+/*
|
|
+ * priorities/facilities are encoded into a single 32-bit quantity, where the
|
|
+ * bottom 3 bits are the priority (0-7) and the top 28 bits are the facility
|
|
+ * (0-big number). Both the priorities and the facilities map roughly
|
|
+ * one-to-one to strings in the syslogd(8) source code. This mapping is
|
|
+ * included in this file.
|
|
+ *
|
|
+ * priorities (these are ordered)
|
|
+ */
|
|
+#define LOG_EMERG 0 /* system is unusable */
|
|
+#define LOG_ALERT 1 /* action must be taken immediately */
|
|
+#define LOG_CRIT 2 /* critical conditions */
|
|
+#define LOG_ERR 3 /* error conditions */
|
|
+#define LOG_WARNING 4 /* warning conditions */
|
|
+#define LOG_NOTICE 5 /* normal but significant condition */
|
|
+#define LOG_INFO 6 /* informational */
|
|
+#define LOG_DEBUG 7 /* debug-level messages */
|
|
+
|
|
+#define LOG_MAKEPRI(fac, pri) (((fac) << 3) | (pri))
|
|
+
|
|
+#ifdef SYSLOG_NAMES
|
|
+#define INTERNAL_NOPRI 0x10 /* the "no priority" priority */
|
|
+ /* mark "facility" */
|
|
+#define INTERNAL_MARK LOG_MAKEPRI(LOG_NFACILITIES, 0)
|
|
+typedef struct _code {
|
|
+ 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 }
|
|
+ };
|
|
+#endif
|
|
+
|
|
+#define LOG_NFACILITIES 24 /* current number of facilities */
|
|
+
|
|
+#ifdef SYSLOG_NAMES
|
|
+CODE facilitynames[] =
|
|
+ {
|
|
+ { "auth", LOG_AUTH },
|
|
+ { "authpriv", LOG_AUTHPRIV },
|
|
+ { "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 },
|
|
+ { "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 }
|
|
+ };
|
|
+#endif
|
|
+
|
|
+/*
|
|
+ * arguments to setlogmask.
|
|
+ */
|
|
+#define LOG_MASK(pri) (1 << (pri)) /* mask for one priority */
|
|
+#define LOG_UPTO(pri) ((1 << ((pri)+1)) - 1) /* all priorities through pri */
|
|
+
|
|
+/*
|
|
+ * Option flags for openlog.
|
|
+ *
|
|
+ * LOG_ODELAY no longer does anything.
|
|
+ * LOG_NDELAY is the inverse of what it used to be.
|
|
+ */
|
|
+#define LOG_PID 0x01 /* log the pid with each message */
|
|
+#define LOG_CONS 0x02 /* log on the console if errors in sending */
|
|
+#define LOG_ODELAY 0x04 /* delay open until first syslog() (default) */
|
|
+#define LOG_NDELAY 0x08 /* don't delay open */
|
|
+#define LOG_NOWAIT 0x10 /* don't wait for console forks: DEPRECATED */
|
|
+#define LOG_PERROR 0x20 /* log to stderr as well */
|
|
+
|
|
+#endif /* sys/syslog.h */
|
|
diff --git a/sysklogd/logread.c b/sysklogd/logread.c
|
|
index 9939569..e978a5d 100644
|
|
--- a/sysklogd/logread.c
|
|
+++ b/sysklogd/logread.c
|
|
@@ -17,8 +17,8 @@
|
|
|
|
#include "libbb.h"
|
|
#include <sys/ipc.h>
|
|
-#include <sys/sem.h>
|
|
-#include <sys/shm.h>
|
|
+#include <linux/sem.h>
|
|
+#include <linux/shm.h>
|
|
|
|
#define DEBUG 0
|
|
|
|
diff --git a/sysklogd/syslogd.c b/sysklogd/syslogd.c
|
|
index fc380d9..1365bb8 100644
|
|
--- a/sysklogd/syslogd.c
|
|
+++ b/sysklogd/syslogd.c
|
|
@@ -65,8 +65,8 @@
|
|
|
|
#if ENABLE_FEATURE_IPC_SYSLOG
|
|
#include <sys/ipc.h>
|
|
-#include <sys/sem.h>
|
|
-#include <sys/shm.h>
|
|
+#include <linux/sem.h>
|
|
+#include <linux/shm.h>
|
|
#endif
|
|
|
|
|
|
diff --git a/sysklogd/syslogd_and_logger.c b/sysklogd/syslogd_and_logger.c
|
|
index 0964f23..81c8909 100644
|
|
--- a/sysklogd/syslogd_and_logger.c
|
|
+++ b/sysklogd/syslogd_and_logger.c
|
|
@@ -11,6 +11,7 @@
|
|
#define SYSLOG_NAMES
|
|
#define SYSLOG_NAMES_CONST
|
|
#include <syslog.h>
|
|
+#include <sys/syslog.h>
|
|
|
|
#if 0
|
|
/* For the record: with SYSLOG_NAMES <syslog.h> defines
|
|
--
|
|
1.7.10.4
|
|
|