+2024-06-05 Bruno Haible <bruno@clisp.org>
+
+ nstrftime: Make %c work on native Windows again.
+ * lib/strftime.c: Include <locale.h> always. Include <wchar.h> 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 <eggert@cs.ucla.edu>
endian: port better to Android NDK r26
* 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.
#include <stdlib.h>
#include <string.h>
-#if USE_C_LOCALE && HAVE_STRFTIME_L
-# include <locale.h>
-#endif
-
+#include <locale.h>
#if (defined __NetBSD__ || defined __sun) && REQUIRE_GNUISH_STRFTIME_AM_PM
-# include <locale.h>
# include "localename.h"
+#elif defined _WIN32 && !defined __CYGWIN__
+# include <wchar.h>
#endif
#include "attribute.h"
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
Include:
"strftime.h"
-Link:
-$(HARD_LOCALE_LIB)
-
License:
LGPL
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) */);