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

[Denys Vlasenko]

Applied, thanks!

On Mon, Aug 24, 2015 at 3:54 PM, Peter Korsgaard <peter at korsgaard.com> wrote:
> 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 at korsgaard.com>
> ---
>  util-linux/dmesg.c | 8 +++++---
>  1 file changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/util-linux/dmesg.c b/util-linux/dmesg.c
> index 81ba1c9..e543446 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;
>
> --
> 2.1.4
>
> _______________________________________________
> busybox mailing list
> busybox at busybox.net
> http://lists.busybox.net/mailman/listinfo/busybox