*
* Copyright (C) 2001 by Gennady Feldman <gfeldman@gena01.com>.
* Changes: Made this a standalone busybox module which uses standalone
- * syslog() client interface.
+ * syslog() client interface.
*
- * Copyright (C) 1999-200
3 by Erik Andersen <andersen@codepoet.org>
+ * Copyright (C) 1999-200
4 by Erik Andersen <andersen@codepoet.org>
*
* Copyright (C) 2000 by Karl M. Hegbloom <karlheg@debian.org>
*
*
* Maintainer: Gennady Feldman <gfeldman@gena01.com> as of Mar 12, 2001
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU 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
- *
+ * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
*/
-#include <stdio.h>
-#include <stdlib.h>
-#include <signal.h> /* for our signal() handlers */
-#include <string.h> /* strncpy() */
-#include <errno.h> /* errno and friends */
-#include <unistd.h>
-#include <ctype.h>
+#include "busybox.h"
#include <sys/syslog.h>
#include <sys/klog.h>
-#include "busybox.h"
-
-static void klogd_signal(int sig)
+static void klogd_signal(int sig ATTRIBUTE_UNUSED)
{
klogctl(7, NULL, 0);
klogctl(0, 0, 0);
- /* logMessage(0, "Kernel log daemon exiting."); */
- syslog_msg(LOG_SYSLOG, LOG_NOTICE, "Kernel log daemon exiting.");
- exit(TRUE);
+ syslog(LOG_NOTICE, "Kernel log daemon exiting");
+ exit(EXIT_SUCCESS);
}
-static void doKlogd(const char console_log_level) __attribute__ ((noreturn));
-static void doKlogd(const char console_log_level)
+#define OPT_LEVEL 1
+#define OPT_FOREGROUND 2
+
+#define KLOGD_LOGBUF_SIZE 4096
+
+int klogd_main(int argc, char **argv)
{
- int priority = LOG_INFO;
- char log_buffer[4096];
- int i, n, lastc;
+ RESERVE_CONFIG_BUFFER(log_buffer, KLOGD_LOGBUF_SIZE);
+ int i = i; /* silence gcc */
char *start;
+ /* do normal option parsing */
+ getopt32(argc, argv, "c:n", &start);
+
+ if (option_mask32 & OPT_LEVEL) {
+ /* Valid levels are between 1 and 8 */
+ i = xatoul_range(start, 1, 8);
+ }
+
+ if (!(option_mask32 & OPT_FOREGROUND)) {
+#ifdef BB_NOMMU
+ vfork_daemon_rexec(0, 1, argc, argv, "-n");
+#else
+ xdaemon(0, 1);
+#endif
+ }
+
+ openlog("kernel", 0, LOG_KERN);
+
/* Set up sig handlers */
signal(SIGINT, klogd_signal);
signal(SIGKILL, klogd_signal);
klogctl(1, NULL, 0);
/* Set level of kernel console messaging.. */
- if (console_log_level)
- klogctl(8, NULL, console_log_level);
+ if (option_mask32 & OPT_LEVEL)
+ klogctl(8, NULL, i);
- syslog_msg(LOG_SYSLOG, LOG_NOTICE, "klogd started: " BB_BANNER);
+ syslog(LOG_NOTICE, "klogd started: %s", BB_BANNER);
while (1) {
+ int n;
+ int priority;
+ char lastc;
+
/* Use kernel syscalls */
- memset(log_buffer, '\0', sizeof(log_buffer));
- n = klogctl(2, log_buffer, sizeof(log_buffer));
+ memset(log_buffer, '\0', KLOGD_LOGBUF_SIZE);
+ /* It will be null-terminted */
+ n = klogctl(2, log_buffer, KLOGD_LOGBUF_SIZE - 1);
if (n < 0) {
- char message[80];
-
if (errno == EINTR)
continue;
- snprintf(message, 79,
- "klogd: Error return from sys_sycall: %d - %s.\n", errno,
- strerror(errno));
- syslog_msg(LOG_SYSLOG, LOG_ERR, message);
- exit(1);
+ syslog(LOG_ERR, "klogd: error from klogctl(2): %d - %m",
+ errno);
+ break;
}
/* klogctl buffer parsing modelled after code in dmesg.c */
start = &log_buffer[0];
lastc = '\0';
+ priority = LOG_INFO;
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');
+ // kernel never ganerates multi-digit prios
+ //priority = 0;
+ //while (log_buffer[i] >= '0' && log_buffer[i] <= '9') {
+ // priority = priority * 10 + (log_buffer[i] - '0');
+ // i++;
+ //}
+ if (isdigit(log_buffer[i])) {
+ priority = (log_buffer[i] - '0');
i++;
}
if (log_buffer[i] == '>')
}
if (log_buffer[i] == '\n') {
log_buffer[i] = '\0'; /* zero terminate this message */
- syslog_msg(LOG_KERN, priority, start);
+ syslog(priority, "%s", start);
start = &log_buffer[i + 1];
priority = LOG_INFO;
}
lastc = log_buffer[i];
}
}
-}
+ if (ENABLE_FEATURE_CLEAN_UP)
+ RELEASE_CONFIG_BUFFER(log_buffer);
-extern int klogd_main(int argc, char **argv)
-{
- /* no options, no getopt */
- int opt;
- int doFork = TRUE;
- unsigned char console_log_level = 7;
-
- /* do normal option parsing */
- while ((opt = getopt(argc, argv, "c:n")) > 0) {
- switch (opt) {
- case 'c':
- if ((optarg == NULL) || (optarg[1] != '\0')) {
- bb_show_usage();
- }
- /* Valid levels are between 1 and 8 */
- console_log_level = *optarg - '1';
- if (console_log_level > 7) {
- bb_show_usage();
- }
- console_log_level++;
-
- break;
- case 'n':
- doFork = FALSE;
- break;
- default:
- bb_show_usage();
- }
- }
-
- if (doFork) {
-#if defined(__uClinux__)
- vfork_daemon_rexec(0, 1, argc, argv, "-n");
-#else /* __uClinux__ */
- if (daemon(0, 1) < 0)
- bb_perror_msg_and_die("daemon");
-#endif /* __uClinux__ */
- }
- doKlogd(console_log_level);
-
- return EXIT_SUCCESS;
+ return EXIT_FAILURE;
}
-
-/*
-Local Variables
-c-file-style: "linux"
-c-basic-offset: 4
-tab-width: 4
-End:
-*/
projects / oweals / busybox.git / blobdiff