From owner-p4-projects@FreeBSD.ORG  Sat Aug  9 13:21:58 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E82B6106568E; Sat,  9 Aug 2008 13:21:57 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id ABA221065685
	for <perforce@freebsd.org>; Sat,  9 Aug 2008 13:21:57 +0000 (UTC)
	(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 999C48FC14
	for <perforce@freebsd.org>; Sat,  9 Aug 2008 13:21:57 +0000 (UTC)
	(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m79DLvVN083277
	for <perforce@freebsd.org>; Sat, 9 Aug 2008 13:21:57 GMT
	(envelope-from gabor@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m79DLvqR083275
	for perforce@freebsd.org; Sat, 9 Aug 2008 13:21:57 GMT
	(envelope-from gabor@freebsd.org)
Date: Sat, 9 Aug 2008 13:21:57 GMT
Message-Id: <200808091321.m79DLvqR083275@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gabor@freebsd.org using -f
From: Gabor Kovesdan <gabor@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 146986 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 09 Aug 2008 13:21:58 -0000

http://perforce.freebsd.org/chv.cgi?CH=146986

Change 146986 by gabor@gabor_server on 2008/08/09 13:21:56

	- Partly revert the previous change to the binary file detecting,
	  in some case it was more accurate, but in some cases it did
	  not work well

Affected files ...

.. //depot/projects/soc2008/gabor_textproc/grep/file.c#32 edit

Differences ...

==== //depot/projects/soc2008/gabor_textproc/grep/file.c#32 (text+ko) ====

@@ -119,20 +119,32 @@
 {
 	int		 i = 0;
 	char		 ch;
+	size_t		 size;
+	wchar_t		 wbinbuf[BUFSIZ];
+	const char	*src = binbuf;
+	mbstate_t	 mbs;
 
 	/* Fill in the buffer if it is empty. */
 	if (binbufptr == NULL) {
 		/* Only pre-read to the buffer if we need the binary check. */
 		if (binbehave != BINFILE_TEXT) {
-			for (; i < sizeof(binbuf) && !grep_feof(f); i++) {
+			for (; i < sizeof(wbinbuf) && !grep_feof(f); i++) {
 				ch = grep_fgetc(f);
-				if ((unsigned char)ch == 0)
-					f->binary = 1;
 				if (ch != EOF)
 					binbuf[i] = ch;
 				else
 					break;
 			}
+			/* Convert at most (BUFSIZ * sizeof(wint_t)) characters or
+				(BUFSIZ - 1) bytes to wide character string. */
+			size = mbsnrtowcs(wbinbuf, &src, sizeof(wbinbuf), BUFSIZ - 1, &mbs);
+			f->binary = 0;
+			for (; size > 0; size--)
+				if (iswbinary(wbinbuf[size])) {
+					f->binary = 1;
+					break;
+				}
+			
 		}
 		binbufsiz = i;
 		binbufptr = binbuf;