[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. debian/0.95+dfsg-1-6156-g094ec9b

[Tomasz Kojm]

The following commit has been merged in the debian/unstable branch:
commit 9da619b44ec346ecb7826eb7435d8d3017194ac7
Author: Tomasz Kojm <tkojm at clamav.net>
Date:   Fri Dec 4 14:20:12 2009 +0100

    clamscan: properly describe --include/exclude (bb#1765)

diff --git a/ChangeLog b/ChangeLog
index 52916b2..d6da769 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Dec  4 14:19:23 CET 2009 (tk)
+---------------------------------
+ * clamscan: properly describe --include/exclude (bb#1765)
+
 Wed Dec  2 23:17:27 CET 2009 (tk)
 ---------------------------------
  * libclamav/qsort.c: fix CMP1 macro (bb#1769)
diff --git a/clamscan/clamscan.c b/clamscan/clamscan.c
index b9fefcb..85c7aa2 100644
--- a/clamscan/clamscan.c
+++ b/clamscan/clamscan.c
@@ -209,17 +209,10 @@ void help(void)
     mprintf("    --remove[=yes/no(*)]                 Remove infected files. Be careful!\n");
     mprintf("    --move=DIRECTORY                     Move infected files into DIRECTORY\n");
     mprintf("    --copy=DIRECTORY                     Copy 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");
     mprintf("    --detect-pua[=yes/no(*)]             Detect Possibly Unwanted Applications\n");
     mprintf("    --exclude-pua=CAT                    Skip PUA sigs of category CAT\n");
diff --git a/docs/man/clamscan.1.in b/docs/man/clamscan.1.in
index 339ca0c..36b4bdf 100644
--- a/docs/man/clamscan.1.in
+++ b/docs/man/clamscan.1.in
@@ -60,11 +60,11 @@ Sound bell on virus detection.
 \fB\-\-no\-summary\fR
 Do not display summary at the end of scanning.
 .TP 
-\fB\-\-exclude=PATT, \-\-exclude\-dir=PATT\fR
-Don't scan file/directory names containing PATT. It may be used multiple times.
+\fB\-\-exclude=REGEX, \-\-exclude\-dir=REGEX\fR
+Don't scan file/directory names matching regular expression. These options can be used multiple times.
 .TP 
-\fB\-\-include=PATT, \-\-include\-dir=PATT\fR
-Only scan file/directory names containing PATT. It may be used multiple times.
+\fB\-\-include=REGEX, \-\-include\-dir=REGEX\fR
+Only scan file/directory matching regular expression. These options can be used multiple times.
 .TP 
 \fB\-i, \-\-infected\fR
 Only print infected files.

-- 
Debian repository for ClamAV