svn commit: trunk/busybox/util-linux

landley at busybox.net landley at busybox.net
Thu Jul 27 15:02:59 UTC 2006


Author: landley
Date: 2006-07-27 08:02:58 -0700 (Thu, 27 Jul 2006)
New Revision: 15752

Log:
There's no excuse for adding new #ifdefs to the code like that.  None at all.


Modified:
   trunk/busybox/util-linux/Config.in
   trunk/busybox/util-linux/dmesg.c


Changeset:
Modified: trunk/busybox/util-linux/Config.in
===================================================================
--- trunk/busybox/util-linux/Config.in	2006-07-27 14:59:36 UTC (rev 15751)
+++ trunk/busybox/util-linux/Config.in	2006-07-27 15:02:58 UTC (rev 15752)
@@ -17,26 +17,6 @@
 	  are also logged to the system console.  Enable this option if you
 	  wish to enable the 'dmesg' utility.
 
-config CONFIG_FEATURE_DMESG_PRETTY
-	bool "pretty dmesg output"
-	default y
-	depends on CONFIG_DMESG
-	help
-	  If you wish to scrub the syslog level from the output, say 'Y' here.
-	  The syslog level is a string prefixed to every line with the form "<#>".
-
-	  With this option you will see:
-	    # dmesg
-	    Linux version 2.6.17.4 .....
-	    BIOS-provided physical RAM map:
-	     BIOS-e820: 0000000000000000 - 000000000009f000 (usable)
-
-	  Without this option you will see:
-	    # dmesg
-	    <5>Linux version 2.6.17.4 .....
-	    <6>BIOS-provided physical RAM map:
-	    <6> BIOS-e820: 0000000000000000 - 000000000009f000 (usable)
-
 config CONFIG_FBSET
 	bool "fbset"
 	default n

Modified: trunk/busybox/util-linux/dmesg.c
===================================================================
--- trunk/busybox/util-linux/dmesg.c	2006-07-27 14:59:36 UTC (rev 15751)
+++ trunk/busybox/util-linux/dmesg.c	2006-07-27 15:02:58 UTC (rev 15752)
@@ -1,9 +1,9 @@
 /* vi: set sw=4 ts=4: */
 /*
+ * 
  * dmesg - display/control kernel ring buffer.
  *
- * Copyright 2006 Rob Landley <rob at landley.net>
- * Copyright 2006 Erik Andersen <andersen at codepoet.org>
+ * Copyring 2006 Rob Landley <rob at landley.net>
  *
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
@@ -28,24 +28,8 @@
 		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;




More information about the busybox-cvs mailing list