From owner-p4-projects@FreeBSD.ORG  Sun Feb  1 00:26:07 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 800761065712; Sun,  1 Feb 2009 00:26:07 +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 3C01910656BF
	for <perforce@freebsd.org>; Sun,  1 Feb 2009 00:26:07 +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 2A3DF8FC12
	for <perforce@freebsd.org>; Sun,  1 Feb 2009 00:26: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 n110Q7id067363
	for <perforce@freebsd.org>; Sun, 1 Feb 2009 00:26:07 GMT
	(envelope-from gabor@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n110Q7I7067361
	for perforce@freebsd.org; Sun, 1 Feb 2009 00:26:07 GMT
	(envelope-from gabor@freebsd.org)
Date: Sun, 1 Feb 2009 00:26:07 GMT
Message-Id: <200902010026.n110Q7I7067361@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 156976 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: Sun, 01 Feb 2009 00:26:08 -0000

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

Change 156976 by gabor@gabor_server on 2009/02/01 00:25:40

	- We just ignore --exclude and --include if -r isn't specified.
	  This is the GNU behaviour and it is more flexible, because it
	  doesn't fail if --exclude / --include precede -r.

Affected files ...

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

Differences ...

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

@@ -513,26 +513,18 @@
 			nullflag = 1;
 			break;
 		case R_INCLUDE_OPT:
-			if (dirbehave != DIR_RECURSE)
-				usage();
 			exclflag = 1;
 			add_epattern(basename(optarg), strlen(basename(optarg)), FILE_PAT, INCL_PAT);
 			break;
 		case R_EXCLUDE_OPT:
-			if (dirbehave != DIR_RECURSE)
-				usage();
 			exclflag = 1;
 			add_epattern(basename(optarg), strlen(basename(optarg)), FILE_PAT, EXCL_PAT);
 			break;
 		case R_DINCLUDE_OPT:
-			if (dirbehave != DIR_RECURSE)
-				usage();
 			exclflag = 1;
 			add_epattern(basename(optarg), strlen(basename(optarg)), DIR_PAT, INCL_PAT);
 			break;
 		case R_DEXCLUDE_OPT:
-			if (dirbehave != DIR_RECURSE)
-				usage();
 			exclflag = 1;
 			add_epattern(basename(optarg), strlen(basename(optarg)), DIR_PAT, EXCL_PAT);
 			break;