Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/util-linux/dmesg.c

Timestamp:

Dec 20, 2016, 4:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

• . (copied) (copied from branches/3.2 )
• mindi-busybox/util-linux/dmesg.c (modified) (3 diffs)

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

@@ -17 +17 @@
 //usage:     "\n    -n LEVEL    Set console logging level"
 //usage:     "\n    -s SIZE     Buffer size"
+//usage:     "\n    -r      Print raw message buffer"
 
 #include <sys/klog.h>
@@ -30 +31 @@
         OPT_c = 1 << 0,
         OPT_s = 1 << 1,
-        OPT_n = 1 << 2
+        OPT_n = 1 << 2,
+        OPT_r = 1 << 3
     };
 
     opt_complementary = "s+:n+"; /* numeric */
-    opts = getopt32(argv, "cs:n:", &len, &level);
+    opts = getopt32(argv, "cs:n:r", &len, &level);
     if (opts & OPT_n) {
         if (klogctl(8, NULL, (long) level))
@@ -56 +58 @@
 
 
-    if (ENABLE_FEATURE_DMESG_PRETTY) {
+    if (ENABLE_FEATURE_DMESG_PRETTY && !(opts & OPT_r)) {
         int last = '\n';
         int in = 0;