From owner-p4-projects@FreeBSD.ORG  Wed Jun 25 12:34:57 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 511AD1065676; Wed, 25 Jun 2008 12:34: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 12C15106566B
	for <perforce@freebsd.org>; Wed, 25 Jun 2008 12:34: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 093248FC1B
	for <perforce@freebsd.org>; Wed, 25 Jun 2008 12:34:57 +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 m5PCYurV085739
	for <perforce@freebsd.org>; Wed, 25 Jun 2008 12:34:56 GMT
	(envelope-from gabor@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5PCYuPO085737
	for perforce@freebsd.org; Wed, 25 Jun 2008 12:34:56 GMT
	(envelope-from gabor@freebsd.org)
Date: Wed, 25 Jun 2008 12:34:56 GMT
Message-Id: <200806251234.m5PCYuPO085737@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 144090 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 12:34:57 -0000

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

Change 144090 by gabor@gabor_server on 2008/06/25 12:34:28

	- Cleanup and style changes
	- Use strlcpy which is safer than memcpy

Affected files ...

.. //depot/projects/soc2008/gabor_textproc/grep/grep.c#47 edit

Differences ...

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

@@ -293,10 +293,11 @@
 	while (pat[0] == '*')
 		pat++;
 
-	if (!xflag && (len == 0 || matchall)) {
+	if (len == 0 || matchall) {
 		matchall = 1;
 		return;
 	}
+
 	if (patterns == pattern_sz) {
 		pattern_sz *= 2;
 		pattern = grep_realloc(pattern, ++pattern_sz * sizeof(*pattern));
@@ -322,7 +323,7 @@
 		len += 14 + extra;
 	} else {
 		pattern[patterns] = grep_malloc(len + 1);
-		memcpy(pattern[patterns], pat, len);
+		strlcpy(pattern[patterns], pat, len);
 		pattern[patterns][len] = '\0';
 	}
 	++patterns;
@@ -617,6 +618,8 @@
 
 	if (Fflag)
 		cflags |= REG_NOSPEC;
+	else if (Gflag)
+		cflags |= REG_BASIC;
 	else if (Eflag)
 		cflags |= REG_EXTENDED;
 	r_pattern = grep_calloc(patterns, sizeof(*r_pattern));