svn commit: r337574 - head/sbin/ipfw

[Andrey V. Elsukov]

Author: ae
Date: Fri Aug 10 14:10:22 2018
New Revision: 337574
URL: https://svnweb.freebsd.org/changeset/base/337574

Log:
  Restore the behaviour changed in r337536, when bad `ipfw delete` command
  returns error.
  
  Now -q option only makes it quiet. And when -f flag is specified, the
  command will ignore errors and continue executing with next batched
  command.
  
  MFC after:	2 weeks

Modified:
  head/sbin/ipfw/ipfw.8
  head/sbin/ipfw/ipfw2.c

Modified: head/sbin/ipfw/ipfw.8
==============================================================================
--- head/sbin/ipfw/ipfw.8	Fri Aug 10 13:38:23 2018	(r337573)
+++ head/sbin/ipfw/ipfw.8	Fri Aug 10 14:10:22 2018	(r337574)
@@ -1,7 +1,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd July 9, 2018
+.Dd August 10, 2018
 .Dt IPFW 8
 .Os
 .Sh NAME
@@ -315,10 +315,15 @@ When listing and
 .Fl d
 is specified, also show expired dynamic rules.
 .It Fl f
-Do not ask for confirmation for commands that can cause problems
-if misused, i.e.,
+Run without prompting for confirmation for commands that can cause problems if misused,
+i.e.,
 .Cm flush .
 If there is no tty associated with the process, this is implied.
+The
+.Cm delete
+command with this flag ignores possible errors,
+i.e., nonexistent rule number.
+And for batched commands execution continues with the next command.
 .It Fl i
 When listing a table (see the
 .Sx LOOKUP TABLES

Modified: head/sbin/ipfw/ipfw2.c
==============================================================================
--- head/sbin/ipfw/ipfw2.c	Fri Aug 10 13:38:23 2018	(r337573)
+++ head/sbin/ipfw/ipfw2.c	Fri Aug 10 14:10:22 2018	(r337574)
@@ -3314,7 +3314,7 @@ ipfw_delete(char *av[])
 			}
 		}
 	}
-	if (exitval != EX_OK && co.do_quiet == 0)
+	if (exitval != EX_OK && co.do_force == 0)
 		exit(exitval);
 }