73cc72729a
This patch moves the gdb/gnulib subdirectory to the top level. It adjusts the top-level build system to build gnulib when necessary, and changes gdb to use this. However, gdbserver still builds its own copy of gnulib, just from the new source location. A small hack was needed to ensure that gnulib is only built when gdb is enabled. The Makefile only provides an ordering -- the directory must be mentioned in configdirs to actually be compiled at all. Most of the patch is just a "git mv" of gnulib, though a few minor path adjustments were needed in some files there. Tested by the buildbot. ChangeLog 2019-06-14 Tom Tromey <tom@tromey.com> * MAINTAINERS: Add gnulib. * gnulib: New directory, move from gdb/gnulib. * configure.ac (host_libs): Add gnulib. * configure: Rebuild. * Makefile.def (host_modules, dependencies): Add gnulib. * Makefile.in: Rebuild. gdb/ChangeLog 2019-06-14 Tom Tromey <tom@tromey.com> * gnulib: Move directory to top-level. * configure.ac: Don't configure gnulib. * configure: Rebuild. * common/common-defs.h: Use new path to gnulib. * Makefile.in (GNULIB_BUILDDIR): Now ../gnulib. (GNULIB_H): Remove. (INCGNU): Look in new gnulib location. (HFILES_NO_SRCDIR): Remove gnulib files. (SUBDIR, REQUIRED_SUBDIRS): Remove gnulib. (generated_files): Remove GNULIB_H. ($(LIBGNU), all-lib): Remove targets. (distclean): Don't mention GNULIB_BUILDDIR. ($(GNULIB_BUILDDIR)/Makefile): Remove target. gdb/gdbserver/ChangeLog 2019-06-14 Tom Tromey <tom@tromey.com> * configure.ac: Use new path to gnulib. * configure: Rebuild. * Makefile.in (INCGNU, $(GNULIB_BUILDDIR)/Makefile): Use new path to gnulib. gnulib/ChangeLog 2019-06-14 Tom Tromey <tom@tromey.com> * update-gnulib.sh: Adjust paths. * Makefile.in: Adjust paths. * configure.ac: Adjust paths. Use ACX_LARGEFILE. * configure: Rebuild.
123 lines
3.6 KiB
C
123 lines
3.6 KiB
C
/* Convert string to wide string.
|
|
Copyright (C) 2008-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/>. */
|
|
|
|
size_t
|
|
mbsrtowcs (wchar_t *dest, const char **srcp, size_t len, mbstate_t *ps)
|
|
{
|
|
if (ps == NULL)
|
|
ps = &_gl_mbsrtowcs_state;
|
|
{
|
|
const char *src = *srcp;
|
|
|
|
if (dest != NULL)
|
|
{
|
|
wchar_t *destptr = dest;
|
|
|
|
for (; len > 0; destptr++, len--)
|
|
{
|
|
size_t src_avail;
|
|
size_t ret;
|
|
|
|
/* An optimized variant of
|
|
src_avail = strnlen1 (src, MB_LEN_MAX); */
|
|
if (src[0] == '\0')
|
|
src_avail = 1;
|
|
else if (src[1] == '\0')
|
|
src_avail = 2;
|
|
else if (src[2] == '\0')
|
|
src_avail = 3;
|
|
else if (MB_LEN_MAX <= 4 || src[3] == '\0')
|
|
src_avail = 4;
|
|
else
|
|
src_avail = 4 + strnlen1 (src + 4, MB_LEN_MAX - 4);
|
|
|
|
/* Parse the next multibyte character. */
|
|
ret = mbrtowc (destptr, src, src_avail, ps);
|
|
|
|
if (ret == (size_t)(-2))
|
|
/* Encountered a multibyte character that extends past a '\0' byte
|
|
or that is longer than MB_LEN_MAX bytes. Cannot happen. */
|
|
abort ();
|
|
|
|
if (ret == (size_t)(-1))
|
|
goto bad_input;
|
|
if (ret == 0)
|
|
{
|
|
src = NULL;
|
|
/* Here mbsinit (ps). */
|
|
break;
|
|
}
|
|
src += ret;
|
|
}
|
|
|
|
*srcp = src;
|
|
return destptr - dest;
|
|
}
|
|
else
|
|
{
|
|
/* Ignore dest and len, don't store *srcp at the end, and
|
|
don't clobber *ps. */
|
|
mbstate_t state = *ps;
|
|
size_t totalcount = 0;
|
|
|
|
for (;; totalcount++)
|
|
{
|
|
size_t src_avail;
|
|
size_t ret;
|
|
|
|
/* An optimized variant of
|
|
src_avail = strnlen1 (src, MB_LEN_MAX); */
|
|
if (src[0] == '\0')
|
|
src_avail = 1;
|
|
else if (src[1] == '\0')
|
|
src_avail = 2;
|
|
else if (src[2] == '\0')
|
|
src_avail = 3;
|
|
else if (MB_LEN_MAX <= 4 || src[3] == '\0')
|
|
src_avail = 4;
|
|
else
|
|
src_avail = 4 + strnlen1 (src + 4, MB_LEN_MAX - 4);
|
|
|
|
/* Parse the next multibyte character. */
|
|
ret = mbrtowc (NULL, src, src_avail, &state);
|
|
|
|
if (ret == (size_t)(-2))
|
|
/* Encountered a multibyte character that extends past a '\0' byte
|
|
or that is longer than MB_LEN_MAX bytes. Cannot happen. */
|
|
abort ();
|
|
|
|
if (ret == (size_t)(-1))
|
|
goto bad_input2;
|
|
if (ret == 0)
|
|
{
|
|
/* Here mbsinit (&state). */
|
|
break;
|
|
}
|
|
src += ret;
|
|
}
|
|
|
|
return totalcount;
|
|
}
|
|
|
|
bad_input:
|
|
*srcp = src;
|
|
bad_input2:
|
|
errno = EILSEQ;
|
|
return (size_t)(-1);
|
|
}
|
|
}
|