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

+Sat Mar  7 19:15:14 CET 2009 (acab)

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

+ * clamscan: extend clamscan summary (bb#1206)

+

 Sat Mar  7 16:31:17 CET 2009 (acab)

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

  * clamdscan: unify error messages

@@ -64,7 +64,7 @@ short recursion = 0, printinfected = 0, bell = 0;

 int main(int argc, char **argv)

 {

 	int ds, dms, ret;

-	double mb;

+	double mb, rmb;

 	struct timeval t1, t2;

 #ifndef C_WINDOWS

 	struct timezone tz;

@@ -195,6 +195,8 @@ int main(int argc, char **argv)

 	}

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

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

+	rmb = info.rblocks * (CL_COUNT_PRECISION / 1024) / 1024.0;

+	logg("Data read: %2.2lf MB (ratio %.2f:1)\n", rmb, info.rblocks ? (double)info.blocks/(double)info.rblocks : 0);

 	logg("Time: %u.%3.3u sec (%u m %u s)\n", ds, dms/1000, ds/60, ds%60);

     }

@@ -26,7 +26,8 @@ struct s_info {

     unsigned int dirs;		/* number of scanned directories */

     unsigned int files;		/* number of scanned files */

     unsigned int ifiles;	/* number of infected files */

-    unsigned long int blocks;	/* number of read 16kb blocks */

+    unsigned long int blocks;	/* number of *scanned* 16kb blocks */

+    unsigned long int rblocks;	/* number of *read* 16kb blocks */

 };

 extern struct s_info info;

@@ -79,7 +79,7 @@ dev_t procdev;

 static int scanfile(const char *filename, struct cl_engine *engine, const struct optstruct *opts, unsigned int options)

 {

-	int ret = 0, fd, included, printclean = 1;

+  int ret = 0, fd, included, printclean = 1, fsize;

 	const struct optstruct *opt;

 	const char *virname;

 #ifdef C_LINUX

@@ -122,12 +122,13 @@ static int scanfile(const char *filename, struct cl_engine *engine, const struct

 	}

     }

-    if(fileinfo(filename, 1) == 0) {

+    fsize = fileinfo(filename, 1);

+    if(fsize == 0) {

 	if(!printinfected)

 	    logg("~%s: Empty file\n", filename);

 	return 0;

     }

-

+    info.rblocks += fsize / CL_COUNT_PRECISION;

 #ifndef C_WINDOWS

     if(geteuid())

 	if(checkaccess(filename, NULL, R_OK) != 1) {

@@ -258,6 +259,7 @@ static int scandirs(const char *dirname, struct cl_engine *engine, const struct

 static int scanstdin(const struct cl_engine *engine, const struct optstruct *opts, int options)

 {

 	int ret;

+	unsigned int fsize = 0;

 	const char *virname, *tmpdir;

 	char *file, buff[FILEBUFF];

 	size_t bread;

@@ -290,17 +292,19 @@ static int scanstdin(const struct cl_engine *engine, const struct optstruct *opt

 	return 63;

     }

-    while((bread = fread(buff, 1, FILEBUFF, stdin)))

+    while((bread = fread(buff, 1, FILEBUFF, stdin))) {

+	fsize += bread;

 	if(fwrite(buff, 1, bread, fs) < bread) {

 	    logg("!Can't write to %s\n", file);

 	    free(file);

 	    return 58;

 	}

-

+    }

     fclose(fs);

     logg("*Checking %s\n", file);

     info.files++;

+    info.rblocks += fsize / CL_COUNT_PRECISION;

     if((ret = cl_scanfile(file, &virname, &info.blocks, engine, options)) == CL_VIRUS) {

 	logg("stdin: %s FOUND\n", virname);