diff options
| author | Siddhesh Poyarekar <siddhesh@sourceware.org> | 2021-09-13 20:48:35 +0530 |
|---|---|---|
| committer | Siddhesh Poyarekar <siddhesh@sourceware.org> | 2021-09-13 20:48:35 +0530 |
| commit | 43cea6d5652b6b9e61ac6ecc69419c909b504f47 (patch) | |
| tree | 2c1b75d47a59bf6a789c6c83b0970b9fe439c136 /iconv/gconv_conf.c | |
| parent | 526c3cf11ee9367344b6b15d669e4c3cb461a2be (diff) | |
| download | glibc-43cea6d5652b6b9e61ac6ecc69419c909b504f47.tar.gz glibc-43cea6d5652b6b9e61ac6ecc69419c909b504f47.tar.xz glibc-43cea6d5652b6b9e61ac6ecc69419c909b504f47.zip | |
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>
Diffstat (limited to 'iconv/gconv_conf.c')
| -rw-r--r-- | iconv/gconv_conf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/iconv/gconv_conf.c b/iconv/gconv_conf.c index 09ffe023f9..077082af66 100644 --- a/iconv/gconv_conf.c +++ b/iconv/gconv_conf.c @@ -477,7 +477,7 @@ __gconv_read_conf (void) __gconv_get_path (); for (cnt = 0; __gconv_path_elem[cnt].name != NULL; ++cnt) - gconv_parseconfdir (__gconv_path_elem[cnt].name, + gconv_parseconfdir (NULL, __gconv_path_elem[cnt].name, __gconv_path_elem[cnt].len); #endif |