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

+Sun Oct 17 01:28:48 CEST 2004 (tk)

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

+  * libclamav: count unpacked data scanned with cl_scanbuff()

+

 Sat Oct 16 20:11:15 BST 2004 (njh)

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

   * libclamav/mbox.c:	Rudimentary handling of BeMail (BeOS) messages.

@@ -12,7 +16,7 @@ Sat Oct 16 18:24:33 BST 2004 (njh)

 Sat Oct 16 17:10:06 BST 2004 (njh)

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

   * libclamav/untar.c:	Handle empty files in the middle of archives, reported

-				by René Bellora <rbellora@tecnoaccion.com.ar>

+				by René Bellora <rbellora*tecnoaccion.com.ar>

 Sat Oct 16 14:55:03 BST 2004 (njh)

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

@@ -1066,6 +1066,9 @@ int cli_scanpe(int desc, const char **virname, long int *scanned, const struct c

 		free(tempfile);

 	    }

+	    if(scanned)

+		*scanned += dsize / CL_COUNT_PRECISION;

+

 	    ret = cl_scanbuff(dest, dsize, virname, root);

 	    free(section_hdr);

 	    free(src);

@@ -840,6 +840,9 @@ static int cli_vba_scandir(const char *dirname, const char **virname, long int *

 	    if(!data) {

 		cli_dbgmsg("VBADir: WARNING: VBA project '%s' decompressed to NULL\n", vba_project->name[i]);

 	    } else {

+		if(scanned)

+		    *scanned += data_len / CL_COUNT_PRECISION;

+

 		if(cli_scanbuff(data, data_len, virname, root, CL_TYPE_MSOLE2) == CL_VIRUS) {

 		    free(data);

 		    ret = CL_VIRUS;

@@ -882,6 +885,8 @@ static int cli_vba_scandir(const char *dirname, const char **virname, long int *

 		if(!data) {

 			cli_dbgmsg("VBADir: WARNING: WM project '%s' macro %d decrypted to NULL\n", vba_project->name[i], i);

 		} else {

+			if(scanned)

+			    *scanned += vba_project->length[i] / CL_COUNT_PRECISION;

 			if(cli_scanbuff(data, vba_project->length[i], virname, root, CL_TYPE_MSOLE2) == CL_VIRUS) {

 				free(data);

 				ret = CL_VIRUS;