X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=console-tools%2Freset.c;h=a23e4f4085d59765ba6d473667ead95c4c02605d;hb=20704f066250744c0c2b84920c27d0fd0aa9e935;hp=861bd435bc6052eaffe2e9b47dca77c6af53acdd;hpb=ed3ef50c233ffb1b50ea0e7382a8e60b86491009;p=oweals%2Fbusybox.git

diff --git a/console-tools/reset.c b/console-tools/reset.c
index 861bd435b..a23e4f408 100644
--- a/console-tools/reset.c
+++ b/console-tools/reset.c
@@ -2,34 +2,48 @@
 /*
  * Mini reset implementation for busybox
  *
+ * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
+ * Written by Erik Andersen and Kent Robotti <robotti@metconnect.com>
  *
- * Copyright (C) 1999,2000 by Lineo, inc.
- * Written by Erik Andersen <andersen@lineo.com>, <andersee@debian.org>
- *        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 source tree.
  */
 
-#include "busybox.h"
-#include <stdio.h>
-#include <stdlib.h>
+/* BTW, which "standard" package has this utility? It doesn't seem
+ * to be ncurses, coreutils, console-tools... then what? */
+
+#include "libbb.h"
 
-extern int reset_main(int argc, char **argv)
+#define ESC "\033"
+
+#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)
 {
-       printf("\033c");
-       return EXIT_SUCCESS;
-}
+	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 ( B"      -- Select G0 Character Set (B = US)
+		 * "ESC [ 0 m"    -- Reset all display attributes
+		 * "ESC [ J"      -- Erase to the end of screen
+		 * "ESC [ ? 25 h" -- Make cursor visible
+		 */
+		printf(ESC"c" ESC"(B" ESC"[0m" ESC"[J" ESC"[?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;
+}