From owner-p4-projects@FreeBSD.ORG  Sat Sep 13 11:48:52 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 73EB61065673; Sat, 13 Sep 2008 11:48:52 +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 361C11065682
	for <perforce@freebsd.org>; Sat, 13 Sep 2008 11:48:52 +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 2037D8FC0C
	for <perforce@freebsd.org>; Sat, 13 Sep 2008 11:48:52 +0000 (UTC)
	(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m8DBmp7i006188
	for <perforce@freebsd.org>; Sat, 13 Sep 2008 11:48:51 GMT
	(envelope-from gabor@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8DBmpp6006186
	for perforce@freebsd.org; Sat, 13 Sep 2008 11:48:51 GMT
	(envelope-from gabor@freebsd.org)
Date: Sat, 13 Sep 2008 11:48:51 GMT
Message-Id: <200809131148.m8DBmpp6006186@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 149702 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, 13 Sep 2008 11:48:52 -0000

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

Change 149702 by gabor@gabor_server on 2008/09/13 11:48:42

	- Make the -i fixed string search wide char compliant
	
	Reported by:	ache

Affected files ...

.. //depot/projects/soc2008/gabor_textproc/grep/fastgrep.c#10 edit

Differences ...

==== //depot/projects/soc2008/gabor_textproc/grep/fastgrep.c#10 (text+ko) ====

@@ -40,10 +40,11 @@
 __FBSDID("$FreeBSD$");
 #endif /* not lint */
 
-#include <ctype.h>
 #include <limits.h>
 #include <stdlib.h>
 #include <string.h>
+#include <wchar.h>
+#include <wctype.h>
 
 #include "grep.h"
 
@@ -281,14 +282,39 @@
 grep_cmp(const unsigned char *pattern, const unsigned char *data, size_t len)
 {
 	int	 i;
+	size_t	 size;
+	wchar_t	*wdata, *wpat;
+
+	if (iflag) {
+		if ((size = mbstowcs(NULL, data, 0)) == -1)
+			return (-1);
+
+		wdata = grep_malloc(size * sizeof(wint_t));
+
+		if (mbstowcs(wdata, data, size) == -1)
+			return (-1);
+
+		if ((size = mbstowcs(NULL, pattern, 0)) == -1)
+			return (-1);
 
-	for (i = 0; i < len; i++) {
-		if (((pattern[i] == data[i]) || ((grepbehave != GREP_FIXED) && pattern[i] == '.'))
-		    || (iflag && toupper(pattern[i]) == toupper(data[i])))
-			continue;
-		return (i);
+		wpat = grep_malloc(size * sizeof(wint_t));
+
+		if (mbstowcs(wpat, pattern, size) == -1)
+			return (-1);
+		for (i = 0; i < len; i++) {
+			if ((towlower(wpat[i]) == towlower(wdata[i])) || ((grepbehave != GREP_FIXED) && wpat[i] == L'.'))
+				continue;
+			free(wpat);
+			free(wdata);
+				return (i);
+		}
+	} else {
+		for (i = 0; i < len; i++) {
+			if ((pattern[i] == data[i]) || ((grepbehave != GREP_FIXED) && pattern[i] == '.'))
+				continue;
+			return (i);
+		}
 	}
-
 	return (-1);
 }