summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorjkh <jkh@FreeBSD.org>1999-02-25 22:18:08 +0000
committerjkh <jkh@FreeBSD.org>1999-02-25 22:18:08 +0000
commitd0aab313efab5f3bef8c85d0c043ff6604ffd6e3 (patch)
treebcc4d3322dd5205bdcea68ac4a101f10177a3841 /bin
parent909314a3a7d15c37f170149208b7e71611ae2a35 (diff)
downloadFreeBSD-src-d0aab313efab5f3bef8c85d0c043ff6604ffd6e3.zip
FreeBSD-src-d0aab313efab5f3bef8c85d0c043ff6604ffd6e3.tar.gz
Don't emit usage() message when no arguments given to -f. This
appears to be consistent with other Unixen, like Solaris. PR: 10240 Submitted by: jun_sun@hlla.is.tsukuba.ac.jp
Diffstat (limited to 'bin')
-rw-r--r--bin/rm/rm.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/bin/rm/rm.c b/bin/rm/rm.c
index ea4ef07..e12bbdea 100644
--- a/bin/rm/rm.c
+++ b/bin/rm/rm.c
@@ -42,7 +42,7 @@ static const char copyright[] =
static char sccsid[] = "@(#)rm.c 8.5 (Berkeley) 4/18/94";
#else
static const char rcsid[] =
- "$Id: rm.c,v 1.17 1997/08/07 15:37:47 steve Exp $";
+ "$Id: rm.c,v 1.18 1997/08/07 21:37:39 steve Exp $";
#endif
#endif /* not lint */
@@ -114,8 +114,11 @@ main(argc, argv)
argc -= optind;
argv += optind;
- if (argc < 1)
+ if (argc < 1) {
+ if (fflag)
+ return 0;
usage();
+ }
checkdot(argv);
uid = geteuid();
OpenPOWER on IntegriCloud