From owner-p4-projects@FreeBSD.ORG  Fri Jun 27 14:25:01 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D99B61065677; Fri, 27 Jun 2008 14:25:00 +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 985A81065670
	for <perforce@freebsd.org>; Fri, 27 Jun 2008 14:25:00 +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 93D3A8FC0A
	for <perforce@freebsd.org>; Fri, 27 Jun 2008 14:25:00 +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 m5REP06s035728
	for <perforce@freebsd.org>; Fri, 27 Jun 2008 14:25:00 GMT
	(envelope-from gabor@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5REP0mg035726
	for perforce@freebsd.org; Fri, 27 Jun 2008 14:25:00 GMT
	(envelope-from gabor@freebsd.org)
Date: Fri, 27 Jun 2008 14:25:00 GMT
Message-Id: <200806271425.m5REP0mg035726@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 144191 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: Fri, 27 Jun 2008 14:25:01 -0000

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

Change 144191 by gabor@gabor_server on 2008/06/27 14:24:02

	- Restore compatibility of empty regexp

Affected files ...

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

Differences ...

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

@@ -343,7 +343,7 @@
 int
 main(int argc, char *argv[])
 {
-	int		 c, lastc, prevoptind, newarg, i;
+	int		 c, lastc, prevoptind, newarg, i, needpattern;
 	char		*ep;
 	unsigned long long l;
 
@@ -382,6 +382,7 @@
 	lastc = '\0';
 	newarg = 1;
 	prevoptind = 1;
+	needpattern = 1;
 	while ((c = getopt_long(argc, argv, optstr,
 				long_options, NULL)) != -1) {
 		switch (c) {
@@ -439,6 +440,7 @@
 			break;
 		case 'e':
 			add_pattern(optarg, strlen(optarg));
+			needpattern = 0;
 			break;
 		case 'F':
 			Eflag = Gflag = 0;
@@ -446,6 +448,7 @@
 			break;
 		case 'f':
 			read_patterns(optarg);
+			needpattern = 0;
 			break;
 		case 'G':
 			Eflag = Fflag = 0;
@@ -575,10 +578,10 @@
 	argc -= optind;
 	argv += optind;
 
-	if (argc == 0 && patterns == 0)
+	if (argc == 0 && needpattern)
 		usage();
 
-	if (patterns == 0) {
+	if (argc != 0 && needpattern) {
 		add_pattern(*argv, strlen(*argv));
 		--argc;
 		++argv;