aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2006-07-27 11:18:36 +0000
committerMike Frysinger <vapier@gentoo.org>2006-07-27 11:18:36 +0000
commiteac0c069385430901357de0d511cbf5d9e4d12a6 (patch)
tree072c5adc7d97de9e37eca13fafca1e6c93a16d8c
parent0b7dfb5ae73bcc29f1d5dfdb1b37c5b1d34b5904 (diff)
downloadbusybox-eac0c069385430901357de0d511cbf5d9e4d12a6.tar.gz
allow people to display dmesg output without syslog levels
-rw-r--r--util-linux/Config.in20
-rw-r--r--util-linux/dmesg.c22
2 files changed, 39 insertions, 3 deletions
diff --git a/util-linux/Config.in b/util-linux/Config.in
index 501ed6bfc..65d670824 100644
--- a/util-linux/Config.in
+++ b/util-linux/Config.in
@@ -17,6 +17,26 @@ config CONFIG_DMESG
are also logged to the system console. Enable this option if you
wish to enable the 'dmesg' utility.
+config CONFIG_FEATURE_DMESG_PRETTY
+ bool "pretty dmesg output"
+ default y
+ depends on CONFIG_DMESG
+ help
+ If you wish to scrub the syslog level from the output, say 'Y' here.
+ The syslog level is a string prefixed to every line with the form "<#>".
+
+ With this option you will see:
+ # dmesg
+ Linux version 2.6.17.4 .....
+ BIOS-provided physical RAM map:
+ BIOS-e820: 0000000000000000 - 000000000009f000 (usable)
+
+ Without this option you will see:
+ # dmesg
+ <5>Linux version 2.6.17.4 .....
+ <6>BIOS-provided physical RAM map:
+ <6> BIOS-e820: 0000000000000000 - 000000000009f000 (usable)
+
config CONFIG_FBSET
bool "fbset"
default n
diff --git a/util-linux/dmesg.c b/util-linux/dmesg.c
index 2b59ee23d..ecfd90668 100644
--- a/util-linux/dmesg.c
+++ b/util-linux/dmesg.c
@@ -1,9 +1,9 @@
/* 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 Erik Andersen <andersen@codepoet.org>
*
* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
*/
@@ -28,8 +28,24 @@ int dmesg_main(int argc, char *argv[])
buf = xmalloc(len);
if (0 > (len = klogctl(3 + (flags & 1), buf, len)))
bb_perror_msg_and_die("klogctl");
- write(1,buf,len);
+
+#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 (newline != '\n') putchar('\n');
+ }
+#else
+ write(1, buf, len);
if (len && buf[len-1]!='\n') putchar('\n');
+#endif
+
+ if (ENABLE_FEATURE_CLEAN_UP) free(buf);
}
return 0;