hexedit: fixes to "goto address" code

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

diff --git a/console-tools/reset.c b/console-tools/reset.c
index f0ea5cb20f2f4b362cbb6f31943e218718863ff6..471ef9158cee9f5cd585838f7204290b9d5dafcb 100644 (file)
--- a/console-tools/reset.c
+++ b/console-tools/reset.c
@@ -5,13 +5,29 @@
  * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
  * Written by Erik Andersen and Kent Robotti <robotti@metconnect.com>
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
+/* "Standard" version of this tool is in ncurses package */
+
+//config:config RESET
+//config:      bool "reset (275 bytes)"
+//config:      default y
+//config:      help
+//config:      This program is used to reset the terminal screen, if it
+//config:      gets messed up.
+
+//applet:IF_RESET(APPLET_NOEXEC(reset, reset, BB_DIR_USR_BIN, BB_SUID_DROP, reset))
+
+//kbuild:lib-$(CONFIG_RESET) += reset.o
+
+//usage:#define reset_trivial_usage
+//usage:       ""
+//usage:#define reset_full_usage "\n\n"
+//usage:       "Reset the screen"
 
 #include "libbb.h"
 
-/* BTW, which "standard" package has this utility? It doesn't seem
- * to be ncurses, coreutils, console-tools... then what? */
+#define ESC "\033"
 
 #if ENABLE_STTY
 int stty_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
@@ -26,20 +42,22 @@ int reset_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
 
        /* no options, no getopt */
 
-       if (isatty(STDIN_FILENO) && isatty(STDOUT_FILENO)) {
+       if (/*isatty(STDIN_FILENO) &&*/ isatty(STDOUT_FILENO)) {
                /* See 'man 4 console_codes' for details:
                 * "ESC c"        -- Reset
-                * "ESC ( K"      -- Select user mapping
+                * "ESC ( B"      -- Select G0 Character Set (B = US)
+                * "ESC [ m"      -- Reset all display attributes
                 * "ESC [ J"      -- Erase to the end of screen
-                * "ESC [ 0 m"    -- Reset all display attributes
                 * "ESC [ ? 25 h" -- Make cursor visible
                 */
-               printf("\033c\033(K\033[J\033[0m\033[?25h");
+               printf(ESC"c" ESC"(B" ESC"[m" 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
+               /* Make sure stdout gets drained before we execvp */
+               fflush_all();
                execvp("stty", (char**)args);
 #endif
        }