17c10964b4
This was shown to be a problem by side effect of now-enabled test case, which was going through C, en_US.UTF-8, ja_JP.SJIS, and ja_JP.eucJP, and failing eventually as data in mbrtowc's mbstate, that was perfectly correct for en_US.UTF-8 was treated as incorrect for ja_JP.SJIS, failing the entire test case. This makes the persistent mbstates to be per ctype-component, and not per-locale so we could easily reset the mbstates when only LC_CTYPE is changed. Reviewed by: bapt, pfg Approved by: kib (mentor, implicit) Differential Revision: https://reviews.freebsd.org/D17796
107 lines
3.1 KiB
C
107 lines
3.1 KiB
C
/*-
|
|
* SPDX-License-Identifier: BSD-2-Clause-FreeBSD
|
|
*
|
|
* Copyright 2013 Garrett D'Amore <garrett@damore.org>
|
|
* Copyright 2010 Nexenta Systems, Inc. All rights reserved.
|
|
* Copyright (c) 2002-2004 Tim J. Robbins.
|
|
*
|
|
* Copyright (c) 2011 The FreeBSD Foundation
|
|
* All rights reserved.
|
|
* Portions of this software were developed by David Chisnall
|
|
* under sponsorship from the FreeBSD Foundation.
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
* SUCH DAMAGE.
|
|
*/
|
|
|
|
#include <sys/cdefs.h>
|
|
__FBSDID("$FreeBSD$");
|
|
|
|
#include <errno.h>
|
|
#include <limits.h>
|
|
#include <stdlib.h>
|
|
#include <wchar.h>
|
|
#include "mblocal.h"
|
|
|
|
size_t
|
|
mbsnrtowcs_l(wchar_t * __restrict dst, const char ** __restrict src,
|
|
size_t nms, size_t len, mbstate_t * __restrict ps, locale_t locale)
|
|
{
|
|
FIX_LOCALE(locale);
|
|
if (ps == NULL)
|
|
ps = &(XLOCALE_CTYPE(locale)->mbsnrtowcs);
|
|
return (XLOCALE_CTYPE(locale)->__mbsnrtowcs(dst, src, nms, len, ps));
|
|
}
|
|
size_t
|
|
mbsnrtowcs(wchar_t * __restrict dst, const char ** __restrict src,
|
|
size_t nms, size_t len, mbstate_t * __restrict ps)
|
|
{
|
|
return mbsnrtowcs_l(dst, src, nms, len, ps, __get_locale());
|
|
}
|
|
|
|
size_t
|
|
__mbsnrtowcs_std(wchar_t * __restrict dst, const char ** __restrict src,
|
|
size_t nms, size_t len, mbstate_t * __restrict ps,
|
|
mbrtowc_pfn_t pmbrtowc)
|
|
{
|
|
const char *s;
|
|
size_t nchr;
|
|
wchar_t wc;
|
|
size_t nb;
|
|
|
|
s = *src;
|
|
nchr = 0;
|
|
|
|
if (dst == NULL) {
|
|
for (;;) {
|
|
if ((nb = pmbrtowc(&wc, s, nms, ps)) == (size_t)-1)
|
|
/* Invalid sequence - mbrtowc() sets errno. */
|
|
return ((size_t)-1);
|
|
else if (nb == 0 || nb == (size_t)-2)
|
|
return (nchr);
|
|
s += nb;
|
|
nms -= nb;
|
|
nchr++;
|
|
}
|
|
/*NOTREACHED*/
|
|
}
|
|
|
|
while (len-- > 0) {
|
|
if ((nb = pmbrtowc(dst, s, nms, ps)) == (size_t)-1) {
|
|
*src = s;
|
|
return ((size_t)-1);
|
|
} else if (nb == (size_t)-2) {
|
|
*src = s + nms;
|
|
return (nchr);
|
|
} else if (nb == 0) {
|
|
*src = NULL;
|
|
return (nchr);
|
|
}
|
|
s += nb;
|
|
nms -= nb;
|
|
nchr++;
|
|
dst++;
|
|
}
|
|
*src = s;
|
|
return (nchr);
|
|
}
|