PERFORCE change 156976 for review

[Gabor Kovesdan]

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

Change 156976 by gabor at 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;