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

Backout rev. 1.42 (relaxing the check for -d plus other flags).

Browse Source 
Instead, issue a warning for now if -d and -C options are used
together.  This will be turned into an error before 4.5-RELEASE.

Reviewed by:	imp
This commit is contained in:
Ruslan Ermilov 2001-05-30 07:08:49 +00:00
parent 0bc62786ea
commit fcbb2c69df
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=77472
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -169,9 +169,16 @@ main(argc, argv)
argv += optind;
/* some options make no sense when creating directories */
if (dostrip && dodir)
if ((safecopy || 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();