svn commit: r239348 - in head: contrib/file lib/libmagic

Stephen McKay mckay at FreeBSD.org
Fri Aug 17 02:27:18 UTC 2012


Author: mckay
Date: Fri Aug 17 02:27:17 2012
New Revision: 239348
URL: http://svn.freebsd.org/changeset/base/239348

Log:
  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

Modified:
  head/contrib/file/apprentice.c
  head/lib/libmagic/Makefile

Modified: head/contrib/file/apprentice.c
==============================================================================
--- head/contrib/file/apprentice.c	Fri Aug 17 02:26:31 2012	(r239347)
+++ head/contrib/file/apprentice.c	Fri Aug 17 02:27:17 2012	(r239348)
@@ -648,7 +648,6 @@ set_test_type(struct magic *mstart, stru
 		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, stru
 			mstart->flag |= BINTEST;
 		else
 			mstart->flag |= TEXTTEST;
-#endif
 		break;
 	case FILE_DEFAULT:
 		/* can't deduce anything; we shouldn't see this at the

Modified: head/lib/libmagic/Makefile
==============================================================================
--- head/lib/libmagic/Makefile	Fri Aug 17 02:26:31 2012	(r239347)
+++ head/lib/libmagic/Makefile	Fri Aug 17 02:27:17 2012	(r239348)
@@ -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}
 


More information about the svn-src-head mailing list