summaryrefslogtreecommitdiff
path: root/util-linux/dmesg.c
diff options
context:
space:
mode:
authorRob Landley2006-07-27 16:40:55 +0000
committerRob Landley2006-07-27 16:40:55 +0000
commit446129adaed302eb499fb2a1e55b5d72ece98386 (patch)
tree2f7f97237a4c90dee9d9e2d7f107d7f633a6f5e3 /util-linux/dmesg.c
parent52c7d7ebf3ed05f24147210aa969b69bdabcc135 (diff)
downloadbusybox-446129adaed302eb499fb2a1e55b5d72ece98386.zip
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/dmesg.c')
-rw-r--r--util-linux/dmesg.c23
1 files changed, 20 insertions, 3 deletions
diff --git a/util-linux/dmesg.c b/util-linux/dmesg.c
index 2b59ee2..34519df 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;