From 4b319e05afef4eab2fbafb6223f25d128ec99fce Mon Sep 17 00:00:00 2001 From: Lasse Collin Date: Thu, 19 Dec 2024 18:31:09 +0200 Subject: [PATCH] xzdec: Use setlocale() instead of tuklib_gettext_setlocale() xzdec isn't translated and doesn't need libintl on Windows even when NLS is enabled, thus libintl_setlocale() cannot interfere with the locale settings. Thus, standard setlocale() works perfectly. In the commit 78868b6e, the explanation in the commit message is wrong. Fixes: 78868b6ed63fa4c89f73e3dfed27abfb8b0d46db --- src/xzdec/xzdec.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/xzdec/xzdec.c b/src/xzdec/xzdec.c index 02028f33..0f82cf3e 100644 --- a/src/xzdec/xzdec.c +++ b/src/xzdec/xzdec.c @@ -14,6 +14,7 @@ #include #include +#include #include #ifndef _MSC_VER @@ -41,7 +42,6 @@ #endif #include "getopt.h" -#include "tuklib_gettext.h" #include "tuklib_progname.h" #include "tuklib_mbstr_nonprint.h" #include "tuklib_exit.h" @@ -430,11 +430,8 @@ main(int argc, char **argv) // // - This is needed on Windows to make non-ASCII filenames display // properly when the active code page has been set to UTF-8 - // in the application manifest. Use the helper macro from - // tuklib_gettext.h instead of plain setlocale(LC_ALL, "") - // because on Windows the standard call isn't enough for - // full UTF-8 support. - tuklib_gettext_setlocale(); + // in the application manifest. + setlocale(LC_ALL, ""); // Parse the command line options. parse_options(argc, argv);