From e11700e21ef6e32612bde060eef8120b23330acf Mon Sep 17 00:00:00 2001 From: ru Date: Wed, 5 Jun 2002 17:37:48 +0000 Subject: Start the (overdue) de-orbit sequence for the -d -C combo, as was promised in revision 1.43. MFC after: 1 month --- usr.bin/xinstall/xinstall.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'usr.bin/xinstall') diff --git a/usr.bin/xinstall/xinstall.c b/usr.bin/xinstall/xinstall.c index 92f30d0..feddb74 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(); -- cgit v1.1