A few more syscalls.

libc/misc/Makefile

@@ -21,7 +21,7 @@
 # respective copyright holders.
 
 
-DIRS = assert crypt fnmatch glob internals lsearch regex shm time
+DIRS = assert crypt fnmatch glob internals lsearch syslog regex shm time
 
 ifeq ($(USE_CTYPE_C_FUNCTIONS),true)
     DIRS+=ctype

libc/misc/syslog/Makefile

@@ -0,0 +1,44 @@
+# Makefile for uCLibc
+#
+# Copyright (C) 2000 by Lineo, inc.
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU Library General Public License as published by the Free
+# Software Foundation; either version 2 of the License, or (at your option) any
+# later version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+# details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+# Place, Suite 330, Boston, MA 02111-1307 USA
+#
+# Derived in part from the Linux-8086 C library, the GNU C Library, and several
+# other sundry sources.  Files within this library are copyright by their
+# respective copyright holders.
+
+TOPDIR=../../
+include $(TOPDIR)Rules.mak
+LIBC=$(TOPDIR)libc.a
+
+CSRC=syslog.c
+COBJS=$(patsubst %.c,%.o, $(CSRC))
+OBJS=$(COBJS)
+
+all: $(OBJS) $(LIBC)
+
+$(LIBC): ar-target
+
+ar-target: $(OBJS)
+	$(AR) $(ARFLAGS) $(LIBC) $(OBJS)
+
+$(COBJS):
+	$(CC) $(CFLAGS) $< -c $*.c -o $*.o
+	$(STRIPTOOL) -x -R .note -R .comment $*.o
+
+clean:
+	rm -f *.[oa] *~ core
+

libc/misc/syslog/syslog.c

