*: use _exit() in sighandlers; showkey: do not use exit-thru-sighandler

While at it, make ESC sequences more readable; and removed check for
isatty(stdin) in reset. Code shrink:

   text    data     bss     dec     hex filename
 884771     936   17216  902923   dc70b busybox_old
 884723     936   17216  902875   dc6db busybox_unstripped

Signed-off-by: Marek Polacek <mmpolacek@gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

1 files changed, 7 insertions, 5 deletions

diff --git a/console-tools/reset.c b/console-tools/reset.c
index 7dffdea18..1806ce742 100644
--- a/console-tools/reset.c
+++ b/console-tools/reset.c
@@ -8,11 +8,13 @@
  * 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 [ 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"(K" ESC"[0m" ESC"[J" ESC"[?25h");
                 /* http://bugs.busybox.net/view.php?id=1414:
                  * people want it to reset echo etc: */
 #if ENABLE_STTY