From owner-p4-projects@FreeBSD.ORG  Tue Jul 22 10:33:36 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id AB5C8106567B; Tue, 22 Jul 2008 10:33:36 +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 6F0BA1065677
	for <perforce@freebsd.org>; Tue, 22 Jul 2008 10:33:36 +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 785978FC0A
	for <perforce@freebsd.org>; Tue, 22 Jul 2008 10:33:36 +0000 (UTC)
	(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m6MAXaFA014410
	for <perforce@freebsd.org>; Tue, 22 Jul 2008 10:33:36 GMT
	(envelope-from gabor@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m6MAXaTW014408
	for perforce@freebsd.org; Tue, 22 Jul 2008 10:33:36 GMT
	(envelope-from gabor@freebsd.org)
Date: Tue, 22 Jul 2008 10:33:36 GMT
Message-Id: <200807221033.m6MAXaTW014408@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 145597 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: Tue, 22 Jul 2008 10:33:36 -0000

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

Change 145597 by gabor@gabor_server on 2008/07/22 10:32:47

	- Partly fix the wchar vs binary file case

Affected files ...

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

Differences ...

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

@@ -100,13 +100,15 @@
 char *
 grep_fgetln(struct file *f, size_t *len)
 {
-	int	 i;
-	char	 ch;
-	size_t	 size;
-	wchar_t	 wbinbuf[BUFSIZ];
+	int		 i;
+	char		 ch;
+	size_t		 size;
+	wchar_t		 wbinbuf[BUFSIZ];
+	const char	*src = binbuf;
+	mbstate_t	 mbs;
 
 	if ((binbufptr == NULL) && (binbehave != BINFILE_TEXT)) {
-		for (i = 0; i < (BUFSIZ * 4); i++) {
+		for (i = 0; i < (BUFSIZ * sizeof(wint_t)); i++) {
 			if (grep_feof(f))
 				break;
 			ch = grep_fgetc(f);
@@ -114,13 +116,14 @@
 		}
 		binbufsiz = i;
 		binbufptr = binbuf;
-//		size = mbsnrtowcs(wbinbuf, &binbuf, BUFSIZ * 4, BUFSIZ - 1, NULL);
+
+		size = mbsnrtowcs(wbinbuf, &src, BUFSIZ * sizeof(wint_t), BUFSIZ - 1, &mbs);
 		f->binary = 0;
-//		for (; size > 0; size--)
-//			if (iswbinary(wbinbuf[size])) {
-//				f->binary = 1;
-//				break;
-//			}
+		for (; size > 0; size--)
+			if (iswbinary(wbinbuf[size])) {
+				f->binary = 1;
+				break;
+			}
 	}
 
 	for (i = 0; ; i++) {