From 81b4bae28a6e54616bef8e4c6c7718bbf1337cc4 Mon Sep 17 00:00:00 2001 From: robi6 Date: Wed, 3 Sep 2014 00:17:19 +0200 Subject: conflict x-123 <-> Targa on many file-versions --- src/magic_block_scan.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/magic_block_scan.c') diff --git a/src/magic_block_scan.c b/src/magic_block_scan.c index 5652adc..8785c7e 100644 --- a/src/magic_block_scan.c +++ b/src/magic_block_scan.c @@ -731,6 +731,11 @@ static int magic_check_block(unsigned char* buf,magic_t cookie , magic_t cookie_ else{ if((!strstr(magic_buf,"x-archive")) &&((strstr(magic_buf,"x-elc") || strstr(magic_buf,"keyring") || strstr(magic_buf,"x-arc")||strstr(magic_buf,"keystore")||strstr(magic_buf,"x-123")|| strstr(magic_buf,"fontobject")))){ //FIXME fontobject + //conflict x-123 <-> Targa on many file-versions + if (strstr(magic_buf,"x-123") && (strstr(text,"Targa"))){ + strncpy(magic_buf,text,60); + retval |= ( M_APPLI | M_ARCHIV | M_CLASS_1 ); + }else retval = M_DATA; } else { -- cgit v1.2.3