From owner-svn-src-user@FreeBSD.ORG  Mon Feb 27 15:59:18 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 2BDCF1065675;
	Mon, 27 Feb 2012 15:59:18 +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 1B86F8FC13;
	Mon, 27 Feb 2012 15:59:18 +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 q1RFxIfk025310;
	Mon, 27 Feb 2012 15:59:18 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q1RFxHQ9025308;
	Mon, 27 Feb 2012 15:59:17 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201202271559.q1RFxHQ9025308@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Mon, 27 Feb 2012 15:59:17 +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: r232217 - 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 15:59:18 -0000

Author: gabor
Date: Mon Feb 27 15:59:17 2012
New Revision: 232217
URL: http://svn.freebsd.org/changeset/base/232217

Log:
  - Use mregerror() to determine which pattern compilation fails and why

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

Modified: user/gabor/tre-integration/usr.bin/grep/grep.c
==============================================================================
--- user/gabor/tre-integration/usr.bin/grep/grep.c	Mon Feb 27 15:58:38 2012	(r232216)
+++ user/gabor/tre-integration/usr.bin/grep/grep.c	Mon Feb 27 15:59:17 2012	(r232217)
@@ -687,9 +687,10 @@ main(int argc, char *argv[])
 	ptr = (const char **)pats;
 	c = mregncomp(&preg, patterns, ptr, lens, cflags);
 	if (c != 0) {
-	  // regerror(c, &r_pattern[i], re_error, RE_ERROR_BUF);
-	  // errx(2, "%s", re_error);
-	  errx(2, "%s", "Bad patterns.");
+	  int no;
+
+	  mregerror(c, &preg, &no, re_error, RE_ERROR_BUF);
+	  errx(2, "%s:%s", pats[no], re_error);
 	}
 
 	if (lbflag)