A number of cleanups. Now compiles with libc5, glibc, and uClibc. Fix a few

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

diff --git a/util-linux/dmesg.c b/util-linux/dmesg.c
index 64265b473e6049a560f324ae2c70f0067570dbc1..73de6d1ae9ba84bf65f72f34b1f713b97fd208be 100644 (file)
--- a/util-linux/dmesg.c
+++ b/util-linux/dmesg.c
@@ -1,98 +1,95 @@
-#include "internal.h"
-#include <stdlib.h>
-#include <unistd.h>
-#include <time.h>
-
+/* vi: set sw=4 ts=4: */
 /* 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
+ * Larger buffersize 3 June 1998 by Nicolai Langfeldt, based on a patch
+ * by Peeter Joot.  This was also suggested by John Hudson.
+ * 1999-02-22 Arkadiusz Mi¶kiewicz <misiek@misiek.eu.org>
+ * - added Native Language Support
+ *
+ * from util-linux -- adapted for busybox by 
+ * Erik Andersen <andersee@debian.org>. I ripped out Native Language 
+ * Support, replaced getopt, added some gotos for redundant stuff.
  */
 
-#include <linux/unistd.h>
 #include <stdio.h>
+#include <stdlib.h>
+#include <getopt.h>
 
-#define __NR_klog __NR_syslog
-
-#if defined(__GLIBC__)
-#include <sys/klog.h>
-#define klog klogctl
+#if __GNU_LIBRARY__ < 5
+# ifdef __alpha__
+#   define klogctl syslog
+# endif
 #else
-static inline _syscall3 (int, klog, int, type, char *, b, int, len)
-#endif                         /* __GLIBC__ */
-
+# include <sys/klog.h>
+#endif
 
+#include "busybox.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)
 {
+       char *buf;
+       int c;
+       int bufsize = 8196;
+       int i;
+       int n;
+       int level = 0;
+       int lastc;
+       int cmd = 3;
 
-    char buf[4096];
-    int i;
-    int n;
-    int level = 0;
-    int lastc;
-    int cmd = 3;
-
-    argc--;
-    argv++;
+       while ((c = getopt(argc, argv, "cn:s:")) != EOF) {
+               switch (c) {
+               case 'c':
+                       cmd = 4;
+                       break;
+               case 'n':
+                       cmd = 8;
+                       if (optarg == NULL)
+                               show_usage();
+                       level = atoi(optarg);
+                       break;
+               case 's':
+                       if (optarg == NULL)
+                               show_usage();
+                       bufsize = atoi(optarg);
+                       break;
+               default:
+                       show_usage();
+               }
+       }                       
 
-    /* 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;
-           }
-    }
+       if (optind < argc) {
+               show_usage();
+       }
 
-    if (cmd == 8) {
-       n = klog (cmd, NULL, level);
-       if (n < 0) {
-           perror ("klog");
-           exit (FALSE);
+       if (cmd == 8) {
+               if (klogctl(cmd, NULL, level) < 0)
+                       perror_msg_and_die("klogctl");
+               return EXIT_SUCCESS;
        }
-       exit (TRUE);
-    }
 
-    n = klog (cmd, buf, sizeof (buf));
-    if (n < 0) {
-       perror ("klog");
-       exit (FALSE);
-    }
+       if (bufsize < 4096)
+               bufsize = 4096;
+       buf = (char *) xmalloc(bufsize);
+       if ((n = klogctl(cmd, buf, bufsize)) < 0)
+               perror_msg_and_die("klogctl");
 
-    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++;
+       lastc = '\n';
+       for (i = 0; i < n; i++) {
+               if (lastc == '\n' && buf[i] == '<') {
+                       i++;
+                       while (buf[i] >= '0' && buf[i] <= '9')
+                               i++;
+                       if (buf[i] == '>')
+                               i++;
+               }
+               lastc = buf[i];
+               putchar(lastc);
        }
-       lastc = buf[i];
-       putchar (lastc);
-    }
-    if (lastc != '\n')
-       putchar ('\n');
-    exit (TRUE);
-
-  end:
-    fprintf (stderr, "Usage: %s\n", dmesg_usage);
-    exit (FALSE);
+       if (lastc != '\n')
+               putchar('\n');
+       return EXIT_SUCCESS;
 }