From owner-svn-src-all@freebsd.org  Thu Jul 28 15:19:49 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 26839BA6245;
 Thu, 28 Jul 2016 15:19:49 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id E7BD3121F;
 Thu, 28 Jul 2016 15:19:48 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u6SFJmk5005732;
 Thu, 28 Jul 2016 15:19:48 GMT (envelope-from ed@FreeBSD.org)
Received: (from ed@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u6SFJmij005731;
 Thu, 28 Jul 2016 15:19:48 GMT (envelope-from ed@FreeBSD.org)
Message-Id: <201607281519.u6SFJmij005731@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ed set sender to ed@FreeBSD.org
 using -f
From: Ed Schouten <ed@FreeBSD.org>
Date: Thu, 28 Jul 2016 15:19:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r303444 - head/usr.bin/grep
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 28 Jul 2016 15:19:49 -0000

Author: ed
Date: Thu Jul 28 15:19:47 2016
New Revision: 303444
URL: https://svnweb.freebsd.org/changeset/base/303444

Log:
  Call basename() in a portable way.
  
  Pull a copy of the filename string before calling basename(). Change the
  loop to not return on its own, so we can put a free() statement at the
  bottom.

Modified:
  head/usr.bin/grep/util.c

Modified: head/usr.bin/grep/util.c
==============================================================================
--- head/usr.bin/grep/util.c	Thu Jul 28 15:17:12 2016	(r303443)
+++ head/usr.bin/grep/util.c	Thu Jul 28 15:19:47 2016	(r303444)
@@ -58,21 +58,26 @@ static int	 procline(struct str *l, int)
 bool
 file_matching(const char *fname)
 {
-	char *fname_base;
+	char *fname_base, *fname_buf;
 	bool ret;
 
 	ret = finclude ? false : true;
-	fname_base = basename(fname);
+	fname_buf = strdup(fname);
+	if (fname_buf == NULL)
+		err(2, "strdup");
+	fname_base = basename(fname_buf);
 
 	for (unsigned int i = 0; i < fpatterns; ++i) {
 		if (fnmatch(fpattern[i].pat, fname, 0) == 0 ||
 		    fnmatch(fpattern[i].pat, fname_base, 0) == 0) {
-			if (fpattern[i].mode == EXCL_PAT)
-				return (false);
-			else
+			if (fpattern[i].mode == EXCL_PAT) {
+				ret = false;
+				break;
+			} else
 				ret = true;
 		}
 	}
+	free(fname_buf);
 	return (ret);
 }