X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=console-tools%2Freset.c;h=6917eda426c4baac59d5adab8f4e3c5eb3336fe2;hb=12450dbeef1afee5ed27f8f3a2395edbdc7a9355;hp=5a7e88d7bfb340c1ffa1fc76dce79378433f5005;hpb=ffe17b51b4305519d39e6772ce0bc7c564efede7;p=oweals%2Fbusybox.git

diff --git a/console-tools/reset.c b/console-tools/reset.c
index 5a7e88d7b..6917eda42 100644
--- a/console-tools/reset.c
+++ b/console-tools/reset.c
@@ -5,32 +5,28 @@
  * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
  * Written by Erik Andersen and Kent Robotti <robotti@metconnect.com>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-/* no options, no getopt */
+#include "libbb.h"
+
+/* BTW, which "standard" package has this utility? It doesn't seem
+ * to be ncurses, coreutils, console-tools... then what? */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include "busybox.h"
+#if ENABLE_STTY
+int stty_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+#endif
 
-extern int reset_main(int argc, char **argv)
+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
@@ -39,7 +35,13 @@ extern int reset_main(int argc, char **argv)
 		 * "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;
 }
-