4 files changed, 29 insertions, 12 deletions

diff --git a/Config.in b/Config.in
index 917712c0c..a8a08a342 100644
--- a/Config.in
+++ b/Config.in
@@ -473,6 +473,15 @@ config FEATURE_EURO
         requires the OEM code page to be 858.  If the OEM code page of
         the console is 850 when BusyBox starts it's changed to 858.
 
+config FEATURE_EURO_INPUT
+        bool "Allow euro on input, even in code pages without euro support"
+        default n
+        depends on PLATFORM_MINGW32 && FEATURE_EURO
+        help
+        Allow the euro character to be entered in the console even if the
+        current code page doesn't support it.  It isn't necessary to
+        enable this setting if the code page in use has euro support.
+
 config TERMINAL_MODE
         int "Default setting for terminal mode"
         default 5
diff --git a/configs/mingw32_defconfig b/configs/mingw32_defconfig
index 492cf34c8..a6272d97f 100644
--- a/configs/mingw32_defconfig
+++ b/configs/mingw32_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Busybox version: 1.37.0.git
-# Sun Mar 19 09:51:34 2023
+# Thu Jun 22 16:55:35 2023
 #
 CONFIG_HAVE_DOT_CONFIG=y
 # CONFIG_PLATFORM_POSIX is not set
@@ -19,6 +19,7 @@ CONFIG_SHOW_USAGE=y
 CONFIG_FEATURE_VERBOSE_USAGE=y
 CONFIG_FEATURE_COMPRESS_USAGE=y
 CONFIG_LFS=y
+CONFIG_TIME64=y
 # CONFIG_PAM is not set
 # CONFIG_FEATURE_DEVPTS is not set
 # CONFIG_FEATURE_UTMP is not set
@@ -47,11 +48,13 @@ CONFIG_FEATURE_PRNG_SHELL=y
 # CONFIG_FEATURE_PRNG_ISAAC is not set
 CONFIG_FEATURE_RESOURCES=y
 CONFIG_FEATURE_VERSIONINFO=y
+# CONFIG_FEATURE_UTF8_MANIFEST is not set
 CONFIG_FEATURE_ICON=y
 # CONFIG_FEATURE_ICON_ATERM is not set
 # CONFIG_FEATURE_ICON_STERM is not set
 CONFIG_FEATURE_ICON_ALL=y
 CONFIG_FEATURE_EURO=y
+# CONFIG_FEATURE_EURO_INPUT is not set
 CONFIG_TERMINAL_MODE=5
 CONFIG_FEATURE_IMPROVED_COLOUR_MAPPING=y
 CONFIG_FEATURE_EXTRA_FILE_DATA=y
@@ -485,6 +488,7 @@ CONFIG_FEATURE_FIND_INUM=y
 CONFIG_FEATURE_FIND_SAMEFILE=y
 CONFIG_FEATURE_FIND_EXEC=y
 CONFIG_FEATURE_FIND_EXEC_PLUS=y
+CONFIG_FEATURE_FIND_EXEC_OK=y
 # CONFIG_FEATURE_FIND_USER is not set
 # CONFIG_FEATURE_FIND_GROUP is not set
 CONFIG_FEATURE_FIND_NOT=y
@@ -707,9 +711,6 @@ CONFIG_XXD=y
 # CONFIG_RENICE is not set
 CONFIG_REV=y
 # CONFIG_RTCWAKE is not set
-CONFIG_DROP=y
-CONFIG_CDROP=y
-CONFIG_PDROP=y
 # CONFIG_SCRIPT is not set
 # CONFIG_SCRIPTREPLAY is not set
 # CONFIG_SETARCH is not set
@@ -802,6 +803,9 @@ CONFIG_FEATURE_CROND_DIR=""
 # CONFIG_DEVFSD_VERBOSE is not set
 # CONFIG_FEATURE_DEVFS is not set
 # CONFIG_DEVMEM is not set
+CONFIG_DROP=y
+CONFIG_CDROP=y
+CONFIG_PDROP=y
 # CONFIG_FBSPLASH is not set
 # CONFIG_FLASH_ERASEALL is not set
 # CONFIG_FLASH_LOCK is not set
diff --git a/configs/mingw64_defconfig b/configs/mingw64_defconfig
index ee793033c..6ccb7b8f0 100644
--- a/configs/mingw64_defconfig
+++ b/configs/mingw64_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Busybox version: 1.37.0.git
-# Sun Mar 19 09:51:34 2023
+# Thu Jun 22 16:55:35 2023
 #
 CONFIG_HAVE_DOT_CONFIG=y
 # CONFIG_PLATFORM_POSIX is not set
@@ -19,6 +19,7 @@ CONFIG_SHOW_USAGE=y
 CONFIG_FEATURE_VERBOSE_USAGE=y
 CONFIG_FEATURE_COMPRESS_USAGE=y
 CONFIG_LFS=y
