this applet needlessly big! TODO: bb_getopt_ulflags()

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

diff --git a/util-linux/dmesg.c b/util-linux/dmesg.c
index 9096621b03a1908aedb9ef74ea863070420032ad..2ca882714cd4cde9ac5f3f31735f62804d7c8dac 100644 (file)
--- a/util-linux/dmesg.c
+++ b/util-linux/dmesg.c
@@ -1,95 +1,99 @@
-#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 <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 <linux/unistd.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <getopt.h>
-
-#define __NR_klog __NR_syslog
-
-#if defined(__GLIBC__)
+#include <errno.h>
 #include <sys/klog.h>
-#define klog klogctl
-#else
-static inline _syscall3(int,klog,int,type,char *,b,int,len)
-#endif /* __GLIBC__ */
 
-const char                     dmesg_usage[] = "dmesg";
+#include "busybox.h"
 
-int
-dmesg_main(int argc, char * * argv)
+int dmesg_main(int argc, char **argv)
 {
+       char *buf
+#ifdef CONFIG_FEATURE_CLEAN_UP
+               = NULL
+#endif
+               ;
+       int bufsize = 8196;
+       int i, n;
+       int level = 0;
+       int lastc;
+       int cmd = 3;
 
-   char buf[4096];
-   int  i;
-   int  n;
-   int  c;
-   int  level = 0;
-   int  lastc;
-   int  cmd = 3;
+       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();
+               }
+       }
 
-   while ((c = getopt( argc, argv, "cn:" )) != EOF) {
-      switch (c) {
-      case 'c':
-        cmd = 4;
-        break;
-      case 'n':
-        cmd = 8;
-        level = atoi(optarg);
-        break;
-      case '?':
-      default:
-        fprintf(stderr, "%s\n", dmesg_usage);
-        exit(1);
-      }
-   }
-   argc -= optind;
-   argv += optind;
-   
-   if (argc > 1) {
-     fprintf(stderr, "%s\n", dmesg_usage);
-      exit(1);
-   }
+       if (optind < argc) {
+               bb_show_usage();
+       }
 
-   if (cmd == 8) {
-      n = klog( cmd, NULL, level );
-      if (n < 0) {
-        perror( "klog" );
-        exit( 1 );
-      }
-      exit( 0 );
-   }
+       if (cmd == 8) {
+               if (klogctl(cmd, NULL, level) < 0)
+                       goto die_the_death;
+               goto all_done;
+       }
 
-   n = klog( cmd, buf, sizeof( buf ) );
-   if (n < 0) {
-      perror( "klog" );
-      exit( 1 );
-   }
+       buf = xmalloc(bufsize);
+       if ((n = klogctl(cmd, buf, bufsize)) < 0)
+               goto die_the_death;
 
-   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' );
-   return 0;
+       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();
 }