Improve error reporting. Use corresponding error message when file to be
preprocessed is missing. Also suggest to use absolute pathname if -p option is specified. PR: bin/156653 MFC after: 2 weeks
This commit is contained in:
parent
2b9be05588
commit
0dba401da6
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=223661
@ -262,7 +262,7 @@ ipfw_main(int oldac, char **oldav)
|
||||
save_av = av;
|
||||
|
||||
optind = optreset = 1; /* restart getopt() */
|
||||
while ((ch = getopt(ac, av, "abcdefhinNqs:STtv")) != -1)
|
||||
while ((ch = getopt(ac, av, "abcdefhinNp:qs:STtv")) != -1)
|
||||
switch (ch) {
|
||||
case 'a':
|
||||
do_acct = 1;
|
||||
@ -306,6 +306,10 @@ ipfw_main(int oldac, char **oldav)
|
||||
co.do_resolv = 1;
|
||||
break;
|
||||
|
||||
case 'p':
|
||||
errx(EX_USAGE, "An absolute pathname must be used "
|
||||
"with -p option.");
|
||||
|
||||
case 'q':
|
||||
co.do_quiet = 1;
|
||||
break;
|
||||
@ -603,9 +607,12 @@ main(int ac, char *av[])
|
||||
* as a file to be preprocessed.
|
||||
*/
|
||||
|
||||
if (ac > 1 && av[ac - 1][0] == '/' && access(av[ac - 1], R_OK) == 0)
|
||||
if (ac > 1 && av[ac - 1][0] == '/') {
|
||||
if (access(av[ac - 1], R_OK) == 0)
|
||||
ipfw_readfile(ac, av);
|
||||
else {
|
||||
else
|
||||
err(EX_USAGE, "pathname: %s", av[ac - 1]);
|
||||
} else {
|
||||
if (ipfw_main(ac, av)) {
|
||||
errx(EX_USAGE,
|
||||
"usage: ipfw [options]\n"
|
||||
|
Loading…
Reference in New Issue
Block a user