This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[PATCH] Fix searching localedef input on I18NPATH (BZ #16984)
- From: Andreas Schwab <schwab at suse dot de>
- To: libc-alpha at sourceware dot org
- Date: Mon, 26 May 2014 12:36:02 +0200
- Subject: [PATCH] Fix searching localedef input on I18NPATH (BZ #16984)
- Authentication-results: sourceware.org; auth=none
Committed.
Andreas.
[BZ #16984]
* locale/programs/repertoire.c (repertoire_read): Add slash
between I18NPATH element and file name.
* locale/programs/locfile.c (locfile_read): Likewise.
diff --git a/locale/programs/locfile.c b/locale/programs/locfile.c
index de6b426..1c4fe85 100644
--- a/locale/programs/locfile.c
+++ b/locale/programs/locfile.c
@@ -84,7 +84,7 @@ locfile_read (struct localedef_t *result, const struct charmap_t *charmap)
if (ldfile == NULL)
{
- stpcpy (stpcpy (path, next), filename);
+ stpcpy (stpcpy (stpcpy (path, next), "/"), filename);
ldfile = lr_open (path, locfile_hash);
}
diff --git a/locale/programs/repertoire.c b/locale/programs/repertoire.c
index 28e4bcc..545ac90 100644
--- a/locale/programs/repertoire.c
+++ b/locale/programs/repertoire.c
@@ -96,7 +96,7 @@ repertoire_read (const char *filename)
if (repfile == NULL)
{
- stpcpy (stpcpy (path, next), filename);
+ stpcpy (stpcpy (stpcpy (path, next), "/"), filename);
repfile = lr_open (path, repertoiremap_hash);
}
--
1.9.3
--
Andreas Schwab, SUSE Labs, schwab@suse.de
GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE 1748 E4D4 88E3 0EEA B9D7
"And now for something completely different."