dnrops
/
radare2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix stuff to make perl bindings happy

This commit is contained in:
pancake 2014-01-05 00:41:13 +01:00
parent aeb681ea33
commit 86507d9637
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libr/include/r_magic.h
View File

@ -11,8 +11,8 @@ extern "C" {
R_LIB_VERSION_HEADER(r_magic); R_LIB_VERSION_HEADER(r_magic);
#ifndef MAGIC #ifndef MAGICFILE
#define MAGIC "/etc/magic" #define MAGICFILE "/etc/magic"
#endif #endif
#define R_MAGIC_PATH R2_LIBDIR"/radare2/"R2_VERSION"/magic" #define R_MAGIC_PATH R2_LIBDIR"/radare2/"R2_VERSION"/magic"

2
libr/magic/apprentice.c
View File

@ -256,7 +256,7 @@ struct mlist * file_apprentice(RMagic *ms, const char *fn, int action) {
init_file_tables (); init_file_tables ();
if (!fn) fn = getenv ("MAGIC"); if (!fn) fn = getenv ("MAGIC");
if (!fn) fn = MAGIC; if (!fn) fn = MAGICFILE;
if ((mfn = strdup (fn)) == NULL) { if ((mfn = strdup (fn)) == NULL) {
file_oomem (ms, strlen (fn)); file_oomem (ms, strlen (fn));