diff --git a/libr/bin/demangle.c b/libr/bin/demangle.c index 7ceb04bc0e..930f4802cf 100644 --- a/libr/bin/demangle.c +++ b/libr/bin/demangle.c @@ -101,10 +101,9 @@ R_API char *r_bin_demangle_cxx(const char *str) { } out = cplus_demangle_v3 (str, flags); - if (out) + if (out) { r_str_replace_char (out, ' ', 0); - - if (!out) { + } else { // TODO: mangler_branch: remove, just for testing now SDemangler *mangler = 0; // char *demangled_name = 0; diff --git a/libr/magic/d/default/code b/libr/magic/d/default/code index 8f2a598283..3f331f72ba 100644 --- a/libr/magic/d/default/code +++ b/libr/magic/d/default/code @@ -1,2 +1,5 @@ 0 string #include C source code 0 string import java. JAVA source code +0 string #!/usr/bin/env python Python script +0 string #!/usr/bin/python Python script +0 string #!/usr/bin/perl PERL script diff --git a/libr/magic/d/default/gpg b/libr/magic/d/default/gpg new file mode 100644 index 0000000000..ccb711e65e --- /dev/null +++ b/libr/magic/d/default/gpg @@ -0,0 +1,2 @@ +0 string BEGIN PGP PRIVATE KEY BLOCK PGP Private key +0 string BEGIN PGP PUBLIC KEY BLOCK PGP Public key diff --git a/libr/magic/d/default/java b/libr/magic/d/default/java index e16e29382a..1276cb5609 100644 --- a/libr/magic/d/default/java +++ b/libr/magic/d/default/java @@ -12,15 +12,15 @@ 0 belong 0xfeedfeed Java KeyStore !:mime application/x-java-keystore -0 belong 0xcececece Java JCE KeyStore -!:mime application/x-java-jce-keystore +# 0 belong 0xcececece Java JCE KeyStore +# !:mime application/x-java-jce-keystore # Dalvik .dex format. http://retrodev.com/android/dexformat.html # From "Mike Fleming" 0 string dex\n ->0 regex dex\n[0-9][0-9][0-9]\0 Dalvik dex file +>0 regex dex\n[0-9][0-9][0-9]\0 Dalvik DEX file >4 string >000 version %s 0 string dey\n ->0 regex dey\n[0-9][0-9][0-9]\0 Dalvik dex file (optimized for host) +>0 regex dey\n[0-9][0-9][0-9]\0 Dalvik ODEX file (optimized for host) >4 string >000 version %s diff --git a/libr/magic/d/default/linux b/libr/magic/d/default/linux index de47af419a..2a92b58953 100644 --- a/libr/magic/d/default/linux +++ b/libr/magic/d/default/linux @@ -22,8 +22,8 @@ 0 lelong 0x006400cc Linux/i386 demand-paged executable (QMAGIC) >16 lelong 0 \b, stripped # -0 string \007\001\000 Linux/i386 object file ->20 lelong >0x1020 \b, DLL library +# 0 string \007\001\000 Linux/i386 object file +# >20 lelong >0x1020 \b, DLL library # # 0 string \01\03\020\20 Minix-386 impure executable # >28 long !0 not stripped @@ -126,19 +126,19 @@ >0x1e6 belong 0x454c4b53 ELKS Kernel >0x1e6 belong !0x454c4b53 style boot sector -0 lelong&0xFF00FFFF 0x4000301 Linux-8086 executable ->2 byte&0x01 !0 \b, unmapped zero page ->2 byte&0x20 0 \b, impure ->2 byte&0x20 !0 ->>2 byte&0x10 !0 \b, A_EXEC ->2 byte&0x02 !0 \b, A_PAL ->2 byte&0x04 !0 \b, A_NSYM ->2 byte&0x08 !0 \b, A_STAND ->2 byte&0x40 !0 \b, A_PURE ->2 byte&0x80 !0 \b, A_TOVLY ->28 long !0 \b, not stripped ->37 string . ->>36 string >\0 \b, libc version %s +# 0 lelong&0xFF00FFFF 0x4000301 Linux-8086 executable +# >2 byte&0x01 !0 \b, unmapped zero page +# >2 byte&0x20 0 \b, impure +# >2 byte&0x20 !0 +# >>2 byte&0x10 !0 \b, A_EXEC +# >2 byte&0x02 !0 \b, A_PAL +# >2 byte&0x04 !0 \b, A_NSYM +# >2 byte&0x08 !0 \b, A_STAND +# >2 byte&0x40 !0 \b, A_PURE +# >2 byte&0x80 !0 \b, A_TOVLY +# >28 long !0 \b, not stripped +# >37 string . +# >>36 string >\0 \b, libc version %s # 0 lelong&0xFF00FFFF 0x10000301 ld86 I80386 executable # 0 lelong&0xFF00FFFF 0xB000301 ld86 M68K executable diff --git a/libr/magic/d/default/microsoft b/libr/magic/d/default/microsoft index 90045f6b21..101a01f82f 100644 --- a/libr/magic/d/default/microsoft +++ b/libr/magic/d/default/microsoft @@ -377,16 +377,16 @@ # Winamp .avs #0 string Nullsoft\ AVS\ Preset\ \060\056\061\032 A plug in for Winamp ms-windows Freeware media player -0 string Nullsoft\ AVS\ Preset\ Winamp plug in +#0 string Nullsoft\ AVS\ Preset\ Winamp plug in # Hyper terminal: -0 string HyperTerminal\ hyperterm ->15 string 1.0\ --\ HyperTerminal\ data\ file MS-windows Hyperterminal +#0 string HyperTerminal\ hyperterm +#>15 string 1.0\ --\ HyperTerminal\ data\ file MS-windows Hyperterminal # Windows Metafont .WMF -0 string \327\315\306\232 ms-windows metafont .wmf -0 string \002\000\011\000 ms-windows metafont .wmf -0 string \001\000\011\000 ms-windows metafont .wmf +#0 string \327\315\306\232 ms-windows metafont .wmf +#0 string \002\000\011\000 ms-windows metafont .wmf +#0 string \001\000\011\000 ms-windows metafont .wmf #tz3 files whatever that is (MS Works files) 0 string \003\001\001\004\070\001\000\000 tz3 ms-works file @@ -443,7 +443,7 @@ # recycled/info the windows trash bin index -9 string \000\000\000\030\001\000\000\000 MS Windows recycled bin info +# 9 string \000\000\000\030\001\000\000\000 MS Windows recycled bin info ##### put in Either Magic/font or Magic/news diff --git a/libr/magic/d/default/python b/libr/magic/d/default/python index 6f5d2fa3bc..ea1f1a7356 100644 --- a/libr/magic/d/default/python +++ b/libr/magic/d/default/python @@ -5,7 +5,7 @@ # # From: David Necas # often the module starts with a multiline string -0 string """ a python script text executable +# 0 string """ a python script text executable # MAGIC as specified in Python/import.c (1.5 to 2.3.0a) # 20121 ( YEAR - 1995 ) + MONTH + DAY (little endian followed by "\r\n" 0 belong 0x994e0d0a python 1.5/1.6 byte-compiled