d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Start the (overdue) de-orbit sequence for the -d -C combo,

Browse Source 
as was promised in revision 1.43.

MFC after:	1 month
This commit is contained in:
ru 2002-06-05 17:37:48 +00:00
parent 9b75b96530
commit e11700e21e
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
usr.bin/xinstall/xinstall.c
View File

@ -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();