mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-11-25 11:04:18 +08:00
49e4877c54
I tried building gdb with G++ 4.7 and CXX="g++ -std=gnu+11", and that tripped on a build error: In file included from build-gnulib/import/stdio.h:53:0, from /home/pedro/gdb/mygit/cxx-convertion/src/gdb/common/common-defs.h:31, from /home/pedro/gdb/mygit/cxx-convertion/src/gdb/defs.h:28, from /home/pedro/gdb/mygit/cxx-convertion/src/gdb/armobsd-tdep.c:20: build-gnulib/import/stddef.h:104:3: error: conflicting declaration ‘typedef union max_align_t max_align_t’ In file included from build-gnulib/import/stddef.h:55:0, from build-gnulib/import/stdio.h:53, from /home/pedro/gdb/mygit/cxx-convertion/src/gdb/common/common-defs.h:31, from /home/pedro/gdb/mygit/cxx-convertion/src/gdb/defs.h:28, from /home/pedro/gdb/mygit/cxx-convertion/src/gdb/armobsd-tdep.c:20: /opt/gcc-4.7/lib/gcc/x86_64-unknown-linux-gnu/4.7.4/include/stddef.h:426:3: error: ‘max_align_t’ has a previous declaration as ‘typedef struct max_align_t max_align_t’ Updating gnulib to current master fixes it, since it brings in this fix: http://lists.gnu.org/archive/html/bug-gnulib/2016-04/msg00000.html Our last update was in August 2015. This doesn't bring in much added baggage, it's mostly bug fixes. It pulled in the "limits-h" module as automatic dependency, and given that looks potentially useful I added it to the set of modules we require. Tested on x86_64 Fedora 23, with g++ 4.7 and g++ 5.3, native and gdbserver. gdb/ChangeLog: 2016-10-18 Pedro Alves <palves@redhat.com> * gnulib/update-gnulib.sh (GNULIB_COMMIT_SHA1): Set to 2692e23a48e21f6daa029e8af9f1a143b7532f47. * gnulib/configure, gnulib/config.in, gnulib/aclocal.m4: Regenerate. * gnulib/import/Makefile: Update. * gnulib/import/alloca: Update. * gnulib/import/basename-lgpl: Update. * gnulib/import/canonicalize-lgpl: Update. * gnulib/import/config: Update. * gnulib/import/dirent: Update. * gnulib/import/dirfd: Update. * gnulib/import/dirname-lgpl: Update. * gnulib/import/dirname.h: Update. * gnulib/import/dosname.h: Update. * gnulib/import/errno: Update. * gnulib/import/extra/snippet/arg-nonnull.h: Update. * gnulib/import/extra/snippet/c++defs.h: Update. * gnulib/import/extra/snippet/warn-on-use.h: Update. * gnulib/import/extra/update-copyright: Update. * gnulib/import/flexmember.h: Update. * gnulib/import/float+.h: Update. * gnulib/import/float: Update. * gnulib/import/float: Update. * gnulib/import/fnmatch: Update. * gnulib/import/fnmatch: Update. * gnulib/import/fnmatch_loop: Update. * gnulib/import/fpucw.h: Update. * gnulib/import/frexp: Update. * gnulib/import/frexpl: Update. * gnulib/import/gettimeofday: Update. * gnulib/import/hard-locale: Update. * gnulib/import/hard-locale.h: Update. * gnulib/import/inttypes: Update. * gnulib/import/isnan: Update. * gnulib/import/isnand-nolibm.h: Update. * gnulib/import/isnand: Update. * gnulib/import/isnanl-nolibm.h: Update. * gnulib/import/isnanl: Update. * gnulib/import/itold: Update. * gnulib/import/limits: Update. * gnulib/import/localcharset: Update. * gnulib/import/localcharset.h: Update. * gnulib/import/lstat: Update. * gnulib/import/m4/00gnulib: Update. * gnulib/import/m4/absolute-header: Update. * gnulib/import/m4/alloca: Update. * gnulib/import/m4/canonicalize: Update. * gnulib/import/m4/codeset: Update. * gnulib/import/m4/configmake: Update. * gnulib/import/m4/dirent_h: Update. * gnulib/import/m4/dirfd: Update. * gnulib/import/m4/dirname: Update. * gnulib/import/m4/double-slash-root: Update. * gnulib/import/m4/eealloc: Update. * gnulib/import/m4/errno_h: Update. * gnulib/import/m4/exponentd: Update. * gnulib/import/m4/exponentl: Update. * gnulib/import/m4/extensions: Update. * gnulib/import/m4/extern-inline: Update. * gnulib/import/m4/fcntl-o: Update. * gnulib/import/m4/flexmember: Update. * gnulib/import/m4/float_h: Update. * gnulib/import/m4/fnmatch: Update. * gnulib/import/m4/fpieee: Update. * gnulib/import/m4/frexp: Update. * gnulib/import/m4/frexpl: Update. * gnulib/import/m4/gettimeofday: Update. * gnulib/import/m4/glibc21: Update. * gnulib/import/m4/gnulib-cache: Update. * gnulib/import/m4/gnulib-common: Update. * gnulib/import/m4/gnulib-comp: Update. * gnulib/import/m4/gnulib-tool: Update. * gnulib/import/m4/hard-locale: Update. * gnulib/import/m4/include_next: Update. * gnulib/import/m4/inttypes-pri: Update. * gnulib/import/m4/inttypes: Update. * gnulib/import/m4/isnand: Update. * gnulib/import/m4/isnanl: Update. * gnulib/import/m4/largefile: Update. * gnulib/import/m4/limits-h: Update. * gnulib/import/m4/localcharset: Update. * gnulib/import/m4/locale-fr: Update. * gnulib/import/m4/locale-ja: Update. * gnulib/import/m4/locale-zh: Update. * gnulib/import/m4/longlong: Update. * gnulib/import/m4/lstat: Update. * gnulib/import/m4/malloc: Update. * gnulib/import/m4/malloca: Update. * gnulib/import/m4/math_h: Update. * gnulib/import/m4/mbrtowc: Update. * gnulib/import/m4/mbsinit: Update. * gnulib/import/m4/mbsrtowcs: Update. * gnulib/import/m4/mbstate_t: Update. * gnulib/import/m4/memchr: Update. * gnulib/import/m4/memmem: Update. * gnulib/import/m4/mmap-anon: Update. * gnulib/import/m4/multiarch: Update. * gnulib/import/m4/nocrash: Update. * gnulib/import/m4/off_t: Update. * gnulib/import/m4/pathmax: Update. * gnulib/import/m4/rawmemchr: Update. * gnulib/import/m4/readlink: Update. * gnulib/import/m4/rename: Update. * gnulib/import/m4/rmdir: Update. * gnulib/import/m4/signal_h: Update. * gnulib/import/m4/ssize_t: Update. * gnulib/import/m4/stat: Update. * gnulib/import/m4/stdbool: Update. * gnulib/import/m4/stddef_h: Update. * gnulib/import/m4/stdint: Update. * gnulib/import/m4/stdio_h: Update. * gnulib/import/m4/stdlib_h: Update. * gnulib/import/m4/strchrnul: Update. * gnulib/import/m4/string_h: Update. * gnulib/import/m4/strstr: Update. * gnulib/import/m4/strtok_r: Update. * gnulib/import/m4/sys_socket_h: Update. * gnulib/import/m4/sys_stat_h: Update. * gnulib/import/m4/sys_time_h: Update. * gnulib/import/m4/sys_types_h: Update. * gnulib/import/m4/time_h: Update. * gnulib/import/m4/unistd_h: Update. * gnulib/import/m4/warn-on-use: Update. * gnulib/import/m4/wchar_h: Update. * gnulib/import/m4/wchar_t: Update. * gnulib/import/m4/wctype_h: Update. * gnulib/import/m4/wint_t: Update. * gnulib/import/malloc: Update. * gnulib/import/malloca: Update. * gnulib/import/malloca.h: Update. * gnulib/import/math: Update. * gnulib/import/math: Update. * gnulib/import/mbrtowc: Update. * gnulib/import/mbsinit: Update. * gnulib/import/mbsrtowcs-impl.h: Update. * gnulib/import/mbsrtowcs-state: Update. * gnulib/import/mbsrtowcs: Update. * gnulib/import/memchr: Update. * gnulib/import/memmem: Update. * gnulib/import/pathmax.h: Update. * gnulib/import/rawmemchr: Update. * gnulib/import/readlink: Update. * gnulib/import/ref-add.sin: Update. * gnulib/import/ref-del.sin: Update. * gnulib/import/rename: Update. * gnulib/import/rmdir: Update. * gnulib/import/same-inode.h: Update. * gnulib/import/signal: Update. * gnulib/import/stat: Update. * gnulib/import/stdbool: Update. * gnulib/import/stddef: Update. * gnulib/import/stdint: Update. * gnulib/import/stdio: Update. * gnulib/import/stdlib: Update. * gnulib/import/str-two-way.h: Update. * gnulib/import/strchrnul: Update. * gnulib/import/streq.h: Update. * gnulib/import/string: Update. * gnulib/import/stripslash: Update. * gnulib/import/strnlen1: Update. * gnulib/import/strnlen1.h: Update. * gnulib/import/strstr: Update. * gnulib/import/strtok_r: Update. * gnulib/import/sys_stat: Update. * gnulib/import/sys_time: Update. * gnulib/import/sys_types: Update. * gnulib/import/time: Update. * gnulib/import/unistd: Update. * gnulib/import/unistd: Update. * gnulib/import/verify.h: Update. * gnulib/import/wchar: Update. * gnulib/import/wctype: Update. * gnulib/import/flexmember.h: New file. * gnulib/import/hard-locale.c: New file. * gnulib/import/hard-locale.h: New file. * gnulib/import/limits.in.h: New file. * gnulib/import/m4/flexmember.m4: New file. * gnulib/import/m4/hard-locale.m4: New file. * gnulib/import/m4/limits-h.m4: New file.
408 lines
11 KiB
C
408 lines
11 KiB
C
/* Convert multibyte character to wide character.
|
|
Copyright (C) 1999-2002, 2005-2016 Free Software Foundation, Inc.
|
|
Written by Bruno Haible <bruno@clisp.org>, 2008.
|
|
|
|
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
|
|
the Free Software Foundation; either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
|
|
|
#include <config.h>
|
|
|
|
/* Specification. */
|
|
#include <wchar.h>
|
|
|
|
#if C_LOCALE_MAYBE_EILSEQ
|
|
# include "hard-locale.h"
|
|
# include <locale.h>
|
|
#endif
|
|
|
|
#if GNULIB_defined_mbstate_t
|
|
/* Implement mbrtowc() on top of mbtowc(). */
|
|
|
|
# include <errno.h>
|
|
# include <stdlib.h>
|
|
|
|
# include "localcharset.h"
|
|
# include "streq.h"
|
|
# include "verify.h"
|
|
|
|
|
|
verify (sizeof (mbstate_t) >= 4);
|
|
|
|
static char internal_state[4];
|
|
|
|
size_t
|
|
mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps)
|
|
{
|
|
char *pstate = (char *)ps;
|
|
|
|
if (s == NULL)
|
|
{
|
|
pwc = NULL;
|
|
s = "";
|
|
n = 1;
|
|
}
|
|
|
|
if (n == 0)
|
|
return (size_t)(-2);
|
|
|
|
/* Here n > 0. */
|
|
|
|
if (pstate == NULL)
|
|
pstate = internal_state;
|
|
|
|
{
|
|
size_t nstate = pstate[0];
|
|
char buf[4];
|
|
const char *p;
|
|
size_t m;
|
|
|
|
switch (nstate)
|
|
{
|
|
case 0:
|
|
p = s;
|
|
m = n;
|
|
break;
|
|
case 3:
|
|
buf[2] = pstate[3];
|
|
/*FALLTHROUGH*/
|
|
case 2:
|
|
buf[1] = pstate[2];
|
|
/*FALLTHROUGH*/
|
|
case 1:
|
|
buf[0] = pstate[1];
|
|
p = buf;
|
|
m = nstate;
|
|
buf[m++] = s[0];
|
|
if (n >= 2 && m < 4)
|
|
{
|
|
buf[m++] = s[1];
|
|
if (n >= 3 && m < 4)
|
|
buf[m++] = s[2];
|
|
}
|
|
break;
|
|
default:
|
|
errno = EINVAL;
|
|
return (size_t)(-1);
|
|
}
|
|
|
|
/* Here m > 0. */
|
|
|
|
# if __GLIBC__ || defined __UCLIBC__
|
|
/* Work around bug <http://sourceware.org/bugzilla/show_bug.cgi?id=9674> */
|
|
mbtowc (NULL, NULL, 0);
|
|
# endif
|
|
{
|
|
int res = mbtowc (pwc, p, m);
|
|
|
|
if (res >= 0)
|
|
{
|
|
if (pwc != NULL && ((*pwc == 0) != (res == 0)))
|
|
abort ();
|
|
if (nstate >= (res > 0 ? res : 1))
|
|
abort ();
|
|
res -= nstate;
|
|
pstate[0] = 0;
|
|
return res;
|
|
}
|
|
|
|
/* mbtowc does not distinguish between invalid and incomplete multibyte
|
|
sequences. But mbrtowc needs to make this distinction.
|
|
There are two possible approaches:
|
|
- Use iconv() and its return value.
|
|
- Use built-in knowledge about the possible encodings.
|
|
Given the low quality of implementation of iconv() on the systems that
|
|
lack mbrtowc(), we use the second approach.
|
|
The possible encodings are:
|
|
- 8-bit encodings,
|
|
- EUC-JP, EUC-KR, GB2312, EUC-TW, BIG5, GB18030, SJIS,
|
|
- UTF-8.
|
|
Use specialized code for each. */
|
|
if (m >= 4 || m >= MB_CUR_MAX)
|
|
goto invalid;
|
|
/* Here MB_CUR_MAX > 1 and 0 < m < 4. */
|
|
{
|
|
const char *encoding = locale_charset ();
|
|
|
|
if (STREQ_OPT (encoding, "UTF-8", 'U', 'T', 'F', '-', '8', 0, 0, 0, 0))
|
|
{
|
|
/* Cf. unistr/u8-mblen.c. */
|
|
unsigned char c = (unsigned char) p[0];
|
|
|
|
if (c >= 0xc2)
|
|
{
|
|
if (c < 0xe0)
|
|
{
|
|
if (m == 1)
|
|
goto incomplete;
|
|
}
|
|
else if (c < 0xf0)
|
|
{
|
|
if (m == 1)
|
|
goto incomplete;
|
|
if (m == 2)
|
|
{
|
|
unsigned char c2 = (unsigned char) p[1];
|
|
|
|
if ((c2 ^ 0x80) < 0x40
|
|
&& (c >= 0xe1 || c2 >= 0xa0)
|
|
&& (c != 0xed || c2 < 0xa0))
|
|
goto incomplete;
|
|
}
|
|
}
|
|
else if (c <= 0xf4)
|
|
{
|
|
if (m == 1)
|
|
goto incomplete;
|
|
else /* m == 2 || m == 3 */
|
|
{
|
|
unsigned char c2 = (unsigned char) p[1];
|
|
|
|
if ((c2 ^ 0x80) < 0x40
|
|
&& (c >= 0xf1 || c2 >= 0x90)
|
|
&& (c < 0xf4 || (c == 0xf4 && c2 < 0x90)))
|
|
{
|
|
if (m == 2)
|
|
goto incomplete;
|
|
else /* m == 3 */
|
|
{
|
|
unsigned char c3 = (unsigned char) p[2];
|
|
|
|
if ((c3 ^ 0x80) < 0x40)
|
|
goto incomplete;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
goto invalid;
|
|
}
|
|
|
|
/* As a reference for this code, you can use the GNU libiconv
|
|
implementation. Look for uses of the RET_TOOFEW macro. */
|
|
|
|
if (STREQ_OPT (encoding,
|
|
"EUC-JP", 'E', 'U', 'C', '-', 'J', 'P', 0, 0, 0))
|
|
{
|
|
if (m == 1)
|
|
{
|
|
unsigned char c = (unsigned char) p[0];
|
|
|
|
if ((c >= 0xa1 && c < 0xff) || c == 0x8e || c == 0x8f)
|
|
goto incomplete;
|
|
}
|
|
if (m == 2)
|
|
{
|
|
unsigned char c = (unsigned char) p[0];
|
|
|
|
if (c == 0x8f)
|
|
{
|
|
unsigned char c2 = (unsigned char) p[1];
|
|
|
|
if (c2 >= 0xa1 && c2 < 0xff)
|
|
goto incomplete;
|
|
}
|
|
}
|
|
goto invalid;
|
|
}
|
|
if (STREQ_OPT (encoding,
|
|
"EUC-KR", 'E', 'U', 'C', '-', 'K', 'R', 0, 0, 0)
|
|
|| STREQ_OPT (encoding,
|
|
"GB2312", 'G', 'B', '2', '3', '1', '2', 0, 0, 0)
|
|
|| STREQ_OPT (encoding,
|
|
"BIG5", 'B', 'I', 'G', '5', 0, 0, 0, 0, 0))
|
|
{
|
|
if (m == 1)
|
|
{
|
|
unsigned char c = (unsigned char) p[0];
|
|
|
|
if (c >= 0xa1 && c < 0xff)
|
|
goto incomplete;
|
|
}
|
|
goto invalid;
|
|
}
|
|
if (STREQ_OPT (encoding,
|
|
"EUC-TW", 'E', 'U', 'C', '-', 'T', 'W', 0, 0, 0))
|
|
{
|
|
if (m == 1)
|
|
{
|
|
unsigned char c = (unsigned char) p[0];
|
|
|
|
if ((c >= 0xa1 && c < 0xff) || c == 0x8e)
|
|
goto incomplete;
|
|
}
|
|
else /* m == 2 || m == 3 */
|
|
{
|
|
unsigned char c = (unsigned char) p[0];
|
|
|
|
if (c == 0x8e)
|
|
goto incomplete;
|
|
}
|
|
goto invalid;
|
|
}
|
|
if (STREQ_OPT (encoding,
|
|
"GB18030", 'G', 'B', '1', '8', '0', '3', '0', 0, 0))
|
|
{
|
|
if (m == 1)
|
|
{
|
|
unsigned char c = (unsigned char) p[0];
|
|
|
|
if ((c >= 0x90 && c <= 0xe3) || (c >= 0xf8 && c <= 0xfe))
|
|
goto incomplete;
|
|
}
|
|
else /* m == 2 || m == 3 */
|
|
{
|
|
unsigned char c = (unsigned char) p[0];
|
|
|
|
if (c >= 0x90 && c <= 0xe3)
|
|
{
|
|
unsigned char c2 = (unsigned char) p[1];
|
|
|
|
if (c2 >= 0x30 && c2 <= 0x39)
|
|
{
|
|
if (m == 2)
|
|
goto incomplete;
|
|
else /* m == 3 */
|
|
{
|
|
unsigned char c3 = (unsigned char) p[2];
|
|
|
|
if (c3 >= 0x81 && c3 <= 0xfe)
|
|
goto incomplete;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
goto invalid;
|
|
}
|
|
if (STREQ_OPT (encoding, "SJIS", 'S', 'J', 'I', 'S', 0, 0, 0, 0, 0))
|
|
{
|
|
if (m == 1)
|
|
{
|
|
unsigned char c = (unsigned char) p[0];
|
|
|
|
if ((c >= 0x81 && c <= 0x9f) || (c >= 0xe0 && c <= 0xea)
|
|
|| (c >= 0xf0 && c <= 0xf9))
|
|
goto incomplete;
|
|
}
|
|
goto invalid;
|
|
}
|
|
|
|
/* An unknown multibyte encoding. */
|
|
goto incomplete;
|
|
}
|
|
|
|
incomplete:
|
|
{
|
|
size_t k = nstate;
|
|
/* Here 0 <= k < m < 4. */
|
|
pstate[++k] = s[0];
|
|
if (k < m)
|
|
{
|
|
pstate[++k] = s[1];
|
|
if (k < m)
|
|
pstate[++k] = s[2];
|
|
}
|
|
if (k != m)
|
|
abort ();
|
|
}
|
|
pstate[0] = m;
|
|
return (size_t)(-2);
|
|
|
|
invalid:
|
|
errno = EILSEQ;
|
|
/* The conversion state is undefined, says POSIX. */
|
|
return (size_t)(-1);
|
|
}
|
|
}
|
|
}
|
|
|
|
#else
|
|
/* Override the system's mbrtowc() function. */
|
|
|
|
# undef mbrtowc
|
|
|
|
size_t
|
|
rpl_mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps)
|
|
{
|
|
size_t ret;
|
|
wchar_t wc;
|
|
|
|
# if MBRTOWC_NULL_ARG2_BUG || MBRTOWC_RETVAL_BUG || MBRTOWC_EMPTY_INPUT_BUG
|
|
if (s == NULL)
|
|
{
|
|
pwc = NULL;
|
|
s = "";
|
|
n = 1;
|
|
}
|
|
# endif
|
|
|
|
# if MBRTOWC_EMPTY_INPUT_BUG
|
|
if (n == 0)
|
|
return (size_t) -2;
|
|
# endif
|
|
|
|
if (! pwc)
|
|
pwc = &wc;
|
|
|
|
# if MBRTOWC_RETVAL_BUG
|
|
{
|
|
static mbstate_t internal_state;
|
|
|
|
/* Override mbrtowc's internal state. We cannot call mbsinit() on the
|
|
hidden internal state, but we can call it on our variable. */
|
|
if (ps == NULL)
|
|
ps = &internal_state;
|
|
|
|
if (!mbsinit (ps))
|
|
{
|
|
/* Parse the rest of the multibyte character byte for byte. */
|
|
size_t count = 0;
|
|
for (; n > 0; s++, n--)
|
|
{
|
|
ret = mbrtowc (&wc, s, 1, ps);
|
|
|
|
if (ret == (size_t)(-1))
|
|
return (size_t)(-1);
|
|
count++;
|
|
if (ret != (size_t)(-2))
|
|
{
|
|
/* The multibyte character has been completed. */
|
|
*pwc = wc;
|
|
return (wc == 0 ? 0 : count);
|
|
}
|
|
}
|
|
return (size_t)(-2);
|
|
}
|
|
}
|
|
# endif
|
|
|
|
ret = mbrtowc (pwc, s, n, ps);
|
|
|
|
# if MBRTOWC_NUL_RETVAL_BUG
|
|
if (ret < (size_t) -2 && !*pwc)
|
|
return 0;
|
|
# endif
|
|
|
|
# if C_LOCALE_MAYBE_EILSEQ
|
|
if ((size_t) -2 <= ret && n != 0 && ! hard_locale (LC_CTYPE))
|
|
{
|
|
unsigned char uc = *s;
|
|
*pwc = uc;
|
|
return 1;
|
|
}
|
|
# endif
|
|
|
|
return ret;
|
|
}
|
|
|
|
#endif
|