Replace a few more bb_info_msg's by bb_error_msg or printf

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

diff --git a/util-linux/dmesg.c b/util-linux/dmesg.c
index e5d403f7acd77b36ed73b478e2dbee6795579c54..e543446c11c87e02c6d92c28518eeda796c1130c 100644 (file)
--- a/util-linux/dmesg.c
+++ b/util-linux/dmesg.c
@@ -1,98 +1,88 @@
-#include "internal.h"
-#include <stdlib.h>
-#include <unistd.h>
-#include <time.h>
-
-/* dmesg.c -- Print out the contents of the kernel ring buffer
- * Created: Sat Oct  9 16:19:47 1993
- * Revised: Thu Oct 28 21:52:17 1993 by faith@cs.unc.edu
- * Copyright 1993 Theodore Ts'o (tytso@athena.mit.edu)
- * This program comes with ABSOLUTELY NO WARRANTY.
- * Modifications by Rick Sladkey (jrs@world.std.com)
- * from util-linux; adapted for busybox
+/* vi: set sw=4 ts=4: */
+/*
+ *
+ * dmesg - display/control kernel ring buffer.
+ *
+ * Copyright 2006 Rob Landley <rob@landley.net>
+ * Copyright 2006 Bernhard Reutner-Fischer <rep.nop@aon.at>
+ *
+ * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 
-#include <linux/unistd.h>
-#include <stdio.h>
-
-#define __NR_klog __NR_syslog
+//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"
 
-#if defined(__GLIBC__)
 #include <sys/klog.h>
-#define klog klogctl
-#else
-static inline _syscall3 (int, klog, int, type, char *, b, int, len)
-#endif                         /* __GLIBC__ */
-
-
+#include "libbb.h"
 
-static const char dmesg_usage[] = "dmesg [-c] [-n level]\n";
-
-int dmesg_main (int argc, char **argv)
+int dmesg_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int dmesg_main(int argc UNUSED_PARAM, char **argv)
 {
+       int len, level;
+       char *buf;
+       unsigned opts;
+       enum {
+               OPT_c = 1 << 0,
+               OPT_s = 1 << 1,
+               OPT_n = 1 << 2,
+               OPT_r = 1 << 3
+       };
 
-    char buf[4096];
-    int i;
-    int n;
-    int level = 0;
-    int lastc;
-    int cmd = 3;
+       opt_complementary = "s+:n+"; /* numeric */
+       opts = getopt32(argv, "cs:n:r", &len, &level);
+       if (opts & OPT_n) {
+               if (klogctl(8, NULL, (long) level))
+                       bb_perror_msg_and_die("klogctl");
+               return EXIT_SUCCESS;
+       }
 
-    argc--;
-    argv++;
+       if (!(opts & OPT_s))
+               len = klogctl(10, NULL, 0); /* read ring buffer size */
+       if (len < 16*1024)
+               len = 16*1024;
+       if (len > 16*1024*1024)
+               len = 16*1024*1024;
 
-    /* Parse any options */
-    while (argc && **argv == '-') {
-       while (*++(*argv))
-           switch (**argv) {
-           case 'c':
-               cmd = 4;
-               break;
-           case 'n':
-               cmd = 8;
-               if (--argc == 0)
-                   goto end;
-               level = atoi (*(++argv));
-               --argc;
-               ++argv;
-               break;
-           default:
-               goto end;
-           }
-    }
+       buf = xmalloc(len);
+       len = klogctl(3 + (opts & OPT_c), buf, len); /* read ring buffer */
+       if (len < 0)
+               bb_perror_msg_and_die("klogctl");
+       if (len == 0)
+               return EXIT_SUCCESS;
 
-    if (cmd == 8) {
-       n = klog (cmd, NULL, level);
-       if (n < 0) {
-           perror ("klog");
-           exit (FALSE);
-       }
-       exit (TRUE);
-    }
 
-    n = klog (cmd, buf, sizeof (buf));
-    if (n < 0) {
-       perror ("klog");
-       exit (FALSE);
-    }
+       if (ENABLE_FEATURE_DMESG_PRETTY && !(opts & OPT_r)) {
+               int last = '\n';
+               int in = 0;
 
-    lastc = '\n';
-    for (i = 0; i < n; i++) {
-       if ((i == 0 || buf[i - 1] == '\n') && buf[i] == '<') {
-           i++;
-           while (buf[i] >= '0' && buf[i] <= '9')
-               i++;
-           if (buf[i] == '>')
-               i++;
+               /* Skip <[0-9]+> at the start of lines */
+               while (1) {
+                       if (last == '\n' && buf[in] == '<') {
+                               while (buf[in++] != '>' && in < len)
+                                       ;
+                       } else {
+                               last = buf[in++];
+                               putchar(last);
+                       }
+                       if (in >= len)
+                               break;
+               }
+               /* Make sure we end with a newline */
+               if (last != '\n')
+                       bb_putchar('\n');
+       } else {
+               full_write(STDOUT_FILENO, buf, len);
+               if (buf[len-1] != '\n')
+                       bb_putchar('\n');
        }
-       lastc = buf[i];
-       putchar (lastc);
-    }
-    if (lastc != '\n')
-       putchar ('\n');
-    exit (TRUE);
 
-  end:
-    usage( dmesg_usage);
-    exit (FALSE);
+       if (ENABLE_FEATURE_CLEAN_UP) free(buf);
+
+       return EXIT_SUCCESS;
 }