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

+Fri Mar 25 23:21:18 CET 2005 (tk)

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

+  * clamscan: add --max-dir-recursion

+

 Fri Mar 25 19:48:42 GMT 2005 (njh)

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

   * libclamav:	Added TNEF (winmail.dat) decoding. Now finds eicar in test 14

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

 /*

- *  Copyright (C) 2002 - 2004 Tomasz Kojm <tkojm@clamav.net>

+ *  Copyright (C) 2002 - 2005 Tomasz Kojm <tkojm@clamav.net>

  *

  *  This program is free software; you can redistribute it and/or modify

  *  it under the terms of the GNU General Public License as published by

@@ -240,10 +240,13 @@ void help(void)

     mprintf("    --mail-follow-urls                   Download and scan URLs\n");

     mprintf("\n");

-    mprintf("    --max-space=#n                       Extract first #n kilobytes only\n");

-    mprintf("    --max-files=#n                       Extract first #n files only\n");

-    mprintf("    --max-recursion=#n                   Maximal recursion level\n");

+    mprintf("    --max-space=#n                       Only extract first #n kilobytes from\n");

+    mprintf("                                         archived files\n");

+    mprintf("    --max-files=#n                       Only extract first #n files from\n");

+    mprintf("                                         archives\n");

+    mprintf("    --max-recursion=#n                   Maximum archive recursion level\n");

     mprintf("    --max-ratio=#n                       Maximum compression ratio limit\n");

+    mprintf("    --max-dir-recursion=#n               Maximum directory recursion level\n");

     mprintf("    --unzip[=FULLPATH]                   Enable support for .zip files\n");

     mprintf("    --unrar[=FULLPATH]                   Enable support for .rar files\n");

     mprintf("    --arj[=FULLPATH]                     Enable support for .arj files\n");

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

 	char *tmpdir, *gendir, *userprg;

 	struct stat statbuf;

+

     stat(filename, &statbuf);

     if(!S_ISREG(statbuf.st_mode)) {

@@ -569,8 +570,13 @@ int scancompressed(const char *filename, struct cl_node *root, const struct pass

     /* fix permissions of extracted files */

     fixperms(gendir);

-    if(!ret) /* execute successful */

-	ret = treewalk(gendir, root, user, opt, limits, options);

+    if(!ret) { /* execute successful */

+	    short oldrec = recursion;

+

+	recursion = 1;

+	ret = treewalk(gendir, root, user, opt, limits, options, 1);

+	recursion = oldrec;

+    }

     /* remove the directory  - as clamav */

     if(!optl(opt, "leave-temps"))

@@ -608,12 +614,8 @@ int scancompressed(const char *filename, struct cl_node *root, const struct pass

 	case -3:

 	    return 0;

 	case 0:

-	    /* no viruses found in archive, we scan just in case the same

-	     * archive

+	    /* no viruses found in archive, we scan just in case a raw file

 	     */

-	    if(!printinfected)

-		mprintf("(raw) ");

-

 	    if((ret = checkfile(filename, root, limits, 0)) == CL_VIRUS) {

 		if(optl(opt, "remove")) {

 		    if(unlink(filename)) {

@@ -629,8 +631,8 @@ int scancompressed(const char *filename, struct cl_node *root, const struct pass

 	    }

 	    return ret;

 	case 1:

-	    logg("%s: Infected Archive FOUND\n", filename);

-	    mprintf("%s: Infected Archive FOUND\n", filename);

+	    logg("%s: Infected.Archive FOUND\n", filename);

+	    mprintf("%s: Infected.Archive FOUND\n", filename);

 	    if(bell)

 		fprintf(stderr, "\007");

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

     }

 #endif

-    if((ret = treewalk(gendir, root, user, opt, limits, options)) == 1) {

+    if((ret = treewalk(gendir, root, user, opt, limits, options, 1)) == 1) {

 	logg("(Real infected archive: %s)\n", filename);

 	mprintf("(Real infected archive: %s)\n", filename);

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

 int scandirs(const char *dirname, struct cl_node *root, const struct passwd *user, const struct optstruct *opt, const struct cl_limits *limits, int options)

 {

-	return treewalk(dirname, root, user, opt, limits, options);

+	return treewalk(dirname, root, user, opt, limits, options, 1);

 }

 int checkfile(const char *filename, const struct cl_node *root, const struct cl_limits *limits, int options)

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

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

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

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

+	    {"max-dir-recursion", 1, 0, 0},

 	    {"disable-archive", 0, 0, 0},

 	    {"no-archive", 0, 0, 0},

 	    {"detect-broken", 0, 0, 0},

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

 /*

- *  Copyright (C) 2002 - 2004 Tomasz Kojm <tkojm@clamav.net>

+ *  Copyright (C) 2002 - 2005 Tomasz Kojm <tkojm@clamav.net>

  *

  *  This program is free software; you can redistribute it and/or modify

  *  it under the terms of the GNU General Public License as published by

@@ -40,18 +40,14 @@

 #include "memory.h"

 #include "output.h"

-/*

- * recursive functions, similar to ftw(), these functions are duplicated below

- * with some small changes.

- */

-

-int treewalk(const char *dirname, struct cl_node *root, const struct passwd *user, const struct optstruct *opt, const struct cl_limits *limits, int options)

+int treewalk(const char *dirname, struct cl_node *root, const struct passwd *user, const struct optstruct *opt, const struct cl_limits *limits, int options, unsigned int depth)

 {

 	DIR *dd;

 	struct dirent *dent;

 	struct stat statbuf;

 	char *fname;

 	int scanret = 0, included;

+	unsigned int maxdepth;

 	struct optnode *optnode;

 	char *argument;

@@ -86,6 +82,14 @@ int treewalk(const char *dirname, struct cl_node *root, const struct passwd *use

 	}

     }

+    if(optl(opt, "max-dir-recursion"))

+        maxdepth = atoi(getargl(opt, "max-dir-recursion"));

+    else

+        maxdepth = 15;

+

+    if(depth > maxdepth)

+	return 0;

+

     claminfo.dirs++;

     if((dd = opendir(dirname)) != NULL) {

@@ -102,7 +106,7 @@ int treewalk(const char *dirname, struct cl_node *root, const struct passwd *use

 		    /* stat the file */

 		    if(lstat(fname, &statbuf) != -1) {

 			if(S_ISDIR(statbuf.st_mode) && !S_ISLNK(statbuf.st_mode) && recursion) {

-			    if(treewalk(fname, root, user, opt, limits, options) == 1)

+			    if(treewalk(fname, root, user, opt, limits, options, ++depth) == 1)

 				scanret++;

 			} else {

 			    if(S_ISREG(statbuf.st_mode))

@@ -29,7 +29,7 @@ struct s_du {

     long int space; /* in kilobytes */

 };

-int treewalk(const char *dirname, struct cl_node *root, const struct passwd *user, const struct optstruct *opt, const struct cl_limits *limits, int options);

+int treewalk(const char *dirname, struct cl_node *root, const struct passwd *user, const struct optstruct *opt, const struct cl_limits *limits, int options, unsigned int depth);

 int rmdirs(const char *dirname);

 int clamav_rmdirs(const char *dir);