summaryrefslogtreecommitdiffstats
path: root/bin/rm
diff options
context:
space:
mode:
authorsteve <steve@FreeBSD.org>1997-08-07 21:37:39 +0000
committersteve <steve@FreeBSD.org>1997-08-07 21:37:39 +0000
commit717042838c948b136f885ba4c16e32cd1787b598 (patch)
tree162e99ae8f435fb39025ca872adef00f7c363c69 /bin/rm
parent792ebc1ba3981adf13023821a2f7c78a8ef90e4e (diff)
downloadFreeBSD-src-717042838c948b136f885ba4c16e32cd1787b598.zip
FreeBSD-src-717042838c948b136f885ba4c16e32cd1787b598.tar.gz
Remove remaining Lite1 stuff from the man page and uphold the
precedence in changing sccsid to rcsid as set by Phillippe Charnier in his previous 100 or so commits. pointed out by: Bruce Evans <bde@zeta.org.au>
Diffstat (limited to 'bin/rm')
-rw-r--r--bin/rm/rm.18
-rw-r--r--bin/rm/rm.c11
2 files changed, 9 insertions, 10 deletions
diff --git a/bin/rm/rm.1 b/bin/rm/rm.1
index 9e46471..4afcb0d 100644
--- a/bin/rm/rm.1
+++ b/bin/rm/rm.1
@@ -33,7 +33,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)rm.1 8.5 (Berkeley) 12/5/94
-.\" $Id: rm.1,v 1.9 1997/04/09 05:04:43 mpp Exp $
+.\" $Id: rm.1,v 1.10 1997/04/29 10:03:09 dfr Exp $
.\"
.Dd December 5, 1994
.Dt RM 1
@@ -158,12 +158,6 @@ system.
UFS is a fixed-block file system, LFS is not.
In addition, only regular files are overwritten, other types of files
are not.
-.Pp
-No support exists for the
-.Xr undelete 2
-call in the kernel, so the
-.Fl W
-option is not yet implemented.
.Sh COMPATIBILITY
The
.Nm rm
diff --git a/bin/rm/rm.c b/bin/rm/rm.c
index b312e20..ea4ef07 100644
--- a/bin/rm/rm.c
+++ b/bin/rm/rm.c
@@ -29,16 +29,21 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
- *
- * from: @(#)rm.c 8.5 (Berkeley) 4/18/94
*/
#ifndef lint
static const char copyright[] =
"@(#) Copyright (c) 1990, 1993, 1994\n\
The Regents of the University of California. All rights reserved.\n";
+#endif /* not lint */
+
+#ifndef lint
+#if 0
+static char sccsid[] = "@(#)rm.c 8.5 (Berkeley) 4/18/94";
+#else
static const char rcsid[] =
- "$Id: rm.c,v 1.16 1997/04/29 10:03:10 dfr Exp $";
+ "$Id: rm.c,v 1.17 1997/08/07 15:37:47 steve Exp $";
+#endif
#endif /* not lint */
#include <sys/types.h>
OpenPOWER on IntegriCloud