summaryrefslogtreecommitdiff
path: root/util-linux/dmesg.c
diff options
context:
space:
mode:
authorRob Landley2006-07-27 15:02:58 +0000
committerRob Landley2006-07-27 15:02:58 +0000
commitfc367f98244c14ec0deeee7a5533811cc9aa2538 (patch)
treee437146af41940b454be0d82181b5e37241b315e /util-linux/dmesg.c
parent277eb6bb444dd0f348079d7d37487f224c9abe39 (diff)
downloadbusybox-fc367f98244c14ec0deeee7a5533811cc9aa2538.zip
busybox-fc367f98244c14ec0deeee7a5533811cc9aa2538.tar.gz
There's no excuse for adding new #ifdefs to the code like that. None at all.
Diffstat (limited to 'util-linux/dmesg.c')
-rw-r--r--util-linux/dmesg.c22
1 files changed, 3 insertions, 19 deletions
diff --git a/util-linux/dmesg.c b/util-linux/dmesg.c
index ecfd906..2b59ee2 100644
--- a/util-linux/dmesg.c
+++ b/util-linux/dmesg.c
@@ -1,9 +1,9 @@
/* vi: set sw=4 ts=4: */
/*
+ *
* dmesg - display/control kernel ring buffer.
*
- * Copyright 2006 Rob Landley <rob@landley.net>
- * Copyright 2006 Erik Andersen <andersen@codepoet.org>
+ * Copyring 2006 Rob Landley <rob@landley.net>
*
* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
*/
@@ -28,24 +28,8 @@ 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");
-
-#ifdef CONFIG_FEATURE_DMESG_PRETTY
- {
- char newline = '\n';
- int i;
- for (i=0; i<len; ++i) {
- if (newline == '\n' && buf[i] == '<')
- i += 3; /* skip <#> */
- putchar(newline=buf[i]);
- }
- if (newline != '\n') putchar('\n');
- }
-#else
- write(1, buf, len);
+ write(1,buf,len);
if (len && buf[len-1]!='\n') putchar('\n');
-#endif
-
- if (ENABLE_FEATURE_CLEAN_UP) free(buf);
}
return 0;