hush: get rid of charmap[]

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

diff --git a/util-linux/dmesg.c b/util-linux/dmesg.c
index e5d403f7acd77b36ed73b478e2dbee6795579c54..f52026c2fdee5649739c4c2a6083849d8d625b7b 100644 (file)
--- a/util-linux/dmesg.c
+++ b/util-linux/dmesg.c
@@ -1,98 +1,67 @@
-#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 tarball for details.
  */
 
-#include <linux/unistd.h>
-#include <stdio.h>
-
-#define __NR_klog __NR_syslog
-
-#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;
+       char *buf;
+       char *size, *level;
+       unsigned flags = getopt32(argv, "cs:n:", &size, &level);
+       enum {
+               OPT_c = 1<<0,
+               OPT_s = 1<<1,
+               OPT_n = 1<<2
+       };
 
-    char buf[4096];
-    int i;
-    int n;
-    int level = 0;
-    int lastc;
-    int cmd = 3;
+       if (flags & OPT_n) {
+               if (klogctl(8, NULL, xatoul_range(level, 0, 10)))
+                       bb_perror_msg_and_die("klogctl");
+               return EXIT_SUCCESS;
+       }
 
-    argc--;
-    argv++;
+       len = (flags & OPT_s) ? xatoul_range(size, 2, INT_MAX) : 16384;
+       buf = xmalloc(len);
+       len = klogctl(3 + (flags & OPT_c), buf, len);
+       if (len < 0)
+               bb_perror_msg_and_die("klogctl");
+       if (len == 0)
+               return EXIT_SUCCESS;
 
-    /* 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;
-           }
-    }
+       /* Skip <#> at the start of lines, and make sure we end with a newline. */
 
-    if (cmd == 8) {
-       n = klog (cmd, NULL, level);
-       if (n < 0) {
-           perror ("klog");
-           exit (FALSE);
-       }
-       exit (TRUE);
-    }
+       if (ENABLE_FEATURE_DMESG_PRETTY) {
+               int last = '\n';
+               int in = 0;
 
-    n = klog (cmd, buf, sizeof (buf));
-    if (n < 0) {
-       perror ("klog");
-       exit (FALSE);
-    }
-
-    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++;
+               do {
+                       if (last == '\n' && buf[in] == '<')
+                               in += 3;
+                       else {
+                               last = buf[in++];
+                               bb_putchar(last);
+                       }
+               } while (in < len);
+               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;
 }