Module Name: src
Committed By: christos
Date: Wed Oct 10 22:52:26 UTC 2012
Modified Files:
src/lib/libc/compat/gen: Makefile.inc
Added Files:
src/lib/libc/compat/gen: compat_syslog.c
Log Message:
Add compat functions for syslog.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/lib/libc/compat/gen/Makefile.inc
cvs rdiff -u -r0 -r1.1 src/lib/libc/compat/gen/compat_syslog.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/compat/gen/Makefile.inc
diff -u src/lib/libc/compat/gen/Makefile.inc:1.14 src/lib/libc/compat/gen/Makefile.inc:1.15
--- src/lib/libc/compat/gen/Makefile.inc:1.14 Sat Mar 12 14:52:47 2011
+++ src/lib/libc/compat/gen/Makefile.inc Wed Oct 10 18:52:26 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.14 2011/03/12 19:52:47 christos Exp $
+# $NetBSD: Makefile.inc,v 1.15 2012/10/10 22:52:26 christos Exp $
.PATH: ${COMPATDIR}/gen
SRCS+=compat_errlist.c compat_fts.c compat___fts13.c compat___fts30.c \
@@ -9,4 +9,4 @@ SRCS+=compat_errlist.c compat_fts.c comp
compat__sys_errlist.c compat__sys_nerr.c compat__sys_siglist.c \
compat_time.c compat_utime.c compat_devname.c compat_alphasort.c \
compat_getpwent.c compat___fts32.c compat_utmp.c compat___fts50.c \
- compat___unvis13.c
+ compat___unvis13.c compat_syslog.c
Added files:
Index: src/lib/libc/compat/gen/compat_syslog.c
diff -u /dev/null src/lib/libc/compat/gen/compat_syslog.c:1.1
--- /dev/null Wed Oct 10 18:52:26 2012
+++ src/lib/libc/compat/gen/compat_syslog.c Wed Oct 10 18:52:26 2012
@@ -0,0 +1,151 @@
+/* $NetBSD: compat_syslog.c,v 1.1 2012/10/10 22:52:26 christos Exp $ */
+
+/*-
+ * Copyright (c) 2012 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Christos Zoulas.
+ *
+ * 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
+ */
+
+#include "namespace.h"
+#include <sys/cdefs.h>
+
+#define __LIBC12_SOURCE__
+#include <stdarg.h>
+
+#include <sys/types.h>
+#include <sys/syslog.h>
+#include <compat/sys/syslog.h>
+
+#ifdef __weak_alias
+__weak_alias(closelog_r,_closelog_r)
+__weak_alias(openlog_r,_openlog_r)
+__weak_alias(setlogmask_r,_setlogmask_r)
+__weak_alias(syslog_r,_syslog_r)
+__weak_alias(vsyslog_r,_vsyslog_r)
+__weak_alias(syslogp_r,_syslogp_r)
+__weak_alias(vsyslogp_r,_vsyslogp_r)
+#endif /* __weak_alias */
+
+__warn_references(closelog_r,
+ "warning: reference to compatibility closelog_r();"
+ " include <sys/syslog.h> for correct reference")
+__warn_references(openlog_r,
+ "warning: reference to compatibility openlog_r();"
+ " include <sys/syslog.h> for correct reference")
+__warn_references(setlogmask_r,
+ "warning: reference to compatibility setlogmask_r();"
+ " include <sys/syslog.h> for correct reference")
+__warn_references(syslog_r,
+ "warning: reference to compatibility syslog_r();"
+ " include <sys/syslog.h> for correct reference")
+__warn_references(vsyslog_r,
+ "warning: reference to compatibility vsyslog_r();"
+ " include <sys/syslog.h> for correct reference")
+__warn_references(syslogp_r,
+ "warning: reference to compatibility syslogp_r();"
+ " include <sys/syslog.h> for correct reference")
+__warn_references(vsyslogp_r,
+ "warning: reference to compatibility vsyslogp_r();"
+ " include <sys/syslog.h> for correct reference")
+
+static void
+syslog_data_convert(struct syslog_data *d, const struct syslog_data60 *s)
+{
+ d->log_file = s->log_file;
+ d->log_connected = s->connected;
+ d->log_opened = s->opened;
+ d->log_stat = s->log_stat;
+ d->log_tag = s->log_tag;
+ d->log_fac = s->log_fac;
+ d->log_mask = s->log_mask;
+}
+
+void
+closelog_r(struct syslog_data60 *data60)
+{
+ struct syslog_data data = SYSLOG_DATA_INIT;
+ syslog_data_convert(&data, data60);
+ __closelog_r60(&data);
+}
+
+void
+openlog_r(const char *ident, int logstat, int logfac,
+ struct syslog_data60 *data60)
+{
+ struct syslog_data data = SYSLOG_DATA_INIT;
+ syslog_data_convert(&data, data60);
+ __openlog_r60(ident, logstat, logfac, &data);
+}
+
+int
+setlogmask_r(int pmask, struct syslog_data60 *data60)
+{
+ struct syslog_data data = SYSLOG_DATA_INIT;
+ syslog_data_convert(&data, data60);
+ return __setlogmask_r60(pmask, &data);
+}
+
+void
+syslog_r(int pri, struct syslog_data60 *data60, const char *fmt, ...)
+{
+ va_list ap;
+ struct syslog_data data = SYSLOG_DATA_INIT;
+ syslog_data_convert(&data, data60);
+
+ va_start(ap, fmt);
+ __vsyslog_r60(pri, &data, fmt, ap);
+ va_end(ap);
+}
+
+void
+vsyslog_r(int pri, struct syslog_data60 *data60, const char *fmt, __va_list ap)
+{
+ struct syslog_data data = SYSLOG_DATA_INIT;
+ syslog_data_convert(&data, data60);
+ __vsyslog_r60(pri, &data, fmt, ap);
+}
+void
+syslogp_r(int pri, struct syslog_data60 *data60, const char *msgid,
+ const char *sdfmt, const char *msgfmt, ...)
+{
+ va_list ap;
+ struct syslog_data data = SYSLOG_DATA_INIT;
+ syslog_data_convert(&data, data60);
+
+ va_start(ap, msgfmt);
+ __vsyslogp_r60(pri, &data, msgid, sdfmt, msgfmt, ap);
+ va_end(ap);
+}
+
+void
+vsyslogp_r(int pri, struct syslog_data60 *data60, const char *msgid,
+ const char *sdfmt, const char *msgfmt, __va_list ap)
+{
+ struct syslog_data data = SYSLOG_DATA_INIT;
+ syslog_data_convert(&data, data60);
+
+ __vsyslogp_r60(pri, &data, msgid, sdfmt, msgfmt, ap);
+}
