mirror of
git://sourceware.org/git/glibc.git
synced 2024-12-09 04:11:27 +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
88 lines
2.8 KiB
C
88 lines
2.8 KiB
C
/* Various paths that might be needed.
|
|
Copyright (C) 2018-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/>. */
|
|
|
|
#include <support/support.h>
|
|
#include <support/check.h>
|
|
|
|
/* The idea here is to make various makefile-level paths available to
|
|
support programs, as canonicalized absolute paths. */
|
|
|
|
/* These point to the TOP of the source/build tree, not your (or
|
|
support's) subdirectory. */
|
|
#ifdef SRCDIR_PATH
|
|
const char support_srcdir_root[] = SRCDIR_PATH;
|
|
#else
|
|
# error please -DSRCDIR_PATH=something in the Makefile
|
|
#endif
|
|
|
|
#ifdef OBJDIR_PATH
|
|
const char support_objdir_root[] = OBJDIR_PATH;
|
|
#else
|
|
# error please -DOBJDIR_PATH=something in the Makefile
|
|
#endif
|
|
|
|
#ifdef OBJDIR_ELF_LDSO_PATH
|
|
/* Corresponds to the path to the runtime linker used by the testsuite,
|
|
e.g. OBJDIR_PATH/elf/ld-linux-x86-64.so.2 */
|
|
const char support_objdir_elf_ldso[] = OBJDIR_ELF_LDSO_PATH;
|
|
#else
|
|
# error please -DOBJDIR_ELF_LDSO_PATH=something in the Makefile
|
|
#endif
|
|
|
|
#ifdef INSTDIR_PATH
|
|
/* Corresponds to the --prefix= passed to configure. */
|
|
const char support_install_prefix[] = INSTDIR_PATH;
|
|
#else
|
|
# error please -DINSTDIR_PATH=something in the Makefile
|
|
#endif
|
|
|
|
#ifdef LIBDIR_PATH
|
|
/* Corresponds to the install's lib/ or lib64/ directory. */
|
|
const char support_libdir_prefix[] = LIBDIR_PATH;
|
|
#else
|
|
# error please -DLIBDIR_PATH=something in the Makefile
|
|
#endif
|
|
|
|
#ifdef BINDIR_PATH
|
|
/* Corresponds to the install's bin/ directory. */
|
|
const char support_bindir_prefix[] = BINDIR_PATH;
|
|
#else
|
|
# error please -DBINDIR_PATH=something in the Makefile
|
|
#endif
|
|
|
|
#ifdef SBINDIR_PATH
|
|
/* Corresponds to the install's bin/ directory. */
|
|
const char support_sbindir_prefix[] = SBINDIR_PATH;
|
|
#else
|
|
# error please -DSBINDIR_PATH=something in the Makefile
|
|
#endif
|
|
|
|
#ifdef ROOTSBINDIR_PATH
|
|
/* Corresponds to the install's sbin/ directory. */
|
|
const char support_install_rootsbindir[] = ROOTSBINDIR_PATH;
|
|
#else
|
|
# error please -DROOTSBINDIR_PATH=something in the Makefile
|
|
#endif
|
|
|
|
#ifdef COMPLOCALEDIR_PATH
|
|
/* Corresponds to the install's compiled locale directory. */
|
|
const char support_complocaledir_prefix[] = COMPLOCALEDIR_PATH;
|
|
#else
|
|
# error please -DCOMPLOCALEDIR_PATH=something in the Makefile
|
|
#endif
|