@@ -619,6 +619,7 @@ fileblobScan(const fileblob *fb)

 {

 	int rc;

 	STATBUF sb;

+        int virus_found = 0;

 	if(fb->isInfected)

 		return CL_VIRUS;

@@ -636,11 +637,14 @@ fileblobScan(const fileblob *fb)

 	fflush(fb->fp);

 	lseek(fb->fd, 0, SEEK_SET);

 	FSTAT(fb->fd, &sb);

-	if(cli_matchmeta(fb->ctx, fb->b.name, sb.st_size, sb.st_size, 0, 0, 0, NULL) == CL_VIRUS)

-	    return CL_VIRUS;

+	if(cli_matchmeta(fb->ctx, fb->b.name, sb.st_size, sb.st_size, 0, 0, 0, NULL) == CL_VIRUS) {

+            if (!(fb->ctx->options & CL_SCAN_ALLMATCHES))

+                return CL_VIRUS;

+            virus_found = 1;

+        }

 	rc = cli_magic_scandesc(fb->fd, fb->ctx);

-	if(rc == CL_VIRUS) {

+	if(rc == CL_VIRUS || virus_found != 0) {

 		cli_dbgmsg("%s is infected\n", fb->fullname);

 		return CL_VIRUS;

 	}

@@ -102,14 +102,17 @@ int cli_scancpio_old(cli_ctx *ctx)

 	char name[513];

 	unsigned int file = 0, trailer = 0;

 	uint32_t filesize, namesize, hdr_namesize;

-	int ret, conv;

+	int ret = CL_CLEAN, conv;

 	off_t pos = 0;

+        int virus_found = 0;

     while(fmap_readn(*ctx->fmap, &hdr_old, pos, sizeof(hdr_old)) == sizeof(hdr_old)) {

 	pos += sizeof(hdr_old);

-	if(!hdr_old.magic && trailer)

-	    return CL_SUCCESS;

+	if(!hdr_old.magic && trailer) {

+            ret = CL_SUCCESS;

+	    goto leave;

+        }

 	if(hdr_old.magic == 070707) {

 	    conv = 0;

@@ -117,7 +120,8 @@ int cli_scancpio_old(cli_ctx *ctx)

 	    conv = 1;

 	} else {

 	    cli_dbgmsg("cli_scancpio_old: Invalid magic number\n");

-	    return CL_EFORMAT;

+	    ret = CL_EFORMAT;

+            goto leave;

 	}

 	cli_dbgmsg("CPIO: -- File %u --\n", ++file);

@@ -148,8 +152,11 @@ int cli_scancpio_old(cli_ctx *ctx)

 	if(!filesize)

 	    continue;

-	if(cli_matchmeta(ctx, name, filesize, filesize, 0, file, 0, NULL) == CL_VIRUS)

-	    return CL_VIRUS;

+	if(cli_matchmeta(ctx, name, filesize, filesize, 0, file, 0, NULL) == CL_VIRUS) {

+            if (!SCAN_ALL)

+                return CL_VIRUS;

+            virus_found = 1;

+        }

 	if((EC16(hdr_old.mode, conv) & 0170000) != 0100000) {

@@ -157,11 +164,14 @@ int cli_scancpio_old(cli_ctx *ctx)

 	} else {

 	    ret = cli_checklimits("cli_scancpio_old", ctx, filesize, 0, 0);

 	    if(ret == CL_EMAXFILES) {

-		return ret;

+		goto leave;

 	    } else if(ret == CL_SUCCESS) {

 		ret = cli_map_scan(*ctx->fmap, pos, filesize, ctx, CL_TYPE_ANY);

-		if(ret == CL_VIRUS)

-		    return ret;

+		if(ret == CL_VIRUS) {

+                    if (!SCAN_ALL)

+                        return ret;

+                    virus_found = 1;

+                }

 	    }

 	}

 	if(filesize % 2)

@@ -170,7 +180,10 @@ int cli_scancpio_old(cli_ctx *ctx)

 	pos += filesize;

     }

-    return CL_CLEAN;

+ leave:

+    if (virus_found != 0)

+        return CL_VIRUS;

+    return ret;

 }

 int cli_scancpio_odc(cli_ctx *ctx)

@@ -179,18 +192,20 @@ int cli_scancpio_odc(cli_ctx *ctx)

 	char name[513], buff[12];

 	unsigned int file = 0, trailer = 0;

 	uint32_t filesize, namesize, hdr_namesize;

-	int ret;

+	int ret = CL_CLEAN;

 	off_t pos = 0;

+        int virus_found = 0;

     while(fmap_readn(*ctx->fmap, &hdr_odc, pos, sizeof(hdr_odc)) == sizeof(hdr_odc)) {

 	pos += sizeof(hdr_odc);

 	if(!hdr_odc.magic[0] && trailer)

-	    return CL_SUCCESS;

+	    goto leave;

 	if(strncmp(hdr_odc.magic, "070707", 6)) {

 	    cli_dbgmsg("cli_scancpio_odc: Invalid magic string\n");

-	    return CL_EFORMAT;

+	    ret = CL_EFORMAT;

+            goto leave;

 	}

 	cli_dbgmsg("CPIO: -- File %u --\n", ++file);

@@ -199,13 +214,15 @@ int cli_scancpio_odc(cli_ctx *ctx)

 	buff[6] = 0;

 	if(sscanf(buff, "%o", &hdr_namesize) != 1) {

 	    cli_dbgmsg("cli_scancpio_odc: Can't convert name size\n");

-	    return CL_EFORMAT;

+	    ret = CL_EFORMAT;

+            goto leave;

 	}

 	if(hdr_namesize) {

 	    namesize = MIN(sizeof(name), hdr_namesize);

 	    if ((uint32_t)fmap_readn(*ctx->fmap, &name, pos, namesize) != namesize) {

 		cli_dbgmsg("cli_scancpio_odc: Can't read file name\n");

-		return CL_EFORMAT;

+		ret = CL_EFORMAT;

+                goto leave;

 	    }

 	    pos += namesize;

 	    name[namesize - 1] = 0;

@@ -222,29 +239,39 @@ int cli_scancpio_odc(cli_ctx *ctx)

 	buff[11] = 0;

 	if(sscanf(buff, "%o", &filesize) != 1) {

 	    cli_dbgmsg("cli_scancpio_odc: Can't convert file size\n");

-	    return CL_EFORMAT;

+	    ret = CL_EFORMAT;

+            goto leave;

 	}

 	cli_dbgmsg("CPIO: Filesize: %u\n", filesize);

 	if(!filesize)

 	    continue;

-	if(cli_matchmeta(ctx, name, filesize, filesize, 0, file, 0, NULL) == CL_VIRUS)

-	    return CL_VIRUS;

+	if(cli_matchmeta(ctx, name, filesize, filesize, 0, file, 0, NULL) == CL_VIRUS) {

+            if (!SCAN_ALL)

+                return CL_VIRUS;

+            virus_found = 1;

+        }

 	ret = cli_checklimits("cli_scancpio_odc", ctx, filesize, 0, 0);

 	if(ret == CL_EMAXFILES) {

-	    return ret;

+	    goto leave;

 	} else if(ret == CL_SUCCESS) {

 	    ret = cli_map_scan(*ctx->fmap, pos, filesize, ctx, CL_TYPE_ANY);

-	    if(ret == CL_VIRUS)

-		return ret;

+	    if(ret == CL_VIRUS) {

+                if (!SCAN_ALL)

+                    return ret;

+                virus_found = 1;

+            }

 	}

 	pos += filesize;

     }

-    return CL_CLEAN;

+ leave:

+    if (virus_found != 0)

+        return CL_VIRUS;

+    return ret;

 }

 int cli_scancpio_newc(cli_ctx *ctx, int crc)

@@ -253,19 +280,21 @@ int cli_scancpio_newc(cli_ctx *ctx, int crc)

 	char name[513], buff[9];

 	unsigned int file = 0, trailer = 0;

 	uint32_t filesize, namesize, hdr_namesize, pad;

-	int ret;

+	int ret = CL_CLEAN;

 	off_t pos = 0;

+        int virus_found = 0;

     memset(name, 0, 513);

     while(fmap_readn(*ctx->fmap, &hdr_newc, pos, sizeof(hdr_newc)) == sizeof(hdr_newc)) {

 	pos += sizeof(hdr_newc);

 	if(!hdr_newc.magic[0] && trailer)

-	    return CL_SUCCESS;

+	    goto leave;

 	if((!crc && strncmp(hdr_newc.magic, "070701", 6)) || (crc && strncmp(hdr_newc.magic, "070702", 6))) {

 	    cli_dbgmsg("cli_scancpio_newc: Invalid magic string\n");

-	    return CL_EFORMAT;

+	    ret = CL_EFORMAT;

+            goto leave;

 	}

 	cli_dbgmsg("CPIO: -- File %u --\n", ++file);

@@ -274,13 +303,15 @@ int cli_scancpio_newc(cli_ctx *ctx, int crc)

 	buff[8] = 0;

 	if(sscanf(buff, "%x", &hdr_namesize) != 1) {

 	    cli_dbgmsg("cli_scancpio_newc: Can't convert name size\n");

-	    return CL_EFORMAT;

+	    ret = CL_EFORMAT;

+            goto leave;

 	}

 	if(hdr_namesize) {

 	    namesize = MIN(sizeof(name), hdr_namesize);

 	    if ((uint32_t)fmap_readn(*ctx->fmap, &name, pos, namesize) != namesize) {

 		cli_dbgmsg("cli_scancpio_newc: Can't read file name\n");

-		return CL_EFORMAT;

+		ret = CL_EFORMAT;

+                goto leave;

 	    }

 	    pos += namesize;

 	    name[namesize - 1] = 0;

@@ -302,23 +333,29 @@ int cli_scancpio_newc(cli_ctx *ctx, int crc)

 	buff[8] = 0;

 	if(sscanf(buff, "%x", &filesize) != 1) {

 	    cli_dbgmsg("cli_scancpio_newc: Can't convert file size\n");

-	    return CL_EFORMAT;

+	    ret = CL_EFORMAT;

+            goto leave;

 	}

 	cli_dbgmsg("CPIO: Filesize: %u\n", filesize);

 	if(!filesize)

 	    continue;

-	if(cli_matchmeta(ctx, name, filesize, filesize, 0, file, 0, NULL) == CL_VIRUS)

-	    return CL_VIRUS;

-

+	if(cli_matchmeta(ctx, name, filesize, filesize, 0, file, 0, NULL) == CL_VIRUS) {

+            if (!SCAN_ALL)

+                return CL_VIRUS;

+            virus_found = 1;

+        }

 	ret = cli_checklimits("cli_scancpio_newc", ctx, filesize, 0, 0);

 	if(ret == CL_EMAXFILES) {

-	    return ret;

+	    goto leave;

 	} else if(ret == CL_SUCCESS) {

 	    ret = cli_map_scan(*ctx->fmap, pos, filesize, ctx, CL_TYPE_ANY);

-	    if(ret == CL_VIRUS)

-		return ret;

+	    if(ret == CL_VIRUS) {

+                if (!SCAN_ALL)

+                    return ret;

+                virus_found = 1;

+            }

 	}

 	if((pad = filesize % 4))

@@ -327,5 +364,8 @@ int cli_scancpio_newc(cli_ctx *ctx, int crc)

 	pos += filesize;

     }

-    return CL_CLEAN;

+ leave:

+    if (virus_found != 0)

+        return CL_VIRUS;

+    return ret;

 }

@@ -350,6 +350,7 @@ int cli_scanishield(cli_ctx *ctx, off_t off, size_t sz) {

     struct IS_CABSTUFF c = { NULL, -1, 0, 0 };

     fmap_t *map = *ctx->fmap;

     unsigned fc = 0;

+    int virus_found = 0;

     while(ret == CL_CLEAN) {

 	fname = fmap_need_offstr(map, coff, 2048);

@@ -379,8 +380,12 @@ int cli_scanishield(cli_ctx *ctx, off_t off, size_t sz) {

 	cli_dbgmsg("ishield: @%lx found file %s (%s) - version %s - size %lu\n", (unsigned long int) coff, fname, path, version, (unsigned long int) fsize);

 	if(cli_matchmeta(ctx, fname, fsize, fsize, 0, fc++, 0, NULL) == CL_VIRUS) {

-	    ret = CL_VIRUS;

-	    break;

+            if (!SCAN_ALL) {

+                ret = CL_VIRUS;

+                break;

+            }

+            ret = CL_CLEAN;

+            virus_found = 1;

 	}

 	sz -= (data - fname) + fsize;

@@ -436,6 +441,9 @@ int cli_scanishield(cli_ctx *ctx, off_t off, size_t sz) {

       } else if( ret == CL_BREAK ) ret = CL_CLEAN;

     }

     if(c.cabs) free(c.cabs);

+

+    if (virus_found != 0)

+        return CL_VIRUS;

     return ret;

 }

@@ -205,6 +205,7 @@ static int cli_scandir(const char *dirname, cli_ctx *ctx)

 static int cli_unrar_scanmetadata(int desc, unrar_metadata_t *metadata, cli_ctx *ctx, unsigned int files, uint32_t* sfx_check)

 {

 	int ret = CL_SUCCESS;

+        int virus_found = 0;

     if(files == 1 && sfx_check) {

 	if(*sfx_check == metadata->crc)

@@ -218,8 +219,11 @@ static int cli_unrar_scanmetadata(int desc, unrar_metadata_t *metadata, cli_ctx

 	(unsigned int) metadata->unpack_size, metadata->method,

 	metadata->pack_size ? (unsigned int) (metadata->unpack_size / metadata->pack_size) : 0);

-    if(cli_matchmeta(ctx, metadata->filename, metadata->pack_size, metadata->unpack_size, metadata->encrypted, files, metadata->crc, NULL) == CL_VIRUS)

-	return CL_VIRUS;

+    if(cli_matchmeta(ctx, metadata->filename, metadata->pack_size, metadata->unpack_size, metadata->encrypted, files, metadata->crc, NULL) == CL_VIRUS) {

+        if (!SCAN_ALL)

+            return CL_VIRUS;

+        virus_found = 1;

+    }

     if(DETECT_ENCRYPTED && metadata->encrypted) {

 	cli_dbgmsg("RAR: Encrypted files found in archive.\n");

@@ -230,6 +234,8 @@ static int cli_unrar_scanmetadata(int desc, unrar_metadata_t *metadata, cli_ctx

 	}

     }

+    if (virus_found != 0)

+        return CL_VIRUS;

     return ret;

 }

@@ -375,6 +381,7 @@ static int cli_scanarj(cli_ctx *ctx, off_t sfx_offset, uint32_t *sfx_check)

 	int ret = CL_CLEAN, rc, file = 0;

 	arj_metadata_t metadata;

 	char *dir;

+        int virus_found = 0;

     UNUSEDPARAM(sfx_check);

@@ -410,10 +417,14 @@ static int cli_scanarj(cli_ctx *ctx, off_t sfx_offset, uint32_t *sfx_check)

 	}

 	file++;

 	if(cli_matchmeta(ctx, metadata.filename, metadata.comp_size, metadata.orig_size, metadata.encrypted, file, 0, NULL) == CL_VIRUS) {

-        cli_rmdirs(dir);

-        free(dir);

-	    return CL_VIRUS;

-    }

+            if (!SCAN_ALL) {

+                cli_rmdirs(dir);

+                free(dir);

+                return CL_VIRUS;

+            }

+            virus_found = 1;

+            ret = CL_SUCCESS;

+        }

 	if ((ret = cli_checklimits("ARJ", ctx, metadata.orig_size, metadata.comp_size, 0))!=CL_CLEAN) {

 	    ret = CL_SUCCESS;

@@ -433,12 +444,16 @@ static int cli_scanarj(cli_ctx *ctx, off_t sfx_offset, uint32_t *sfx_check)

 	    close(metadata.ofd);

 	    if (rc == CL_VIRUS) {

 		cli_dbgmsg("ARJ: infected with %s\n", cli_get_last_virus(ctx));

-		ret = CL_VIRUS;

-		if (metadata.filename) {

-		    free(metadata.filename);

-		    metadata.filename = NULL;

-		}

-		break;

+                if (!SCAN_ALL) {

+                    ret = CL_VIRUS;

+                    if (metadata.filename) {

+                        free(metadata.filename);

+                        metadata.filename = NULL;

+                    }

+                    break;

+                }

+                virus_found = 1;

+                ret = CL_SUCCESS;

 	    }

 	}

 	if (metadata.filename) {

@@ -456,6 +471,8 @@ static int cli_scanarj(cli_ctx *ctx, off_t sfx_offset, uint32_t *sfx_check)

 	free(metadata.filename);

     }

+    if (virus_found != 0)

+        ret = CL_VIRUS;

     cli_dbgmsg("ARJ: Exit code: %d\n", ret);

     if (ret == CL_BREAK)

 	ret = CL_CLEAN;

@@ -1484,7 +1501,7 @@ static int cli_scanscript(cli_ctx *ctx)

 	cli_ac_freedata(&tmdata);

 	cli_ac_freedata(&gmdata);

-	if (SCAN_ALL && viruses_found)

+	if (viruses_found)

 		return CL_VIRUS;

 	return ret;

@@ -1688,7 +1705,7 @@ static int cli_scanmschm(cli_ctx *ctx)

     if (ret == CL_BREAK)

 	ret = CL_CLEAN;

-    if (SCAN_ALL && viruses_found)

+    if (viruses_found)

 	return CL_VIRUS;

     return ret;

 }

