Regression testing bugfixes from Larry Doolittle. As an aside,

[oweals/busybox.git] / dmesg.c

diff --git a/dmesg.c b/dmesg.c
index c220d90184f9e76d06a3401d1fd2e0dfde67ab10..47f9f4474a245235009685db4e8b3a5aa4ab63c7 100644 (file)
--- a/dmesg.c
+++ b/dmesg.c
@@ -18,9 +18,11 @@
 #include "busybox.h"
 #include <stdio.h>
 #include <stdlib.h>
+#include <getopt.h>
 
 #if __GNU_LIBRARY__ < 5
-
+#include <sys/syscall.h>
+#include <linux/unistd.h>
 #ifndef __alpha__
 # define __NR_klogctl __NR_syslog
 static inline _syscall3(int, klogctl, int, type, char *, b, int, len);
@@ -51,21 +53,21 @@ int dmesg_main(int argc, char **argv)
                case 'n':
                        cmd = 8;
                        if (optarg == NULL)
-                               usage(dmesg_usage);
+                               show_usage();
                        level = atoi(optarg);
                        break;
                case 's':
                        if (optarg == NULL)
-                               usage(dmesg_usage);
+                               show_usage();
                        bufsize = atoi(optarg);
                        break;
                default:
-                       usage(dmesg_usage);
+                       show_usage();
                }
        }                       
 
        if (optind < argc) {
-               goto end;
+               show_usage();
        }
 
        if (cmd == 8) {
@@ -95,7 +97,4 @@ int dmesg_main(int argc, char **argv)
        if (lastc != '\n')
                putchar('\n');
        return EXIT_SUCCESS;
-  end:
-       usage(dmesg_usage);
-       return EXIT_FAILURE;
 }