reset: enable in default configuration

The 'reset' applet attempts to reset the screen.  It's more thorough
than 'clear'.

Since it tries to reset the screen buffer for the current process
it has to be a NOFORK applet.

To run the Windows executable C:/Windows/System32/reset.exe use the
full path, as the 'reset' applet will take precedence.

3 files changed, 18 insertions, 5 deletions

diff --git a/configs/mingw32_defconfig b/configs/mingw32_defconfig
index c3ba17a46..7800e9340 100644
--- a/configs/mingw32_defconfig
+++ b/configs/mingw32_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Busybox version: 1.31.0.git
-# Sun Mar 31 09:45:46 2019
+# Sun Apr  7 12:34:37 2019
 #
 CONFIG_HAVE_DOT_CONFIG=y
 # CONFIG_PLATFORM_POSIX is not set
@@ -385,7 +385,7 @@ CONFIG_DEFAULT_SETFONT_DIR=""
 # CONFIG_FEATURE_LOADFONT_RAW is not set
 # CONFIG_LOADKMAP is not set
 # CONFIG_OPENVT is not set
-# CONFIG_RESET is not set
+CONFIG_RESET=y
 # CONFIG_RESIZE is not set
 # CONFIG_FEATURE_RESIZE_PRINT is not set
 # CONFIG_SETCONSOLE is not set
diff --git a/configs/mingw64_defconfig b/configs/mingw64_defconfig
index 721420c06..f39e02fca 100644
--- a/configs/mingw64_defconfig
+++ b/configs/mingw64_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Busybox version: 1.31.0.git
-# Sun Mar 31 09:45:46 2019
+# Sun Apr  7 12:34:37 2019
 #
 CONFIG_HAVE_DOT_CONFIG=y
 # CONFIG_PLATFORM_POSIX is not set
@@ -385,7 +385,7 @@ CONFIG_DEFAULT_SETFONT_DIR=""
 # CONFIG_FEATURE_LOADFONT_RAW is not set
 # CONFIG_LOADKMAP is not set
 # CONFIG_OPENVT is not set
-# CONFIG_RESET is not set
+CONFIG_RESET=y
 # CONFIG_RESIZE is not set
 # CONFIG_FEATURE_RESIZE_PRINT is not set
 # CONFIG_SETCONSOLE is not set
diff --git a/console-tools/reset.c b/console-tools/reset.c
index 113bb5c76..2f65aad15 100644
--- a/console-tools/reset.c
+++ b/console-tools/reset.c
@@ -14,7 +14,10 @@
 //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))
+// NOTE: For WIN32 this applet is NOFORK so we can change the screen
+//       buffer for the current process.
+
+//applet:IF_RESET(APPLET_NOFORK(reset, reset, BB_DIR_USR_BIN, BB_SUID_DROP, reset))
 
 //kbuild:lib-$(CONFIG_RESET) += reset.o
 
@@ -36,6 +39,7 @@ int stty_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int reset_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int reset_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
 {
+#if !ENABLE_PLATFORM_MINGW32
         static const char *const args[] = {
                 "stty", "sane", NULL
         };
@@ -61,5 +65,14 @@ int reset_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
                 execvp("stty", (char**)args);
 #endif
         }
+#else
+        if (isatty(STDOUT_FILENO)) {
+                // "ESC [ m"        -- Reset all display attributes
+                // "ESC [ ? 1049 l" -- Use normal screen buffer
+                // reset_screen     -- Reset cursor and clear screen buffer
+                full_write1_str(ESC"[m" ESC"[?1049l");
+                reset_screen();
+        }
+#endif
         return EXIT_SUCCESS;
 }