1.00 is stable

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

diff --git a/util-linux/dmesg.c b/util-linux/dmesg.c
index e38fd55551cebfb6a87c862b0f84d73dc5e914ba..2ca882714cd4cde9ac5f3f31735f62804d7c8dac 100644 (file)
--- a/util-linux/dmesg.c
+++ b/util-linux/dmesg.c
@@ -1,3 +1,4 @@
+/* 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
@@ -9,116 +10,90 @@
  * 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 
+ * from util-linux -- adapted for busybox by
+ * Erik Andersen <andersen@codepoet.org>. I ripped out Native Language
  * Support, replaced getopt, added some gotos for redundant stuff.
+ *
+ * Audited and cleaned up on 7 March 2003 to reduce size of
+ * check error handling by Erik Andersen <andersen@codepoet.org>
  */
 
-#include "internal.h"
-#include <linux/unistd.h>
 #include <stdio.h>
-#include <getopt.h>
 #include <stdlib.h>
+#include <getopt.h>
+#include <errno.h>
+#include <sys/klog.h>
 
-#if __GNU_LIBRARY__ < 5
-
-#ifndef __alpha__
-# define __NR_klogctl __NR_syslog
-  static inline _syscall3(int, klogctl, int, type, char *, b, int, len);
-#else /* __alpha__ */
-#define klogctl syslog
-#endif
-
-#else
-# include <sys/klog.h>
-#endif
-
-static const char dmesg_usage[] = "dmesg [-c] [-n level] [-s bufsize]\n";
+#include "busybox.h"
 
-int dmesg_main( int argc, char** argv )
+int dmesg_main(int argc, char **argv)
 {
-   char *buf;
-   int bufsize=8196;
-   int  i;
-   int  n;
-   int  level = 0;
-   int  lastc;
-   int  cmd = 3;
-   int stopDoingThat;
-
-   argc--;
-   argv++;
+       char *buf
+#ifdef CONFIG_FEATURE_CLEAN_UP
+               = NULL
+#endif
+               ;
+       int bufsize = 8196;
+       int i, n;
+       int level = 0;
+       int lastc;
+       int cmd = 3;
 
-    /* Parse any options */
-    while (argc && **argv == '-') {
-       stopDoingThat = FALSE;
-       while (stopDoingThat == FALSE && *++(*argv)) {
-           switch (**argv) {
-           case 'c':
-               cmd = 4;
-               break;
-           case 'n':
-               cmd = 8;
-               if (--argc == 0)
-                   goto end;
-               level = atoi (*(++argv));
-               if (--argc > 0)
-                   ++argv;
-               stopDoingThat = TRUE;
-               break;
-           case 's':
-               if (--argc == 0)
-                   goto end;
-               bufsize = atoi (*(++argv));
-               if (--argc > 0)
-                   ++argv;
-               stopDoingThat = TRUE;
-               break;
-           default:
-               goto end;
-           }
+       while ((i = getopt(argc, argv, "cn:s:")) > 0) {
+               switch (i) {
+                       case 'c':
+                               cmd = 4;
+                               break;
+                       case 'n':
+                               cmd = 8;
+                               level = bb_xgetlarg(optarg, 10, 0, 10);
+                               break;
+                       case 's':
+                               /* I think a 512k max kernel ring buffer is big enough for
+                                * anybody, as the default is 16k...  Could be wrong though.
+                                * If so I'm sure I'll hear about it by the enraged masses*/
+                               bufsize = bb_xgetlarg(optarg, 10, 4096, 512*1024);
+                               break;
+                       default:
+                               bb_show_usage();
+               }
        }
-    }
-   
-   if (argc > 1) {
-       goto end;
-   }
 
-   if (cmd == 8) {
-      n = klogctl( cmd, NULL, level );
-      if (n < 0) {
-         goto klogctl_error;
-      }
-      exit( TRUE );
-   }
+       if (optind < argc) {
+               bb_show_usage();
+       }
 
-   if (bufsize < 4096) bufsize = 4096;
-   buf = (char*)malloc(bufsize);
-   n = klogctl( cmd, buf, bufsize );
-   if (n < 0) {
-       goto klogctl_error;
-   }
+       if (cmd == 8) {
+               if (klogctl(cmd, NULL, level) < 0)
+                       goto die_the_death;
+               goto all_done;
+       }
 
-   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 = buf[i];
-      putchar( lastc );
-   }
-   if (lastc != '\n')
-      putchar( '\n' );
-   exit( TRUE);
-end:
-    usage( dmesg_usage);
-    exit (FALSE);
-klogctl_error:
-    perror( "klogctl" );
-    exit( FALSE );
+       buf = xmalloc(bufsize);
+       if ((n = klogctl(cmd, buf, bufsize)) < 0)
+               goto die_the_death;
 
+       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);
+       }
+       if (lastc != '\n')
+               putchar('\n');
+all_done:
+#ifdef CONFIG_FEATURE_CLEAN_UP
+       if (buf) {
+               free(buf);
+       }
+#endif
+       return EXIT_SUCCESS;
+die_the_death:
+       bb_perror_nomsg_and_die();
 }