3c2c0c0443
When collation support was brought in, the second and third arguments in __collate_range_cmp() were changed from int to wchar_t, breaking the ABI. Change them to a "char" type which makes more sense and keeps the ABI compatible. Also introduce __wcollate_range_cmp() which does work with wide characters. This function is used only internally in libc so we don't export it. Use the new function in glob(3), fnmatch(3), and regexec(3). PR: 179721 Suggested by: ache. jilles MFC after: 3 weeks (perhaps partial only)
69 lines
2.2 KiB
C
69 lines
2.2 KiB
C
/*
|
|
* Copyright (C) 1996 by Andrey A. Chernov, Moscow, Russia.
|
|
* All rights reserved.
|
|
*
|
|
* Copyright (c) 2011 The FreeBSD Foundation
|
|
* All rights reserved.
|
|
* Portions of this software were developed by David Chisnall
|
|
* under sponsorship from the FreeBSD Foundation.
|
|
*
|
|
* 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 ``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 REGENTS 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 <string.h>
|
|
#include <wchar.h>
|
|
#include <xlocale.h>
|
|
#include "collate.h"
|
|
|
|
/*
|
|
* Compare two characters using collate
|
|
*/
|
|
|
|
int __collate_range_cmp(struct xlocale_collate *table, char c1, char c2)
|
|
{
|
|
char s1[2], s2[2];
|
|
|
|
s1[0] = c1;
|
|
s1[1] = '\0';
|
|
s2[0] = c2;
|
|
s2[1] = '\0';
|
|
struct _xlocale l = {{0}};
|
|
l.components[XLC_COLLATE] = (struct xlocale_component *)table;
|
|
return (strcoll_l(s1, s2, &l));
|
|
}
|
|
|
|
int __wcollate_range_cmp(struct xlocale_collate *table, wchar_t c1, wchar_t c2)
|
|
{
|
|
wchar_t s1[2], s2[2];
|
|
|
|
s1[0] = c1;
|
|
s1[1] = L'\0';
|
|
s2[0] = c2;
|
|
s2[1] = L'\0';
|
|
struct _xlocale l = {{0}};
|
|
l.components[XLC_COLLATE] = (struct xlocale_component *)table;
|
|
return (wcscoll_l(s1, s2, &l));
|
|
}
|