From owner-svn-src-all@FreeBSD.ORG Fri Jan 2 03:31:46 2009 Return-Path: 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 419491065689; Fri, 2 Jan 2009 03:31:46 +0000 (UTC) (envelope-from obrien@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 2FE9C8FC08; Fri, 2 Jan 2009 03:31:46 +0000 (UTC) (envelope-from obrien@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n023VjY2086468; Fri, 2 Jan 2009 03:31:45 GMT (envelope-from obrien@svn.freebsd.org) Received: (from obrien@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n023VjsS086467; Fri, 2 Jan 2009 03:31:45 GMT (envelope-from obrien@svn.freebsd.org) Message-Id: <200901020331.n023VjsS086467@svn.freebsd.org> From: "David E. O'Brien" Date: Fri, 2 Jan 2009 03:31:45 +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: r186692 - head/contrib/file 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 " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Jan 2009 03:31:47 -0000 Author: obrien Date: Fri Jan 2 03:31:45 2009 New Revision: 186692 URL: http://svn.freebsd.org/changeset/base/186692 Log: Add an additional COMPILE_ONLY check. Modified: head/contrib/file/apprentice.c Modified: head/contrib/file/apprentice.c ============================================================================== --- head/contrib/file/apprentice.c Fri Jan 2 03:10:55 2009 (r186691) +++ head/contrib/file/apprentice.c Fri Jan 2 03:31:45 2009 (r186692) @@ -588,9 +588,11 @@ set_test_type(struct magic *mstart, stru break; case FILE_REGEX: case FILE_SEARCH: +#ifndef COMPILE_ONLY /* binary test if pattern is not text */ if (file_looks_utf8(m->value.us, m->vallen, NULL, NULL) <= 0) mstart->flag |= BINTEST; +#endif break; case FILE_DEFAULT: /* can't deduce anything; we shouldn't see this at the