Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/console-tools/reset.c

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/console-tools/reset.c (modified) (1 diff)

branches/2.2.9/mindi-busybox/console-tools/reset.c

@@ -6 +6 @@
  * 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.
  */
 
-/* no options, no getopt */
+/* BTW, which "standard" package has this utility? It doesn't seem
+ * to be ncurses, coreutils, console-tools... then what? */
 
 #include "libbb.h"
 
-int reset_main(int argc, char **argv);
-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)
 {
-    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
-         * "ESC [ J"        -- Erase display
-         * "ESC [ 0 m"      -- Reset all display attributes
-         * "ESC [ ? 25 h"   -- Make cursor visible.
+         * "ESC c"        -- Reset
+         * "ESC ( K"      -- Select user mapping
+         * "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
+        return stty_main(2, (char**)args);
+#else
+        execvp("stty", (char**)args);
+#endif
     }
     return EXIT_SUCCESS;
 }
-