Howdy, This is just a quick heads up to let y'all know that I've MFCed src/bin/rm through RELENG_[456], so the code in all 3 branches is now equivalent to that in HEAD. I have tested these changes on all 4 branches, so I don't expect there to be any problems, but if there are, please mail this list and myself ASAP and we'll get it sorted out. Enjoy, Doug -------- Original Message -------- Subject: cvs commit: src/bin/rm Makefile rm.1 rm.c Date: Sat, 8 Oct 2005 17:46:12 +0000 (UTC) From: Doug Barton <dougb@FreeBSD.org> To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org dougb 2005-10-08 17:46:12 UTC FreeBSD src repository Modified files: (Branch: RELENG_4) bin/rm Makefile rm.1 rm.c Log: MFC through rm.c 1.53, rm.1 1.38, and Makefile 1.18. This includes the recent change to improve handling of the -P flag on read-only files, addition of the -I option for better handling of recursive deletes, a test for removal of / in the argument list, removal of clause 3 from the BSD license, some small code cleanups, and related mdoc and comment changes and improvements. The Makefile change removes a spurious SRCS=, and WARNS? Revision Changes Path 1.12.2.3 +1 -3 src/bin/rm/Makefile 1.19.2.7 +37 -26 src/bin/rm/rm.1 1.29.2.6 +129 -28 src/bin/rm/rm.c http://www.FreeBSD.org/cgi/cvsweb.cgi/src/bin/rm/Makefile.diff?&r1=1.12.2.2&r2=1.12.2.3&f=h http://www.FreeBSD.org/cgi/cvsweb.cgi/src/bin/rm/rm.1.diff?&r1=1.19.2.6&r2=1.19.2.7&f=h http://www.FreeBSD.org/cgi/cvsweb.cgi/src/bin/rm/rm.c.diff?&r1=1.29.2.5&r2=1.29.2.6&f=h