@@ -1,3 +1,7 @@

+Sat Jan 13 01:01:40 CET 2007 (tk)

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

+  * clamdscan: add new option --multiscan, -m

+

 Sat Jan 13 00:59:01 CET 2007 (tk)

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

   * libclamav: extract and scan RAR archives file-by-file (bb#141)

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

 	char *clamdscan_accepted[] = { "help", "version", "verbose", "quiet",

 				  "stdout", "log", "move", "copy", "remove",

 				  "config-file", "no-summary",

-				  "disable-summary", NULL };

+				  "disable-summary", "multiscan", NULL };

     opt = opt_parse(argc, argv, clamscan_shortopt, clamscan_longopt, clamdscan_accepted);

@@ -151,7 +151,8 @@ void help(void)

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

     mprintf("    --copy=DIRECTORY                   Copy infected files into DIRECTORY\n");

     mprintf("    --config-file=FILE                 Read configuration from FILE.\n");

-    mprintf("    --infected            -i             Only print infected files\n");

+    mprintf("    --multiscan           -m           Force MULTISCAN mode\n");

+    mprintf("    --infected            -i           Only print infected files\n");

     mprintf("    --no-summary                       Disable summary at end of scanning\n");

     mprintf("\n");

@@ -411,6 +411,9 @@ int client(const struct optstruct *opt, int *infected)

     *infected = 0;

+    if(ncore || opt_check(opt, "multiscan"))

+	scantype = "MULTISCAN";

+

     /* parse argument list */

     if(opt->filename == NULL || strlen(opt->filename) == 0) {

 	/* scan current directory */

@@ -422,12 +425,6 @@ int client(const struct optstruct *opt, int *infected)

 	if((sockd = dconnect(opt)) < 0)

 	    return 2;

-	/* TODO: add a cmdline option to allow using MULTISCAN on systems

-	 * without hardware accelerators (but with multiple CPUs)

-	 */

-	if(ncore)

-	    scantype = "MULTISCAN";

-

 	if((ret = dsfile(sockd, scantype, cwd, opt)) >= 0)

 	    *infected += ret;

 	else

@@ -486,9 +483,6 @@ int client(const struct optstruct *opt, int *infected)

 			if((sockd = dconnect(opt)) < 0)

 			    return 2;

-			if(ncore)

-			    scantype = "MULTISCAN";

-

 			if((ret = dsfile(sockd, scantype, fullpath, opt)) >= 0)

 			    *infected += ret;

 			else

@@ -38,6 +38,7 @@ static struct option clamscan_longopt[] = {

     {"tempdir", 1, 0, 0},

     {"leave-temps", 0, 0, 0},

     {"config-file", 1, 0, 0},	    /* clamdscan */

+    {"multiscan", 0, 0, 'm'},

     {"database", 1, 0, 'd'},

     {"force", 0, 0, 0},

     {"recursive", 0, 0, 'r'},

@@ -34,6 +34,9 @@ Read clamd settings from FILE.

 \fB\-l FILE, \-\-log=FILE\fR

 Save the scan report to FILE.

 .TP 

+\fB\-m, \-\-multiscan\fR

+Always use MULTISCAN instead of CONTSCAN.

+.TP

 \fB\-\-remove\fR

 Remove infected files. \fBBe careful.\fR

 .TP