From owner-p4-projects@FreeBSD.ORG  Wed Jun 25 15:40:04 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4CF751065670; Wed, 25 Jun 2008 15:40:04 +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 0D7A6106566B
	for <perforce@freebsd.org>; Wed, 25 Jun 2008 15:40:04 +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 01B1B8FC0A
	for <perforce@freebsd.org>; Wed, 25 Jun 2008 15:40:04 +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 m5PFe3nI013081
	for <perforce@freebsd.org>; Wed, 25 Jun 2008 15:40:03 GMT
	(envelope-from gabor@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5PFe3tD013079
	for perforce@freebsd.org; Wed, 25 Jun 2008 15:40:03 GMT
	(envelope-from gabor@freebsd.org)
Date: Wed, 25 Jun 2008 15:40:03 GMT
Message-Id: <200806251540.m5PFe3tD013079@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 144100 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 15:40:04 -0000

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

Change 144100 by gabor@gabor_server on 2008/06/25 15:39:53

	- Restore compatibility of status codes

Affected files ...

.. //depot/projects/soc2008/gabor_textproc/grep/grep.c#51 edit
.. //depot/projects/soc2008/gabor_textproc/grep/util.c#45 edit

Differences ...

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

@@ -607,12 +607,13 @@
 		hflag = 1;
 
 	if (argc == 0)
-		exit(!procfile(NULL));
+		exit(!procfile("-"));
 
 	if (dirbehave == DIR_RECURSE)
 		c = grep_tree(argv);
-	else
-		c+= procfile(*argv);
+	else 
+		for (c = 0; argc--; ++argv)
+			c+= procfile(*argv);
 
 #ifndef WITHOUT_NLS
 	catclose(catalog);

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

@@ -114,16 +114,14 @@
 	if (mflag && (mcount <= 0))
 		return (0);
 
-	if (fn == NULL || (strcmp(fn, "-") == 0)) {
+	if (strcmp(fn, "-") == 0) {
 		if (label != NULL)
 			fn = label;
 		else
 			fn = getstr(1);
 		f = grep_stdin_open();
 	} else {
-		if (stat(fn, &sb))
-			err(2, NULL);
-		else {
+		if (!stat(fn, &sb)) {
 			s = sb.st_mode & S_IFMT;
 			if (s == S_IFDIR && dirbehave == DIR_SKIP)
 				return (0);