X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=util-linux%2Fdmesg.c;h=34519dfd16fc9e5bfc5a3867e64171e9b1ced5d6;hb=6ced427a6debb71967a8b9cebc12e31c08de0f6a;hp=de9c3700f4bcf8758c3a4d76d9d728d2e11360c0;hpb=aa516a61b994526e1b09fbe863ea34e553e76017;p=oweals%2Fbusybox.git diff --git a/util-linux/dmesg.c b/util-linux/dmesg.c index de9c3700f..34519dfd1 100644 --- a/util-linux/dmesg.c +++ b/util-linux/dmesg.c @@ -3,7 +3,8 @@ * * dmesg - display/control kernel ring buffer. * - * Copyring 2006 Rob Landley + * Copyright 2006 Rob Landley + * Copyright 2006 Bernhard Fischer * * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ @@ -18,7 +19,7 @@ int dmesg_main(int argc, char *argv[]) int flags = bb_getopt_ulflags(argc, argv, "cs:n:", &size, &level); if (flags & 4) { - if(klogctl(8, NULL, bb_xgetlarg(level, 10, 0, 10))) + if (klogctl(8, NULL, bb_xgetlarg(level, 10, 0, 10))) bb_perror_msg_and_die("klogctl"); } else { int len; @@ -28,8 +29,24 @@ int dmesg_main(int argc, char *argv[]) buf = xmalloc(len); if (0 > (len = klogctl(3 + (flags & 1), buf, len))) bb_perror_msg_and_die("klogctl"); - write(1,buf,len); - if (len && buf[len-1]!='\n') putchar('\n'); + + // 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