From 446129adaed302eb499fb2a1e55b5d72ece98386 Mon Sep 17 00:00:00 2001 From: Rob Landley Date: Thu, 27 Jul 2006 16:40:55 +0000 Subject: Add back in non-ifdef version of FEATURE_PRETTY_PRINT, and get the attribution right this time. --- util-linux/dmesg.c | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) (limited to 'util-linux/dmesg.c') diff --git a/util-linux/dmesg.c b/util-linux/dmesg.c index 2b59ee23d..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. */ @@ -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