mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-21 01:12:26 +08:00
684fbab755
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 <law@redhat.com> Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
98 lines
3.3 KiB
Bash
98 lines
3.3 KiB
Bash
#!/bin/sh
|
|
# Generate test locale files.
|
|
# Copyright (C) 2000-2024 Free Software Foundation, Inc.
|
|
# This file is part of the GNU C Library.
|
|
|
|
# The GNU C Library is free software; you can redistribute it and/or
|
|
# modify it under the terms of the GNU Lesser General Public
|
|
# License as published by the Free Software Foundation; either
|
|
# version 2.1 of the License, or (at your option) any later version.
|
|
|
|
# The GNU C Library is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
# Lesser General Public License for more details.
|
|
|
|
# You should have received a copy of the GNU Lesser General Public
|
|
# License along with the GNU C Library; if not, see
|
|
# <https://www.gnu.org/licenses/>.
|
|
|
|
set -e
|
|
|
|
common_objpfx="$1"; shift
|
|
localedef_before_env="$1"; shift
|
|
run_program_env="$1"; shift
|
|
localedef_after_env="$1"; shift
|
|
locfile="$1"; shift
|
|
|
|
generate_locale ()
|
|
{
|
|
charmap=$1
|
|
input=$2
|
|
out=$3
|
|
flags=$4
|
|
ret=0
|
|
${localedef_before_env} ${run_program_env} I18NPATH=../localedata \
|
|
${localedef_after_env} $flags -f $charmap -i $input \
|
|
${common_objpfx}localedata/$out || ret=$?
|
|
if [ $ret -eq 0 ]; then
|
|
# The makefile checks the timestamp of the LC_CTYPE file,
|
|
# but localedef won't have touched it if it was able to
|
|
# hard-link it to an existing file.
|
|
touch ${common_objpfx}localedata/$out/LC_CTYPE
|
|
else
|
|
echo "Charmap: \"${charmap}\" Inputfile: \"${input}\"" \
|
|
"Outputdir: \"${out}\" failed"
|
|
exit 1
|
|
fi
|
|
}
|
|
|
|
locfile=`echo $locfile|sed 's|.*/\([^/]*/LC_CTYPE\)|\1|'`
|
|
locale=`echo $locfile|sed 's|\([^.]*\).*/LC_CTYPE|\1|'`
|
|
charmap=`echo $locfile|sed -e 's|[^.]*\([^@ ]*\)\(@[^ ]*\)\?/LC_CTYPE|\1|' -e 's|^\.||g'`
|
|
modifier=`echo $locfile|sed 's|[^.]*\([^@ ]*\)\(@[^ ]*\)\?/LC_CTYPE|\2|'`
|
|
|
|
echo "Generating locale $locale.$charmap: this might take a while..."
|
|
|
|
# Do not force output with '-c', all locales should compile without
|
|
# warning or errors. There is likewise no need to run quietly with
|
|
# '--quiet' since all locales should compile without additional
|
|
# diagnostics. If there are messages printed then we want to see
|
|
# them, fix them, and the associated error or warning. During
|
|
# development it may be beneficialy to put '--quiet -c' here to allow
|
|
# you to develop in-progress locales.
|
|
flags=""
|
|
|
|
charmap_real="$charmap"
|
|
|
|
# If no character map is specified then we fall back to UTF-8.
|
|
if [ -z "$charmap" ]; then
|
|
charmap_real="UTF-8"
|
|
fi
|
|
|
|
# For SJIS the charmap is SHIFT_JIS. We just want the locale to have
|
|
# a slightly nicer name instead of using "*.SHIFT_SJIS", but that
|
|
# means we need a mapping here.
|
|
if [ "$charmap" = "SJIS" ]; then
|
|
charmap_real="SHIFT_JIS"
|
|
fi
|
|
|
|
# In addition to this the SHIFT_JIS character maps are not ASCII
|
|
# compatible so we must use `--no-warnings=ascii' to disable the
|
|
# warning. See localedata/Makefile $(INSTALL-SUPPORTED-LOCALES)
|
|
# for the same logic.
|
|
if [ "$charmap_real" = 'SHIFT_JIS' ] \
|
|
|| [ "$charmap_real" = 'SHIFT_JISX0213' ]; then
|
|
flags="$flags --no-warnings=ascii"
|
|
fi
|
|
|
|
# If the character map is not specified then we output a locale
|
|
# with the just the name of the locale e.g. eo, en_US. This is
|
|
# used for test locales that act as fallbacks.
|
|
output_file="$locale.$charmap$modifier"
|
|
if [ -z "$charmap" ]; then
|
|
output_file="$locale"
|
|
fi
|
|
|
|
generate_locale $charmap_real $locale$modifier $output_file "$flags"
|