]> git.ipfire.org Git - thirdparty/glibc.git/commit
iconvconfig: Fix behaviour with --prefix [BZ #28199]
authorSiddhesh Poyarekar <siddhesh@sourceware.org>
Mon, 13 Sep 2021 15:18:35 +0000 (20:48 +0530)
committerSiddhesh Poyarekar <siddhesh@sourceware.org>
Mon, 13 Sep 2021 15:21:04 +0000 (20:51 +0530)
commit3fc51f35b4f32e1bb99d85c1578e930e725ff929
tree226f4bf452111654748516c7fd29c5d183333bea
parenta8ac8c4725ddb1119764126a8674a04c9dd5aea8
iconvconfig: Fix behaviour with --prefix [BZ #28199]

The consolidation of configuration parsing broke behaviour with
--prefix, where the prefix bled into the modules cache.  Accept a
prefix which, when non-NULL, is prepended to the path when looking for
configuration files but only the original directory is added to the
modules cache.

This has no effect on the codegen of gconv_conf since it passes NULL.

Reported-by: Patrick McCarty <patrick.mccarty@intel.com>
Reported-by: Michael Hudson-Doyle <michael.hudson@canonical.com>
Reviewed-by: Andreas Schwab <schwab@linux-m68k.org>
(cherry picked from commit 43cea6d5652b6b9e61ac6ecc69419c909b504f47)
iconv/gconv_conf.c
iconv/gconv_parseconfdir.h
iconv/iconvconfig.c