@@ -1918,7 +1935,7 @@ static int cli_scanmail(cli_ctx *ctx)

 	cli_rmdirs(dir);

     free(dir);

-    if (SCAN_ALL && viruses_found)

+    if (viruses_found)

 	return CL_VIRUS;

     return ret;

 }

@@ -2000,7 +2017,7 @@ static int cli_scan_structured(cli_ctx *ctx)

 	    return CL_VIRUS;

     }

-    if (SCAN_ALL && viruses_found)

+    if (viruses_found)

 	return CL_VIRUS;

     return CL_CLEAN;

 }

@@ -2595,6 +2612,8 @@ static int magic_scandesc_cleanup(cli_ctx *ctx, cli_file_t type, unsigned char *

             cache_add(hash, hashed_size, ctx);

         perf_stop(ctx, PERFT_CACHE);

     }

+    if (retcode == CL_VIRUS && SCAN_ALL)

+        return CL_CLEAN;

     return retcode;

 }

@@ -504,6 +504,7 @@ static unsigned int lhdr(fmap_t *map, uint32_t loff,uint32_t zsize, unsigned int

   const uint8_t *lh, *zip;

   char name[256];

   uint32_t csize, usize;

+  int virus_found = 0;

   if(!(lh = fmap_need_off(map, loff, SIZEOF_LH))) {

       cli_dbgmsg("cli_unzip: lh - out of file\n");

@@ -540,8 +541,10 @@ static unsigned int lhdr(fmap_t *map, uint32_t loff,uint32_t zsize, unsigned int

   /* ZMDfmt virname:encrypted(0-1):filename(exact|*):usize(exact|*):csize(exact|*):crc32(exact|*):method(exact|*):fileno(exact|*):maxdepth(exact|*) */

   if(cli_matchmeta(ctx, name, LH_csize, LH_usize, (LH_flags & F_ENCR)!=0, fc, LH_crc32, NULL) == CL_VIRUS) {

-    *ret = CL_VIRUS;

-    return 0;

+      *ret = CL_VIRUS;

+      if (!SCAN_ALL)

+          return 0;

+      virus_found = 1;

   }

   if(LH_flags & F_MSKED) {

@@ -555,8 +558,11 @@ static unsigned int lhdr(fmap_t *map, uint32_t loff,uint32_t zsize, unsigned int

     cli_dbgmsg("cli_unzip: Encrypted files found in archive.\n");

     cli_append_virus(ctx, "Heuristics.Encrypted.Zip");

     *ret = CL_VIRUS;

-    fmap_unneed_off(map, loff, SIZEOF_LH);

-    return 0;

+    if (!SCAN_ALL) {

+        fmap_unneed_off(map, loff, SIZEOF_LH);

+        return 0;

+    }

+    virus_found = 1;

   }

   if(LH_flags & F_USEDD) {

@@ -595,6 +601,9 @@ static unsigned int lhdr(fmap_t *map, uint32_t loff,uint32_t zsize, unsigned int

       zsize-=csize;

   }

+  if (virus_found != 0)

+      *ret = CL_VIRUS;

+

   fmap_unneed_off(map, loff, SIZEOF_LH); /* unneed now. block is guaranteed to exists till the next need */

   if(LH_flags & F_USEDD) {

       if(zsize<12) {