From owner-cvs-all  Sun Aug 29 12:28:28 1999
Delivered-To: cvs-all@freebsd.org
Received: from zibbi.mikom.csir.co.za (zibbi.mikom.csir.co.za [146.64.24.58])
	by hub.freebsd.org (Postfix) with ESMTP
	id E1BED14D53; Sun, 29 Aug 1999 12:28:17 -0700 (PDT)
	(envelope-from jhay@zibbi.mikom.csir.co.za)
Received: (from jhay@localhost)
	by zibbi.mikom.csir.co.za (8.9.3/8.9.3) id VAA37960;
	Sun, 29 Aug 1999 21:27:12 +0200 (SAT)
	(envelope-from jhay)
From: John Hay <jhay@mikom.csir.co.za>
Message-Id: <199908291927.VAA37960@zibbi.mikom.csir.co.za>
Subject: Re: cvs commit: src/bin/rm rm.1 rm.c
In-Reply-To: <19990829114222.B14701@dragon.nuxi.com> from "David O'Brien" at "Aug 29, 1999 11:42:22 am"
To: obrien@FreeBSD.org
Date: Sun, 29 Aug 1999 21:27:12 +0200 (SAT)
Cc: freebsd@gndrsh.dnsmgr.net (Rodney W. Grimes),
	mharo@FreeBSD.org (Michael Haro), cvs-committers@FreeBSD.org,
	cvs-all@FreeBSD.org
X-Mailer: ELM [version 2.4ME+ PL54 (25)]
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk

> > >   Reviewed by:	obrien
> > 
> > Either of you care to make any comments about this: (There is a second
> > report of it as well)
> 
> Na.  I'd rather just fix it.
>  

This seems to fix it for me.

John
-- 
John Hay -- John.Hay@mikom.csir.co.za

Index: rm.c
===================================================================
RCS file: /home/ncvs/src/bin/rm/rm.c,v
retrieving revision 1.22
diff -u -r1.22 rm.c
--- rm.c	1999/08/29 02:20:26	1.22
+++ rm.c	1999/08/29 18:57:59
@@ -235,7 +235,7 @@
 			switch (p->fts_info) {
 			case FTS_DP:
 			case FTS_DNR:
-				if ((e=rmdir(p->fts_accpath)) || (fflag && errno == ENOENT)) {
+				if (!(e=rmdir(p->fts_accpath)) || (fflag && errno == ENOENT)) {
 					if (e == 0 && vflag)
 						(void)printf("%s\n", p->fts_accpath);
 					continue;



To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message