... | ... |
@@ -29,53 +29,54 @@ |
29 | 29 |
#include "interface.h" |
30 | 30 |
|
31 | 31 |
const char *types[] = { |
32 |
- "HTML", /* 0 */ |
|
33 |
- "HTML_UTF16", /* 1 */ |
|
34 |
- "MSEXE", /* 2 */ |
|
35 |
- "GRAPHICS", /* 3 */ |
|
36 |
- "TEXT_ASCII", /* 4 */ |
|
37 |
- "TEXT_UTF8", /* 5 */ |
|
38 |
- "TEXT_UTF16LE", /* 6 */ |
|
39 |
- "TEXT_UTF16BE", /* 7 */ |
|
40 |
- "PDF", /* 8 */ |
|
41 |
- "SCRIPT", /* 9 */ |
|
42 |
- "RTF", /* 10 */ |
|
43 |
- "RIFF", /* 11 */ |
|
44 |
- "MSCHM", /* 12 */ |
|
45 |
- "MSCAB", /* 13 */ |
|
46 |
- "MSOLE2", /* 14 */ |
|
47 |
- "MSSZDD", /* 15 */ |
|
48 |
- "ZIP", /* 16 */ |
|
49 |
- "RAR", /* 17 */ |
|
50 |
- "7Z", /* 18 */ |
|
51 |
- "BZ", /* 19 */ |
|
52 |
- "GZ", /* 20 */ |
|
53 |
- "ARJ", /* 21 */ |
|
54 |
- "ZIPSFX", /* 22 */ |
|
55 |
- "RARSFX", /* 23 */ |
|
56 |
- "CABSFX", /* 24 */ |
|
57 |
- "ARJSFX", /* 25 */ |
|
58 |
- "NULSFT", /* 26 */ |
|
59 |
- "AUTOIT", /* 27 */ |
|
60 |
- "ISHIELD_MSI", /* 28 */ |
|
61 |
- "SFX", /* 29 */ |
|
62 |
- "BINHEX", /* 30 */ |
|
63 |
- "MAIL", /* 31 */ |
|
64 |
- "TNEF", /* 32 */ |
|
65 |
- "BINARY_DATA", /* 33 */ |
|
66 |
- "CRYPTFF", /* 34 */ |
|
67 |
- "UUENCODED", /* 35 */ |
|
68 |
- "SCRENC", /* 36 */ |
|
69 |
- "POSIX_TAR", /* 37 */ |
|
70 |
- "OLD_TAR", /* 38 */ |
|
71 |
- "ELF", /* 39 */ |
|
72 |
- "MACHO", /* 40 */ |
|
73 |
- "MACHO_UNIBIN", /* 41 */ |
|
74 |
- "SIS", /* 42 */ |
|
75 |
- "SWF", /* 43 */ |
|
76 |
- "CPIO_ODC", /* 44 */ |
|
77 |
- "CPIO_NEWC", /* 45 */ |
|
78 |
- "CPIO_CRC", /* 46 */ |
|
32 |
+ "<<rsvd>>" /* 0 */ |
|
33 |
+ "MSEXE", /* 1 */ |
|
34 |
+ "HTML", /* 2 */ |
|
35 |
+ "HTML_UTF16", /* 3 */ |
|
36 |
+ "GRAPHICS", /* 4 */ |
|
37 |
+ "TEXT_ASCII", /* 5 */ |
|
38 |
+ "TEXT_UTF8", /* 6 */ |
|
39 |
+ "TEXT_UTF16LE", /* 7 */ |
|
40 |
+ "TEXT_UTF16BE", /* 8 */ |
|
41 |
+ "PDF", /* 9 */ |
|
42 |
+ "SCRIPT", /* 10 */ |
|
43 |
+ "RTF", /* 11 */ |
|
44 |
+ "RIFF", /* 12 */ |
|
45 |
+ "MSCHM", /* 13 */ |
|
46 |
+ "MSCAB", /* 14 */ |
|
47 |
+ "MSOLE2", /* 15 */ |
|
48 |
+ "MSSZDD", /* 16 */ |
|
49 |
+ "ZIP", /* 17 */ |
|
50 |
+ "RAR", /* 18 */ |
|
51 |
+ "7Z", /* 19 */ |
|
52 |
+ "BZ", /* 20 */ |
|
53 |
+ "GZ", /* 21 */ |
|
54 |
+ "ARJ", /* 22 */ |
|
55 |
+ "ZIPSFX", /* 23 */ |
|
56 |
+ "RARSFX", /* 24 */ |
|
57 |
+ "CABSFX", /* 25 */ |
|
58 |
+ "ARJSFX", /* 26 */ |
|
59 |
+ "NULSFT", /* 27 */ |
|
60 |
+ "AUTOIT", /* 28 */ |
|
61 |
+ "ISHIELD_MSI", /* 29 */ |
|
62 |
+ "SFX", /* 30 */ |
|
63 |
+ "BINHEX", /* 31 */ |
|
64 |
+ "MAIL", /* 32 */ |
|
65 |
+ "TNEF", /* 33 */ |
|
66 |
+ "BINARY_DATA", /* 34 */ |
|
67 |
+ "CRYPTFF", /* 35 */ |
|
68 |
+ "UUENCODED", /* 36 */ |
|
69 |
+ "SCRENC", /* 37 */ |
|
70 |
+ "POSIX_TAR", /* 38 */ |
|
71 |
+ "OLD_TAR", /* 39 */ |
|
72 |
+ "ELF", /* 40 */ |
|
73 |
+ "MACHO", /* 41 */ |
|
74 |
+ "MACHO_UNIBIN", /* 42 */ |
|
75 |
+ "SIS", /* 43 */ |
|
76 |
+ "SWF", /* 44 */ |
|
77 |
+ "CPIO_ODC", /* 45 */ |
|
78 |
+ "CPIO_NEWC", /* 46 */ |
|
79 |
+ "CPIO_CRC", /* 47 */ |
|
79 | 80 |
NULL |
80 | 81 |
}; |
81 | 82 |
|
... | ... |
@@ -1081,7 +1082,7 @@ int CLAMAPI Scan_DeleteScanInfo(CClamAVScanner *pScanner, PCLAM_SCAN_INFO_LIST p |
1081 | 1081 |
static void ftype_bits(const char *type, _int64 *filetype) { |
1082 | 1082 |
int i; |
1083 | 1083 |
if(!strncmp(type, "CL_TYPE_", 8)) { |
1084 |
- for(i=0; types[i]; i++) { |
|
1084 |
+ for(i=1; types[i]; i++) { |
|
1085 | 1085 |
if(!strcmp(&type[8], types[i])) |
1086 | 1086 |
break; |
1087 | 1087 |
} |