X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=util-linux%2Fdmesg.c;h=f52026c2fdee5649739c4c2a6083849d8d625b7b;hb=319fe129a15278193625eeb05752511d576c5588;hp=2b59ee23d133aa6f1e8b58c2145ca569bd4a9bd5;hpb=a7881119ccdd325e4dac67981c304aa815ee56ef;p=oweals%2Fbusybox.git

diff --git a/util-linux/dmesg.c b/util-linux/dmesg.c
index 2b59ee23d..f52026c2f 100644
--- a/util-linux/dmesg.c
+++ b/util-linux/dmesg.c
@@ -1,36 +1,67 @@
 /* vi: set sw=4 ts=4: */
 /*
- * 
+ *
  * dmesg - display/control kernel ring buffer.
  *
- * Copyring 2006 Rob Landley <rob@landley.net>
+ * Copyright 2006 Rob Landley <rob@landley.net>
+ * 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 tarball for details.
  */
 
-#include "busybox.h"
-#include <unistd.h>
 #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)
 {
+	int len;
+	char *buf;
 	char *size, *level;
-	int flags = bb_getopt_ulflags(argc, argv, "cs:n:", &size, &level);
+	unsigned flags = getopt32(argv, "cs:n:", &size, &level);
+	enum {
+		OPT_c = 1<<0,
+		OPT_s = 1<<1,
+		OPT_n = 1<<2
+	};
 
-	if (flags & 4) {
-		if (klogctl(8, NULL, bb_xgetlarg(level, 10, 0, 10)))
+	if (flags & OPT_n) {
+		if (klogctl(8, NULL, xatoul_range(level, 0, 10)))
 			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");
-		write(1,buf,len);
-		if (len && buf[len-1]!='\n') putchar('\n');
+	len = (flags & OPT_s) ? xatoul_range(size, 2, INT_MAX) : 16384;
+	buf = xmalloc(len);
+	len = klogctl(3 + (flags & OPT_c), buf, len);
+	if (len < 0)
+		bb_perror_msg_and_die("klogctl");
+	if (len == 0)
+		return EXIT_SUCCESS;
+
+	/* Skip <#> at the start of lines, and make sure we end with a newline. */
+
+	if (ENABLE_FEATURE_DMESG_PRETTY) {
+		int last = '\n';
+		int in = 0;
+
+		do {
+			if (last == '\n' && buf[in] == '<')
+				in += 3;
+			else {
+				last = buf[in++];
+				bb_putchar(last);
+			}
+		} while (in < len);
+		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;
 }