From: Jan Lentfer <Jan.Lentfer@web.de>
Date: Mon, 25 Jan 2010 20:11:28 +0000 (+0100)
Subject: Merge branch 'vendor/FILE'
X-Git-Url: https://gitweb.dragonflybsd.org/~lentferj/dragonfly.git/commitdiff_plain/96d24db91c8454b549fb47466f22b706255e93a5

Merge branch 'vendor/FILE'
---

96d24db91c8454b549fb47466f22b706255e93a5
diff --cc contrib/file/src/apprentice.c
index f3df21fa01,58826c3165..fdf4b2f584
--- a/contrib/file/src/apprentice.c
+++ b/contrib/file/src/apprentice.c
@@@ -594,12 -592,21 +592,22 @@@ set_test_type(struct magic *mstart, str
  		break;
  	case FILE_REGEX:
  	case FILE_SEARCH:
 -		/* Check for override */
 +#ifndef COMPILE_ONLY
+ 		if (mstart->str_flags & STRING_BINTEST)
+ 			mstart->flag |= BINTEST;
+ 		if (mstart->str_flags & STRING_TEXTTEST)
+ 			mstart->flag |= TEXTTEST;
+ 		    
+ 		if (mstart->flag & (TEXTTEST|BINTEST))
+ 			break;
+ 
  		/* binary test if pattern is not text */
  		if (file_looks_utf8(m->value.us, (size_t)m->vallen, NULL,
  		    NULL) <= 0)
  			mstart->flag |= BINTEST;
+ 		else
+ 			mstart->flag |= TEXTTEST;
 +#endif
  		break;
  	case FILE_DEFAULT:
  		/* can't deduce anything; we shouldn't see this at the