@@ -55,7 +55,7 @@ int cli_scanapm(cli_ctx *ctx)

 {

     struct apm_driver_desc_map ddm;

     struct apm_partition_info aptable, apentry;

-    int ret = 0, old_school = 0;

+    int ret = CL_CLEAN, detection = CL_CLEAN, old_school = 0;

     size_t sectorsize, maplen, partsize, sectorcheck;

     off_t pos = 0, partoff = 0;

     unsigned i;

@@ -139,10 +139,11 @@ int cli_scanapm(cli_ctx *ctx)

     /* check that the partition table fits in the space specified - HEURISTICS */

     if ((ctx->options & CL_SCAN_PARTITION_INTXN) && (ctx->dconf->other & OTHER_CONF_PRTNINTXN)) {

         ret = apm_prtn_intxn(ctx, aptable, sectorsize, old_school);

-        if ((ret != CL_CLEAN) &&

-            !((ctx->options & CL_SCAN_ALLMATCHES) && (ret == CL_VIRUS))) {

-

-            return ret;

+        if (ret != CL_CLEAN) {

+            if ((ctx->options & CL_SCAN_ALLMATCHES) && (ret == CL_VIRUS))

+                detection = CL_VIRUS;

+            else

+                return ret;

         }

     }

@@ -223,13 +224,15 @@ int cli_scanapm(cli_ctx *ctx)

         cli_dbgmsg("Type: %s\n", (char*)apentry.type);

         cli_dbgmsg("Signature: %x\n", apentry.signature);

         cli_dbgmsg("Partition Count: %u\n", apentry.numPartitions);

-        cli_dbgmsg("Blocks: [%u, +%u), ([%u, +%u))\n",

-                   apentry.pBlockStart, apentry.pBlockCount, partoff, partsize);

+        cli_dbgmsg("Blocks: [%u, +%u), ([%lu, +%lu))\n",

+                   apentry.pBlockStart, apentry.pBlockCount, (long unsigned)partoff, (long unsigned)partsize);

         /* send the partition to cli_map_scan */

         ret = cli_map_scan(*ctx->fmap, partoff, partsize, ctx, CL_TYPE_PART_ANY);

-        if ((ret != CL_CLEAN) &&

-            !((ctx->options & CL_SCAN_ALLMATCHES) && (ret == CL_VIRUS))) {

+        if (ret != CL_CLEAN) {

+            if ((ctx->options & CL_SCAN_ALLMATCHES) && (ret == CL_VIRUS))

+                detection = CL_VIRUS;

+            else

                 return ret;

         }

     } 

@@ -238,7 +241,7 @@ int cli_scanapm(cli_ctx *ctx)

         cli_dbgmsg("cli_scanapm: max partitions reached\n");

     }

-    return ret;

+    return detection;

 }

 static int apm_prtn_intxn(cli_ctx *ctx, struct apm_partition_info aptable, size_t sectorsize, int old_school)

