From fe654687cf76a3b5341e0082806a6ba27d77137e Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Wed, 5 Jun 2024 16:32:02 +0200 Subject: [PATCH] nstrftime: Make %c work on native Windows again. * lib/strftime.c: Include always. Include on native Windows. (__strftime_internal): On native Windows, inspect the locale name like hard_locale would do. * modules/nstrftime (Link): Remove section. * tests/test-nstrftime.h (locales_test): Disallow alternative that is not culturally acceptable for French. --- ChangeLog | 13 ++++++++++++- lib/strftime.c | 24 ++++++++++++++++++------ modules/nstrftime | 3 --- tests/test-nstrftime.h | 1 - 4 files changed, 30 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8e808fd6a8..d04105378d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2024-06-05 Bruno Haible + + nstrftime: Make %c work on native Windows again. + * lib/strftime.c: Include always. Include on native + Windows. + (__strftime_internal): On native Windows, inspect the locale name like + hard_locale would do. + * modules/nstrftime (Link): Remove section. + * tests/test-nstrftime.h (locales_test): Disallow alternative that is + not culturally acceptable for French. + 2024-06-04 Paul Eggert endian: port better to Android NDK r26 @@ -28,7 +39,7 @@ * lib/strftime.c: Include locale.h only if (USE_C_LOCALE && HAVE_STRFTIME_L) || ((defined __NetBSD__ || defined __sun) && REQUIRE_GNUISH_STRFTIME_AM_PM). Do not include hard-locale.h. - (libc_hidden_def): On native MS-Windows, use the C locale %c + (__strftime_internal): On native MS-Windows, use the C locale %c format regardless of language. I hope that’s good enough. If not, let’s try to think of a way of solving the problem that doesn’t require using hard_locale. diff --git a/lib/strftime.c b/lib/strftime.c index 5f1e76833f..19a2d73ebd 100644 --- a/lib/strftime.c +++ b/lib/strftime.c @@ -92,13 +92,11 @@ extern char *tzname[]; #include #include -#if USE_C_LOCALE && HAVE_STRFTIME_L -# include -#endif - +#include #if (defined __NetBSD__ || defined __sun) && REQUIRE_GNUISH_STRFTIME_AM_PM -# include # include "localename.h" +#elif defined _WIN32 && !defined __CYGWIN__ +# include #endif #include "attribute.h" @@ -1293,7 +1291,21 @@ __strftime_internal (STREAM_OR_CHAR_T *s, STRFTIME_ARG (size_t maxsize) subfmt = L_("%a %b %e %H:%M:%S %Y"); #elif defined _WIN32 && !defined __CYGWIN__ /* On native Windows, "%c" is "%d/%m/%Y %H:%M:%S" by default. */ - subfmt = L_("%a %b %e %H:%M:%S %Y"); + bool is_c_locale; + /* This code is equivalent to is_c_locale = !hard_locale (LC_TIME). */ +# if defined _MSC_VER + const wchar_t *locale = _wsetlocale (LC_TIME, NULL); + is_c_locale = + (wstrcmp (locale, L"C") == 0 || wstrcmp (locale, L"POSIX") == 0); +# else + const char *locale = setlocale (LC_TIME, NULL); + is_c_locale = + (strcmp (locale, "C") == 0 || strcmp (locale, "POSIX") == 0); +# endif + if (is_c_locale) + subfmt = L_("%a %b %e %H:%M:%S %Y"); + else + subfmt = L_("%a %e %b %Y %H:%M:%S"); #else goto underlying_strftime; #endif diff --git a/modules/nstrftime b/modules/nstrftime index e2f852a16b..69b9d84605 100644 --- a/modules/nstrftime +++ b/modules/nstrftime @@ -29,9 +29,6 @@ lib_SOURCES += nstrftime.c Include: "strftime.h" -Link: -$(HARD_LOCALE_LIB) - License: LGPL diff --git a/tests/test-nstrftime.h b/tests/test-nstrftime.h index 80edc7aaec..b822f3acd1 100644 --- a/tests/test-nstrftime.h +++ b/tests/test-nstrftime.h @@ -482,7 +482,6 @@ locales_test (language_t language) ASSERT (STREQ (buf, "jeu. 26 oct. 2017 06:40:03") /* glibc, Cygwin */ || STREQ (buf, "jeu. 26 oct. 06:40:03 2017") /* FreeBSD */ || STREQ (buf, "Jeu 26 oct 06:40:03 2017") /* macOS, older FreeBSD */ - || STREQ (buf, "Jeu oct. 26 06:40:03 2017") /* MS-Windows */ || STREQ (buf, "26 octobre 2017 06:40:03") /* NetBSD */ || STREQ (buf, "26 octobre 2017 à 06:40:03") /* Solaris (UTF-8) */ || STREQ (buf, "26 octobre 2017 \340 06:40:03") /* Solaris (ISO-8859-1) */); -- 2.39.5