From owner-svn-src-user@FreeBSD.ORG  Mon Feb 27 16:18:51 2012
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B673B1065680;
	Mon, 27 Feb 2012 16:18:51 +0000 (UTC)
	(envelope-from gabor@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 8FD3F8FC1B;
	Mon, 27 Feb 2012 16:18:49 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q1RGInJs026361;
	Mon, 27 Feb 2012 16:18:49 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q1RGInMJ026359;
	Mon, 27 Feb 2012 16:18:49 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201202271618.q1RGInMJ026359@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Mon, 27 Feb 2012 16:18:49 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r232224 - user/gabor/tre-integration/usr.bin/grep
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Feb 2012 16:18:51 -0000

Author: gabor
Date: Mon Feb 27 16:18:49 2012
New Revision: 232224
URL: http://svn.freebsd.org/changeset/base/232224

Log:
  - mregerror() (and regerror()) can also be used after regexec() and the rest

Modified:
  user/gabor/tre-integration/usr.bin/grep/util.c

Modified: user/gabor/tre-integration/usr.bin/grep/util.c
==============================================================================
--- user/gabor/tre-integration/usr.bin/grep/util.c	Mon Feb 27 16:15:56 2012	(r232223)
+++ user/gabor/tre-integration/usr.bin/grep/util.c	Mon Feb 27 16:18:49 2012	(r232224)
@@ -285,9 +285,10 @@ procline(struct str *l, int nottext)
 		    (size_t)pmatch.rm_eo;
 		if (r == REG_NOMATCH)
 			continue;
-		else if (r != REG_OK)
-		  // XXX: better error msg?
-		  errx(2, "Failed processing input.");
+		else if (r != REG_OK) {
+			mregerror(r, &preg, NULL, re_error, RE_ERROR_BUF);
+			errx(2, "%s", re_error);
+		}
 
 		/*
 		 * Check for full match.  There is already a match so