From: Matthew Dillon <dillon@dragonflybsd.org>
Date: Mon, 18 Oct 2004 17:35:13 +0000 (+0000)
Subject: Adjust rm's usage and manual page synopsis to include the new -I option.
X-Git-Tag: v2.0.1~9952
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/4d99682239ee5bd6b4e12758e853927511a16b6f

Adjust rm's usage and manual page synopsis to include the new -I option.
Take out the 'dumb user' mention, the option works well for power users and
sysops and not just newbies.

Submitted-by: Frank Denis <dragonfly@pureftpd.org> (usage, synopsis fixes)
		Matt Dillon (dumb user fix)
---

diff --git a/bin/rm/rm.1 b/bin/rm/rm.1
index 8d5c111169..88b5a45b75 100644
--- a/bin/rm/rm.1
+++ b/bin/rm/rm.1
@@ -34,7 +34,7 @@
 .\"
 .\"	@(#)rm.1	8.5 (Berkeley) 12/5/94
 .\" $FreeBSD: src/bin/rm/rm.1,v 1.19.2.6 2003/02/04 22:10:42 trhodes Exp $
-.\" $DragonFly: src/bin/rm/rm.1,v 1.3 2004/10/06 06:16:43 dillon Exp $
+.\" $DragonFly: src/bin/rm/rm.1,v 1.4 2004/10/18 17:35:13 dillon Exp $
 .\"
 .Dd January 28, 1999
 .Dt RM 1
@@ -45,7 +45,7 @@
 .Nd remove directory entries
 .Sh SYNOPSIS
 .Nm
-.Op Fl dfiPRrvW
+.Op Fl dfiIPRrvW
 .Ar
 .Nm unlink
 .Ar file
@@ -83,9 +83,10 @@ option overrides any previous
 options.
 .It Fl I
 Request confirmation once if more then three files are being removed or if a
-directory is being recursively removed.  This is a less intrusive dumb-user
-option than
+directory is being recursively removed.  This is a far less intrusive option
+than
 .Fl i
+yet provides almost the same level of protection against mistakes.
 .It Fl P
 Overwrite regular files before deleting them.
 Files are overwritten three times, first with the byte pattern 0xff,
diff --git a/bin/rm/rm.c b/bin/rm/rm.c
index fad026e6e4..ee0e6d7c38 100644
--- a/bin/rm/rm.c
+++ b/bin/rm/rm.c
@@ -33,7 +33,7 @@
  * @(#) Copyright (c) 1990, 1993, 1994 The Regents of the University of California.  All rights reserved.
  * @(#)rm.c	8.5 (Berkeley) 4/18/94
  * $FreeBSD: src/bin/rm/rm.c,v 1.29.2.5 2002/07/12 07:25:48 tjr Exp $
- * $DragonFly: src/bin/rm/rm.c,v 1.6 2004/10/06 06:58:53 dillon Exp $
+ * $DragonFly: src/bin/rm/rm.c,v 1.7 2004/10/18 17:35:13 dillon Exp $
  */
 
 #include <sys/stat.h>
@@ -531,7 +531,7 @@ usage(void)
 {
 
 	(void)fprintf(stderr, "%s\n%s\n",
-	    "usage: rm [-f | -i] [-dPRrvW] file ...",
+	    "usage: rm [-f | -i] [-dIPRrvW] file ...",
 	    "       unlink file");
 	exit(EX_USAGE);
 }