ash,hush: recheck LANG before every line input

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

diff --git a/console-tools/reset.c b/console-tools/reset.c
index f0ea5cb20f2f4b362cbb6f31943e218718863ff6..a23e4f4085d59765ba6d473667ead95c4c02605d 100644 (file)
--- a/console-tools/reset.c
+++ b/console-tools/reset.c
@@ -5,14 +5,16 @@
  * 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.
  */
 
-#include "libbb.h"
-
 /* BTW, which "standard" package has this utility? It doesn't seem
  * to be ncurses, coreutils, console-tools... then what? */
 
+#include "libbb.h"
+
+#define ESC "\033"
+
 #if ENABLE_STTY
 int stty_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 #endif
@@ -26,15 +28,15 @@ 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 [ J"      -- Erase to the end of screen
+                * "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("\033c\033(K\033[J\033[0m\033[?25h");
+               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