alarsyo/spot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

update gnulib to 47bf2cf3184027c1eb9c1dfeea5c5b8b2d69710d

Browse source 
* lib/dosname.h, lib/glthread/lock.c, lib/glthread/lock.h,
lib/glthread/threadlib.c, lib/windows-mutex.c, lib/windows-mutex.h,
lib/windows-once.c, lib/windows-once.h, lib/windows-recmutex.c,
lib/windows-recmutex.h, lib/windows-rwlock.c, lib/windows-rwlock.h,
m4/host-cpu-c-abi.m4, m4/lib-ld.m4, m4/lib-link.m4, m4/lib-prefix.m4,
m4/lock.m4, m4/longlong.m4, m4/pthread_rwlock_rdlock.m4,
tools/config.rpath: Delete.
* lib/alloca.in.h, lib/argmatch.c, lib/argmatch.h, lib/arg-nonnull.h,
lib/argp-ba.c, lib/argp-eexst.c, lib/argp-fmtstream.c,
lib/argp-fmtstream.h, lib/argp-fs-xinl.c, lib/argp.h, lib/argp-help.c,
lib/argp-namefrob.h, lib/argp-parse.c, lib/argp-pin.c, lib/argp-pv.c,
lib/argp-pvh.c, lib/argp-xinl.c, lib/asnprintf.c, lib/basename-lgpl.c,
lib/c-ctype.h, lib/c++defs.h, lib/cdefs.h, lib/closeout.c,
lib/closeout.h, lib/close-stream.c, lib/c-strcasecmp.c,
lib/c-strcaseeq.h, lib/c-strcase.h, lib/c-strncasecmp.c,
lib/dirname.h, lib/dirname-lgpl.c, lib/errno.in.h, lib/error.c,
lib/error.h, lib/exitfail.c, lib/exitfail.h, lib/fcntl.in.h,
lib/filename.h, lib/float.c, lib/float+.h, lib/float.in.h,
lib/fpending.c, lib/fpending.h, lib/getopt1.c, lib/getopt.c,
lib/getopt-cdefs.in.h, lib/getopt-core.h, lib/getopt-ext.h,
lib/getopt.in.h, lib/getopt_int.h, lib/getopt-pfx-core.h,
lib/getopt-pfx-ext.h, lib/getprogname.c, lib/getprogname.h,
lib/gettext.h, lib/gettimeofday.c, lib/hard-locale.c,
lib/hard-locale.h, lib/intprops.h, lib/isatty.c, lib/itold.c,
lib/libc-config.h, lib/limits.in.h, lib/localcharset.c,
lib/localcharset.h, lib/localtime-buffer.c, lib/localtime-buffer.h,
lib/lstat.c, lib/Makefile.am, lib/malloca.c, lib/malloca.h,
lib/malloc.c, lib/mbrtowc.c, lib/mbsinit.c, lib/memchr.c,
lib/memchr.valgrind, lib/mempcpy.c, lib/minmax.h, lib/mkdir.c,
lib/mkstemp.c, lib/mkstemps.c, lib/msvc-inval.c, lib/msvc-inval.h,
lib/msvc-nothrow.c, lib/msvc-nothrow.h, lib/_Noreturn.h,
lib/pathmax.h, lib/printf-args.c, lib/printf-args.h,
lib/printf-parse.c, lib/printf-parse.h, lib/progname.c,
lib/progname.h, lib/quotearg.c, lib/quotearg.h, lib/quote.h,
lib/rawmemchr.c, lib/rawmemchr.valgrind, lib/secure_getenv.c,
lib/size_max.h, lib/sleep.c, lib/stat.c, lib/stat-time.h,
lib/stat-w32.c, lib/stat-w32.h, lib/stdalign.in.h, lib/stdbool.in.h,
lib/stddef.in.h, lib/stdint.in.h, lib/stdio-impl.h, lib/stdio.in.h,
lib/stdlib.in.h, lib/stpcpy.c, lib/strcasecmp.c, lib/strchrnul.c,
lib/strchrnul.valgrind, lib/streq.h, lib/strerror.c,
lib/strerror-override.c, lib/strerror-override.h, lib/string.in.h,
lib/strings.in.h, lib/stripslash.c, lib/strncasecmp.c, lib/strndup.c,
lib/strnlen.c, lib/strverscmp.c, lib/sysexits.in.h, lib/sys_stat.in.h,
lib/sys_time.in.h, lib/sys_types.in.h, lib/sys_wait.in.h,
lib/tempname.c, lib/tempname.h, lib/time.in.h, lib/unistd.in.h,
lib/vasnprintf.c, lib/vasnprintf.h, lib/verify.h, lib/vsnprintf.c,
lib/warn-on-use.h, lib/wchar.in.h, lib/wctype.in.h,
lib/windows-initguard.h, lib/xalloc-die.c, lib/xalloc.h,
lib/xalloc-oversized.h, lib/xmalloc.c, lib/xsize.h, m4/00gnulib.m4,
m4/absolute-header.m4, m4/alloca.m4, m4/argp.m4, m4/codeset.m4,
m4/dirname.m4, m4/double-slash-root.m4, m4/eealloc.m4, m4/errno_h.m4,
m4/error.m4, m4/exponentd.m4, m4/extensions.m4, m4/extern-inline.m4,
m4/fcntl_h.m4, m4/fcntl-o.m4, m4/float_h.m4, m4/fpending.m4,
m4/getopt.m4, m4/getprogname.m4, m4/gettimeofday.m4,
m4/gnulib-cache.m4, m4/gnulib-common.m4, m4/gnulib-comp.m4,
m4/gnulib-tool.m4, m4/include_next.m4, m4/__inline.m4, m4/intmax_t.m4,
m4/inttypes_h.m4, m4/isatty.m4, m4/largefile.m4, m4/limits-h.m4,
m4/localcharset.m4, m4/locale-fr.m4, m4/locale-ja.m4, m4/locale-zh.m4,
m4/localtime-buffer.m4, m4/lstat.m4, m4/malloca.m4, m4/malloc.m4,
m4/math_h.m4, m4/mbrtowc.m4, m4/mbsinit.m4, m4/mbstate_t.m4,
m4/memchr.m4, m4/mempcpy.m4, m4/minmax.m4, m4/mkdir.m4, m4/mkstemp.m4,
m4/mkstemps.m4, m4/mmap-anon.m4, m4/msvc-inval.m4, m4/msvc-nothrow.m4,
m4/multiarch.m4, m4/nocrash.m4, m4/off_t.m4, m4/pathmax.m4,
m4/printf.m4, m4/quotearg.m4, m4/quote.m4, m4/rawmemchr.m4,
m4/secure_getenv.m4, m4/size_max.m4, m4/sleep.m4, m4/ssize_t.m4,
m4/stat.m4, m4/stat-time.m4, m4/stdalign.m4, m4/stdbool.m4,
m4/stddef_h.m4, m4/std-gnu11.m4, m4/stdint_h.m4, m4/stdint.m4,
m4/stdio_h.m4, m4/stdlib_h.m4, m4/stpcpy.m4, m4/strcase.m4,
m4/strchrnul.m4, m4/strerror.m4, m4/string_h.m4, m4/strings_h.m4,
m4/strndup.m4, m4/strnlen.m4, m4/strverscmp.m4, m4/sysexits.m4,
m4/sys_socket_h.m4, m4/sys_stat_h.m4, m4/sys_time_h.m4,
m4/sys_types_h.m4, m4/sys_wait_h.m4, m4/tempname.m4, m4/threadlib.m4,
m4/time_h.m4, m4/unistd_h.m4, m4/vasnprintf.m4, m4/vsnprintf.m4,
m4/warn-on-use.m4, m4/wchar_h.m4, m4/wchar_t.m4, m4/wctype_h.m4,
m4/wint_t.m4, m4/xalloc.m4, m4/xsize.m4: Update.
* lib/inttypes.in.h, lib/lc-charset-dispatch.c,
lib/lc-charset-dispatch.h, lib/locale.in.h, lib/mbrtowc-impl.h,
lib/mbrtowc-impl-utf8.h, lib/mbtowc-lock.c, lib/mbtowc-lock.h,
lib/setlocale-lock.c, lib/setlocale_null.c, lib/setlocale_null.h,
m4/inttypes.m4, m4/locale_h.m4, m4/setlocale_null.m4,
m4/visibility.m4, m4/zzgnulib.m4: New files.
This commit is contained in:
Alexandre Duret-Lutz 2020-04-16 10:47:14 +02:00
parent fe642bc9ad
commit 1e86463205
287 changed files with 6133 additions and 6812 deletions
Download patch file Download diff file Expand all files Collapse all files

