Changes to grep/src/grep.c,v

[Bernhard Rosenkraenzer]

CVSROOT:        /sources/grep
Module name:    grep
Changes by:     Bernhard Rosenkraenzer <bero>   06/08/18 22:00:31

Index: src/grep.c
===================================================================
RCS file: /sources/grep/grep/src/grep.c,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -b -r1.120 -r1.121
--- src/grep.c  18 Aug 2006 21:38:03 -0000      1.120
+++ src/grep.c  18 Aug 2006 22:00:31 -0000      1.121
@@ -265,6 +265,7 @@
 
 static struct exclude *excluded_patterns;
 static struct exclude *included_patterns;
+static struct exclude *excluded_directory_patterns;
 /* Short options.  */
 static char const short_options[] =
 "0123456789A:B:C:D:HITUVabcd:e:f:hiKLlm:noqRrsuvwxyZz"
@@ -282,7 +283,8 @@
   EXCLUDE_OPTION,
   EXCLUDE_FROM_OPTION,
   LINE_BUFFERED_OPTION,
-  LABEL_OPTION
+  LABEL_OPTION,
+  EXCLUDE_DIRECTORY_OPTION
 };
 
 /* Long options equivalences. */
@@ -307,6 +309,7 @@
   {"directories", required_argument, NULL, 'd'},
   {"exclude", required_argument, NULL, EXCLUDE_OPTION},
   {"exclude-from", required_argument, NULL, EXCLUDE_FROM_OPTION},
+  {"exclude-dir", required_argument, NULL, EXCLUDE_DIRECTORY_OPTION},
   {"file", required_argument, NULL, 'f'},
   {"files-with-matches", no_argument, NULL, 'l'},
   {"files-without-match", no_argument, NULL, 'L'},
@@ -1332,9 +1335,14 @@
 static int
 grepdir (char const *dir, struct stats const *stats)
 {
-  int status = 1;
   struct stats const *ancestor;
   char *name_space;
+  int status = 1;
+  if ( excluded_directory_patterns &&
+       excluded_filename (excluded_directory_patterns, dir, 0)  ) {
+       return 1;
+  }    
+
 
   /* Mingw32 does not support st_ino.  No known working hosts use zero
      for st_ino, so assume that the Mingw32 bug applies if it's zero.  */
@@ -1350,7 +1358,7 @@
        }
 
   name_space = savedir (dir, stats->stat.st_size, included_patterns,
-                       excluded_patterns);
+                       excluded_patterns, excluded_directory_patterns);
 
   if (! name_space)
     {
@@ -1464,6 +1472,7 @@
       --include=FILE_PATTERN  search only files that match FILE_PATTERN\n\
       --exclude=FILE_PATTERN  skip files and directories matching 
FILE_PATTERN\n\
       --exclude-from=FILE   skip files matching any file pattern from FILE\n\
+      --exclude-dir=PATTERN directories that match PATTERN will be skipped.\n\
   -L, --files-without-match print only names of FILEs containing no match\n\
   -l, --files-with-matches  print only names of FILEs containing matches\n\
   -c, --count               print only a count of matching lines per FILE\n\
@@ -2098,7 +2107,6 @@
          excluded_patterns = new_exclude ();
        add_exclude (excluded_patterns, optarg);
        break;
-
       case EXCLUDE_FROM_OPTION:
        if (!excluded_patterns)
          excluded_patterns = new_exclude ();
@@ -2109,12 +2117,20 @@
           }
         break;
 
+      case EXCLUDE_DIRECTORY_OPTION:
+        if (!excluded_directory_patterns)
+         excluded_directory_patterns = new_exclude ();
+       add_exclude (excluded_directory_patterns, optarg);
+        break; 
+       
       case INCLUDE_OPTION:
        if (!included_patterns)
          included_patterns = new_exclude ();
        add_exclude (included_patterns, optarg);
        break;
 
+       
+
       case LINE_BUFFERED_OPTION:
        line_buffered = 1;
        break;