X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=util-linux%2Fdmesg.c;h=e543446c11c87e02c6d92c28518eeda796c1130c;hb=066e76befe5d39fc3451846af94cbba96747186c;hp=ecfd90668dc7e07781bb50324d9e7ea646b0350d;hpb=eac0c069385430901357de0d511cbf5d9e4d12a6;p=oweals%2Fbusybox.git

diff --git a/util-linux/dmesg.c b/util-linux/dmesg.c
index ecfd90668..e543446c1 100644
--- a/util-linux/dmesg.c
+++ b/util-linux/dmesg.c
@@ -1,52 +1,88 @@
 /* vi: set sw=4 ts=4: */
 /*
+ *
  * dmesg - display/control kernel ring buffer.
  *
  * Copyright 2006 Rob Landley <rob@landley.net>
- * Copyright 2006 Erik Andersen <andersen@codepoet.org>
+ * Copyright 2006 Bernhard Reutner-Fischer <rep.nop@aon.at>
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 
-#include "busybox.h"
-#include <unistd.h>
+//usage:#define dmesg_trivial_usage
+//usage:       "[-c] [-n LEVEL] [-s SIZE]"
+//usage:#define dmesg_full_usage "\n\n"
+//usage:       "Print or control the kernel ring buffer\n"
+//usage:     "\n	-c		Clear ring buffer after printing"
+//usage:     "\n	-n LEVEL	Set console logging level"
+//usage:     "\n	-s SIZE		Buffer size"
+//usage:     "\n	-r		Print raw message buffer"
+
 #include <sys/klog.h>
+#include "libbb.h"
 
-int dmesg_main(int argc, char *argv[])
+int dmesg_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int dmesg_main(int argc UNUSED_PARAM, char **argv)
 {
-	char *size, *level;
-	int flags = bb_getopt_ulflags(argc, argv, "cs:n:", &size, &level);
+	int len, level;
+	char *buf;
+	unsigned opts;
+	enum {
+		OPT_c = 1 << 0,
+		OPT_s = 1 << 1,
+		OPT_n = 1 << 2,
+		OPT_r = 1 << 3
+	};
 
-	if (flags & 4) {
-		if (klogctl(8, NULL, bb_xgetlarg(level, 10, 0, 10)))
+	opt_complementary = "s+:n+"; /* numeric */
+	opts = getopt32(argv, "cs:n:r", &len, &level);
+	if (opts & OPT_n) {
+		if (klogctl(8, NULL, (long) level))
 			bb_perror_msg_and_die("klogctl");
-	} else {
-		int len;
-		char *buf;
+		return EXIT_SUCCESS;
+	}
 
-		len = (flags & 2) ? bb_xgetlarg(size, 10, 2, INT_MAX) : 16384;
-		buf = xmalloc(len);
-		if (0 > (len = klogctl(3 + (flags & 1), buf, len)))
-			bb_perror_msg_and_die("klogctl");
+	if (!(opts & OPT_s))
+		len = klogctl(10, NULL, 0); /* read ring buffer size */
+	if (len < 16*1024)
+		len = 16*1024;
+	if (len > 16*1024*1024)
+		len = 16*1024*1024;
+
+	buf = xmalloc(len);
+	len = klogctl(3 + (opts & OPT_c), buf, len); /* read ring buffer */
+	if (len < 0)
+		bb_perror_msg_and_die("klogctl");
+	if (len == 0)
+		return EXIT_SUCCESS;
 
-#ifdef CONFIG_FEATURE_DMESG_PRETTY
-		{
-			char newline = '\n';
-			int i;
-			for (i=0; i<len; ++i) {
-				if (newline == '\n' && buf[i] == '<')
-					i += 3; /* skip <#> */
-				putchar(newline=buf[i]);
+
+	if (ENABLE_FEATURE_DMESG_PRETTY && !(opts & OPT_r)) {
+		int last = '\n';
+		int in = 0;
+
+		/* Skip <[0-9]+> at the start of lines */
+		while (1) {
+			if (last == '\n' && buf[in] == '<') {
+				while (buf[in++] != '>' && in < len)
+					;
+			} else {
+				last = buf[in++];
+				putchar(last);
 			}
-			if (newline != '\n') putchar('\n');
+			if (in >= len)
+				break;
 		}
-#else
-		write(1, buf, len);
-		if (len && buf[len-1]!='\n') putchar('\n');
-#endif
-
-		if (ENABLE_FEATURE_CLEAN_UP) free(buf);
+		/* Make sure we end with a newline */
+		if (last != '\n')
+			bb_putchar('\n');
+	} else {
+		full_write(STDOUT_FILENO, buf, len);
+		if (buf[len-1] != '\n')
+			bb_putchar('\n');
 	}
 
-	return 0;
+	if (ENABLE_FEATURE_CLEAN_UP) free(buf);
+
+	return EXIT_SUCCESS;
 }