+CONFIG_TIME64=y
 # CONFIG_PAM is not set
 # CONFIG_FEATURE_DEVPTS is not set
 # CONFIG_FEATURE_UTMP is not set
@@ -47,11 +48,13 @@ CONFIG_FEATURE_PRNG_SHELL=y
 # CONFIG_FEATURE_PRNG_ISAAC is not set
 CONFIG_FEATURE_RESOURCES=y
 CONFIG_FEATURE_VERSIONINFO=y
+# CONFIG_FEATURE_UTF8_MANIFEST is not set
 CONFIG_FEATURE_ICON=y
 # CONFIG_FEATURE_ICON_ATERM is not set
 # CONFIG_FEATURE_ICON_STERM is not set
 CONFIG_FEATURE_ICON_ALL=y
 CONFIG_FEATURE_EURO=y
+# CONFIG_FEATURE_EURO_INPUT is not set
 CONFIG_TERMINAL_MODE=5
 CONFIG_FEATURE_IMPROVED_COLOUR_MAPPING=y
 CONFIG_FEATURE_EXTRA_FILE_DATA=y
@@ -485,6 +488,7 @@ CONFIG_FEATURE_FIND_INUM=y
 CONFIG_FEATURE_FIND_SAMEFILE=y
 CONFIG_FEATURE_FIND_EXEC=y
 CONFIG_FEATURE_FIND_EXEC_PLUS=y
+CONFIG_FEATURE_FIND_EXEC_OK=y
 # CONFIG_FEATURE_FIND_USER is not set
 # CONFIG_FEATURE_FIND_GROUP is not set
 CONFIG_FEATURE_FIND_NOT=y
@@ -707,9 +711,6 @@ CONFIG_XXD=y
 # CONFIG_RENICE is not set
 CONFIG_REV=y
 # CONFIG_RTCWAKE is not set
-CONFIG_DROP=y
-CONFIG_CDROP=y
-CONFIG_PDROP=y
 # CONFIG_SCRIPT is not set
 # CONFIG_SCRIPTREPLAY is not set
 # CONFIG_SETARCH is not set
@@ -802,6 +803,9 @@ CONFIG_FEATURE_CROND_DIR=""
 # CONFIG_DEVFSD_VERBOSE is not set
 # CONFIG_FEATURE_DEVFS is not set
 # CONFIG_DEVMEM is not set
+CONFIG_DROP=y
+CONFIG_CDROP=y
+CONFIG_PDROP=y
 # CONFIG_FBSPLASH is not set
 # CONFIG_FLASH_ERASEALL is not set
 # CONFIG_FLASH_LOCK is not set
diff --git a/win32/termios.c b/win32/termios.c
index 9fa97685d..081a41e5b 100644
--- a/win32/termios.c
+++ b/win32/termios.c
@@ -34,7 +34,7 @@ int64_t FAST_FUNC windows_read_key(int fd, char *buf UNUSED_PARAM, int timeout)
         INPUT_RECORD record;
         DWORD nevent_out, mode;
         int ret = -1;
-#if ENABLE_FEATURE_EURO
+#if ENABLE_FEATURE_EURO_INPUT
         wchar_t uchar;
         char achar;
 #endif
@@ -54,7 +54,7 @@ int64_t FAST_FUNC windows_read_key(int fd, char *buf UNUSED_PARAM, int timeout)
                         if (WaitForSingleObject(cin, timeout) != WAIT_OBJECT_0)
                                 goto done;
                 }
-#if ENABLE_FEATURE_EURO
+#if ENABLE_FEATURE_EURO_INPUT
                 if (!ReadConsoleInputW(cin, &record, 1, &nevent_out))
 #else
                 if (!ReadConsoleInput(cin, &record, 1, &nevent_out))
@@ -73,7 +73,7 @@ int64_t FAST_FUNC windows_read_key(int fd, char *buf UNUSED_PARAM, int timeout)
                 }
                 alt_pressed = state & LEFT_ALT_PRESSED;
 
-#if ENABLE_FEATURE_EURO
+#if ENABLE_FEATURE_EURO_INPUT
                 if (!record.Event.KeyEvent.uChar.UnicodeChar) {
 #else
                 if (!record.Event.KeyEvent.uChar.AsciiChar) {
@@ -119,7 +119,7 @@ int64_t FAST_FUNC windows_read_key(int fd, char *buf UNUSED_PARAM, int timeout)
                                 ret &= ~0x80;
                         goto done;
                 }
-#if ENABLE_FEATURE_EURO
+#if ENABLE_FEATURE_EURO_INPUT
                 uchar = record.Event.KeyEvent.uChar.UnicodeChar;
                 achar = uchar & 0x7f;
                 if (achar != uchar)