From 684fbab755e727a8c15f8b621648d66694cd1f53 Mon Sep 17 00:00:00 2001 From: Carlos O'Donell Date: Mon, 22 Apr 2024 08:16:09 -0400 Subject: locale: Handle loading a missing locale twice (Bug 14247) Delay setting file->decided until the data has been successfully loaded by _nl_load_locale(). If the function fails to load the data then we must return and error and leave decided untouched to allow the caller to attempt to load the data again at a later time. We should not set decided to 1 early in the function since doing so may prevent attempting to load it again. We want to try loading it again because that allows an open to fail and set errno correctly. On the other side of this problem is that if we are called again with the same inputs we will fetch the cached version of the object and carry out no open syscalls and that fails to set errno so we must set errno to ENOENT in that case. There is a second code path that has to be handled where the name of the locale matches but the codeset doesn't match. These changes ensure that errno is correctly set on failure in all the return paths in _nl_find_locale(). Adds tst-locale-loadlocale to cover the bug. No regressions on x86_64. Co-authored-by: Jeff Law Reviewed-by: Adhemerval Zanella --- gen-locales.mk | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'gen-locales.mk') diff --git a/gen-locales.mk b/gen-locales.mk index 9c523d2a05..b005a72866 100644 --- a/gen-locales.mk +++ b/gen-locales.mk @@ -1,8 +1,19 @@ # defines target $(gen-locales) that generates the locales given in $(LOCALES) LOCALE_SRCS := $(shell echo "$(LOCALES)"|sed 's/\([^ .]*\)[^@ ]*\(@[^ ]*\)\?/\1\2/g') +# The CHARMAPS dependency handling must be able to process: +# 1. No character map e.g. eo, en_US +# 2. Character maps e.g. en_US.UTF-8 +# 3. Character maps with modifier e.g. tt_RU.UTF-8@iqtelif +# This complicates the processing slightly so we do it in multiple edits, +# the first captures the character map with the anchoring period while +# the rest of the edits remove the period to get a valid file or adjust +# the name to match the true name. CHARMAPS := $(shell echo "$(LOCALES)" | \ - sed -e 's/[^ .]*[.]\([^@ ]*\)\(@[^@ ]*\)*/\1/g' -e s/SJIS/SHIFT_JIS/g) + sed -e 's/\([^ .]*\)\([^@ ]*\)\(@[^@ ]*\)*/\2/g' \ + -e 's/^\./ /g' \ + -e 's/ \./ /g' \ + -e s/SJIS/SHIFT_JIS/g) CTYPE_FILES = $(addsuffix /LC_CTYPE,$(LOCALES)) gen-locales := $(addprefix $(common-objpfx)localedata/,$(CTYPE_FILES)) -- cgit 1.4.1