From owner-p4-projects@FreeBSD.ORG  Wed Jun 25 10:45:05 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 954151065686; Wed, 25 Jun 2008 10:45:05 +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 571951065674
	for <perforce@freebsd.org>; Wed, 25 Jun 2008 10:45:05 +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 4E8128FC14
	for <perforce@freebsd.org>; Wed, 25 Jun 2008 10:45:05 +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 m5PAj5ZU073240
	for <perforce@freebsd.org>; Wed, 25 Jun 2008 10:45:05 GMT
	(envelope-from gabor@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5PAj5l6073238
	for perforce@freebsd.org; Wed, 25 Jun 2008 10:45:05 GMT
	(envelope-from gabor@freebsd.org)
Date: Wed, 25 Jun 2008 10:45:05 GMT
Message-Id: <200806251045.m5PAj5l6073238@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 144083 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: Wed, 25 Jun 2008 10:45:05 -0000

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

Change 144083 by gabor@gabor_server on 2008/06/25 10:44:04

	- Check EILSEQ when dealing with wide chars and return 1, when
	  EILSEQ is triggered.
	
	  Suggested by:	ache

Affected files ...

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

Differences ...

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

@@ -38,6 +38,7 @@
 
 #include <bzlib.h>
 #include <err.h>
+#include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -65,8 +66,12 @@
 	if (fseek(f->f, 0L, SEEK_SET) == -1)
 		return (0);
 
-	for (i = 0; (i <= BUFSIZ) && (ch != WEOF); i++) {
-		ch = fgetwc(f->f);
+	for (i = 0; i <= BUFSIZ; i++) {
+		if ((ch = fgetwc(f->f)) == WEOF) {
+			if (errno == EILSEQ)
+				ret = 1;
+			break;
+		}
 		if (iswbinary(ch)) {
 			ret = 1;
 			break;