From patchwork Mon May 26 10:36:02 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Schwab X-Patchwork-Id: 352482 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 1C36014008A for ; Mon, 26 May 2014 20:36:12 +1000 (EST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id:mime-version :content-type; q=dns; s=default; b=QFxO+E/4WFrFbiHGBP2QyHM/tQTau /ZHUDVMHNgcgyUQ6R2JJZkeSjz19Ptpmxa0X7rTWVWqd7X6XRJIWZfGu0rK0zxdF Yjy8fJHw0BMp+JJPsCebnUPbjuvAUgrrrCuapRrUnZ80sYkkaVxU8cYY/TxfVT5y zA4ebFJ4+ltv3c= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id:mime-version :content-type; s=default; bh=P2QNbqgpFii10KaIqnJDieg0tSs=; b=E9o tNPv53qsyUjOs9qmRaQArl5XH3Xu8dlFqwL+dWEbMwvrly00FAlcmKX+r/PvZ4hj 5JBn/IH8tfn/fvjwpOx3CV+JlvJsVfrwrqXKJvoAVj+rL9J2L7QwhNoJKlzzKqqF Q4vlVCVjMviOoG4MZ29ZoETRjbGOVx87dBZvX9z8= Received: (qmail 19262 invoked by alias); 26 May 2014 10:36:07 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 19252 invoked by uid 89); 26 May 2014 10:36:07 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-3.2 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: mx2.suse.de From: Andreas Schwab To: libc-alpha@sourceware.org Subject: [PATCH] Fix searching localedef input on I18NPATH (BZ #16984) X-Yow: ...I think I'm having an overnight sensation right now!! Date: Mon, 26 May 2014 12:36:02 +0200 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux) MIME-Version: 1.0 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); }