[BusyBox-cvs] busybox/console-tools Config.in, 1.3, 1.4 Makefile.in, 1.3, 1.4 reset.c, 1.11, 1.12 loadacm.c, 1.24, NONE

[Erik Andersen]

Update of /var/cvs/busybox/console-tools
In directory nail:/tmp/cvs-serv3885/console-tools

Modified Files:
	Config.in Makefile.in reset.c 
Removed Files:
	loadacm.c 
Log Message:
Kill off the loadacm applet.  It is unused, unmaintained
garbage leftover from before I started maintaining BusyBox.
As the Klingon's like to say, Today is a good day to die.
 -Erik


Index: Makefile.in
===================================================================
RCS file: /var/cvs/busybox/console-tools/Makefile.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile.in	14 Jul 2003 21:20:42 -0000	1.3
+++ Makefile.in	20 Dec 2003 07:07:22 -0000	1.4
@@ -27,7 +27,6 @@
 CONSOLETOOLS_DIR-$(CONFIG_CLEAR)	+= clear.o
 CONSOLETOOLS_DIR-$(CONFIG_DEALLOCVT)	+= deallocvt.o
 CONSOLETOOLS_DIR-$(CONFIG_DUMPKMAP)	+= dumpkmap.o
-CONSOLETOOLS_DIR-$(CONFIG_LOADACM)	+= loadacm.o
 CONSOLETOOLS_DIR-$(CONFIG_LOADFONT)	+= loadfont.o
 CONSOLETOOLS_DIR-$(CONFIG_LOADKMAP)	+= loadkmap.o
 CONSOLETOOLS_DIR-$(CONFIG_OPENVT)	+= openvt.o

Index: Config.in
===================================================================
RCS file: /var/cvs/busybox/console-tools/Config.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Config.in	14 Jul 2003 19:36:54 -0000	1.3
+++ Config.in	20 Dec 2003 07:07:22 -0000	1.4
@@ -31,12 +31,6 @@
 	  This program dumps the kernel's keyboard translation table to
 	  stdout, in binary format. You can then use loadkmap to load it.
 
-config CONFIG_LOADACM
-	bool "loadacm"
-	default n
-	help
-	  This program loads an acm from standard input.
-
 config CONFIG_LOADFONT
 	bool "loadfont"
 	default n

--- loadacm.c DELETED ---

Index: reset.c
===================================================================
RCS file: /var/cvs/busybox/console-tools/reset.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- reset.c	22 Oct 2003 10:34:15 -0000	1.11
+++ reset.c	20 Dec 2003 07:07:22 -0000	1.12
@@ -25,11 +25,21 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <unistd.h>
 #include "busybox.h"
 
 extern int reset_main(int argc, char **argv)
 {
-	printf("\033[?25h\033c\033[J");
+	if (isatty(0) || isatty(0) || isatty(0)) {
+		/* See 'man 4 console_codes' for details:
+		 * "ESC c"			-- Reset
+		 * "ESC ( K"		-- Select user mapping
+		 * "ESC [ J"		-- Erase display
+		 * "ESC [ 0 m"		-- Reset all Graphics Rendition display attributes
+		 * "ESC [ ? 25 h"	-- Make cursor visible.
+		 */
+		printf("\033c\033(K\033[J\033[0m\033[?25h");
+	}
 	return EXIT_SUCCESS;
 }