Add errno.h

[oweals/busybox.git] / dmesg.c

diff --git a/dmesg.c b/dmesg.c
index a8c61c7b4cad5108cfdd41a97deaf7e17b100fc5..c220d90184f9e76d06a3401d1fd2e0dfde67ab10 100644 (file)
--- a/dmesg.c
+++ b/dmesg.c
@@ -15,7 +15,7 @@
  * Support, replaced getopt, added some gotos for redundant stuff.
  */
 
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <stdlib.h>
 
@@ -34,7 +34,8 @@ static inline _syscall3(int, klogctl, int, type, char *, b, int, len);
 
 int dmesg_main(int argc, char **argv)
 {
-       char *buf, c;
+       char *buf;
+       int c;
        int bufsize = 8196;
        int i;
        int n;
@@ -68,24 +69,20 @@ int dmesg_main(int argc, char **argv)
        }
 
        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++;
@@ -97,11 +94,8 @@ int dmesg_main(int argc, char **argv)
        }
        if (lastc != '\n')
                putchar('\n');
-       exit(TRUE);
+       return EXIT_SUCCESS;
   end:
        usage(dmesg_usage);
-       exit(FALSE);
-  klogctl_error:
-       perror("klogctl");
-       return(FALSE);
+       return EXIT_FAILURE;
 }