aboutsummaryrefslogtreecommitdiff
path: root/util-linux
diff options
context:
space:
mode:
authorGravatar Peter Korsgaard <peter@korsgaard.com>2015-08-24 15:54:49 +0200
committerGravatar Denys Vlasenko <vda.linux@googlemail.com>2015-08-24 21:08:02 +0200
commit864d1b7a1506002ef5804305b31e0fd7197c1ea4 (patch)
treea584265aebb67556bd017cf71853343784b7d019 /util-linux
parent65c501a093b6ae1f8344a71378fd99f27177adaf (diff)
downloadbusybox-864d1b7a1506002ef5804305b31e0fd7197c1ea4.tar.gz
busybox-864d1b7a1506002ef5804305b31e0fd7197c1ea4.tar.bz2
dmesg: add -r option to print raw format even when FEATURE_DMESG_PRETTY is enabled
Similar to the "big" util-linux version. For !DMESG_PRETTY, the option is accepted (but ignored) as well, for compatibility reasons. Signed-off-by: Peter Korsgaard <peter@korsgaard.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'util-linux')
-rw-r--r--util-linux/dmesg.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/util-linux/dmesg.c b/util-linux/dmesg.c
index 81ba1c9d1..e543446c1 100644
--- a/util-linux/dmesg.c
+++ b/util-linux/dmesg.c
@@ -16,6 +16,7 @@
//usage: "\n -c Clear ring buffer after printing"
//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>
#include "libbb.h"
@@ -29,11 +30,12 @@ int dmesg_main(int argc UNUSED_PARAM, char **argv)
enum {
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))
bb_perror_msg_and_die("klogctl");
@@ -55,7 +57,7 @@ int dmesg_main(int argc UNUSED_PARAM, char **argv)
return EXIT_SUCCESS;
- if (ENABLE_FEATURE_DMESG_PRETTY) {
+ if (ENABLE_FEATURE_DMESG_PRETTY && !(opts & OPT_r)) {
int last = '\n';
int in = 0;