[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. debian/0.95+dfsg-1-6156-g094ec9b

[aCaB]

The following commit has been merged in the debian/unstable branch:
commit 76d92cf01a3908a01f11be593f89b2b8e8526712
Author: aCaB <acab at clamav.net>
Date:   Tue Jan 19 11:50:05 2010 +0100

    bb#1760

diff --git a/ChangeLog b/ChangeLog
index 48431a8..51427a5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Jan 19 11:49:12 CET 2010 (acab)
+-----------------------------------
+  * clamdscan/proto.c: don't stop scanning if a file is not found (bb#1760)
+
 Tue Jan 19 11:26:11 CET 2010 (acab)
 -----------------------------------
   * clamscan/manager.c: use unsigned fsize (bb#1788)
diff --git a/clamdscan/proto.c b/clamdscan/proto.c
index 3021ff2..212dddd 100644
--- a/clamdscan/proto.c
+++ b/clamdscan/proto.c
@@ -354,7 +354,6 @@ static int serial_callback(struct stat *sb, char *filename, const char *path, en
     switch(reason) {
     case error_stat:
 	logg("!Can't access file %s\n", path);
-	c->errors++;
 	return CL_SUCCESS;
     case error_mem:
 	logg("!Memory allocation failed in ftw\n");
@@ -414,6 +413,7 @@ int serial_client_scan(char *file, int scantype, int *infected, int maxlevel, in
 	return 0;
     } else if(!cdata.files) {
 	logg("~%s: No files scanned\n", file);
+	return 0;
     }
     return 1;
 }
@@ -499,7 +499,6 @@ static int parallel_callback(struct stat *sb, char *filename, const char *path,
     switch(reason) {
     case error_stat:
 	logg("!Can't access file %s\n", path);
-	c->errors++;
 	return CL_SUCCESS;
     case error_mem:
 	logg("!Memory allocation failed in ftw\n");
@@ -618,6 +617,8 @@ int parallel_client_scan(char *file, int scantype, int *infected, int maxlevel,
 	logg("!Clamd closed the connection before scanning all files.\n");
 	return 1;
     }
+    if(!cdata.files)
+	return 0;
     if(cdata.errors == cdata.files)
 	return 1;
     if(cdata.printok)

-- 
Debian repository for ClamAV