From 27416e7dd65efb062d315e23bcf575cb73034b67 Mon Sep 17 00:00:00 2001 From: Gavin Hayes Date: Thu, 18 Aug 2022 18:51:23 -0400 Subject: [PATCH] Add fake support for locale="" (#546) --- libc/str/setlocale.c | 6 ++++-- test/libc/str/setlocale_test.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 test/libc/str/setlocale_test.c diff --git a/libc/str/setlocale.c b/libc/str/setlocale.c index 190c0ce57..f2b3e4caf 100644 --- a/libc/str/setlocale.c +++ b/libc/str/setlocale.c @@ -17,16 +17,18 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/intrin/safemacros.internal.h" -#include "libc/str/str.h" #include "libc/str/locale.h" +#include "libc/str/str.h" /** * Sets program locale. * * Cosmopolitan only supports the C or POSIX locale. + * + * "You can have any locale you want as long as it's C." -- Henry Ford */ char *setlocale(int category, const char *locale) { - if (!locale) return "C"; + if (!locale || (*locale == '\0')) return "C"; if (!strcmp(locale, "C") || !strcmp(locale, "POSIX")) { return locale; } else { diff --git a/test/libc/str/setlocale_test.c b/test/libc/str/setlocale_test.c new file mode 100644 index 000000000..dd16fdf57 --- /dev/null +++ b/test/libc/str/setlocale_test.c @@ -0,0 +1,30 @@ +/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│ +│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│ +╞══════════════════════════════════════════════════════════════════════════════╡ +│ Copyright 2022 Gavin Arthur Hayes │ +│ │ +│ Permission to use, copy, modify, and/or distribute this software for │ +│ any purpose with or without fee is hereby granted, provided that the │ +│ above copyright notice and this permission notice appear in all copies. │ +│ │ +│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │ +│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │ +│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │ +│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │ +│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │ +│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │ +│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ +│ PERFORMANCE OF THIS SOFTWARE. │ +╚─────────────────────────────────────────────────────────────────────────────*/ +#include "libc/str/locale.h" +#include "libc/testlib/testlib.h" + +TEST(setlocale, test) { + EXPECT_STREQ("C", setlocale(LC_ALL, NULL)); + EXPECT_STREQ("C", setlocale(LC_ALL, "C")); + EXPECT_STREQ("C", setlocale(LC_ALL, NULL)); + EXPECT_STREQ("POSIX", setlocale(LC_ALL, "POSIX")); + EXPECT_STREQ("C", setlocale(LC_ALL, "")); + EXPECT_EQ(0, setlocale(LC_ALL, "ja_JP.PCK")); + EXPECT_STREQ("C", setlocale(LC_ALL, NULL)); +}