From owner-svn-src-user@FreeBSD.ORG  Thu Sep  1 13:40:41 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 E14511065680;
	Thu,  1 Sep 2011 13:40:41 +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 C59138FC16;
	Thu,  1 Sep 2011 13:40:41 +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 p81Def7b053619;
	Thu, 1 Sep 2011 13:40:41 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p81DefWk053617;
	Thu, 1 Sep 2011 13:40:41 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201109011340.p81DefWk053617@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Thu, 1 Sep 2011 13:40:41 +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: r225310 - 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: Thu, 01 Sep 2011 13:40:42 -0000

Author: gabor
Date: Thu Sep  1 13:40:41 2011
New Revision: 225310
URL: http://svn.freebsd.org/changeset/base/225310

Log:
  - Restore proper err() call on non-existent file and use more concise code
  
  Submitted by:	jh

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

Modified: user/gabor/grep/trunk/grep.c
==============================================================================
--- user/gabor/grep/trunk/grep.c	Thu Sep  1 13:36:29 2011	(r225309)
+++ user/gabor/grep/trunk/grep.c	Thu Sep  1 13:40:41 2011	(r225310)
@@ -296,14 +296,12 @@ read_patterns(const char *fn)
 	size_t len;
 	int fd;
 
-	if ((fd = open(fn, O_RDONLY)) == -1)
-		return;
-	if ((fstat(fd, &st) == -1) || (S_ISDIR(st.st_mode))) {
+	if ((f = fopen(fn, "r")) == NULL)
+		err(2, "%s", fn);
+	if ((fstat(fileno(f), &st) == -1) || (S_ISDIR(st.st_mode))) {
 		close(fd);
 		return;
 	}
-	if ((f = fdopen(fd, "r")) == NULL)
-		err(2, "%s", fn);
         while ((line = fgetln(f, &len)) != NULL)
 		add_pattern(line, line[0] == '\n' ? 0 : len);
 	if (ferror(f))