emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dmesg: add -r option to print raw format even when FEATURE_DMESG_PRETTY is enabled

Browse Source 
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>
This commit is contained in:
Peter Korsgaard 2015-08-24 15:54:49 +02:00 committed by Denys Vlasenko
parent 65c501a093
commit 864d1b7a15
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
util-linux/dmesg.c
View File

@ -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;