From 62960b16b05ba9299d6351aceeca2b493002de5f Mon Sep 17 00:00:00 2001
From: Martin Matuska <martin@matuska.de>
Date: Fri, 10 May 2024 01:27:11 +0200
Subject: [PATCH] unzip: do not use getenv() and setenv() in test_I.c

Use the env command to run in modified environment instead.
---
 unzip/test/test_I.c | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/unzip/test/test_I.c b/unzip/test/test_I.c
index d189edca1a..bc70a38591 100644
--- a/unzip/test/test_I.c
+++ b/unzip/test/test_I.c
@@ -33,7 +33,12 @@
 DEFINE_TEST(test_I)
 {
 	const char *reffile = "test_I.zip";
-	const char *lang;
+#if !defined(_WIN32) || defined(__CYGWIN__)
+	const char *envstr = "env LANG=en_US.UTF-8 LC_ALL=en_US.UTF-8 "
+	    "LC_CTYPE=en_US.UTF-8";
+#else
+	const char *envstr = "";
+#endif
 	int r;
 
 #if HAVE_SETLOCALE
@@ -45,18 +50,12 @@ DEFINE_TEST(test_I)
 	skipping("setlocale() not available on this system.");
 #endif
 
-	lang = getenv("LANG");
-	setenv("LANG", "en_US.UTF-8", 1);
 	extract_reference_file(reffile);
-	r = systemf("%s -I UTF-8 %s >test.out 2>test.err", testprog, reffile);
+	r = systemf("%s %s -I UTF-8 %s >test.out 2>test.err", envstr, testprog,
+	    reffile);
 	assertEqualInt(0, r);
 	assertNonEmptyFile("test.out");
 	assertEmptyFile("test.err");
 
 	assertTextFileContents("Hello, World!\n", "Γειά σου Κόσμε.txt");
-
-	if (lang == NULL)
-		unsetenv("LANG");
-	else
-		setenv("LANG", lang, 1);
 }