Changed bb_regcomp to xregcomp and #if 0'ed out destroy_cmd_strs in sed.c

[oweals/busybox.git] / dmesg.c

diff --git a/dmesg.c b/dmesg.c
index aa26f5836c7e9c6e6b319d875c84920a96d614dc..df2bce7133b6afb76ed25940560c7cfce63b7f2d 100644 (file)
--- a/dmesg.c
+++ b/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
@@ -15,17 +16,15 @@
  */
 
 #include "internal.h"
-#include <linux/unistd.h>
 #include <stdio.h>
-#include <getopt.h>
 #include <stdlib.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__ */
+static inline _syscall3(int, klogctl, int, type, char *, b, int, len);
+#else                                                  /* __alpha__ */
 #define klogctl syslog
 #endif
 
@@ -33,84 +32,100 @@
 # include <sys/klog.h>
 #endif
 
-static const char dmesg_usage[] = "dmesg [-c] [-n level] [-s bufsize]\n";
+static const char dmesg_usage[] = "dmesg [-c] [-n LEVEL] [-s SIZE]\n"
+#ifndef BB_FEATURE_TRIVIAL_HELP
+       "\nPrints or controls the kernel ring buffer\n\n"
+       "Options:\n"
+       "\t-c\t\tClears the ring buffer's contents after printing\n"
+       "\t-n LEVEL\tSets console logging level\n"
+       "\t-s SIZE\t\tUse a buffer of size SIZE\n"
+#endif
+       ;
 
-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;
+       char *buf;
+       int bufsize = 8196;
+       int i;
+       int n;
+       int level = 0;
+       int lastc;
+       int cmd = 3;
+       int stopDoingThat;
 
-    /* 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;
-           case 's':
-               if (--argc == 0)
-                   goto end;
-               bufsize = atoi (*(++argv));
-               --argc;
-               ++argv;
-               break;
-           default:
-               goto end;
-           }
-    }
-   
-   if (argc > 1) {
-       goto end;
-   }
+       argc--;
+       argv++;
 
-   if (cmd == 8) {
-      n = klogctl( cmd, NULL, level );
-      if (n < 0) {
-         goto klogctl_error;
-      }
-      exit( TRUE );
-   }
+       /* 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;
+                       }
+               }
+       }
+
+       if (argc > 1) {
+               goto end;
+       }
 
-   if (bufsize < 4096) bufsize = 4096;
-   buf = (char*)malloc(bufsize);
-   n = klogctl( cmd, buf, bufsize );
-   if (n < 0) {
-       goto klogctl_error;
-   }
+       if (cmd == 8) {
+               n = klogctl(cmd, NULL, level);
+               if (n < 0) {
+                       goto klogctl_error;
+               }
+               exit(TRUE);
+       }
 
-   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 );
+       if (bufsize < 4096)
+               bufsize = 4096;
+       buf = (char *) xmalloc(bufsize);
+       n = klogctl(cmd, buf, bufsize);
+       if (n < 0) {
+               goto klogctl_error;
+       }
 
+       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");
+       return(FALSE);
 }