@@ -0,0 +1,349 @@
+/*
+ * Copyright (c) 1983, 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.
+ * 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.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char sccsid[] = "@(#)syslog.c	8.4 (Berkeley) 3/18/94";
+#endif /* LIBC_SCCS and not lint */
+
+/*
+ * SYSLOG -- print message on log file
+ *
+ * This routine looks a lot like printf, except that it outputs to the
+ * log file instead of the standard output.  Also:
+ *	adds a timestamp,
+ *	prints the module name in front of the message,
+ *	has some other formatting types (or will sometime),
+ *	adds a newline on the end of the message.
+ *
+ * The output of this routine is intended to be read by syslogd(8).
+ *
+ * Author: Eric Allman
+ * Modified to use UNIX domain IPC by Ralph Campbell
+ * Patched March 12, 1996 by A. Ian Vogelesang <vogelesang@hdshq.com>
+ *  - to correct the handling of message & format string truncation,
+ *  - to visibly tag truncated records to facilitate
+ *    investigation of such Bad Things with grep, and,
+ *  - to correct the handling of case where "write"
+ *    returns after writing only part of the message.
+ * Rewritten by Martin Mares <mj@atrey.karlin.mff.cuni.cz> on May 14, 1997
+ *  - better buffer overrun checks.
+ *  - special handling of "%m" removed as we use GNU sprintf which handles
+ *    it automatically.
+ *  - Major code cleanup.
+ */
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/file.h>
+#include <sys/signal.h>
+#include <sys/syslog.h>
+#if 0
+#include "syslog.h"
+#include "pathnames.h"
+#endif
+
+#include <sys/uio.h>
+#include <sys/wait.h>
+#include <netdb.h>
+#include <string.h>
+#include <time.h>
+#include <unistd.h>
+#include <errno.h>
+#include <stdarg.h>
+#include <paths.h>
+#include <stdio.h>
+#include <ctype.h>
+#include <signal.h>
+
+
+#if defined(_REENTRENT) || defined(_THREAD_SAFE)
+# include <pthread.h>
+
+extern int __writev( int, const struct iovec *, size_t);
+
+/* We need to initialize the mutex.  For this we use a method provided
+   by pthread function 'pthread_once'.  For this we need a once block.  */
+static pthread_once__t _once_block = pthread_once_init;
+
+/* This is the mutex which protects the global environment of simultaneous
+   modifications.  */
+static pthread_mutex_t _syslog_mutex;
+
+static void
+DEFUN_VOID(_init_syslog_mutex)
+{
+  pthread_mutex_init(&_syslog_mutex, pthread_mutexattr_default);
+}
+
+# define LOCK() \
+   do { pthread_once(&_once_block, _init_syslog_mutex);
+        pthread_mutex_lock(&_syslog_mutex); } while (0)
+# define UNLOCK() pthread_mutex_unlock(&_syslog_mutex)
+
+#else /* !_REENTRENT && !_THREAD_SAFE */
+
+# define LOCK()
+# define UNLOCK()
+
+#endif /* _REENTRENT || _THREAD_SAFE */
+
+
+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 = "syslog";	/* string to tag the entry with */
+static int	LogFacility = LOG_USER;	/* default facility code */
+static int	LogMask = 0xff;		/* mask of priorities to be logged */
+
+static void closelog_intern( int );
+void syslog( int, const char *, ...);
+void vsyslog( int, const char *, va_list );
+void openlog( const char *, int, int );
+void closelog( void );
+int setlogmask( int );
+
+static void 
+closelog_intern(int to_default)
+{
+	LOCK();
+	(void) close(LogFile);
+	LogFile = -1;
+	connected = 0;
+	if (to_default)
+	{
+		LogStat = 0;
+		LogTag = "syslog";
+		LogFacility = LOG_USER;
+		LogMask = 0xff;
+	}
+	UNLOCK();
+}
+
+static void
+sigpipe_handler (int sig)
+{
+  closelog_intern (0);
+}
+
+/*
+ * syslog, vsyslog --
+ *     print message on log file; output is intended for syslogd(8).
+ */
+void
+syslog(int pri, const char *fmt, ...)
+{
+	va_list ap;
+
+	va_start(ap, fmt);
+	vsyslog(pri, fmt, ap);
+	va_end(ap);
+}
+
+void
+vsyslog( int pri, const char *fmt, va_list ap )
+{
+	register char *p;
+	char *last_chr, *head_end, *end, *stdp;
+	time_t now;
+	int fd, saved_errno;
+	int rc;
+	char tbuf[1024];	/* syslogd is unable to handle longer messages */
+
+	struct sigaction action, oldaction;
+	int sigpipe;
+	memset (&action, 0, sizeof (action));
+	action.sa_handler = sigpipe_handler;
+	sigemptyset (&action.sa_mask);
+	sigpipe = sigaction (SIGPIPE, &action, &oldaction);
+
+	saved_errno = errno;
+
+	LOCK();
+
+	/* See if we should just throw out this message. */
+	if (!(LogMask & LOG_MASK(LOG_PRI(pri))) || (pri &~ (LOG_PRIMASK|LOG_FACMASK)))
+		goto getout;
+	if (LogFile < 0 || !connected)
+		openlog(LogTag, LogStat | LOG_NDELAY, 0);
+
+	/* Set default facility if none specified. */
+	if ((pri & LOG_FACMASK) == 0)
+		pri |= LogFacility;
+
+	/* Build the message. We know the starting part of the message can take
+	 * no longer than 64 characters plus length of the LogTag. So it's
+	 * safe to test only LogTag and use normal sprintf everywhere else.
+	 */
+	(void)time(&now);
+	stdp = p = tbuf + sprintf(tbuf, "<%d>%.15s ", pri, ctime(&now) + 4);
+	if (LogTag) {
+		if (strlen(LogTag) < sizeof(tbuf) - 64)
+			p += sprintf(p, "%s", LogTag);
+		else
+			p += sprintf(p, "<BUFFER OVERRUN ATTEMPT>");
+	}
+	if (LogStat & LOG_PID)
+		p += sprintf(p, "[%d]", getpid());
+	if (LogTag) {
+		*p++ = ':';
+		*p++ = ' ';
+	}
+	head_end = p;
+
+	/* We format the rest of the message. If the buffer becomes full, we mark
+	 * the message as truncated. Note that we require at least 2 free bytes
+	 * in the buffer as we might want to add "\r\n" there.
+	 */
+
+	end = tbuf + sizeof(tbuf) - 1;
+	errno = saved_errno;
+	p += vsnprintf(p, end - p, fmt, ap);
+	if (p >= end || p < head_end) {	/* Returned -1 in case of error... */
+		static char truncate_msg[12] = "[truncated] ";
+		memmove(head_end + sizeof(truncate_msg), head_end,
+			end - head_end - sizeof(truncate_msg));
+		memcpy(head_end, truncate_msg, sizeof(truncate_msg));
+		p = end - 1;
+	}
+	last_chr = p;
+
+	/* Output to stderr if requested. */
+	if (LogStat & LOG_PERROR) {
+		*last_chr = '\n';
+		(void)write(STDERR_FILENO, stdp, last_chr - stdp + 1);
+	}
+
+	/* Output the message to the local logger using NUL as a message delimiter. */
+	p = tbuf;
+	*last_chr = 0;
+	do {
+		rc = write(LogFile, p, last_chr + 1 - p);
+		if (rc < 0) {
+			if ((errno==EAGAIN) || (errno==EINTR))
+				rc=0;
+			else {
+				closelog_intern(0);
+				break;
+			}
+		}
+		p+=rc;
+	} while (p <= last_chr);
+	if (rc >= 0) 
+		goto getout;
+
+	/*
+	 * 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.
+	 */
+	/* should mode be `O_WRONLY | O_NOCTTY' ? -- Uli */
+	if (LogStat & LOG_CONS &&
+	    (fd = open(_PATH_CONSOLE, O_WRONLY, 0)) >= 0) {
+		p = index(tbuf, '>') + 1;
+		last_chr[0] = '\r';
+		last_chr[1] = '\n';
+		(void)write(fd, p, last_chr - p + 2);
+		(void)close(fd);
+	}
+
+getout:
+	UNLOCK();
+	if (sigpipe == 0)
+		sigaction (SIGPIPE, &oldaction,
+			(struct sigaction *) NULL);
+}
+
+static struct sockaddr SyslogAddr;	/* AF_UNIX address of local logger */
+/*
+ * OPENLOG -- open system log
+ */
+void
+openlog( const char *ident, int logstat, int logfac )
+{
+        LOCK();
+
+	if (ident != NULL)
+		LogTag = ident;
+	LogStat = logstat;
+	if (logfac != 0 && (logfac &~ LOG_FACMASK) == 0)
+		LogFacility = logfac;
+	if (LogFile == -1) {
+		SyslogAddr.sa_family = AF_UNIX;
+		(void)strncpy(SyslogAddr.sa_data, _PATH_LOG,
+		    sizeof(SyslogAddr.sa_data));
+		if (LogStat & LOG_NDELAY) {
+		        if ((LogFile = socket(AF_UNIX, SOCK_STREAM, 0)) == -1){
+			        UNLOCK();
+				return;
+			}
+/*			fcntl(LogFile, F_SETFD, 1); */
+		}
+	}
+	if (LogFile != -1 && !connected &&
+#if 0
+	    connect(LogFile, &SyslogAddr, sizeof(SyslogAddr.sa_family)+
+			strlen(SyslogAddr.sa_data)) != -1)
+#else
+	    connect(LogFile, &SyslogAddr, sizeof(SyslogAddr) -
+			sizeof(SyslogAddr.sa_data) +
+			strlen(SyslogAddr.sa_data)) != -1)
+#endif
+		connected = 1;
+
+        UNLOCK();
+}
+
+/*
+ * CLOSELOG -- close the system log
+ */
+void
+closelog( void )
+{
+	closelog_intern(1);
+}
+
+/*
+ * SETLOGMASK -- set the log mask level
+ */
+int
+setlogmask( int pmask )
+{
+	int omask;
+
+	omask = LogMask;
+	LOCK();
+	if (pmask != 0)
+		LogMask = pmask;
+	UNLOCK();
+	return (omask);
+}