diff options
author | Ludovic Courtès <ludo@gnu.org> | 2023-01-18 18:25:25 +0100 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2023-01-18 22:50:18 +0100 |
commit | aeb22f486139f457ae7fc44c2d931312aaae52d8 (patch) | |
tree | 0fbfe6d421e637553f9bca39f08577c0ddb990e8 /lib/hard-locale.c | |
parent | 4404b553a5a135aee5a606dedea9b6fa25363be4 (diff) | |
download | guile-aeb22f486139f457ae7fc44c2d931312aaae52d8.tar.gz |
Update Gnulib to v0.1-5703-g356a414e8c and add 'posix_spawn' module.
This is a followup to edfca3b7e5931b5b5a83112e2a9813b068be99c2, which
added the 'posix_spawnp' module but not 'posix_spawn'.
* m4/gnulib-cache.m4: Add 'posix_spawn' module.
* gnulib-local/m4/clock_time.m4.diff: Adjust.
* configure.ac: Move 'gl_EARLY' use right after 'AC_PROG_CC'.
Diffstat (limited to 'lib/hard-locale.c')
-rw-r--r-- | lib/hard-locale.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/lib/hard-locale.c b/lib/hard-locale.c index f7fbc470b..c01fce534 100644 --- a/lib/hard-locale.c +++ b/lib/hard-locale.c @@ -1,6 +1,6 @@ /* hard-locale.c -- Determine whether a locale is hard. - Copyright (C) 1997-1999, 2002-2004, 2006-2007, 2009-2022 Free Software + Copyright (C) 1997-1999, 2002-2004, 2006-2007, 2009-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify @@ -21,6 +21,7 @@ #include "hard-locale.h" #include <locale.h> +#include <stdlib.h> #include <string.h> bool @@ -31,5 +32,16 @@ hard_locale (int category) if (setlocale_null_r (category, locale, sizeof (locale))) return false; - return !(strcmp (locale, "C") == 0 || strcmp (locale, "POSIX") == 0); + if (!(strcmp (locale, "C") == 0 || strcmp (locale, "POSIX") == 0)) + return true; + +#if defined __ANDROID__ + /* On Android 5.0 or newer, it is possible to set a locale that has the same + name as the "C" locale but in fact uses UTF-8 encoding. Cf. test case 2 in + <https://lists.gnu.org/archive/html/bug-gnulib/2023-01/msg00141.html>. */ + if (MB_CUR_MAX > 1) + return true; +#endif + + return false; } |