Page MenuHomeFreeBSD
Files F141139245

D30146.id88732.diff
No OneTemporary
Actions

D30146.id88732.diff
View Options

diff --git a/lib/libc/locale/collate.c b/lib/libc/locale/collate.c
--- a/lib/libc/locale/collate.c
+++ b/lib/libc/locale/collate.c
@@ -68,6 +68,14 @@
{{0}, "C"}, 1, 0, 0, 0
};
+struct xlocale_collate __xlocale_POSIX_collate = {
+ {{0}, "POSIX"}, 1, 0, 0, 0
+};
+
+struct xlocale_collate __xlocale_CUTF8_collate = {
+ {{0}, "C.UTF-8"}, 1, 0, 0, 0
+};
+
static int
__collate_load_tables_l(const char *encoding, struct xlocale_collate *table);
@@ -84,10 +92,13 @@
void *
__collate_load(const char *encoding, __unused locale_t unused)
{
- if (strcmp(encoding, "C") == 0 || strcmp(encoding, "POSIX") == 0 ||
- strncmp(encoding, "C.", 2) == 0) {
- return &__xlocale_C_collate;
- }
+ if (strcmp(encoding, "C") == 0)
+ return (&__xlocale_C_collate);
+ else if (strcmp(encoding, "POSIX") == 0)
+ return (&__xlocale_POSIX_collate);
+ else if (strcmp(encoding, "C.UTF-8") == 0)
+ return (&__xlocale_CUTF8_collate);
+
struct xlocale_collate *table = calloc(sizeof(struct xlocale_collate), 1);
table->header.header.destructor = destruct_collate;
// FIXME: Make sure that _LDP_CACHE is never returned. We should be doing
diff --git a/lib/libc/tests/locale/Makefile b/lib/libc/tests/locale/Makefile
--- a/lib/libc/tests/locale/Makefile
+++ b/lib/libc/tests/locale/Makefile
@@ -13,6 +13,7 @@
ATF_TESTS_C+= mbsrtowcs_test
ATF_TESTS_C+= mbstowcs_2_test
ATF_TESTS_C+= mbtowc_2_test
+ATF_TESTS_C+= newlocale_test
ATF_TESTS_C+= towctrans_test
ATF_TESTS_C+= wcrtomb_test
ATF_TESTS_C+= wcsnrtombs_test
diff --git a/lib/libc/tests/locale/newlocale_test.c b/lib/libc/tests/locale/newlocale_test.c
new file mode 100644
--- /dev/null
+++ b/lib/libc/tests/locale/newlocale_test.c
@@ -0,0 +1,54 @@
+/*-
+ * Copyright 2021 Yuri Pankov
+ *
+ * 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 <locale.h>
+
+#include <atf-c.h>
+
+ATF_TC_WITHOUT_HEAD(collate_c_posix);
+ATF_TC_BODY(collate_c_posix, tc)
+{
+ locale_t c, p;
+
+ /* Create "C" locale object and check LC_COLLATE */
+ ATF_REQUIRE((c = newlocale(LC_ALL_MASK, "C", NULL)) != NULL);
+ ATF_REQUIRE_STREQ(querylocale(LC_COLLATE_MASK, c), "C");
+ /* Create "POSIX" locale object and check LC_COLLATE */
+ ATF_REQUIRE((p = newlocale(LC_ALL_MASK, "POSIX", NULL)) != NULL);
+ ATF_REQUIRE_STREQ(querylocale(LC_COLLATE_MASK, p), "POSIX");
+ /* Check that first locale object's LC_COLLATE did not change */
+ ATF_REQUIRE_STREQ(querylocale(LC_COLLATE_MASK, c), "C");
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+ ATF_TP_ADD_TC(tp, collate_c_posix);
+
+ return (atf_no_error());
+}

File Metadata

Mime Type
text/plain
Expires
Fri, Jan 2, 9:39 AM (55 m, 52 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
27454886
Default Alt Text
D30146.id88732.diff (3 KB)

Event Timeline