From owner-p4-projects@FreeBSD.ORG  Wed Jul  9 15:05:29 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A599B106567E; Wed,  9 Jul 2008 15:05:29 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6958D106567B
	for <perforce@freebsd.org>; Wed,  9 Jul 2008 15:05:29 +0000 (UTC)
	(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 59ADC8FC16
	for <perforce@freebsd.org>; Wed,  9 Jul 2008 15:05:29 +0000 (UTC)
	(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m69F5TRB081879
	for <perforce@freebsd.org>; Wed, 9 Jul 2008 15:05:29 GMT
	(envelope-from gabor@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m69F5Thu081877
	for perforce@freebsd.org; Wed, 9 Jul 2008 15:05:29 GMT
	(envelope-from gabor@freebsd.org)
Date: Wed, 9 Jul 2008 15:05:29 GMT
Message-Id: <200807091505.m69F5Thu081877@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gabor@freebsd.org using -f
From: Gabor Kovesdan <gabor@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 144946 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 09 Jul 2008 15:05:29 -0000

http://perforce.freebsd.org/chv.cgi?CH=144946

Change 144946 by gabor@gabor_server on 2008/07/09 15:05:16

	- Fix --exclude and --include with proper basename() calls

Affected files ...

.. //depot/projects/soc2008/gabor_textproc/grep/grep.c#64 edit
.. //depot/projects/soc2008/gabor_textproc/grep/util.c#57 edit

Differences ...

==== //depot/projects/soc2008/gabor_textproc/grep/grep.c#64 (text+ko) ====

@@ -43,6 +43,7 @@
 #include <err.h>
 #include <errno.h>
 #include <getopt.h>
+#include <libgen.h>
 #include <locale.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -260,6 +261,7 @@
 		 --len;
 	epattern[epatterns] = grep_malloc(len + 1);
 	memcpy(epattern[epatterns], pat, len);
+	epattern[epatterns][len] = '\0';
 	++epatterns;
 }
 
@@ -511,14 +513,14 @@
 				usage();
 			inclflag = 1;
 			exclflag = 0;
-			add_epattern(optarg, strlen(optarg));
+			add_epattern(basename(optarg), strlen(basename(optarg)));
 			break;
 		case R_EXCLUDE_OPT:
 			if (dirbehave != DIR_RECURSE)
 				usage();
 			inclflag = 0;
 			exclflag = 1;
-			add_epattern(optarg, strlen(optarg));
+			add_epattern(basename(optarg), strlen(basename(optarg)));
 			break;
 		case HELP_OPT:
 		default:

==== //depot/projects/soc2008/gabor_textproc/grep/util.c#57 (text+ko) ====

@@ -43,6 +43,7 @@
 #include <errno.h>
 #include <fnmatch.h>
 #include <fts.h>
+#include <libgen.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -97,14 +98,14 @@
 			if (exclflag) {
 				ok = 1;
 				for (i = 0; i < epatterns; ++i)
-					if (fnmatch(epattern[i], p->fts_path, 0) == 0) {
+					if (fnmatch(epattern[i], basename(p->fts_path), 0) == 0) {
 						ok = 0;
 						break;
 					}
 			} else if (inclflag) {
 				ok = 0;
 				for (i = 0; i < epatterns; i++)
-					if (fnmatch(epattern[i], p->fts_path, 0) == 0) {
+					if (fnmatch(epattern[i], basename(p->fts_path), 0) == 0) {
 						ok = 1;
 						break;
 					}