91
lib/localcharset.c
View file

@ -1,6 +1,6 @@
/* Determine a canonical name for the current locale's character encoding.
Copyright (C) 2000-2006, 2008-2019 Free Software Foundation, Inc.
Copyright (C) 2000-2006, 2008-2020 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@ -58,6 +58,9 @@
#elif defined WINDOWS_NATIVE
# define WIN32_LEAN_AND_MEAN
# include <windows.h>
/* For the use of setlocale() below, the Gnulib override in setlocale.c is
not needed; see the platform lists in setlocale_null.m4. */
# undef setlocale
#endif
#if defined OS2
# define INCL_DOS
@ -150,7 +153,8 @@ static const struct table_entry alias_table[] =
{ "ISO8859-2", "ISO-8859-2" },
{ "ISO8859-4", "ISO-8859-4" },
{ "ISO8859-5", "ISO-8859-5" },
{ "ISO8859-7", "ISO-8859-7" }
{ "ISO8859-7", "ISO-8859-7" },
{ "US-ASCII", "ASCII" }
# define alias_table_defined
# endif
# if defined __APPLE__ && defined __MACH__ /* Mac OS X */
@ -378,8 +382,6 @@ static const struct table_entry alias_table[] =
by Alex Taylor:
<http://altsan.org/os2/toolkits/uls/index.html#codepages>.
See also "__convcp() of kLIBC":
<http://trac.netlabs.org/libc/browser/branches/libc-0.6/src/emx/src/lib/locale/__convcp.c>,
or:
<https://github.com/bitwiseworks/libc/blob/master/src/emx/src/lib/locale/__convcp.c>. */
{ "CP1004", "CP1252" },
/*{ "CP1041", "CP943" },*/
@ -814,8 +816,11 @@ static const struct table_entry locale_table[] =
/* Determine the current locale's character encoding, and canonicalize it
into one of the canonical names listed in localcharset.h.
The result must not be freed; it is statically allocated.
into one of the canonical names listed below.
The result must not be freed; it is statically allocated. The result
becomes invalid when setlocale() is used to change the global locale, or
when the value of one of the environment variables LC_ALL, LC_CTYPE, LANG
is changed; threads in multithreaded programs should not do this.
If the canonical name cannot be determined, the result is a non-canonical
name. */
@ -827,6 +832,13 @@ locale_charset (void)
{
const char *codeset;
/* This function must be multithread-safe. To achieve this without using
thread-local storage, we use a simple strcpy or memcpy to fill this static
buffer. Filling it through, for example, strcpy + strcat would not be
guaranteed to leave the buffer's contents intact if another thread is
currently accessing it. If necessary, the contents is first assembled in
a stack-allocated buffer. */
#if HAVE_LANGINFO_CODESET || defined WINDOWS_NATIVE || defined OS2
# if HAVE_LANGINFO_CODESET
@ -841,7 +853,7 @@ locale_charset (void)
if (codeset != NULL && strcmp (codeset, "US-ASCII") == 0)
{
const char *locale;
static char buf[2 + 10 + 1];
static char resultbuf[2 + 10 + 1];
locale = getenv ("LC_ALL");
if (locale == NULL || locale[0] == '\0')
@ -865,11 +877,12 @@ locale_charset (void)
modifier = strchr (dot, '@');
if (modifier == NULL)
return dot;
if (modifier - dot < sizeof (buf))
if (modifier - dot < sizeof (resultbuf))
{
memcpy (buf, dot, modifier - dot);
buf [modifier - dot] = '\0';
return buf;
/* This way of filling resultbuf is multithread-safe. */
memcpy (resultbuf, dot, modifier - dot);
resultbuf [modifier - dot] = '\0';
return resultbuf;
}
}
}
@ -885,8 +898,13 @@ locale_charset (void)
converting to GetConsoleOutputCP(). This leads to correct results,
except when SetConsoleOutputCP has been called and a raster font is
in use. */
sprintf (buf, "CP%u", GetACP ());
codeset = buf;
{
char buf[2 + 10 + 1];
sprintf (buf, "CP%u", GetACP ());
strcpy (resultbuf, buf);
codeset = resultbuf;
}
}
# endif
@ -896,34 +914,28 @@ locale_charset (void)
# elif defined WINDOWS_NATIVE
static char buf[2 + 10 + 1];
char buf[2 + 10 + 1];
static char resultbuf[2 + 10 + 1];
/* The Windows API has a function returning the locale's codepage as
a number, but the value doesn't change according to what the
'setlocale' call specified. So we use it as a last resort, in
case the string returned by 'setlocale' doesn't specify the
codepage. */
char *current_locale = setlocale (LC_ALL, NULL);
char *pdot;
char *current_locale = setlocale (LC_CTYPE, NULL);
char *pdot = strrchr (current_locale, '.');
/* If they set different locales for different categories,
'setlocale' will return a semi-colon separated list of locale
values. To make sure we use the correct one, we choose LC_CTYPE. */
if (strchr (current_locale, ';'))
current_locale = setlocale (LC_CTYPE, NULL);
pdot = strrchr (current_locale, '.');
if (pdot && 2 + strlen (pdot + 1) + 1 <= sizeof (buf))
sprintf (buf, "CP%s", pdot + 1);
else
{
/* The Windows API has a function returning the locale's codepage as a
number: GetACP().
When the output goes to a console window, it needs to be provided in
GetOEMCP() encoding if the console is using a raster font, or in
GetConsoleOutputCP() encoding if it is using a TrueType font.
But in GUI programs and for output sent to files and pipes, GetACP()
encoding is the best bet. */
number: GetACP().
When the output goes to a console window, it needs to be provided in
GetOEMCP() encoding if the console is using a raster font, or in
GetConsoleOutputCP() encoding if it is using a TrueType font.
But in GUI programs and for output sent to files and pipes, GetACP()
encoding is the best bet. */
sprintf (buf, "CP%u", GetACP ());
}
/* For a locale name such as "French_France.65001", in Windows 10,
@ -931,12 +943,15 @@ locale_charset (void)
if (strcmp (buf + 2, "65001") == 0 || strcmp (buf + 2, "utf8") == 0)
codeset = "UTF-8";
else
codeset = buf;
{
strcpy (resultbuf, buf);
codeset = resultbuf;
}
# elif defined OS2
const char *locale;
static char buf[2 + 10 + 1];
static char resultbuf[2 + 10 + 1];
ULONG cp[3];
ULONG cplen;
@ -965,11 +980,12 @@ locale_charset (void)
modifier = strchr (dot, '@');
if (modifier == NULL)
return dot;
if (modifier - dot < sizeof (buf))
if (modifier - dot < sizeof (resultbuf))
{
memcpy (buf, dot, modifier - dot);
buf [modifier - dot] = '\0';
return buf;
/* This way of filling resultbuf is multithread-safe. */
memcpy (resultbuf, dot, modifier - dot);
resultbuf [modifier - dot] = '\0';
return resultbuf;
}
}
@ -985,8 +1001,11 @@ locale_charset (void)
codeset = "";
else
{
char buf[2 + 10 + 1];
sprintf (buf, "CP%u", cp[0]);
codeset = buf;
strcpy (resultbuf, buf);
codeset = resultbuf;
}
}