From owner-svn-src-all@FreeBSD.ORG  Fri Aug 17 02:27:18 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6CAE6106566B;
	Fri, 17 Aug 2012 02:27:18 +0000 (UTC)
	(envelope-from mckay@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 574E38FC12;
	Fri, 17 Aug 2012 02:27:18 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q7H2RI5Q003654;
	Fri, 17 Aug 2012 02:27:18 GMT (envelope-from mckay@svn.freebsd.org)
Received: (from mckay@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7H2RIkB003651;
	Fri, 17 Aug 2012 02:27:18 GMT (envelope-from mckay@svn.freebsd.org)
Message-Id: <201208170227.q7H2RIkB003651@svn.freebsd.org>
From: Stephen McKay <mckay@FreeBSD.org>
Date: Fri, 17 Aug 2012 02:27:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r239348 - in head: contrib/file lib/libmagic
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 17 Aug 2012 02:27:18 -0000

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}