From patchwork Mon Mar 20 20:41:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rafal Luzynski X-Patchwork-Id: 741173 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 3vn7CS0pKVz9rvt for ; Tue, 21 Mar 2017 07:41:39 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="V7CKz9Oz"; dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:date:from:reply-to:to:message-id:subject :mime-version:content-type:content-transfer-encoding; q=dns; s= default; b=sCmAY8uV5YaIbILAD0mw652c1Mx/LlkVudOwHXISgHA432Zb1//ob eWPJBdbt/SbYKqea43xWPdvL6qW2sp+IhZDCNjYoKWL7FZFNwe+6xQ1ZgwjOxTsI tIVd5ptQnQYqLF1LQmhCZs+rWsQZ0l2cbvtUMboEKLeWlfppeuFjuw= 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:date:from:reply-to:to:message-id:subject :mime-version:content-type:content-transfer-encoding; s=default; bh=sH3S5yt3GM41BTYUqE6S+cr5Tco=; b=V7CKz9OzXxA6hv1Y9Nw0Ko6VIJgB mM5FbvQc+DvQpgiVq6x8nSMP7ykNnasrx8yd+J6lw+VETFRZHSkgls0qO6Ec7WK2 S70cqXAnJ/4tO5p3fpNUa4FbUbOEpfLvUveP9SDXec7TqnJvSsFByGxCearMMwi0 oWPAUILv5xK2jLo= Received: (qmail 93254 invoked by alias); 20 Mar 2017 20:41:28 -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 92854 invoked by uid 89); 20 Mar 2017 20:41:28 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-23.4 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_LAZY_DOMAIN_SECURITY autolearn=ham version=3.3.2 spammy=time, month, H*x:Mailer, H*UA:Mailer X-HELO: aev204.rev.netart.pl X-Spam-Score: 0 Date: Mon, 20 Mar 2017 21:41:25 +0100 (CET) From: Rafal Luzynski Reply-To: Rafal Luzynski To: libc-alpha@sourceware.org Message-ID: <1964062218.88237.1490042485800@poczta.nazwa.pl> Subject: [RFC][PATCH v6 08/16] Let alternative month names be a copy of regular ones (bug 10871). MIME-Version: 1.0 X-Originating-Client: com.openexchange.ox.gui.dhtml If alt_mon definition is missing from a locale then let it be a copy of mon array. Majority of languages do not need this feature so let us accept the locale definition file without alt_mon and provide the same content as mon when software requires alt_mon. [BZ #10871] * locale/programs/ld-time.c: alternative month names are a copy of mon if not provided explicitly. --- locale/programs/ld-time.c | 8 ++++++++ 1 file changed, 8 insertions(+) default: diff --git a/locale/programs/ld-time.c b/locale/programs/ld-time.c index 66a9e30..a6bf2b1 100644 --- a/locale/programs/ld-time.c +++ b/locale/programs/ld-time.c @@ -960,6 +960,14 @@ time_read (struct linereader *ldfile, struct localedef_t *result, lr_error (ldfile, _("\ %1$s: definition does not end with `END %1$s'"), "LC_TIME"); lr_ignore_rest (ldfile, now->tok == tok_lc_time); + + /* If alt_mon is missing then let it be a copy of mon. */ + if (!ignore_content && !time->alt_mon_defined) + { + memcpy (time->alt_mon, time->mon, sizeof (time->mon)); + memcpy (time->walt_mon, time->wmon, sizeof (time->wmon)); + time->alt_mon_defined = 1; + } return;