Renamed "internal.h" to the more sensible "busybox.h".

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

diff --git a/util-linux/dmesg.c b/util-linux/dmesg.c
index bbed8221aec0d48010d38e9514860f5c424f7456..88b5d13930bb3dcd232ffa63fbdb65ab263a2b2a 100644 (file)
--- a/util-linux/dmesg.c
+++ b/util-linux/dmesg.c
@@ -15,10 +15,8 @@
  * Support, replaced getopt, added some gotos for redundant stuff.
  */
 
-#include "internal.h"
-#include <linux/unistd.h>
+#include "busybox.h"
 #include <stdio.h>
-#include <getopt.h>
 #include <stdlib.h>
 
 #if __GNU_LIBRARY__ < 5
@@ -34,54 +32,39 @@ static inline _syscall3(int, klogctl, int, type, char *, b, int, len);
 # include <sys/klog.h>
 #endif
 
-static const char dmesg_usage[] = "dmesg [-c] [-n level] [-s bufsize]\n";
-
 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;
-       int stopDoingThat;
-
-       argc--;
-       argv++;
 
-       /* 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 ((c = getopt(argc, argv, "cn:s:")) != EOF) {
+               switch (c) {
+               case 'c':
+                       cmd = 4;
+                       break;
+               case 'n':
+                       cmd = 8;
+                       if (optarg == NULL)
+                               usage(dmesg_usage);
+                       level = atoi(optarg);
+                       break;
+               case 's':
+                       if (optarg == NULL)
+                               usage(dmesg_usage);
+                       bufsize = atoi(optarg);
+                       break;
+               default:
+                       usage(dmesg_usage);
                }
-       }
+       }                       
 
-       if (argc > 1) {
+       if (optind < argc) {
                goto end;
        }
 
@@ -95,7 +78,7 @@ int dmesg_main(int argc, char **argv)
 
        if (bufsize < 4096)
                bufsize = 4096;
-       buf = (char *) malloc(bufsize);
+       buf = (char *) xmalloc(bufsize);
        n = klogctl(cmd, buf, bufsize);
        if (n < 0) {
                goto klogctl_error;
@@ -121,6 +104,5 @@ int dmesg_main(int argc, char **argv)
        exit(FALSE);
   klogctl_error:
        perror("klogctl");
-       exit(FALSE);
-
+       return(FALSE);
 }