restore compare_string_array new interface (make broken by landley)

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

diff --git a/util-linux/dmesg.c b/util-linux/dmesg.c
index 88b5d13930bb3dcd232ffa63fbdb65ab263a2b2a..2ca882714cd4cde9ac5f3f31735f62804d7c8dac 100644 (file)
--- a/util-linux/dmesg.c
+++ b/util-linux/dmesg.c
@@ -10,83 +10,72 @@
  * 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 <andersen@codepoet.org>
  */
 
-#include "busybox.h"
 #include <stdio.h>
 #include <stdlib.h>
+#include <getopt.h>
+#include <errno.h>
+#include <sys/klog.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
-
-#else
-# include <sys/klog.h>
-#endif
+#include "busybox.h"
 
 int dmesg_main(int argc, char **argv)
 {
-       char *buf;
-       int c;
+       char *buf
+#ifdef CONFIG_FEATURE_CLEAN_UP
+               = NULL
+#endif
+               ;
        int bufsize = 8196;
-       int i;
-       int n;
+       int i, n;
        int level = 0;
        int lastc;
        int cmd = 3;
 
-       while ((c = getopt(argc, argv, "cn:s:")) != EOF) {
-               switch (c) {
-               case 'c':
-                       cmd = 4;
-                       break;
-               case 'n':
-                       cmd = 8;
-                       if (optarg == NULL)
-                               usage(dmesg_usage);
-                       level = atoi(optarg);
-                       break;
-               case 's':
-                       if (optarg == NULL)
-                               usage(dmesg_usage);
-                       bufsize = atoi(optarg);
-                       break;
-               default:
-                       usage(dmesg_usage);
+       while ((i = getopt(argc, argv, "cn:s:")) > 0) {
+               switch (i) {
+                       case 'c':
+                               cmd = 4;
+                               break;
+                       case 'n':
+                               cmd = 8;
+                               level = bb_xgetlarg(optarg, 10, 0, 10);
+                               break;
+                       case 's':
+                               /* I think a 512k max kernel ring buffer is big enough for
+                                * anybody, as the default is 16k...  Could be wrong though.
+                                * If so I'm sure I'll hear about it by the enraged masses*/
+                               bufsize = bb_xgetlarg(optarg, 10, 4096, 512*1024);
+                               break;
+                       default:
+                               bb_show_usage();
                }
-       }                       
+       }
 
        if (optind < argc) {
-               goto end;
+               bb_show_usage();
        }
 
        if (cmd == 8) {
-               n = klogctl(cmd, NULL, level);
-               if (n < 0) {
-                       goto klogctl_error;
-               }
-               exit(TRUE);
+               if (klogctl(cmd, NULL, level) < 0)
+                       goto die_the_death;
+               goto all_done;
        }
 
-       if (bufsize < 4096)
-               bufsize = 4096;
-       buf = (char *) xmalloc(bufsize);
-       n = klogctl(cmd, buf, bufsize);
-       if (n < 0) {
-               goto klogctl_error;
-       }
+       buf = xmalloc(bufsize);
+       if ((n = klogctl(cmd, buf, bufsize)) < 0)
+               goto die_the_death;
 
        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 +87,13 @@ 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);
+all_done:
+#ifdef CONFIG_FEATURE_CLEAN_UP
+       if (buf) {
+               free(buf);
+       }
+#endif
+       return EXIT_SUCCESS;
+die_the_death:
+       bb_perror_nomsg_and_die();
 }