aboutsummaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorRuslan Ermilov <ru@FreeBSD.org>2002-06-05 17:37:48 +0000
committerRuslan Ermilov <ru@FreeBSD.org>2002-06-05 17:37:48 +0000
commit5af50a7c59af6bb79da79b94c1d902fe30d535e8 (patch)
tree37e94c473b15a5feb4c50b9d866d775b88470a1f /usr.bin
parentc0716492d44e20d8b5db4116620bc4a8f4c6b8b0 (diff)
Notes
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/xinstall/xinstall.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/usr.bin/xinstall/xinstall.c b/usr.bin/xinstall/xinstall.c
index 92f30d0dc88b..feddb7452fa6 100644
--- a/usr.bin/xinstall/xinstall.c
+++ b/usr.bin/xinstall/xinstall.c
@@ -173,16 +173,9 @@ main(argc, argv)
argv += optind;
/* some options make no sense when creating directories */
- if ((safecopy || dostrip) && dodir)
+ if ((safecopy || docompare || dostrip) && dodir)
usage();
- /*
- * Older versions allowed -d -C combo. Issue a warning
- * for now, but turn this into an error before 4.5-RELEASE.
- */
- if (docompare && dodir)
- warnx("the -d and -C options may not be specified together");
-
/* must have at least two arguments, except when creating directories */
if (argc < 2 && !dodir)
usage();