A number of cleanups. Now compiles with libc5, glibc, and uClibc. Fix a few

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

diff --git a/util-linux/dmesg.c b/util-linux/dmesg.c
index 99d053a72640e5fe887eb31fe17cae699ec5af7a..73de6d1ae9ba84bf65f72f34b1f713b97fd208be 100644 (file)
--- a/util-linux/dmesg.c
+++ b/util-linux/dmesg.c
@@ -15,23 +15,20 @@
  * Support, replaced getopt, added some gotos for redundant stuff.
  */
 
-#include "internal.h"
 #include <stdio.h>
 #include <stdlib.h>
+#include <getopt.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__ */
-#define klogctl syslog
-#endif
-
+# ifdef __alpha__
+#   define klogctl syslog
+# endif
 #else
 # include <sys/klog.h>
 #endif
 
+#include "busybox.h"
+
 int dmesg_main(int argc, char **argv)
 {
        char *buf;
@@ -51,42 +48,38 @@ 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) {
-               n = klogctl(cmd, NULL, level);
-               if (n < 0) {
-                       goto klogctl_error;
-               }
-               exit(TRUE);
+               if (klogctl(cmd, NULL, level) < 0)
+                       perror_msg_and_die("klogctl");
+               return EXIT_SUCCESS;
        }
 
        if (bufsize < 4096)
                bufsize = 4096;
        buf = (char *) xmalloc(bufsize);
-       n = klogctl(cmd, buf, bufsize);
-       if (n < 0) {
-               goto klogctl_error;
-       }
+       if ((n = klogctl(cmd, buf, bufsize)) < 0)
+               perror_msg_and_die("klogctl");
 
        lastc = '\n';
        for (i = 0; i < n; i++) {
-               if ((i == 0 || buf[i - 1] == '\n') && buf[i] == '<') {
+               if (lastc == '\n' && buf[i] == '<') {
                        i++;
                        while (buf[i] >= '0' && buf[i] <= '9')
                                i++;
@@ -98,11 +91,5 @@ int dmesg_main(int argc, char **argv)
        }
        if (lastc != '\n')
                putchar('\n');
-       exit(TRUE);
-  end:
-       usage(dmesg_usage);
-       exit(FALSE);
-  klogctl_error:
-       perror("klogctl");
-       return(FALSE);
+       return EXIT_SUCCESS;
 }