From patchwork Fri Dec 8 09:16:59 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnold Robbins X-Patchwork-Id: 846053 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=sourceware.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=libc-alpha-return-87930-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="yNlVHj8Z"; dkim-atps=neutral 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 3ytRgy24Lfz9s74 for ; Fri, 8 Dec 2017 20:22:06 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:mime-version:content-transfer-encoding :content-type:from:message-id:date:to:subject; q=dns; s=default; b= rBLyBBoMC5D2acOupKNNhfL+IqspbAQ0ydtHkGQN/WTeKGZGcuVOlvYBylxZqnPW 0CXDW7qSu+krPgl9W+F2Rtu0f9GMIyr9YL2NoyRCzGuLCblU1P4gzwRlM9Sv+AKQ UhtJLhZobAjtQS6iIad9FMcsO1zUbHgkDrpUpd9+OEM= 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:mime-version:content-transfer-encoding :content-type:from:message-id:date:to:subject; s=default; bh=QOP UandGAxXqQPDndLKVRkRh5+s=; b=yNlVHj8Z2RILaeMlGyXzeYKEueTX3Xo14tD vTenk/eNRmjx3ZW6wLVMxP2sFyqywAq+sbX15eYHnScRIYevgKcULIGiZsli0ZnS PMSZZaExUOpSaaTz82C3uMK3LplHF5MDx4A6OLi9tckF/tkQ7HF91MWt7hEqrHnI wiwlSS+o= Received: (qmail 96773 invoked by alias); 8 Dec 2017 09:20: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 69517 invoked by uid 89); 8 Dec 2017 09:18:17 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.5 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_LAZY_DOMAIN_SECURITY, MANY_HDRS_LCASE, RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.2 spammy=unmatched, HContent-type:text, Hx-spam-relays-external:ESMTPA X-HELO: mxout4.netvision.net.il MIME-version: 1.0 Content-transfer-encoding: 7BIT Content-type: text/plain; CHARSET=US-ASCII From: Arnold Robbins Message-id: <201712080916.vB89Gxai005517@skeeve.com> Date: Fri, 08 Dec 2017 11:16:59 +0200 To: carlos@redhat.com, libc-alpha@sourceware.org Subject: [PATCH 14/17] Regex: Improve error text for REG_EBRACK. User-Agent: Heirloom mailx 12.5 6/20/10 This patch improves the error text for REG_EBRACK. 2017-11-30 Arnold D. Robbins * regcomp.c (__re_error_msgid): Improve the text for REG_EBRACK. diff --git a/posix/regcomp.c b/posix/regcomp.c index 701855a..8920cf1 100644 --- a/posix/regcomp.c +++ b/posix/regcomp.c @@ -155,9 +155,9 @@ const char __re_error_msgid[] attribute_hidden = gettext_noop ("Invalid back reference") /* REG_ESUBREG */ "\0" #define REG_EBRACK_IDX (REG_ESUBREG_IDX + sizeof "Invalid back reference") - gettext_noop ("Unmatched [ or [^") /* REG_EBRACK */ + gettext_noop ("Unmatched [, [^, [:, [., or [=") /* REG_EBRACK */ "\0" -#define REG_EPAREN_IDX (REG_EBRACK_IDX + sizeof "Unmatched [ or [^") +#define REG_EPAREN_IDX (REG_EBRACK_IDX + sizeof "Unmatched [, [^, [:, [., or [=") gettext_noop ("Unmatched ( or \\(") /* REG_EPAREN */ "\0" #define REG_EBRACE_IDX (REG_EPAREN_IDX + sizeof "Unmatched ( or \\(")