niansa-misc/musl
1
0
Fork 0
mirror of git://git.musl-libc.org/musl synced 2025-03-06 20:48:29 +01:00
Code Issues Projects Releases Packages Wiki Activity

adapt setlocale to support possibility of failure

Browse source 
introduce a new LOC_MAP_FAILED sentinel for errors, since null
pointers for a category's locale map indicate the C locale. at this
time, __get_locale does not fail, so there should be no functional
change by this commit.
This commit is contained in:
Rich Felker 2018-10-20 21:54:20 -04:00
parent 8084d6ab57
commit d88e5dfa8b
2 changed files with 22 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/internal/locale_impl.h
View file

@ -27,6 +27,8 @@ hidden const char *__lctrans_impl(const char *, const struct __locale_map *);
hidden int __loc_is_allocated(locale_t);
hidden char *__gettextdomain(void);
#define LOC_MAP_FAILED ((const struct __locale_map *)-1)
#define LCTRANS(msg, lc, loc) __lctrans(msg, (loc)->cat[(lc)])
#define LCTRANS_CUR(msg) __lctrans_cur(msg)

32
src/locale/setlocale.c
View file

@ -7,19 +7,10 @@
static char buf[LC_ALL*(LOCALE_NAME_MAX+1)];
static char *setlocale_one_unlocked(int cat, const char *name)
{
const struct __locale_map *lm;
if (name) libc.global_locale.cat[cat] = lm = __get_locale(cat, name);
else lm = libc.global_locale.cat[cat];
return lm ? (char *)lm->name : "C";
}
char *setlocale(int cat, const char *name)
{
static volatile int lock[1];
const struct __locale_map *lm;
if ((unsigned)cat > LC_ALL) return 0;
@ -33,6 +24,7 @@ char *setlocale(int cat, const char *name)
if (cat == LC_ALL) {
int i;
if (name) {
struct __locale_struct tmp_locale;
char part[LOCALE_NAME_MAX+1] = "C.UTF-8";
const char *p = name;
for (i=0; i<LC_ALL; i++) {
@ -42,8 +34,14 @@ char *setlocale(int cat, const char *name)
part[z-p] = 0;
if (*z) p = z+1;
}
setlocale_one_unlocked(i, part);
lm = __get_locale(i, name);
if (lm == LOC_MAP_FAILED) {
UNLOCK(lock);
return 0;
}
tmp_locale.cat[i] = lm;
}
libc.global_locale = tmp_locale;
}
char *s = buf;
const char *part;
@ -63,7 +61,17 @@ char *setlocale(int cat, const char *name)
return same==LC_ALL ? (char *)part : buf;
}
char *ret = setlocale_one_unlocked(cat, name);
if (name) {
lm = __get_locale(cat, name);
if (lm == LOC_MAP_FAILED) {
UNLOCK(lock);
return 0;
}
libc.global_locale.cat[cat] = lm;
} else {
lm = libc.global_locale.cat[cat];
}
char *ret = lm ? (char *)lm->name : "C";
UNLOCK(lock);