@@ -1,3 +1,8 @@

+Tue Mar  1 02:29:54 CET 2005 (tk)

+---------------------------------

+  * clamscan: use --include-dir/exclude-dir for directories instead of

+	      --include/exclude

+

 Tue Mar  1 02:16:15 CET 2005 (tk)

 ---------------------------------

   * clamscan: respect --exclude/include when entering directories (requested

@@ -218,10 +218,14 @@ void help(void)

     mprintf("    --move=DIRECTORY                     Move infected files into DIRECTORY\n");

 #ifdef HAVE_REGEX_H

     mprintf("    --exclude=REGEX                      Don't scan file names matching REGEX\n");

+    mprintf("    --exclude-dir=REGEX                  Don't scan directories matching REGEX\n");

     mprintf("    --include=REGEX                      Only scan file names matching REGEX\n");

+    mprintf("    --include-dir=REGEX                  Only scan directories matching REGEX\n");

 #else

     mprintf("    --exclude=PATT                       Don't scan file names containing PATT\n");

+    mprintf("    --exclude-dir=PATT                   Don't scan directories containing PATT\n");

     mprintf("    --include=PATT                       Only scan file names containing PATT\n");

+    mprintf("    --include-dir=PATT                   Only scan directories containing PATT\n");

 #endif

     mprintf("\n");

@@ -83,7 +83,9 @@ int main(int argc, char **argv)

 	    {"move", 1, 0, 0},

 	    {"remove", 0, 0, 0},

 	    {"exclude", 1, 0, 0},

+	    {"exclude-dir", 1, 0, 0},

 	    {"include", 1, 0, 0},

+	    {"include-dir", 1, 0, 0},

 	    {"max-files", 1, 0, 0},

 	    {"max-space", 1, 0, 0},

             {"max-ratio", 1, 0, 0},

@@ -56,8 +56,8 @@ int treewalk(const char *dirname, struct cl_node *root, const struct passwd *use

 	char *argument;

-    if(optl(opt, "exclude")) {

-	argument = getfirstargl(opt, "exclude", &optnode);

+    if(optl(opt, "exclude-dir")) {

+	argument = getfirstargl(opt, "exclude-dir", &optnode);

 	while(argument) {

 	    if(match_regex(dirname, argument) == 1) {

 		if(!printinfected)

@@ -68,9 +68,9 @@ int treewalk(const char *dirname, struct cl_node *root, const struct passwd *use

 	}

     }

-   if(optl(opt, "include")) {

+   if(optl(opt, "include-dir")) {

 	included = 0;

-	argument = getfirstargl(opt, "include", &optnode);

+	argument = getfirstargl(opt, "include-dir", &optnode);

 	while(argument && !included) {

 	    if(match_regex(dirname, argument) == 1) {

 		included = 1;

@@ -1,5 +1,5 @@

 .\" Manual page created by Tomasz Kojm, 14/15 IV 2002

-.TH "clamscan" "1" "January 26, 2005" "Tomasz Kojm" "Clam AntiVirus"

+.TH "clamscan" "1" "March 1, 2005" "Tomasz Kojm" "Clam AntiVirus"

 .SH "NAME"

 .LP 

 clamscan \- scan files and directories against viruses

@@ -52,11 +52,11 @@ Sound bell on virus detection.

 \fB\-\-no\-summary\fR

 Do not display summary at the end of scanning.

 .TP 

-\fB\-\-exclude=PATT\fR

-Don't scan file names containing PATT. It may be used multiple times.

+\fB\-\-exclude=PATT, \-\-exclude\-dir=PATT\fR

+Don't scan file/directory names containing PATT. It may be used multiple times.

 .TP 

-\fB\-\-include=PATT\fR

-Only scan file names containing PATT. It may be used multiple times.

+\fB\-\-include=PATT, \-\-include\-dir=PATT\fR

+Only scan file/directory names containing PATT. It may be used multiple times.

 .TP 

 \fB\-i, \-\-infected\fR

 Only print infected files.