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

+Thu Dec 30 15:02:05 CET 2010 (tk)

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

+ * libclamav/filetypes.c: improve detection of tar files

+

 Wed Dec 29 14:36:46 CET 2010 (tk)

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

  * libclamav/scanners.c: improve scanning of mail files in raw mode (bb#2244)

@@ -163,6 +163,17 @@ cli_file_t cli_filetype2(fmap_t *map, const struct cl_engine *engine)

     ret = cli_filetype(buff, bread, engine);

+    if(ret == CL_TYPE_BINARY_DATA) {

+	switch(is_tar(buff, bread)) {

+	    case 1:

+		cli_dbgmsg("Recognized old fashioned tar file\n");

+		return CL_TYPE_OLD_TAR;

+	    case 2:

+		cli_dbgmsg("Recognized POSIX tar file\n");

+		return CL_TYPE_POSIX_TAR;

+	}

+    }

+

     if(ret >= CL_TYPE_TEXT_ASCII && ret <= CL_TYPE_BINARY_DATA) {

 	/* HTML files may contain special characters and could be

 	 * misidentified as BINARY_DATA by cli_filetype()

@@ -234,18 +245,5 @@ cli_file_t cli_filetype2(fmap_t *map, const struct cl_engine *engine)

 	}

     }

-    if(ret == CL_TYPE_BINARY_DATA) {

-	switch(is_tar(buff, bread)) {

-	    case 1:

-		ret = CL_TYPE_OLD_TAR;

-		cli_dbgmsg("Recognized old fashioned tar file\n");

-		break;

-	    case 2:

-		ret = CL_TYPE_POSIX_TAR;

-		cli_dbgmsg("Recognized POSIX tar file\n");

-		break;

-	}

-    }

-

     return ret;

 }