summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormckay <mckay@FreeBSD.org>2012-08-17 02:27:17 +0000
committermckay <mckay@FreeBSD.org>2012-08-17 02:27:17 +0000
commit3671fbcc9a0b75432bc70c518226f2246097359b (patch)
tree2819f9b8abe52ece5cd3100f41f3b62e489dfa30
parent3f0806aa1fc8c8dc2f294421d558472faec7fd3f (diff)
downloadFreeBSD-src-3671fbcc9a0b75432bc70c518226f2246097359b.zip
FreeBSD-src-3671fbcc9a0b75432bc70c518226f2246097359b.tar.gz
Correct a regression introduced during the import of file(1) 5.11.
Magic tests containing "search" or "regex" directives were incorrectly compiled by "mkmagic" and were effectively ignored. This caused troff files (for example) to be detected as simply "ASCII text" instead of as "troff or preprocessor input, ASCII text". PR: bin/170415 Approved by: consensus on developers@ MFC after: 3 days
-rw-r--r--contrib/file/apprentice.c2
-rw-r--r--lib/libmagic/Makefile2
2 files changed, 1 insertions, 3 deletions
diff --git a/contrib/file/apprentice.c b/contrib/file/apprentice.c
index a9d4d17..8e0f2cf 100644
--- a/contrib/file/apprentice.c
+++ b/contrib/file/apprentice.c
@@ -648,7 +648,6 @@ set_test_type(struct magic *mstart, struct magic *m)
break;
case FILE_REGEX:
case FILE_SEARCH:
-#ifndef COMPILE_ONLY
/* Check for override */
if (mstart->str_flags & STRING_BINTEST)
mstart->flag |= BINTEST;
@@ -664,7 +663,6 @@ set_test_type(struct magic *mstart, struct magic *m)
mstart->flag |= BINTEST;
else
mstart->flag |= TEXTTEST;
-#endif
break;
case FILE_DEFAULT:
/* can't deduce anything; we shouldn't see this at the
diff --git a/lib/libmagic/Makefile b/lib/libmagic/Makefile
index fbf71ef..d983813 100644
--- a/lib/libmagic/Makefile
+++ b/lib/libmagic/Makefile
@@ -39,7 +39,7 @@ magic.mgc: mkmagic magic
CLEANFILES+= mkmagic
build-tools: mkmagic
-mkmagic: apprentice.c funcs.c getline.c magic.c print.c
+mkmagic: apprentice.c encoding.c funcs.c getline.c magic.c print.c
${CC} ${CFLAGS} -DCOMPILE_ONLY -DHOSTPROG ${LDFLAGS} \
-o ${.TARGET} ${.ALLSRC}
OpenPOWER on IntegriCloud