X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=util-linux%2Fdmesg.c;h=820b837c976931dbc938f952f24568f031ba9797;hb=51742f4bb0c57a4d5063ece9437a2f34a42e52c8;hp=de9c3700f4bcf8758c3a4d76d9d728d2e11360c0;hpb=aa516a61b994526e1b09fbe863ea34e553e76017;p=oweals%2Fbusybox.git

diff --git a/util-linux/dmesg.c b/util-linux/dmesg.c
index de9c3700f..820b837c9 100644
--- a/util-linux/dmesg.c
+++ b/util-linux/dmesg.c
@@ -1,35 +1,53 @@
 /* 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 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>
 
-int dmesg_main(int argc, char *argv[])
+int dmesg_main(int argc, char **argv);
+int dmesg_main(int argc, char **argv)
 {
 	char *size, *level;
-	int flags = bb_getopt_ulflags(argc, argv, "cs:n:", &size, &level);
+	int flags = getopt32(argc, argv, "cs:n:", &size, &level);
 
 	if (flags & 4) {
-		if(klogctl(8, NULL, bb_xgetlarg(level, 10, 0, 10)))
+		if (klogctl(8, NULL, xatoul_range(level, 0, 10)))
 			bb_perror_msg_and_die("klogctl");
 	} else {
 		int len;
 		char *buf;
 
-		len = (flags & 2) ? bb_xgetlarg(size, 10, 2, INT_MAX) : 16384;
+		len = (flags & 2) ? xatoul_range(size, 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');
+
+		// Skip <#> at the start of lines, and make sure we end with a newline.
+
+		if (ENABLE_FEATURE_DMESG_PRETTY) {
+			int last = '\n';
+			int in;
+
+			for (in = 0; in<len;) {
+				if (last == '\n' && buf[in] == '<') in += 3;
+				else putchar(last = buf[in++]);
+			}
+			if (last != '\n') putchar('\n');
+		} else {
+			write(1,buf,len);
+			if (len && buf[len-1]!='\n') putchar('\n');
+		}
+
+		if (ENABLE_FEATURE_CLEAN_UP) free(buf);
 	}
 
 	return 0;