1 still search in /etc/magic
2 still use ~/.magic by default
4 --- file-5.12/src/Makefile.am.orig 2013-01-05 18:06:28.459521884 +0100
5 +++ file-5.12/src/Makefile.am 2013-01-05 18:07:08.582854382 +0100
10 -AM_CPPFLAGS = -DMAGIC='"$(MAGIC)"'
11 +AM_CPPFLAGS = -DMAGIC='"/etc/magic:$(MAGIC)"'
12 AM_CFLAGS = $(CFLAG_VISIBILITY) @WARNINGS@
14 libmagic_la_SOURCES = magic.c apprentice.c softmagic.c ascmagic.c \
15 --- file-5.06/src/magic.c~ 2011-04-07 22:20:30.000000000 +0300
16 +++ file-5.06/src/magic.c 2011-04-18 11:56:38.611292743 +0300
19 get_default_magic(void)
21 - static const char hmagic[] = "/.magic/magic.mgc";
22 + static const char hmagic[] = "/.magic";
23 static char *default_magic;
24 char *home, *hmagicpath;
26 --- a/src/apprentice.c
27 +++ b/src/apprentice.c
28 @@ -460,7 +460,7 @@ apprentice_1(struct magic_set *ms, const char *fn, int action)
30 map = apprentice_map(ms, fn);
32 - if (ms->flags & MAGIC_CHECK)
33 + if (ms->flags & MAGIC_CHECK && strcmp("/etc/magic", fn) != 0)
34 file_magwarn(ms, "using regular magic file `%s'", fn);
35 map = apprentice_load(ms, fn, action);