mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-27 03:41:23 +08:00
92954ffa5a
During testing of localedef running in a minimal container there were several error cases which were hard to diagnose since they appeared as strerror (errno) values printed by the higher level functions. This change adds three new verbose messages for potential failure paths. The new messages give the user the opportunity to use -v and display additional information about why localedef might be failing. I found these messages useful myself while writing a localedef container test for --no-hard-links. Since the changes cleanup the code that handle codeset normalization we add tst-localedef-path-norm which contains many sub-tests to verify the correct expected normalization of codeset strings both when installing to default paths (the only time normalization is enabled) and installing to absolute paths. During the refactoring I created at least one buffer-overflow which valgrind caught, but these tests did not catch because the exec in the container had a very clean heap with zero-initialized memory. However, between valgrind and the tests the results are clean. The new tst-localedef-path-norm passes without regression on x86_64. Change-Id: I28b9f680711ff00252a2cb15625b774cc58ecb9d
119 lines
4.0 KiB
Makefile
119 lines
4.0 KiB
Makefile
# Copyright (C) 1991-2020 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/>.
|
|
|
|
#
|
|
# Makefile for locales.
|
|
#
|
|
subdir := locale
|
|
|
|
include ../Makeconfig
|
|
|
|
headers = langinfo.h locale.h bits/locale.h \
|
|
bits/types/locale_t.h bits/types/__locale_t.h
|
|
routines = setlocale findlocale loadlocale loadarchive \
|
|
localeconv nl_langinfo nl_langinfo_l mb_cur_max \
|
|
newlocale duplocale freelocale uselocale
|
|
tests = tst-C-locale tst-locname tst-duplocale
|
|
tests-container = tst-localedef-path-norm
|
|
categories = ctype messages monetary numeric time paper name \
|
|
address telephone measurement identification collate
|
|
aux = $(categories:%=lc-%) $(categories:%=C-%) SYS_libc C_name \
|
|
xlocale localename global-locale coll-lookup
|
|
others = localedef locale
|
|
#others-static = localedef locale
|
|
install-bin = localedef locale
|
|
extra-objs = $(localedef-modules:=.o) $(localedef-aux:=.o) \
|
|
$(locale-modules:=.o) $(lib-modules:=.o)
|
|
generated += C-translit.h
|
|
before-compile += $(objpfx)C-translit.h
|
|
|
|
extra-libs = libBrokenLocale
|
|
extra-libs-others = $(extra-libs)
|
|
|
|
libBrokenLocale-routines = broken_cur_max
|
|
|
|
subdir-dirs = programs
|
|
vpath %.c programs ../crypt
|
|
vpath %.h programs
|
|
vpath %.gperf programs
|
|
|
|
localedef-modules := localedef $(categories:%=ld-%) \
|
|
charmap linereader locfile \
|
|
repertoire locarchive
|
|
localedef-aux := md5
|
|
locale-modules := locale locale-spec
|
|
lib-modules := charmap-dir simple-hash xmalloc xstrdup \
|
|
record-status xasprintf
|
|
|
|
|
|
GPERF = gperf
|
|
GPERFFLAGS = -acCgopt -k1,2,5,9,$$ -L ANSI-C
|
|
|
|
ifeq ($(run-built-tests),yes)
|
|
tests-special += $(objpfx)tst-locale-locpath.out
|
|
endif
|
|
|
|
include ../Rules
|
|
|
|
CFLAGS-md5.c += -I../crypt
|
|
|
|
programs/%-kw.h: programs/%-kw.gperf
|
|
cd programs \
|
|
&& $(GPERF) $(GPERFFLAGS) -N $(@F:-kw.h=_hash) $(<F) > $(@F).new
|
|
mv -f $@.new $@
|
|
|
|
$(objpfx)localedef: $(localedef-modules:%=$(objpfx)%.o)
|
|
$(objpfx)localedef: $(localedef-aux:%=$(objpfx)%.o)
|
|
$(objpfx)locale: $(locale-modules:%=$(objpfx)%.o)
|
|
$(objpfx)localedef $(objpfx)locale: $(lib-modules:%=$(objpfx)%.o)
|
|
|
|
$(objpfx)C-translit.h: C-translit.h.in gen-translit.py
|
|
$(make-target-directory)
|
|
$(PYTHON) gen-translit.py < $< > $@.tmp
|
|
mv -f $@.tmp $@
|
|
|
|
# The path to the compiled binary locale archive or compiled locales,
|
|
# along with the parent path to the source locales and source
|
|
# charmaps.
|
|
localepath = "$(complocaledir):$(i18ndir)"
|
|
|
|
# -Iprograms doesn't really belong here, but this gets it at the head
|
|
# of the list instead of the tail, where CPPFLAGS-$(lib) gets added.
|
|
# We need it before the standard -I's to see programs/config.h first.
|
|
locale-CPPFLAGS = -DCOMPLOCALEDIR='"$(complocaledir)"' \
|
|
-DLOCALE_ALIAS_PATH='"$(localedir)"' \
|
|
-Iprograms
|
|
|
|
CPPFLAGS-locale-programs = -DLOCALE_PATH='$(localepath)' \
|
|
-DCHARMAP_PATH='"$(i18ndir)/charmaps"' \
|
|
-DREPERTOIREMAP_PATH='"$(i18ndir)/repertoiremaps"' \
|
|
-DLOCSRCDIR='"$(i18ndir)/locales"'
|
|
|
|
CFLAGS-charmap.c += -Wno-write-strings -Wno-char-subscripts
|
|
CFLAGS-locfile.c += -Wno-write-strings -Wno-char-subscripts
|
|
CFLAGS-charmap-dir.c += -Wno-write-strings
|
|
|
|
# Set libof-* for each routine.
|
|
cpp-srcs-left := $(localedef-modules) $(localedef-aux) $(locale-modules) \
|
|
$(lib-modules)
|
|
lib := locale-programs
|
|
include $(patsubst %,$(..)libof-iterator.mk,$(cpp-srcs-left))
|
|
|
|
$(objpfx)tst-locale-locpath.out : tst-locale-locpath.sh $(objpfx)locale
|
|
$(SHELL) $< '$(common-objpfx)' '$(test-wrapper-env)' '$(run-program-env)' > $@; \
|
|
$(evaluate-test)
|