10.4/ipfilter-ipmon-usage.diff

Fix the outdated online usage string of ipmon(8).
Ported from IP Filter Rivoreo fork commit 4dcd677.

diff -ru --exclude-from freebsd-src-diff-exclude-names /var/archive3/public/freebsd-releng-10.4-src/contrib/ipfilter/tools/ipmon.c freebsd-10.4/contrib/ipfilter/tools/ipmon.c
--- /var/archive3/public/freebsd-releng-10.4-src/contrib/ipfilter/tools/ipmon.c	2017-09-29 08:20:29.000000000 +0800
+++ freebsd-10.4/contrib/ipfilter/tools/ipmon.c	2019-08-17 23:44:36.260283641 +0800
@@ -1479,8 +1479,11 @@
 static void usage(prog)
 	char *prog;
 {
-	fprintf(stderr, "%s: [-NFhstvxX] [-f <logfile>]\n", prog);
-	exit(1);
+	fprintf(stderr, "Usage: %s [-abDFhnpstvxX] [-B <output-binary-log-file>] [-C <config-file>]\n"
+		"	[-f <filter-input-file>] [-L <syslog-facility>] [-N <nat-input-file>]\n"
+		"	[-o <letters>] [-O <letters>] [-P <pid-file>] [-S <state-input-file>]\n"
+		"	[<output-log-file>]\n", prog);
+	exit(-1);
 }
 
 
@@ -1612,7 +1615,7 @@
 	initconfig(&config);
 
 	while ((c = getopt(argc, argv,
-			   "?abB:C:Df:FhL:nN:o:O:pP:sS:tvxX")) != -1)
+			   "abB:C:Df:FhL:nN:o:O:pP:sS:tvxX")) != -1) {
 		switch (c)
 		{
 		case 'a' :
@@ -1703,6 +1706,7 @@
 		case '?' :
 			usage(argv[0]);
 		}
+	}
 
 	if (ipmonopts & IPMON_SYSLOG)
 		openlog(prog, LOG_NDELAY|LOG_PID, logfac);