X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=sysklogd%2Fklogd.c;h=6a675b8b3fdb5faa5c18e7896de2a26344420652;hb=d553faf5a53cf9d72e16fc789451a92a797f1b70;hp=b8d69c4450b5f4c16cba1deb65b76d34436f5c40;hpb=86f5c9906beac527f3d7966f24811b571a589e08;p=oweals%2Fbusybox.git

diff --git a/sysklogd/klogd.c b/sysklogd/klogd.c
index b8d69c445..6a675b8b3 100644
--- a/sysklogd/klogd.c
+++ b/sysklogd/klogd.c
@@ -17,123 +17,105 @@
  * 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 <sys/syslog.h>
+#include "libbb.h"
+#include <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(LOG_NOTICE, "Kernel log daemon exiting.");
+	klogctl(0, NULL, 0);
+	syslog(LOG_NOTICE, "klogd: exiting");
 	exit(EXIT_SUCCESS);
 }
 
-static void doKlogd(const int console_log_level) ATTRIBUTE_NORETURN;
-static void doKlogd(const int console_log_level)
+#define log_buffer bb_common_bufsiz1
+enum {
+	KLOGD_LOGBUF_SIZE = sizeof(log_buffer),
+	OPT_LEVEL      = (1 << 0),
+	OPT_FOREGROUND = (1 << 1),
+};
+
+int klogd_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int klogd_main(int argc, char **argv)
 {
-	int priority = LOG_INFO;
-	char log_buffer[4096];
-	int i, n, lastc;
+	int i = i; /* silence gcc */
 	char *start;
 
+	/* do normal option parsing */
+	getopt32(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)) {
+		bb_daemonize_or_rexec(DAEMON_CHDIR_ROOT, argv);
+	}
+
 	openlog("kernel", 0, LOG_KERN);
 
 	/* Set up sig handlers */
-	signal(SIGINT, klogd_signal);
-	signal(SIGKILL, klogd_signal);
-	signal(SIGTERM, klogd_signal);
+	bb_signals(0
+		+ (1 << SIGINT)
+		+ (1 << SIGTERM)
+		, klogd_signal);
 	signal(SIGHUP, SIG_IGN);
 
 	/* "Open the log. Currently a NOP." */
 	klogctl(1, NULL, 0);
 
-	/* Set level of kernel console messaging.. */
-	if (console_log_level != -1)
-		klogctl(8, NULL, console_log_level);
+	/* Set level of kernel console messaging. */
+	if (option_mask32 & OPT_LEVEL)
+		klogctl(8, NULL, i);
 
-	syslog(LOG_NOTICE, "klogd started: " BB_BANNER);
+	syslog(LOG_NOTICE, "klogd started: %s", bb_banner);
 
+	/* Note: this code does not detect incomplete messages
+	 * (messages not ending with '\n' or just when kernel
+	 * generates too many messages for us to keep up)
+	 * and will split them in two separate lines */
 	while (1) {
-		/* Use kernel syscalls */
-		memset(log_buffer, '\0', sizeof(log_buffer));
-		n = klogctl(2, log_buffer, sizeof(log_buffer));
+		int n;
+		int priority;
+
+		n = klogctl(2, log_buffer, KLOGD_LOGBUF_SIZE - 1);
 		if (n < 0) {
 			if (errno == EINTR)
 				continue;
-			syslog(LOG_ERR, "klogd: Error return from sys_sycall: %d - %m.\n", errno);
-			exit(EXIT_FAILURE);
+			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';
-		for (i = 0; i < n; i++) {
-			if (lastc == '\0' && log_buffer[i] == '<') {
-				priority = 0;
+		log_buffer[n] = '\n';
+		i = 0;
+		while (i < n) {
+			priority = LOG_INFO;
+			start = &log_buffer[i];
+			if (log_buffer[i] == '<') {
 				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] == '>')
 					i++;
 				start = &log_buffer[i];
 			}
-			if (log_buffer[i] == '\n') {
-				log_buffer[i] = '\0';	/* zero terminate this message */
-				syslog(priority, "%s", start);
-				start = &log_buffer[i + 1];
-				priority = LOG_INFO;
-			}
-			lastc = log_buffer[i];
+			while (log_buffer[i] != '\n')
+				i++;
+			log_buffer[i] = '\0';
+			syslog(priority, "%s", start);
+			i++;
 		}
 	}
-}
-
-#define OPT_LEVEL        1
-#define OPT_FOREGROUND   2
-
-extern int klogd_main(int argc, char **argv)
-{
-	unsigned long opt;
-	char *c_arg;
-	int console_log_level = -1;
 
-	/* do normal option parsing */
-	opt = bb_getopt_ulflags (argc, argv, "c:n", &c_arg);
-
-	if (opt & OPT_LEVEL) {
-		/* Valid levels are between 1 and 8 */
-		console_log_level = bb_xgetlarg(c_arg, 10, 1, 8);
-	}
-
-	if (!(opt & OPT_FOREGROUND)) {
-#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:
-*/