diff options
| author | Rob Landley <rob@landley.net> | 2006-07-27 16:40:55 +0000 |
|---|---|---|
| committer | Rob Landley <rob@landley.net> | 2006-07-27 16:40:55 +0000 |
| commit | 446129adaed302eb499fb2a1e55b5d72ece98386 (patch) | |
| tree | 2f7f97237a4c90dee9d9e2d7f107d7f633a6f5e3 /util-linux | |
| parent | 52c7d7ebf3ed05f24147210aa969b69bdabcc135 (diff) | |
| download | busybox-446129adaed302eb499fb2a1e55b5d72ece98386.tar.gz | |
Add back in non-ifdef version of FEATURE_PRETTY_PRINT, and get the attribution
right this time.
Diffstat (limited to 'util-linux')
| -rw-r--r-- | util-linux/Config.in | 20 | ||||
| -rw-r--r-- | util-linux/dmesg.c | 23 |
2 files changed, 40 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..34519dfd1 100644 --- a/util-linux/dmesg.c +++ b/util-linux/dmesg.c @@ -3,7 +3,8 @@ * * 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. */ @@ -28,8 +29,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); - 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; |