From 2014a9685633bb48bfcd4363d8d883055ef8b68b Mon Sep 17 00:00:00 2001
From: Ron Yorston <rmy@pobox.com>
Date: Sun, 19 Feb 2023 13:15:44 +0000
Subject: win32: shuffle skip_ansi_emulation() code
Rearrange code to avoid unnecessary tests when the environment
variable BB_SKIP_ANSI_EMULATION is set.
---
win32/winansi.c | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/win32/winansi.c b/win32/winansi.c
index 1400ea3bb..15f443f4b 100644
--- a/win32/winansi.c
+++ b/win32/winansi.c
@@ -77,12 +77,14 @@ int skip_ansi_emulation(int reset)
if (skip < 0 || reset) {
const char *var = getenv(BB_SKIP_ANSI_EMULATION);
- int dflt = CONFIG_SKIP_ANSI_EMULATION_DEFAULT;
- if (is_wine() || getenv("CONEMUPID") != NULL)
- dflt = 0;
- skip = var == NULL ? dflt : atoi(var);
- if (skip < 0 || skip > 2)
- skip = 0;
+ if (var) {
+ skip = atoi(var);
+ if (skip < 0 || skip > 2)
+ skip = 0;
+ } else {
+ skip = (getenv("CONEMUPID") != NULL || is_wine()) ? 0 :
+ CONFIG_SKIP_ANSI_EMULATION_DEFAULT;
+ }
if (is_console(STDOUT_FILENO)) {
HANDLE h = get_console();
--
cgit v1.2.3-55-g6feb