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

+Sun Oct 29 15:36:21 CET 2006 (tk)

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

+  * clamscan, clamdscan: new option --copy, patch from aCaB

+

 Sun Oct 29 15:06:21 CET 2006 (tk)

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

   * clamd/thrmgr.c: fix possible memory leaks and improve handling of memory

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

 	time_t starttime;

 	struct optstruct *opt;

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

-				  "stdout", "log", "move", "remove",

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

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

 				  "disable-summary", NULL };

@@ -149,6 +149,7 @@ void help(void)

     mprintf("    --log=FILE          -l FILE        Save scan report in FILE\n");

     mprintf("    --remove                           Remove infected files. Be careful!\n");

     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("    --no-summary                       Disable summary at end of scanning\n");

@@ -80,13 +80,13 @@ static int dsresult(int sockd, const struct optstruct *opt)

 	if(strstr(buff, "FOUND\n")) {

 	    infected++;

 	    logg("%s", buff);

-	    if(opt_check(opt, "move")) {

+	    if(opt_check(opt, "move") || opt_check(opt, "copy")) {

 		/* filename: Virus FOUND */

 		if((pt = strrchr(buff, ':'))) {

 		    *pt = 0;

 		    move_infected(buff, opt);

 		} else {

-		    mprintf("@Broken data format. File not moved.\n");

+		    mprintf("@Broken data format. File not %s.\n", opt_check(opt, "move") ? "moved" : "copied");

 		}

 	    } else if(opt_check(opt, "remove")) {

@@ -515,10 +515,12 @@ void move_infected(const char *filename, const struct optstruct *opt)

 	char *movedir, *movefilename, *tmp, numext[4 + 1];

 	struct stat fstat, mfstat;

 	int n, len, movefilename_size;

+	int moveflag = opt_check(opt, "move");

 	struct utimbuf ubuf;

-    if(!(movedir = opt_arg(opt, "move"))) {

+    if((moveflag && !(movedir = opt_arg(opt, "move"))) ||

+        (!moveflag && !(movedir = opt_arg(opt, "copy")))) {

         /* Should never reach here */

         logg("^opt_arg() returned NULL\n");

         notmoved++;

@@ -526,7 +528,7 @@ void move_infected(const char *filename, const struct optstruct *opt)

     }

     if(access(movedir, W_OK|X_OK) == -1) {

-        logg("^error moving file '%s': cannot write to '%s': %s\n", filename, movedir, strerror(errno));

+        logg("^error %s file '%s': cannot write to '%s': %s\n", (moveflag) ? "moving" : "copying", filename, movedir, strerror(errno));

         notmoved++;

         return;

     }

@@ -589,9 +591,9 @@ void move_infected(const char *filename, const struct optstruct *opt)

        }

     }

-    if(rename(filename, movefilename) == -1) {

+    if(!moveflag || rename(filename, movefilename) == -1) {

 	if(filecopy(filename, movefilename) == -1) {

-	    logg("^cannot move '%s' to '%s': %s\n", filename, movefilename, strerror(errno));

+	    logg("^cannot %s '%s' to '%s': %s\n", (moveflag) ? "move" : "copy", filename, movefilename, strerror(errno));

 	    notmoved++;

 	    free(movefilename);

 	    return;

@@ -604,7 +606,7 @@ void move_infected(const char *filename, const struct optstruct *opt)

 	ubuf.modtime = fstat.st_mtime;

 	utime(movefilename, &ubuf);

-	if(unlink(filename)) {

+	if(moveflag && unlink(filename)) {

 	    logg("^cannot unlink '%s': %s\n", filename, strerror(errno));

 	    notremoved++;            

 	    free(movefilename);

@@ -612,7 +614,7 @@ void move_infected(const char *filename, const struct optstruct *opt)

 	}

     }

-    logg("%s: moved to '%s'\n", filename, movefilename);

+    logg("%s: %s to '%s'\n", (moveflag)?"moved":"copied", filename, movefilename);

     free(movefilename);

 }

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

 	    logg("Not removed: %d\n", claminfo.notremoved);

 	}

 	if(claminfo.notmoved) {

-	    logg("Not moved: %d\n", claminfo.notmoved);

+	    logg("Not %s: %d\n", opt_check(opt, "copy") ? "moved" : "copied", claminfo.notmoved);

 	}

 	mb = claminfo.blocks * (CL_COUNT_PRECISION / 1024) / 1024.0;

 	logg("Data scanned: %2.2lf MB\n", mb);

@@ -235,6 +235,7 @@ void help(void)

     mprintf("    --recursive           -r             Scan subdirectories recursively\n");

     mprintf("    --remove                             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");

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

     {"threads", 1, 0, 0},	    /* not used */

     {"one-virus", 0, 0, 0},	    /* not used */

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

+    {"copy", 1, 0, 0},

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

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

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

@@ -391,7 +391,7 @@ int scanfile(const char *filename, struct cl_node *root, const struct passwd *us

 		} else {

 		    logg("%s: Removed\n", filename);

 		}

-	    } else if (opt_check(opt, "move"))

+	    } else if (opt_check(opt, "move") || opt_check(opt, "copy"))

 		move_infected(filename, opt);

 	    return 1;

@@ -455,7 +455,7 @@ int scanfile(const char *filename, struct cl_node *root, const struct passwd *us

 	    } else {

 		logg("%s: Removed\n", filename);

 	    }

-	} else if (opt_check(opt, "move"))

