Fix searching localedef input on I18NPATH (BZ #16984)
diff mbox

Message ID mvm38fwomi5.fsf@hawking.suse.de
State New
Headers show

Commit Message

Andreas Schwab May 26, 2014, 10:36 a.m. UTC
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.

Comments

Carlos O'Donell May 26, 2014, 11:01 a.m. UTC | #1
On 05/26/2014 06:36 AM, Andreas Schwab wrote:
> 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.

Please set your subject line to [COMMITTED] then.

c.

Patch
diff mbox

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);
 		    }