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

o Legitimate -f (force) flags for -p (preprocessor) case.

Browse Source 
PR:		bin/60433
Submitted:	Bjoern A. Zeeb
MFC after:	3 weeks
This commit is contained in:
maxim 2003-12-24 13:04:04 +00:00
parent 36f747d768
commit 912d84fa39
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sbin/ipfw/ipfw.8
View File

@ -54,7 +54,7 @@
.Op Ar number ...
.Pp
.Nm
.Op Fl cnNqS
.Op Fl cfnNqS
.Oo
.Fl p Ar preproc
.Oo

11
sbin/ipfw/ipfw2.c
View File

@ -63,6 +63,7 @@ int
do_dynamic, /* display dynamic rules */
do_expired, /* display expired dynamic rules */
do_compact, /* show rules in compact mode */
do_force, /* do not ask for confirmation */
show_sets, /* display rule sets */
test_only, /* only check syntax */
comment_only, /* only print action and comment */
@ -3593,7 +3594,6 @@ ipfw_main(int oldac, char **oldav)
int ch, ac, save_ac;
char **av, **save_av;
int do_acct = 0; /* Show packet/byte count */
int do_force = 0; /* Don't ask for confirmation */
#define WHITESP " \t\f\v\n\r"
if (oldac == 0)
@ -3678,7 +3678,8 @@ ipfw_main(int oldac, char **oldav)
}
/* Set the force flag for non-interactive processes */
do_force = !isatty(STDIN_FILENO);
if (!do_force)
do_force = !isatty(STDIN_FILENO);
/* Save arguments for final freeing of memory. */
save_ac = ac;
@ -3840,12 +3841,16 @@ ipfw_readfile(int ac, char *av[])
filename = av[ac-1];
while ((c = getopt(ac, av, "cNnp:qS")) != -1) {
while ((c = getopt(ac, av, "cfNnp:qS")) != -1) {
switch(c) {
case 'c':
do_compact = 1;
break;
case 'f':
do_force = 1;
break;
case 'N':
do_resolv = 1;
break;