+	} else if (opt_check(opt, "move") || opt_check(opt, "copy"))

             move_infected(filename, opt);

     }

     return ret;

@@ -618,7 +618,7 @@ int scancompressed(const char *filename, struct cl_node *root, const struct pass

 		    } else {

 			logg("%s: Removed\n", filename);

 		    }

-		} else if (opt_check(opt, "move"))

+		} else if (opt_check(opt, "move") || opt_check(opt, "copy"))

 		    move_infected(filename, opt);

 	    }

 	    return ret;

@@ -635,7 +635,7 @@ int scancompressed(const char *filename, struct cl_node *root, const struct pass

 		    } else {

 			logg("%s: Removed\n", filename);

 		    }

-		} else if (opt_check(opt, "move"))

+		} else if (opt_check(opt, "move") || opt_check(opt, "copy"))

 		    move_infected(filename, opt);

 	    }

 	    return ret;

@@ -652,7 +652,7 @@ int scancompressed(const char *filename, struct cl_node *root, const struct pass

 		} else {

 		    logg("%s: Removed\n", filename);

 		}

-	    } else if (opt_check(opt, "move"))

+	    } else if (opt_check(opt, "move") || opt_check(opt, "copy"))

 		move_infected(filename, opt);

 	    return 1;

@@ -732,7 +732,7 @@ int scandenied(const char *filename, struct cl_node *root, const struct passwd *

 	    } else {

 	        logg("%s: Removed\n", filename);

 	    }

-	} else if (opt_check(opt, "move"))

+	} else if (opt_check(opt, "move") || opt_check(opt, "copy"))

 	    move_infected(filename, opt);

     }

@@ -957,10 +957,12 @@ void move_infected(const char *filename, const struct optstruct *opt)

 	char *movedir, *movefilename, *tmp, numext[4 + 1];

 	struct stat fstat, mfstat;

 	int n, len, movefilename_size;

+	int moveflag = opt_check(opt, "move");

 	struct utimbuf ubuf;

-    if(!(movedir = opt_arg(opt, "move"))) {

+    if((moveflag && !(movedir = opt_arg(opt, "move"))) ||

+	(!moveflag && !(movedir = opt_arg(opt, "copy")))) {

         /* Should never reach here */

         logg("!opt_arg() returned NULL\n", filename);

         claminfo.notmoved++;

@@ -968,7 +970,7 @@ void move_infected(const char *filename, const struct optstruct *opt)

     }

     if(access(movedir, W_OK|X_OK) == -1) {

-        logg("!Can't move file '%s': cannot write to '%s': %s\n", filename, movedir, strerror(errno));

+	logg("!Can't %s file '%s': cannot write to '%s': %s\n", (moveflag) ? "move" : "copy", filename, movedir, strerror(errno));

         claminfo.notmoved++;

         return;

     }

@@ -1026,9 +1028,9 @@ void move_infected(const char *filename, const struct optstruct *opt)

        }

     }

-    if(rename(filename, movefilename) == -1) {

+    if(!moveflag || rename(filename, movefilename) == -1) {

 	if(filecopy(filename, movefilename) == -1) {

-	    logg("!Can't move '%s' to '%s': %s\n", filename, movefilename, strerror(errno));

+	    logg("!Can't %s '%s' to '%s': %s\n", (moveflag) ? "move" : "copy", filename, movefilename, strerror(errno));

 	    claminfo.notmoved++;

 	    free(movefilename);

 	    return;

@@ -1043,7 +1045,7 @@ void move_infected(const char *filename, const struct optstruct *opt)

 	ubuf.modtime = fstat.st_mtime;

 	utime(movefilename, &ubuf);

-	if(unlink(filename)) {

+	if(moveflag && unlink(filename)) {

 	    logg("!Can't unlink '%s': %s\n", filename, strerror(errno));

 	    claminfo.notremoved++;            

 	    free(movefilename);

@@ -1051,7 +1053,7 @@ void move_infected(const char *filename, const struct optstruct *opt)

 	}

     }

-    logg("%s: moved to '%s'\n", filename, movefilename);

+    logg("%s: %s to '%s'\n", filename, (moveflag) ? "moved" : "copied", movefilename);

     free(movefilename);

 }