@@ -246,7 +249,7 @@ static int apm_prtn_intxn(cli_ctx *ctx, struct apm_partition_info aptable, size_

     prtn_intxn_list_t prtncheck;

     struct apm_partition_info apentry;

     unsigned i, pitxn;

-    int ret = 0, tmp = 0;

+    int ret = CL_CLEAN, tmp = CL_CLEAN;

     off_t pos;

     uint32_t max_prtns = 0;

@@ -103,7 +103,7 @@ int cli_scangpt(cli_ctx *ctx, size_t sectorsize)

 {

     struct gpt_header phdr, shdr;

     enum GPT_SCANSTATE state = INVALID;

-    int ret = 0;

+    int ret = CL_CLEAN, detection = CL_CLEAN;

     size_t maplen;

     off_t pos = 0;

@@ -134,10 +134,11 @@ int cli_scangpt(cli_ctx *ctx, size_t sectorsize)

     /* check the protective mbr */

     ret = gpt_check_mbr(ctx, sectorsize);

-    if ((ret != CL_CLEAN) &&

-        !((ctx->options & CL_SCAN_ALLMATCHES) && (ret == CL_VIRUS))) {

-

-        return ret;

+    if (ret != CL_CLEAN) {

+        if ((ctx->options & CL_SCAN_ALLMATCHES) && (ret == CL_VIRUS))

+            detection = CL_VIRUS;

+        else

+            return ret;

     }

     pos = GPT_PRIMARY_HDR_LBA * sectorsize; /* sector 1 (second sector) is the primary gpt header */

@@ -197,16 +198,18 @@ int cli_scangpt(cli_ctx *ctx, size_t sectorsize)

     /* check that the partition table has no intersections - HEURISTICS */

     if ((ctx->options & CL_SCAN_PARTITION_INTXN) && (ctx->dconf->other & OTHER_CONF_PRTNINTXN)) {

         ret = gpt_prtn_intxn(ctx, phdr, sectorsize);

-        if ((ret != CL_CLEAN) &&

-            !((ctx->options & CL_SCAN_ALLMATCHES) && (ret == CL_VIRUS))) {

-            

-            return ret;

+        if (ret != CL_CLEAN) {

+            if ((ctx->options & CL_SCAN_ALLMATCHES) && (ret == CL_VIRUS))

+                detection = CL_VIRUS;

+            else

+                return ret;

         }

         ret = gpt_prtn_intxn(ctx, shdr, sectorsize);

-        if ((ret != CL_CLEAN) &&

-            !((ctx->options & CL_SCAN_ALLMATCHES) && (ret == CL_VIRUS))) {

-            

-            return ret;

+        if (ret != CL_CLEAN) {

+            if ((ctx->options & CL_SCAN_ALLMATCHES) && (ret == CL_VIRUS))

+                detection = CL_VIRUS;

+            else

+                return ret;

         }

     }

@@ -215,44 +218,52 @@ int cli_scangpt(cli_ctx *ctx, size_t sectorsize)

     case PRIMARY_ONLY:

         cli_dbgmsg("cli_scangpt: Scanning primary GPT partitions only\n");

         ret = gpt_scan_partitions(ctx, phdr, sectorsize);

-        if ((ret != CL_CLEAN) && 

-            !((ctx->options & CL_SCAN_ALLMATCHES) && (ret == CL_VIRUS))) {

-                break;

+        if (ret != CL_CLEAN) {

+            if ((ctx->options & CL_SCAN_ALLMATCHES) && (ret == CL_VIRUS))

+                detection = CL_VIRUS;

+            else

+                return ret;

         }

         break;

     case SECONDARY_ONLY:

         cli_dbgmsg("cli_scangpt: Scanning secondary GPT partitions only\n");

         ret = gpt_scan_partitions(ctx, shdr, sectorsize);

-        if ((ret != CL_CLEAN) && 

-            !((ctx->options & CL_SCAN_ALLMATCHES) && (ret == CL_VIRUS))) {

-                break;

+        if (ret != CL_CLEAN) {

+            if ((ctx->options & CL_SCAN_ALLMATCHES) && (ret == CL_VIRUS))

+                detection = CL_VIRUS;

+            else

+                return ret;

         }

         break;

     case BOTH:

         cli_dbgmsg("cli_scangpt: Scanning primary GPT partitions\n");

         ret = gpt_scan_partitions(ctx, phdr, sectorsize);

-        if ((ret != CL_CLEAN) &&

-            !((ctx->options & CL_SCAN_ALLMATCHES) && (ret == CL_VIRUS))) {

-                break;

+        if (ret != CL_CLEAN) {

+            if ((ctx->options & CL_SCAN_ALLMATCHES) && (ret == CL_VIRUS))

+                detection = CL_VIRUS;

+            else

+                return ret;

         }

         cli_dbgmsg("cli_scangpt: Scanning secondary GPT partitions\n");

         ret = gpt_scan_partitions(ctx, shdr, sectorsize);

-        if ((ret != CL_CLEAN) &&

-            !((ctx->options & CL_SCAN_ALLMATCHES) && (ret == CL_VIRUS))) {

-                break;

+        if (ret != CL_CLEAN) {

+            if ((ctx->options & CL_SCAN_ALLMATCHES) && (ret == CL_VIRUS))

+                detection = CL_VIRUS;

+            else

+                return ret;

         }

         break;

     default:

         cli_dbgmsg("cli_scangpt: State is invalid\n");

     }

-    return ret;

+    return detection;

 }

 static int gpt_scan_partitions(cli_ctx *ctx, struct gpt_header hdr, size_t sectorsize)

 {

     struct gpt_partition_entry gpe;

-    int ret = 0;

+    int ret = CL_CLEAN, detection = CL_CLEAN;

     size_t maplen, part_size = 0;

     off_t pos = 0, part_off = 0;

     unsigned i = 0, j = 0;

@@ -337,9 +348,10 @@ static int gpt_scan_partitions(cli_ctx *ctx, struct gpt_header hdr, size_t secto

             part_off = gpe.firstLBA * sectorsize;

             part_size = (gpe.lastLBA - gpe.firstLBA + 1) * sectorsize;

             ret = cli_map_scan(*ctx->fmap, part_off, part_size, ctx, CL_TYPE_PART_ANY);

-            if ((ret != CL_CLEAN) &&

-                !((ctx->options & CL_SCAN_ALLMATCHES) && (ret == CL_VIRUS))) {

-                    //gpt_printName(gpe.name, "Detection in Partition");

+            if (ret != CL_CLEAN) {

+                if ((ctx->options & CL_SCAN_ALLMATCHES) && (ret == CL_VIRUS))

+                    detection = CL_VIRUS;

+                else

                     return ret;

             }

         }

@@ -352,7 +364,7 @@ static int gpt_scan_partitions(cli_ctx *ctx, struct gpt_header hdr, size_t secto

         cli_dbgmsg("cli_scangpt: max partitions reached\n");

     }

-    return ret;

+    return detection;

 }

 static int gpt_validate_header(cli_ctx *ctx, struct gpt_header hdr, size_t sectorsize)

@@ -599,7 +611,7 @@ static int gpt_prtn_intxn(cli_ctx *ctx, struct gpt_header hdr, size_t sectorsize

     prtn_intxn_list_t prtncheck;

     struct gpt_partition_entry gpe;

     unsigned i, pitxn;

-    int ret = 0, tmp = 0;

+    int ret = CL_CLEAN, tmp = CL_CLEAN;

     off_t pos;

     size_t maplen;

     uint32_t max_prtns = 0;

@@ -99,7 +99,7 @@ int cli_scanmbr(cli_ctx *ctx, size_t sectorsize)

 {

     struct mbr_boot_record mbr;

     enum MBR_STATE state = SEEN_NOTHING;

-    int ret = CL_CLEAN;

+    int ret = CL_CLEAN, detection = CL_CLEAN;

     off_t pos = 0, mbr_base = 0, partoff = 0;

     unsigned i = 0, prtncount = 0;

     size_t maplen, partsize;

@@ -145,18 +145,21 @@ int cli_scanmbr(cli_ctx *ctx, size_t sectorsize)

     /* MBR is valid, examine bootstrap code */

     ret = cli_map_scan(*ctx->fmap, 0, sectorsize, ctx, CL_TYPE_ANY);

-    if ((ret != CL_CLEAN) &&

-        !((ctx->options & CL_SCAN_ALLMATCHES) && (ret == CL_VIRUS))) {

-        return ret;

+    if (ret != CL_CLEAN) {

+        if ((ctx->options & CL_SCAN_ALLMATCHES) && (ret == CL_VIRUS))

+            detection = CL_VIRUS;

+        else

+            return ret;

     }

     /* check that the partition table has no intersections - HEURISTICS */

     if ((ctx->options & CL_SCAN_PARTITION_INTXN) && (ctx->dconf->other & OTHER_CONF_PRTNINTXN)) {

         ret = mbr_primary_prtn_intxn(ctx, mbr, sectorsize);

-        if ((ret != CL_CLEAN) &&

-            !((ctx->options & CL_SCAN_ALLMATCHES) && (ret == CL_VIRUS))) {

-        

-            return ret;

+        if (ret != CL_CLEAN) {

+            if ((ctx->options & CL_SCAN_ALLMATCHES) && (ret == CL_VIRUS))

+                detection = CL_VIRUS;

+            else

+                return ret;

         }

     }

@@ -186,9 +189,11 @@ int cli_scanmbr(cli_ctx *ctx, size_t sectorsize)

             ret = mbr_scanextprtn(ctx, &prtncount, mbr.entries[i].firstLBA, 

                                   mbr.entries[i].numLBA, sectorsize);

-            if ((ret != CL_CLEAN) &&

-                !((ctx->options & CL_SCAN_ALLMATCHES) && (ret == CL_VIRUS))) {

-                return ret;

+            if (ret != CL_CLEAN) {

+                if ((ctx->options & CL_SCAN_ALLMATCHES) && (ret == CL_VIRUS))

+                    detection = CL_VIRUS;

+                else

+                    return ret;

             }

         }

         else {

@@ -198,8 +203,10 @@ int cli_scanmbr(cli_ctx *ctx, size_t sectorsize)

             partsize = mbr.entries[i].numLBA * sectorsize;

             mbr_parsemsg("cli_map_scan: [%u, +%u)\n", partoff, partsize);

             ret = cli_map_scan(*ctx->fmap, partoff, partsize, ctx, CL_TYPE_PART_ANY);

-            if ((ret != CL_CLEAN) &&

-                !((ctx->options & CL_SCAN_ALLMATCHES) && (ret == CL_VIRUS))) {

+            if (ret != CL_CLEAN) {

+                if ((ctx->options & CL_SCAN_ALLMATCHES) && (ret == CL_VIRUS))

+                    detection = CL_VIRUS;

+                else

                     return ret;

             }

         }

@@ -208,14 +215,15 @@ int cli_scanmbr(cli_ctx *ctx, size_t sectorsize)

     if (prtncount >= ctx->engine->maxpartitions) {

         cli_dbgmsg("cli_scanmbr: maximum partitions reached\n");

     }

-    return ret;

+

+    return detection;

 }

 static int mbr_scanextprtn(cli_ctx *ctx, unsigned *prtncount, off_t extlba, size_t extlbasize, size_t sectorsize)

 {

     struct mbr_boot_record ebr;

     enum MBR_STATE state = SEEN_NOTHING;

-    int ret = CL_CLEAN;

+    int ret = CL_CLEAN, detection = CL_CLEAN;

     off_t pos = 0, mbr_base = 0, logiclba = 0, extoff = 0, partoff = 0;

     size_t partsize, extsize;

     unsigned i = 0, j = 0;

@@ -338,9 +346,11 @@ static int mbr_scanextprtn(cli_ctx *ctx, unsigned *prtncount, off_t extlba, size

                     }

                     ret = cli_map_scan(*ctx->fmap, partoff, partsize, ctx, CL_TYPE_PART_ANY);

-                    if ((ret != CL_CLEAN) &&

-                        !((ctx->options & CL_SCAN_ALLMATCHES) && (ret == CL_VIRUS))) {

-                        return ret;

+                    if (ret != CL_CLEAN) {

+                        if ((ctx->options & CL_SCAN_ALLMATCHES) && (ret == CL_VIRUS))

+                            detection = CL_VIRUS;

+                        else

+                            return ret;

                     }

                 }

             }

@@ -357,7 +367,8 @@ static int mbr_scanextprtn(cli_ctx *ctx, unsigned *prtncount, off_t extlba, size

     } while (logiclba != 0 && (*prtncount) < ctx->engine->maxpartitions);

     cli_dbgmsg("cli_scanmbr: examined %u logical partitions\n", i);

-    return ret;

+

+    return detection;

 }

 void mbr_convert_to_host(struct mbr_boot_record *record)

@@ -450,7 +461,7 @@ static int mbr_primary_prtn_intxn(cli_ctx *ctx, struct mbr_boot_record mbr, size

 {

     prtn_intxn_list_t prtncheck;

     unsigned i = 0, pitxn = 0, prtncount = 0;

-    int ret = 0, tmp = 0;

+    int ret = CL_CLEAN, tmp = CL_CLEAN;

     prtn_intxn_list_init(&prtncheck);

@@ -518,7 +529,7 @@ static int mbr_extended_prtn_intxn(cli_ctx *ctx, unsigned *prtncount, off_t extl

     struct mbr_boot_record ebr;

     prtn_intxn_list_t prtncheck;

     unsigned i, pitxn;

-    int ret = 0, mbr_base = 0, tmp = 0;

+    int ret = CL_CLEAN, tmp = CL_CLEAN, mbr_base = 0;

     off_t pos = 0, logiclba = 0;

     mbr_base = sectorsize - sizeof(struct mbr_boot_record);