Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/util-linux/dmesg.c

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/util-linux/dmesg.c (modified) (1 diff)

branches/2.2.9/mindi-busybox/util-linux/dmesg.c

@@ -5 +5 @@
  *
  * Copyright 2006 Rob Landley <rob@landley.net>
- * Copyright 2006 Bernhard Fischer <rep.nop@aon.at>
+ * Copyright 2006 Bernhard Reutner-Fischer <rep.nop@aon.at>
  *
- * Licensed under GPLv2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
  */
-
 #include <sys/klog.h>
 #include "libbb.h"
 
-int dmesg_main(int argc, char **argv);
-int dmesg_main(int argc, char **argv)
+int dmesg_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int dmesg_main(int argc UNUSED_PARAM, char **argv)
 {
-    char *size, *level;
-    int flags = getopt32(argv, "cs:n:", &size, &level);
+    int len, level;
+    char *buf;
+    unsigned opts;
+    enum {
+        OPT_c = 1 << 0,
+        OPT_s = 1 << 1,
+        OPT_n = 1 << 2
+    };
 
-    if (flags & 4) {
-        if (klogctl(8, NULL, xatoul_range(level, 0, 10)))
+    opt_complementary = "s+:n+"; /* numeric */
+    opts = getopt32(argv, "cs:n:", &len, &level);
+    if (opts & OPT_n) {
+        if (klogctl(8, NULL, (long) level))
             bb_perror_msg_and_die("klogctl");
-    } else {
-        int len;
-        char *buf;
-
-        len = (flags & 2) ? xatoul_range(size, 2, INT_MAX) : 16384;
-        buf = xmalloc(len);
-        if (0 > (len = klogctl(3 + (flags & 1), buf, len)))
-            bb_perror_msg_and_die("klogctl");
-
-        // Skip <#> at the start of lines, and make sure we end with a newline.
-
-        if (ENABLE_FEATURE_DMESG_PRETTY) {
-            int last = '\n';
-            int in;
-
-            for (in = 0; in<len;) {
-                if (last == '\n' && buf[in] == '<') in += 3;
-                else putchar(last = buf[in++]);
-            }
-            if (last != '\n') putchar('\n');
-        } else {
-            write(1,buf,len);
-            if (len && buf[len-1]!='\n') putchar('\n');
-        }
-
-        if (ENABLE_FEATURE_CLEAN_UP) free(buf);
+        return EXIT_SUCCESS;
     }
 
-    return 0;
+    if (!(opts & OPT_s))
+        len = klogctl(10, NULL, 0); /* read ring buffer size */
+    if (len < 16*1024)
+        len = 16*1024;
+    if (len > 16*1024*1024)
+        len = 16*1024*1024;
+
+    buf = xmalloc(len);
+    len = klogctl(3 + (opts & OPT_c), buf, len); /* read ring buffer */
+    if (len < 0)
+        bb_perror_msg_and_die("klogctl");
+    if (len == 0)
+        return EXIT_SUCCESS;
+
+
+    if (ENABLE_FEATURE_DMESG_PRETTY) {
+        int last = '\n';
+        int in = 0;
+
+        /* Skip <#> at the start of lines */
+        while (1) {
+            if (last == '\n' && buf[in] == '<') {
+                in += 3;
+                if (in >= len)
+                    break;
+            }
+            last = buf[in];
+            putchar(last);
+            in++;
+            if (in >= len)
+                break;
+        }
+        /* Make sure we end with a newline */
+        if (last != '\n')
+            bb_putchar('\n');
+    } else {
+        full_write(STDOUT_FILENO, buf, len);
+        if (buf[len-1] != '\n')
+            bb_putchar('\n');
+    }
+
+    if (ENABLE_FEATURE_CLEAN_UP) free(buf);
+
+    return EXIT_SUCCESS;
 }