From owner-svn-src-user@FreeBSD.ORG  Fri Sep  2 16:46:42 2011
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 DA780106564A;
	Fri,  2 Sep 2011 16:46:42 +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 CA9308FC1A;
	Fri,  2 Sep 2011 16:46:42 +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 p82Gkg5u007455;
	Fri, 2 Sep 2011 16:46:42 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p82GkgP4007453;
	Fri, 2 Sep 2011 16:46:42 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201109021646.p82GkgP4007453@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Fri, 2 Sep 2011 16:46:42 +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: r225335 - user/gabor/grep/trunk
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: Fri, 02 Sep 2011 16:46:42 -0000

Author: gabor
Date: Fri Sep  2 16:46:42 2011
New Revision: 225335
URL: http://svn.freebsd.org/changeset/base/225335

Log:
  - Add proper error handling for grep -F

Modified:
  user/gabor/grep/trunk/grep.c

Modified: user/gabor/grep/trunk/grep.c
==============================================================================
--- user/gabor/grep/trunk/grep.c	Fri Sep  2 16:40:18 2011	(r225334)
+++ user/gabor/grep/trunk/grep.c	Fri Sep  2 16:46:42 2011	(r225335)
@@ -687,9 +687,15 @@ main(int argc, char *argv[])
 
 	/* Check if cheating is allowed (always is for fgrep). */
 	if (grepbehave == GREP_FIXED) {
-		for (i = 0; i < patterns; ++i)
-			fixncomp(&fg_pattern[i], pattern[i].pat,
+		for (i = 0; i < patterns; ++i) {
+			c = fixncomp(&fg_pattern[i], pattern[i].pat,
 			    pattern[i].len, cflags);
+			if (c != 0) {
+				regerror(c, &r_pattern[i], re_error,
+				    RE_ERROR_BUF);
+				errx(2, "%s", re_error);
+			}
+		}
 	} else {
 		for (i = 0; i < patterns; ++i) {
 			if (fastncomp(&fg_pattern[i], pattern[i].pat,