mirror of
https://github.com/freebsd/freebsd-src.git
synced 2024-11-28 04:43:32 +00:00
Start the (overdue) de-orbit sequence for the -d -C combo,
as was promised in revision 1.43. MFC after: 1 month
This commit is contained in:
parent
c0716492d4
commit
5af50a7c59
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=97876
@ -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();
|
||||
|
Loading…
Reference in New Issue
Block a user