--- trunk/mkinitrd-magellan/busybox/console-tools/reset.c	2009/04/24 18:32:46	815
+++ trunk/mkinitrd-magellan/busybox/console-tools/reset.c	2009/04/24 18:33:46	816
@@ -8,16 +8,25 @@
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-/* no options, no getopt */
+#include "libbb.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include "busybox.h"
+/* BTW, which "standard" package has this utility? It doesn't seem
+ * to be ncurses, coreutils, console-tools... then what? */
 
-int reset_main(int argc, char **argv)
+#if ENABLE_STTY
+int stty_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+#endif
+
+int reset_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int reset_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
 {
-	if (isatty(1)) {
+	static const char *const args[] = {
+		"stty", "sane", NULL
+	};
+
+	/* no options, no getopt */
+
+	if (isatty(STDIN_FILENO) && isatty(STDOUT_FILENO)) {
 		/* See 'man 4 console_codes' for details:
 		 * "ESC c"			-- Reset
 		 * "ESC ( K"		-- Select user mapping
@@ -26,7 +35,13 @@
 		 * "ESC [ ? 25 h"	-- Make cursor visible.
 		 */
 		printf("\033c\033(K\033[J\033[0m\033[?25h");
+		/* http://bugs.busybox.net/view.php?id=1414:
+		 * people want it to reset echo etc: */
+#if ENABLE_STTY
+		return stty_main(2, (char**)args);
+#else
+		execvp("stty", (char**)args);
+#endif
 	}
 	return EXIT_SUCCESS;
 }
-