From: Joseph Koshy <jkoshy@users.sourceforge.net>
Date: Fri, 25 Nov 2011 16:20:33 +0000 (+0530)
Subject: fix rm -f
X-Git-Tag: v3.2.0~219
X-Git-Url: http://zhaoyanbai.com/repos/icons/static/doxygen.log?a=commitdiff_plain;h=39b1aee2e1d09ee8c51b400d3756e357ecfe9d00;p=minix.git

fix rm -f

    "/bin/rm" should not issue a usage message if the "-f" option was
    specified.
---

diff --git a/commands/cp/cp.c b/commands/cp/cp.c
index f29e78389..75cf43107 100644
--- a/commands/cp/cp.c
+++ b/commands/cp/cp.c
@@ -1320,7 +1320,11 @@ int main(int argc, char **argv)
 
     switch (action) {
     case REMOVE:
-	if (i == argc) usage();
+	if (i == argc) {
+	    if (fflag)
+		exit(0);
+	    usage();
+	}
 	break;
     case LINK:
 	/* 'ln dir/file' is to be read as 'ln dir/file .'. */