Try to make a "type-punned pointer" warning go away for somebody on the

[oweals/busybox.git] / util-linux / dmesg.c

diff --git a/util-linux/dmesg.c b/util-linux/dmesg.c
index 2b59ee23d133aa6f1e8b58c2145ca569bd4a9bd5..34519dfd16fc9e5bfc5a3867e64171e9b1ced5d6 100644 (file)
--- 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;