root
/
xz
mirror of https://git.tukaani.org/xz.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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: 78868b6ed6
This commit is contained in:
Lasse Collin 2024-12-19 18:31:09 +02:00
parent 34b80e282e
commit 4b319e05af
No known key found for this signature in database
GPG Key ID: 38EE757D69184620
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/xzdec/xzdec.c
View File

@ -14,6 +14,7 @@
#include <stdarg.h> #include <stdarg.h>
#include <errno.h> #include <errno.h>
#include <locale.h>
#include <stdio.h> #include <stdio.h>
#ifndef _MSC_VER #ifndef _MSC_VER
@ -41,7 +42,6 @@
#endif #endif
#include "getopt.h" #include "getopt.h"
#include "tuklib_gettext.h"
#include "tuklib_progname.h" #include "tuklib_progname.h"
#include "tuklib_mbstr_nonprint.h" #include "tuklib_mbstr_nonprint.h"
#include "tuklib_exit.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 // - This is needed on Windows to make non-ASCII filenames display
// properly when the active code page has been set to UTF-8 // properly when the active code page has been set to UTF-8
// in the application manifest. Use the helper macro from // in the application manifest.
// tuklib_gettext.h instead of plain setlocale(LC_ALL, "") setlocale(LC_ALL, "");
// because on Windows the standard call isn't enough for
// full UTF-8 support.
tuklib_gettext_setlocale();
// Parse the command line options. // Parse the command line options.
parse_options(argc, argv); parse_options(argc, argv);