@@ -157,7 +157,7 @@ int cli_scancpio_old(cli_ctx *ctx)

 	    if(ret == CL_EMAXFILES) {

 		return ret;

 	    } else if(ret == CL_SUCCESS) {

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

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

 		if(ret == CL_VIRUS)

 		    return ret;

 	    }

@@ -234,7 +234,7 @@ int cli_scancpio_odc(cli_ctx *ctx)

 	if(ret == CL_EMAXFILES) {

 	    return ret;

 	} else if(ret == CL_SUCCESS) {

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

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

 	    if(ret == CL_VIRUS)

 		return ret;

 	}

@@ -313,7 +313,7 @@ int cli_scancpio_newc(cli_ctx *ctx, int crc)

 	if(ret == CL_EMAXFILES) {

 	    return ret;

 	} else if(ret == CL_SUCCESS) {

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

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

 	    if(ret == CL_VIRUS)

 		return ret;

 	}

@@ -180,7 +180,7 @@ int cli_scandmg(cli_ctx *ctx)

     }

     /* scan XML with cli_map_scandesc */

-    ret = cli_map_scan(*ctx->fmap, (off_t)hdr.xmlOffset, (size_t)hdr.xmlLength, ctx);

+    ret = cli_map_scan(*ctx->fmap, (off_t)hdr.xmlOffset, (size_t)hdr.xmlLength, ctx, CL_TYPE_ANY);

     if (ret != CL_CLEAN) {

         cli_dbgmsg("cli_scandmg: retcode from scanning TOC xml: %s\n", cl_strerror(ret));

         if (!ctx->engine->keeptmp)

@@ -553,7 +553,7 @@ int cli_scanmacho_unibin(cli_ctx *ctx)

 	cli_dbgmsg("UNIBIN: Binary %u of %u\n", i + 1, fat_header.nfats);

 	cli_dbgmsg("UNIBIN: File offset: %u\n", fat_arch.offset);

 	cli_dbgmsg("UNIBIN: File size: %u\n", fat_arch.size);

-	ret = cli_map_scan(map, fat_arch.offset, fat_arch.size, ctx);

+	ret = cli_map_scan(map, fat_arch.offset, fat_arch.size, ctx, CL_TYPE_ANY);

 	if(ret == CL_VIRUS)

 	    break;

     }

@@ -554,7 +554,7 @@ char *cli_gentemp(const char *dir);

 int cli_gentempfd(const char *dir, char **name, int *fd);

 unsigned int cli_rndnum(unsigned int max);

 int cli_filecopy(const char *src, const char *dest);

-int cli_mapscan(fmap_t *map, off_t offset, size_t size, cli_ctx *ctx);

+int cli_mapscan(fmap_t *map, off_t offset, size_t size, cli_ctx *ctx, cli_file_t type);

 bitset_t *cli_bitset_init(void);

 void cli_bitset_free(bitset_t *bs);

 int cli_bitset_set(bitset_t *bs, unsigned long bit_offset);

@@ -2979,7 +2979,7 @@ int cl_scandesc(int desc, const char **virname, unsigned long int *scanned, cons

 }

 /* For map scans that may be forced to disk */

-int cli_map_scan(cl_fmap_t *map, off_t offset, size_t length, cli_ctx *ctx)

+int cli_map_scan(cl_fmap_t *map, off_t offset, size_t length, cli_ctx *ctx, cli_file_t type)

 {

     off_t old_off = map->nested_offset;

     size_t old_len = map->len;

@@ -3035,7 +3035,7 @@ int cli_map_scan(cl_fmap_t *map, off_t offset, size_t length, cli_ctx *ctx)

         }

         /* scan the temp file */

-        ret = cli_base_scandesc(fd, ctx, CL_TYPE_ANY);

+        ret = cli_base_scandesc(fd, ctx, type);

         /* remove the temp file, if needed */

         if (fd > -1) {

@@ -3051,13 +3051,13 @@ int cli_map_scan(cl_fmap_t *map, off_t offset, size_t length, cli_ctx *ctx)

     }

     else {

         /* Not forced to disk, use nested map */

-        ret = cli_map_scandesc(map, offset, length, ctx);

+        ret = cli_map_scandesc(map, offset, length, ctx, type);

     }

     return ret;

 }

 /* For map scans that are not forced to disk */

-int cli_map_scandesc(cl_fmap_t *map, off_t offset, size_t length, cli_ctx *ctx)

+int cli_map_scandesc(cl_fmap_t *map, off_t offset, size_t length, cli_ctx *ctx, cli_file_t type)

 {

     off_t old_off = map->nested_offset;

     size_t old_len = map->len;

@@ -3091,7 +3091,7 @@ int cli_map_scandesc(cl_fmap_t *map, off_t offset, size_t length, cli_ctx *ctx)

     map->len = length;

     map->real_len = map->nested_offset + length;

     if (CLI_ISCONTAINED(old_off, old_len, map->nested_offset, map->len)) {

-	ret = magic_scandesc(ctx, CL_TYPE_ANY);

+	ret = magic_scandesc(ctx, type);

     } else {

 	long long len1, len2;

 	len1 = old_off + old_len;

@@ -3114,7 +3114,7 @@ int cli_mem_scandesc(const void *buffer, size_t length, cli_ctx *ctx)

     if (!map) {

 	return CL_EMAP;

     }

-    ret = cli_map_scan(map, 0, length, ctx);

+    ret = cli_map_scan(map, 0, length, ctx, CL_TYPE_ANY);

     cl_fmap_close(map);

     return ret;

 }

@@ -3163,7 +3163,7 @@ static int scan_common(int desc, cl_fmap_t *map, const char **virname, unsigned

 #endif

     cli_logg_setup(&ctx);

-    rc = map ? cli_map_scandesc(map, 0, map->len, &ctx) : cli_magic_scandesc(desc, &ctx);

+    rc = map ? cli_map_scandesc(map, 0, map->len, &ctx, CL_TYPE_ANY) : cli_magic_scandesc(desc, &ctx);

     if (ctx.options & CL_SCAN_ALLMATCHES) {

 	*virname = (char *)ctx.virname; /* temp hack for scanall mode until api augmentation */

@@ -28,8 +28,8 @@

 int cli_magic_scandesc(int desc, cli_ctx *ctx);

 int cli_partition_scandesc(int desc, cli_ctx *ctx);

 int cli_magic_scandesc_type(cli_ctx *ctx, cli_file_t type);

-int cli_map_scandesc(cl_fmap_t *map, off_t offset, size_t length, cli_ctx *ctx);

-int cli_map_scan(cl_fmap_t *map, off_t offset, size_t length, cli_ctx *ctx);

+int cli_map_scandesc(cl_fmap_t *map, off_t offset, size_t length, cli_ctx *ctx, cli_file_t type);

+int cli_map_scan(cl_fmap_t *map, off_t offset, size_t length, cli_ctx *ctx, cli_file_t type);

 int cli_mem_scandesc(const void *buffer, size_t length, cli_ctx *ctx);

 int cli_found_possibly_unwanted(cli_ctx* ctx);