Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 06:38:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Allow -B flag in non-Debug builds, but ignore it.

Browse source 
The `-B` flag allows to enable debug streams in Debug builds. We
previously didn't support passing the flag for other builds. With that
whether an invocation of `zeek` executed or not depended on the way zeek
was built.

With this patch we accept and parse the flag when passed in the
invocation, but ignore any requests for actual debug streams in
non-Debug builds (no streams are available). If `-B help` is passed we
emit a message and abort.
This commit is contained in:
Benjamin Bannier 2021-08-26 15:16:48 +02:00
parent 853b49ea48
commit ebe285f591
1 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/Options.cc
View file

@ -12,6 +12,8 @@
#endif
#include <algorithm>
#include <cstdio>
#include <cstdlib>
#include <sstream>
#include "zeek/bsd-getopt-long.h"
@ -328,10 +330,7 @@ Options parse_cmdline(int argc, char** argv)
{"watchdog", no_argument, nullptr, 'W'},
{"print-id", required_argument, nullptr, 'I'},
{"status-file", required_argument, nullptr, 'U'},
#ifdef DEBUG
{"debug", required_argument, nullptr, 'B'},
#endif
#ifdef USE_PERFTOOLS_DEBUG
{"mem-leaks", no_argument, nullptr, 'm'},
@ -437,11 +436,17 @@ Options parse_cmdline(int argc, char** argv)
rval.pcap_output_file = optarg;
break;
#ifdef DEBUG
case 'B':
#ifdef DEBUG
rval.debug_log_streams = optarg;
break;
#else
if ( util::streq(optarg, "help") )
{
fprintf(stderr,"debug streams unavailable\n");
exit(1);
}
#endif
break;
case 'C':
rval.ignore_checksums = true;