From owner-p4-projects@FreeBSD.ORG  Wed Feb  4 10:24:09 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 58547106566C; Wed,  4 Feb 2009 10:24:08 +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 15B541065670
	for <perforce@freebsd.org>; Wed,  4 Feb 2009 10:24:08 +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 DC70F8FC24
	for <perforce@freebsd.org>; Wed,  4 Feb 2009 10:24:07 +0000 (UTC)
	(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n14AO7hu098556
	for <perforce@freebsd.org>; Wed, 4 Feb 2009 10:24:07 GMT
	(envelope-from gabor@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n14AO7wk098554
	for perforce@freebsd.org; Wed, 4 Feb 2009 10:24:07 GMT
	(envelope-from gabor@freebsd.org)
Date: Wed, 4 Feb 2009 10:24:07 GMT
Message-Id: <200902041024.n14AO7wk098554@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 157128 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, 04 Feb 2009 10:24:11 -0000

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

Change 157128 by gabor@gabor_server on 2009/02/04 10:23:19

	- Add --exclude-dir and --include-dir, options similar to
	  --exclude and --include but for directories
	
	Requested by:	bz

Affected files ...

.. //depot/projects/soc2008/gabor_textproc/grep/grep.c#80 edit
.. //depot/projects/soc2008/gabor_textproc/grep/util.c#79 edit

Differences ...

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

@@ -182,8 +182,8 @@
 	{"colour",		optional_argument,	NULL, COLOR_OPT},
 	{"exclude",		required_argument,	NULL, R_EXCLUDE_OPT},
 	{"include",		required_argument,	NULL, R_INCLUDE_OPT},
-/*	{"exclude-dir",		required_argument,	NULL, R_DEXCLUDE_OPT},
-	{"include-dir",		required_argument,	NULL, R_DINCLUDE_OPT}, */
+	{"exclude-dir",		required_argument,	NULL, R_DEXCLUDE_OPT},
+	{"include-dir",		required_argument,	NULL, R_DINCLUDE_OPT},
 	{"after-context",	required_argument,	NULL, 'A'},
 	{"text",		no_argument,		NULL, 'a'},
 	{"before-context",	required_argument,	NULL, 'B'},

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

@@ -66,6 +66,7 @@
 	FTS		*fts;
 	FTSENT		*p;
 	int		 i, c, ok, fts_flags;
+	char		*d, *dirname;
 
 	c = fts_flags = 0;
 
@@ -99,14 +100,30 @@
 			/* Check for file exclusion/inclusion */
 			ok = 1;
 			if (exclflag) {
+				d = strrchr(p->fts_path, '/');
+				dirname = grep_malloc(sizeof(char) * (d - p->fts_path + 2));
+				strlcpy(dirname, p->fts_path, (d - p->fts_path + 1));
 				for (i = 0; i < epatterns; ++i) {
-					if (fnmatch(epattern[i].pat, basename(p->fts_path), 0) == 0) {
-						if (epattern[i].mode == EXCL_PAT)
-							ok = 0;
-						else
-							ok = 1;
+					switch(epattern[i].type) {
+					case FILE_PAT:
+						if (fnmatch(epattern[i].pat, basename(p->fts_path), 0) == 0) {
+							if (epattern[i].mode == EXCL_PAT)
+								ok = 0;
+							else
+								ok = 1;
+						}
+						break;
+					case DIR_PAT:
+						if (strstr(dirname, epattern[i].pat) != NULL) {
+							if (epattern[i].mode == EXCL_PAT)
+								ok = 0;
+							else
+								ok = 1;
+						}
+						break;
 					}
 				}
+			free(dirname);
 			}
 
 			if (ok)