init: O_NONBLOCK needs more thought. reverted for now

[oweals/busybox.git] / console-tools / reset.c

diff --git a/console-tools/reset.c b/console-tools/reset.c
index deffe286dfb6a7c37b5fbd9a8917bc3a334d9023..6917eda426c4baac59d5adab8f4e3c5eb3336fe2 100644 (file)
--- a/console-tools/reset.c
+++ b/console-tools/reset.c
@@ -8,14 +8,25 @@
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-/* no options, no getopt */
-
 #include "libbb.h"
 
-int reset_main(int argc, char **argv);
-int reset_main(int argc, char **argv)
+/* BTW, which "standard" package has this utility? It doesn't seem
+ * to be ncurses, coreutils, console-tools... then what? */
+
+#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
@@ -24,7 +35,13 @@ 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;
 }
-