generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Proper MB_CUR_MAX.

Browse Source 
Previously this was hard coded to 4. This is only the case for UTF-8
locales.

As a side effect, this properly reports C.UTF-8 as the default locale
instead of C.

Change-Id: I7c73cc8fe6ffac61d211cd5f75287e36de06f4fc
(cherry picked from commit 1aec7c1a35)
This commit is contained in:
Dan Albert
2014-07-30 10:53:48 -07:00
parent 00a8344ae8
commit 6035e6cc83
4 changed files with 55 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
tests/locale_test.cpp
View File

@@ -48,8 +48,8 @@ TEST(locale, localeconv) {
}
TEST(locale, setlocale) {
EXPECT_STREQ("C", setlocale(LC_ALL, NULL));
EXPECT_STREQ("C", setlocale(LC_CTYPE, NULL));
EXPECT_STREQ("C.UTF-8", setlocale(LC_ALL, NULL));
EXPECT_STREQ("C.UTF-8", setlocale(LC_CTYPE, NULL));
errno = 0;
EXPECT_EQ(NULL, setlocale(-1, NULL));
@@ -105,3 +105,20 @@ TEST(locale, uselocale) {
EXPECT_EQ(n, uselocale(NULL));
}
TEST(locale, mb_cur_max) {
// We can't reliably test the behavior with setlocale(3) or the behavior for
// initial program conditions because (unless we're the only test that was
// run), another test has almost certainly called uselocale(3) in this thread.
// See b/16685652.
locale_t cloc = newlocale(LC_ALL, "C", 0);
locale_t cloc_utf8 = newlocale(LC_ALL, "C.UTF-8", 0);
uselocale(cloc);
ASSERT_EQ(1U, MB_CUR_MAX);
uselocale(cloc_utf8);
ASSERT_EQ(4U, MB_CUR_MAX);
freelocale(cloc);
freelocale(cloc_utf8);
}