From cbaab3d4faee0faf50dea28b5ef759cb6c6ae2da Mon Sep 17 00:00:00 2001
From: Jon Siwek <jsiwek@corelight.com>
Date: Wed, 31 Oct 2018 22:26:24 -0500
Subject: [PATCH] GH-199: change `bro --help` exit status from 1 to 0

Fixes #199
---
 CHANGES     |  4 ++++
 VERSION     |  2 +-
 src/main.cc | 16 ++++++++--------
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/CHANGES b/CHANGES
index da1c3bb9e4..f119f32b3d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,8 @@
 
+2.6-beta2-57 | 2018-10-31 22:26:24 -0500
+
+  * GH-199: change `bro --help` exit status from 1 to 0 (Jon Siwek, Corelight)
+
 2.6-beta2-55 | 2018-10-30 09:59:44 -0500
 
   * Add a test with an encrypted MySQL connection (Vlad Grigorescu)
diff --git a/VERSION b/VERSION
index c86c33eb80..c8ab95122a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.6-beta2-55
+2.6-beta2-57
diff --git a/src/main.cc b/src/main.cc
index f21c15e298..742773bf73 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -157,7 +157,7 @@ const char* bro_dns_fake()
 		return "on";
 	}
 
-void usage()
+void usage(int code = 1)
 	{
 	fprintf(stderr, "bro version %s\n", bro_version());
 	fprintf(stderr, "usage: %s [options] [file ...]\n", prog);
@@ -168,7 +168,7 @@ void usage()
 	fprintf(stderr, "    -e|--exec <bro code>           | augment loaded policies by given code\n");
 	fprintf(stderr, "    -f|--filter <filter>           | tcpdump filter\n");
 	fprintf(stderr, "    -g|--dump-config               | dump current config into .state dir\n");
-	fprintf(stderr, "    -h|--help|-?                   | command line help\n");
+	fprintf(stderr, "    -h|--help                      | command line help\n");
 	fprintf(stderr, "    -i|--iface <interface>         | read from given interface\n");
 	fprintf(stderr, "    -p|--prefix <prefix>           | add given prefix to policy file resolution\n");
 	fprintf(stderr, "    -r|--readfile <readfile>       | read from given tcpdump file\n");
@@ -217,7 +217,7 @@ void usage()
 
 	fprintf(stderr, "\n");
 
-	exit(1);
+	exit(code);
 	}
 
 bool show_plugins(int level)
@@ -634,7 +634,7 @@ int main(int argc, char** argv)
 			break;
 
 		case 'h':
-			usage();
+			usage(0);
 			break;
 
 		case 'i':
@@ -687,7 +687,7 @@ int main(int argc, char** argv)
 
 		case 'F':
 			if ( dns_type != DNS_DEFAULT )
-				usage();
+				usage(1);
 			dns_type = DNS_FORCE;
 			break;
 
@@ -709,7 +709,7 @@ int main(int argc, char** argv)
 
 		case 'P':
 			if ( dns_type != DNS_DEFAULT )
-				usage();
+				usage(1);
 			dns_type = DNS_PRIME;
 			break;
 
@@ -765,7 +765,7 @@ int main(int argc, char** argv)
 
 		case '?':
 		default:
-			usage();
+			usage(1);
 			break;
 		}
 
@@ -806,7 +806,7 @@ int main(int argc, char** argv)
 	// and Solaris provide /dev/urandom).
 
 	if ( interfaces.length() > 0 && read_files.length() > 0 )
-		usage();
+		usage(1);
 
 #ifdef USE_IDMEF
 	char* libidmef_dtd_path_cstr = new char[libidmef_dtd_path.length() + 1];