#include <signal.h>
#include <stdarg.h>
#include <time.h>
+#include <string.h>
#include <unistd.h>
#include <sys/socket.h>
#include <sys/types.h>
#include <sys/param.h>
#if ! defined __GLIBC__ && ! defined __UCLIBC__
-
+#include <sys/syscall.h>
+#include <linux/unistd.h>
typedef unsigned int socklen_t;
#ifndef __alpha__
c_fac->c_name && !(c_fac->c_val == LOG_FAC(pri) << 3); c_fac++);
for (c_pri = prioritynames;
c_pri->c_name && !(c_pri->c_val == LOG_PRI(pri)); c_pri++);
- if (*c_fac->c_name == '\0' || *c_pri->c_name == '\0')
+ if (c_fac->c_name == NULL || c_pri->c_name == NULL)
snprintf(res, sizeof(res), "<%d>", pri);
else
snprintf(res, sizeof(res), "%s.%s", c_fac->c_name, c_pri->c_name);
#ifdef BB_FEATURE_REMOTE_LOG
/* send message to remote logger */
if ( -1 != remotefd){
-#define IOV_COUNT 2
+static const int IOV_COUNT = 2;
struct iovec iov[IOV_COUNT];
struct iovec *v = iov;
}
}
-#define BUFSIZE 1023
+static const int BUFSIZE = 1023;
static int serveConnection (int conn)
{
- char buf[ BUFSIZE + 1 ];
+ RESERVE_BB_BUFFER(buf, BUFSIZE + 1);
int n_read;
while ((n_read = read (conn, buf, BUFSIZE )) > 0) {
int sock_fd;
fd_set fds;
- char lfile[BUFSIZ];
+ RESERVE_BB_BUFFER(lfile, BUFSIZ);
/* Set up signal handlers. */
signal (SIGINT, quit_signal);
/* Create the syslog file so realpath() can work. */
close (open (_PATH_LOG, O_RDWR | O_CREAT, 0644));
if (realpath (_PATH_LOG, lfile) == NULL)
- error_msg_and_die ("Could not resolve path to " _PATH_LOG ": %s\n", strerror (errno));
+ perror_msg_and_die ("Could not resolve path to " _PATH_LOG);
unlink (lfile);
sunx.sun_family = AF_UNIX;
strncpy (sunx.sun_path, lfile, sizeof (sunx.sun_path));
if ((sock_fd = socket (AF_UNIX, SOCK_STREAM, 0)) < 0)
- error_msg_and_die ("Couldn't obtain descriptor for socket " _PATH_LOG ": %s\n", strerror (errno));
+ perror_msg_and_die ("Couldn't obtain descriptor for socket " _PATH_LOG);
addrLength = sizeof (sunx.sun_family) + strlen (sunx.sun_path);
if ((bind (sock_fd, (struct sockaddr *) &sunx, addrLength)) || (listen (sock_fd, 5)))
- error_msg_and_die ("Could not connect to socket " _PATH_LOG ": %s\n", strerror (errno));
+ perror_msg_and_die ("Could not connect to socket " _PATH_LOG);
if (chmod (lfile, 0666) < 0)
- error_msg_and_die ("Could not set permission on " _PATH_LOG ": %s\n", strerror (errno));
+ perror_msg_and_die ("Could not set permission on " _PATH_LOG);
FD_ZERO (&fds);
FD_SET (sock_fd, &fds);
if ((n_ready = select (FD_SETSIZE, &readfds, NULL, NULL, NULL)) < 0) {
if (errno == EINTR) continue; /* alarm may have happened. */
- error_msg_and_die ("select error: %s\n", strerror (errno));
+ perror_msg_and_die ("select error");
}
for (fd = 0; (n_ready > 0) && (fd < FD_SETSIZE); fd++) {
pid_t pid;
if ((conn = accept (sock_fd, (struct sockaddr *) &sunx, &addrLength)) < 0) {
- error_msg_and_die ("accept error: %s\n", strerror (errno));
+ perror_msg_and_die ("accept error");
}
pid = fork();
{
int priority = LOG_INFO;
char log_buffer[4096];
- char *logp;
+ int i, n, lastc;
+ char *start;
/* Set up sig handlers */
signal(SIGINT, klogd_signal);
logMessage(0, "klogd started: "
"BusyBox v" BB_VER " (" BB_BT ")");
+ /* "Open the log. Currently a NOP." */
klogctl(1, NULL, 0);
while (1) {
/* Use kernel syscalls */
memset(log_buffer, '\0', sizeof(log_buffer));
- if (klogctl(2, log_buffer, sizeof(log_buffer)) < 0) {
+ n = klogctl(2, log_buffer, sizeof(log_buffer));
+ if (n < 0) {
char message[80];
if (errno == EINTR)
logMessage(LOG_SYSLOG | LOG_ERR, message);
exit(1);
}
- logp = log_buffer;
- if (*log_buffer == '<') {
- switch (*(log_buffer + 1)) {
- case '0':
- priority = LOG_EMERG;
- break;
- case '1':
- priority = LOG_ALERT;
- break;
- case '2':
- priority = LOG_CRIT;
- break;
- case '3':
- priority = LOG_ERR;
- break;
- case '4':
- priority = LOG_WARNING;
- break;
- case '5':
- priority = LOG_NOTICE;
- break;
- case '6':
+
+ /* klogctl buffer parsing modelled after code in dmesg.c */
+ start=&log_buffer[0];
+ lastc='\0';
+ for (i=0; i<n; i++) {
+ if (lastc == '\0' && log_buffer[i] == '<') {
+ priority = 0;
+ i++;
+ while (isdigit(log_buffer[i])) {
+ priority = priority*10+(log_buffer[i]-'0');
+ i++;
+ }
+ if (log_buffer[i] == '>') i++;
+ start = &log_buffer[i];
+ }
+ if (log_buffer[i] == '\n') {
+ log_buffer[i] = '\0'; /* zero terminate this message */
+ logMessage(LOG_KERN | priority, start);
+ start = &log_buffer[i+1];
priority = LOG_INFO;
- break;
- case '7':
- default:
- priority = LOG_DEBUG;
}
- logp += 3;
+ lastc = log_buffer[i];
}
- logMessage(LOG_KERN | priority, logp);
}
}
extern int syslogd_main(int argc, char **argv)
{
- int pid, klogd_pid;
+ int opt, pid, klogd_pid;
int doFork = TRUE;
#ifdef BB_FEATURE_KLOGD
int startKlogd = TRUE;
#endif
- int stopDoingThat = FALSE;
char *p;
- char **argv1 = argv;
- while (--argc > 0 && **(++argv1) == '-') {
- stopDoingThat = FALSE;
- while (stopDoingThat == FALSE && *(++(*argv1))) {
- switch (**argv1) {
+ /* do normal option parsing */
+ while ((opt = getopt(argc, argv, "m:nKO:R:L")) > 0) {
+ switch (opt) {
case 'm':
- if (--argc == 0) {
- usage(syslogd_usage);
- }
- MarkInterval = atoi(*(++argv1)) * 60;
+ MarkInterval = atoi(optarg) * 60;
break;
case 'n':
doFork = FALSE;
break;
#endif
case 'O':
- if (--argc == 0) {
- usage(syslogd_usage);
- }
- logFilePath = *(++argv1);
- stopDoingThat = TRUE;
+ logFilePath = strdup(optarg);
break;
#ifdef BB_FEATURE_REMOTE_LOG
case 'R':
- if (--argc == 0) {
- usage(syslogd_usage);
- }
- RemoteHost = *(++argv1);
- if ( (p = strchr(RemoteHost, ':'))){
- RemotePort = atoi(p+1);
- *p = '\0';
- }
- doRemoteLog = TRUE;
- stopDoingThat = TRUE;
- break;
+ RemoteHost = strdup(optarg);
+ if ( (p = strchr(RemoteHost, ':'))){
+ RemotePort = atoi(p+1);
+ *p = '\0';
+ }
+ doRemoteLog = TRUE;
+ break;
case 'L':
local_logging = TRUE;
break;
#endif
default:
usage(syslogd_usage);
- }
}
}
- if (argc > 0)
- usage(syslogd_usage);
+#ifdef BB_FEATURE_REMOTE_LOG
+ /* If they have not specified remote logging, then log locally */
+ if (doRemoteLog == FALSE)
+ local_logging = TRUE;
+#endif
/* Store away localhost's name before the fork */
gethostname(LocalHostName, sizeof(LocalHostName));