ash: reset ANSI emulation when BB_SKIP_ANSI_EMULATION changes

Update the skip status on the first call to skip_ansi_emulation()
and whenever the BB_SKIP_ANSI_EMULATION variable changes.

5 files changed, 22 insertions, 10 deletions

diff --git a/include/libbb.h b/include/libbb.h
index 8979665b2..7077f0e0d 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -2215,6 +2215,7 @@ extern const char bb_busybox_exec_path[] ALIGN1;
 #define BB_PATH_ROOT_PATH "PATH=/sbin;/usr/sbin;/bin;/usr/bin" BB_ADDITIONAL_PATH
 #define PATH_SEP ';'
 #define PATH_SEP_STR ";"
+extern const char bb_skip_ansi_emulation[] ALIGN1;
 #endif
 extern const char bb_PATH_root_path[] ALIGN1; /* BB_PATH_ROOT_PATH */
 #define bb_default_root_path (bb_PATH_root_path + sizeof("PATH"))
diff --git a/include/mingw.h b/include/mingw.h
index 3516cd31c..0fead43c9 100644
--- a/include/mingw.h
+++ b/include/mingw.h
@@ -538,3 +538,4 @@ char *xabsolute_path(char *path);
 char *get_drive_cwd(const char *path, char *buffer, int size);
 void fix_path_case(char *path);
 void seek_sparse(int fd, size_t size);
+int skip_ansi_emulation(int reset);
diff --git a/libbb/messages.c b/libbb/messages.c
index f5bbd3e32..04863855a 100644
--- a/libbb/messages.c
+++ b/libbb/messages.c
@@ -29,6 +29,8 @@ const char bb_hexdigits_upcase[] ALIGN1 = "0123456789ABCDEF";
 
 #if !ENABLE_PLATFORM_MINGW32
 const char bb_busybox_exec_path[] ALIGN1 = CONFIG_BUSYBOX_EXEC_PATH;
+#else
+const char bb_skip_ansi_emulation[] ALIGN1 = "BB_SKIP_ANSI_EMULATION";
 #endif
 const char bb_default_login_shell[] ALIGN1 = LIBBB_DEFAULT_LOGIN_SHELL;
 /* util-linux manpage says /sbin:/bin:/usr/sbin:/usr/bin,
diff --git a/shell/ash.c b/shell/ash.c
index ca8acd705..4f1fe005b 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -2248,6 +2248,14 @@ static void change_seconds(const char *) FAST_FUNC;
 static void change_realtime(const char *) FAST_FUNC;
 #endif
 
+#if ENABLE_PLATFORM_MINGW32
+static void FAST_FUNC
+change_skip_ansi(const char *newval UNUSED_PARAM)
+{
+        skip_ansi_emulation(TRUE);
+}
+#endif
+
 static const struct {
         int flags;
         const char *var_text;
@@ -2284,6 +2292,9 @@ static const struct {
 #if ENABLE_FEATURE_EDITING_SAVEHISTORY
         { VSTRFIXED|VTEXTFIXED|VUNSET, "HISTFILE"  , NULL            },
 #endif
+#if ENABLE_PLATFORM_MINGW32
+        { VSTRFIXED|VTEXTFIXED|VUNSET, bb_skip_ansi_emulation, change_skip_ansi },
+#endif
 };
 
 struct redirtab;
diff --git a/win32/winansi.c b/win32/winansi.c
index dcfdd7e1f..c4c7ee87c 100644
--- a/win32/winansi.c
+++ b/win32/winansi.c
@@ -53,17 +53,14 @@ static int is_console_in(int fd)
         return isatty(fd) && GetStdHandle(STD_INPUT_HANDLE) != INVALID_HANDLE_VALUE;
 }
 
-static int skip_ansi_emulation(void)
+int skip_ansi_emulation(int reset)
 {
-        static char *var = NULL;
-        static int got_var = FALSE;
+        static int skip = -1;
 
-        if (!got_var) {
-                var = getenv("BB_SKIP_ANSI_EMULATION");
-                got_var = TRUE;
-        }
+        if (skip < 0 || reset)
+                skip = getenv(bb_skip_ansi_emulation) != NULL;
 
-        return var != NULL;
+        return skip;
 }
 
 void set_title(const char *str)
@@ -557,7 +554,7 @@ static int ansi_emulate(const char *s, FILE *stream)
 
         while (*pos) {
                 pos = strchr(str, '\033');
-                if (pos && !skip_ansi_emulation()) {
+                if (pos && !skip_ansi_emulation(FALSE)) {
                         size_t len = pos - str;
 
                         if (len) {
@@ -811,7 +808,7 @@ static int ansi_emulate_write(int fd, const void *buf, size_t count)
         /* we've checked the data doesn't contain any NULs */
         while (*pos) {
                 pos = strchr(str, '\033');
-                if (pos && !skip_ansi_emulation()) {
+                if (pos && !skip_ansi_emulation(FALSE)) {
                         len = pos - str;
 
                         if (len) {