From owner-cvs-src@FreeBSD.ORG Thu Sep 29 20:59:44 2005 Return-Path: X-Original-To: cvs-src@FreeBSD.org Delivered-To: cvs-src@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2F5B016A41F for ; Thu, 29 Sep 2005 20:59:44 +0000 (GMT) (envelope-from dougb@FreeBSD.org) Received: from mail2.fluidhosting.com (mail2.fluidhosting.com [204.14.90.62]) by mx1.FreeBSD.org (Postfix) with SMTP id A8A5143D58 for ; Thu, 29 Sep 2005 20:59:38 +0000 (GMT) (envelope-from dougb@FreeBSD.org) Received: (qmail 90424 invoked by uid 399); 29 Sep 2005 20:59:38 -0000 Received: from mail1.fluidhosting.com (204.14.90.61) by mail2.fluidhosting.com with SMTP; 29 Sep 2005 20:59:38 -0000 Received: (qmail 8333 invoked by uid 399); 29 Sep 2005 20:59:37 -0000 Received: from localhost (HELO ?192.168.1.100?) (dougb@dougbarton.net@127.0.0.1) by localhost with SMTP; 29 Sep 2005 20:59:37 -0000 Message-ID: <433C55B7.8060901@FreeBSD.org> Date: Thu, 29 Sep 2005 13:59:35 -0700 From: Doug Barton Organization: http://www.FreeBSD.org/ User-Agent: Mozilla Thunderbird 1.0.6 (X11/20050908) X-Accept-Language: en-us, en MIME-Version: 1.0 To: src-committers@FreeBSD.org References: <200509292040.j8TKeTPf068156@repoman.freebsd.org> In-Reply-To: <200509292040.j8TKeTPf068156@repoman.freebsd.org> X-Enigmail-Version: 0.92.0.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: cvs-src@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/bin/rm rm.1 rm.c X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 29 Sep 2005 20:59:44 -0000 Doug Barton wrote: > dougb 2005-09-29 20:40:29 UTC > > FreeBSD src repository > > Modified files: > bin/rm rm.1 rm.c > Log: > Handle the case where the -P flag is specified for a read-only file > earlier, and more gracefully. Previously, this combination would be > ignored early in the code where permissions are tested and fail later > with a very unhelpful "permission denied" error. > > Instead, test for this flag in the same block that generates the > "override?" messages for read-only files, but instead of trying > to guess what the user has in mind, generate an error and exit. > > Update the man page to reflect this new behavior. > > Not objected to by: freebsd-hackers@ > > Revision Changes Path > 1.37 +4 -0 src/bin/rm/rm.1 > 1.53 +5 -4 src/bin/rm/rm.c > > http://www.FreeBSD.org/cgi/cvsweb.cgi/src/bin/rm/rm.1.diff?&r1=1.36&r2=1.37&f=h > http://www.FreeBSD.org/cgi/cvsweb.cgi/src/bin/rm/rm.c.diff?&r1=1.52&r2=1.53&f=h Assuming there is no overwhelming bikeshed over this change, I'll request an MFC prior to 6.0-RELEASE. I am of course still willing to listen to rational arguments about why this change might be a bad idea, or could be handled in a better way. Doug -- This .signature sanitized for your protection