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 bbed8221aec0d48010d38e9514860f5c424f7456..df2bce7133b6afb76ed25940560c7cfce63b7f2d 100644 (file)
--- a/dmesg.c
+++ b/dmesg.c
@@ -16,9 +16,7 @@
  */
 
 #include "internal.h"
-#include <linux/unistd.h>
 #include <stdio.h>
-#include <getopt.h>
 #include <stdlib.h>
 
 #if __GNU_LIBRARY__ < 5
@@ -34,7 +32,15 @@ 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";
+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)
 {
@@ -95,7 +101,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 +127,5 @@ int dmesg_main(int argc, char **argv)
        exit(FALSE);
   klogctl_error:
        perror("klogctl");
-       exit(FALSE);
-
+       return(FALSE);
 }