1.00 is stable

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

diff --git a/util-linux/dmesg.c b/util-linux/dmesg.c
index 56e0771f0facb4fd111ab799701b3e75b5d7473a..2ca882714cd4cde9ac5f3f31735f62804d7c8dac 100644 (file)
--- a/util-linux/dmesg.c
+++ b/util-linux/dmesg.c
@@ -10,39 +10,36 @@
  * 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 <andersee@debian.org>
+ * check error handling by Erik Andersen <andersen@codepoet.org>
  */
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <getopt.h>
 #include <errno.h>
-
-#if __GNU_LIBRARY__ < 5
-# ifdef __alpha__
-#   define klogctl syslog
-# endif
-#else
-# include <sys/klog.h>
-#endif
+#include <sys/klog.h>
 
 #include "busybox.h"
 
 int dmesg_main(int argc, char **argv)
 {
-       char *buf;
+       char *buf
+#ifdef CONFIG_FEATURE_CLEAN_UP
+               = NULL
+#endif
+               ;
        int bufsize = 8196;
        int i, n;
        int level = 0;
        int lastc;
        int cmd = 3;
 
-       while ((i = getopt(argc, argv, "cn:s:")) != EOF) {
+       while ((i = getopt(argc, argv, "cn:s:")) > 0) {
                switch (i) {
                        case 'c':
                                cmd = 4;
@@ -58,12 +55,12 @@ int dmesg_main(int argc, char **argv)
                                bufsize = bb_xgetlarg(optarg, 10, 4096, 512*1024);
                                break;
                        default:
-                               show_usage();
+                               bb_show_usage();
                }
        }
 
        if (optind < argc) {
-               show_usage();
+               bb_show_usage();
        }
 
        if (cmd == 8) {
@@ -98,5 +95,5 @@ all_done:
 #endif
        return EXIT_SUCCESS;
 die_the_death:
-       perror_msg_and_die("klogctl");
+       bb_perror_nomsg_and_die();
 }