fdisk: sanitize partition name printing; drop "Code" column; get rid of one static var

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

diff --git a/util-linux/dmesg.c b/util-linux/dmesg.c
index 6e43a22f5605a047c2a34d0dc303a0f82e2b4203..b7b2c69241894f44741a814450e59793d013a85d 100644 (file)
--- a/util-linux/dmesg.c
+++ b/util-linux/dmesg.c
@@ -8,6 +8,53 @@
  *
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
+//config:config DMESG
+//config:      bool "dmesg"
+//config:      default y
+//config:      select PLATFORM_LINUX
+//config:      help
+//config:        dmesg is used to examine or control the kernel ring buffer. When the
+//config:        Linux kernel prints messages to the system log, they are stored in
+//config:        the kernel ring buffer. You can use dmesg to print the kernel's ring
+//config:        buffer, clear the kernel ring buffer, change the size of the kernel
+//config:        ring buffer, and change the priority level at which kernel messages
+//config:        are also logged to the system console. Enable this option if you
+//config:        wish to enable the 'dmesg' utility.
+//config:
+//config:config FEATURE_DMESG_PRETTY
+//config:      bool "Pretty dmesg output"
+//config:      default y
+//config:      depends on DMESG
+//config:      help
+//config:        If you wish to scrub the syslog level from the output, say 'Y' here.
+//config:        The syslog level is a string prefixed to every line with the form
+//config:        "<#>".
+//config:
+//config:        With this option you will see:
+//config:          # dmesg
+//config:          Linux version 2.6.17.4 .....
+//config:          BIOS-provided physical RAM map:
+//config:           BIOS-e820: 0000000000000000 - 000000000009f000 (usable)
+//config:
+//config:        Without this option you will see:
+//config:          # dmesg
+//config:          <5>Linux version 2.6.17.4 .....
+//config:          <6>BIOS-provided physical RAM map:
+//config:          <6> BIOS-e820: 0000000000000000 - 000000000009f000 (usable)
+
+//applet:IF_DMESG(APPLET(dmesg, BB_DIR_BIN, BB_SUID_DROP))
+
+//kbuild:lib-$(CONFIG_DMESG) += dmesg.o
+
+//usage:#define dmesg_trivial_usage
+//usage:       "[-c] [-n LEVEL] [-s SIZE]"
+//usage:#define dmesg_full_usage "\n\n"
+//usage:       "Print or control the kernel ring buffer\n"
+//usage:     "\n       -c              Clear ring buffer after printing"
+//usage:     "\n       -n LEVEL        Set console logging level"
+//usage:     "\n       -s SIZE         Buffer size"
+//usage:     "\n       -r              Print raw message buffer"
+
 #include <sys/klog.h>
 #include "libbb.h"
 
@@ -20,11 +67,11 @@ int dmesg_main(int argc UNUSED_PARAM, char **argv)
        enum {
                OPT_c = 1 << 0,
                OPT_s = 1 << 1,
-               OPT_n = 1 << 2
+               OPT_n = 1 << 2,
+               OPT_r = 1 << 3
        };
 
-       opt_complementary = "s+:n+"; /* numeric */
-       opts = getopt32(argv, "cs:n:", &len, &level);
+       opts = getopt32(argv, "cs:+n:+r", &len, &level);
        if (opts & OPT_n) {
                if (klogctl(8, NULL, (long) level))
                        bb_perror_msg_and_die("klogctl");
@@ -46,20 +93,19 @@ int dmesg_main(int argc UNUSED_PARAM, char **argv)
                return EXIT_SUCCESS;
 
 
-       if (ENABLE_FEATURE_DMESG_PRETTY) {
+       if (ENABLE_FEATURE_DMESG_PRETTY && !(opts & OPT_r)) {
                int last = '\n';
                int in = 0;
 
-               /* Skip <#> at the start of lines */
+               /* Skip <[0-9]+> at the start of lines */
                while (1) {
                        if (last == '\n' && buf[in] == '<') {
-                               in += 3;
-                               if (in >= len)
-                                       break;
+                               while (buf[in++] != '>' && in < len)
+                                       ;
+                       } else {
+                               last = buf[in++];
+                               putchar(last);
                        }
-                       last = buf[in];
-                       putchar(last);
-                       in++;
                        if (in >= len)
                                break;
                }