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

Rename all BRO-prefixed environment variables

Browse source 
For backward compatibility when reading values, we first check
the ZEEK-prefixed value, and if not set, then check the corresponding
BRO-prefixed value.
This commit is contained in:
Daniel Thayer 2019-05-21 21:40:21 -05:00
parent d6096b1618
commit 1a74516db1
105 changed files with 330 additions and 274 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/util.cc
View file

@ -958,10 +958,15 @@ const std::string& bro_path()
{
if ( bro_path_value.empty() )
{
const char* path = getenv("BROPATH");
const char* path = getenv("ZEEKPATH");
if ( ! path )
path = DEFAULT_ZEEKPATH;
{
path = getenv("BROPATH");
if ( ! path )
path = DEFAULT_ZEEKPATH;
}
bro_path_value = path;
}
@ -979,20 +984,30 @@ extern void add_to_bro_path(const string& dir)
const char* bro_plugin_path()
{
const char* path = getenv("BRO_PLUGIN_PATH");
const char* path = getenv("ZEEK_PLUGIN_PATH");
if ( ! path )
path = BRO_PLUGIN_INSTALL_PATH;
{
path = getenv("BRO_PLUGIN_PATH");
if ( ! path )
path = BRO_PLUGIN_INSTALL_PATH;
}
return path;
}
const char* bro_plugin_activate()
{
const char* names = getenv("BRO_PLUGIN_ACTIVATE");
const char* names = getenv("ZEEK_PLUGIN_ACTIVATE");
if ( ! names )
names = "";
{
names = getenv("BRO_PLUGIN_ACTIVATE");
if ( ! names )
names = "";
}
return names;
}
@ -1388,7 +1403,11 @@ FILE* rotate_file(const char* name, RecordVal* rotate_info)
const char* log_file_name(const char* tag)
{
const char* env = getenv("BRO_LOG_SUFFIX");
const char* env = getenv("ZEEK_LOG_SUFFIX");
if ( ! env )
env = getenv("BRO_LOG_SUFFIX");
return fmt("%s.%s", tag, (env ? env : "log"));
}