Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-08 17:48:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'master' of https://github.com/dnthayer/zeek

Browse source 
* 'master' of https://github.com/dnthayer/zeek:
  Update tests and baselines due to renaming all scripts
  Rename all scripts to have ".zeek" file extension
  Update a few tests due to scripts with new file extension
  Add test cases to verify new file extension is recognized
  Fix the core/load-duplicates.bro test
  Update script search logic for new file extension
  Remove unnecessary ".bro" from @load directives
This commit is contained in:
Jon Siwek 2019-04-16 11:56:00 -07:00
commit 4574799609
427 changed files with 1921 additions and 1655 deletions
Download patch file Download diff file Expand all files Collapse all files

70
src/util.cc
View file

@ -20,6 +20,7 @@
#endif
#include <string>
#include <array>
#include <vector>
#include <algorithm>
#include <ctype.h>
@ -1007,7 +1008,20 @@ string bro_prefixes()
return rval;
}
const char* PACKAGE_LOADER = "__load__.bro";
const array<string, 2> script_extensions = {".zeek", ".bro"};
bool is_package_loader(const string& path)
{
string filename(std::move(SafeBasename(path).result));
for ( const string& ext : script_extensions )
{
if ( filename == "__load__" + ext )
return true;
}
return false;
}
FILE* open_file(const string& path, const string& mode)
{
@ -1034,13 +1048,22 @@ static bool can_read(const string& path)
FILE* open_package(string& path, const string& mode)
{
string arg_path = path;
path.append("/").append(PACKAGE_LOADER);
path.append("/__load__");
if ( can_read(path) )
return open_file(path, mode);
for ( const string& ext : script_extensions )
{
string p = path + ext;
if ( can_read(p) )
{
path.append(ext);
return open_file(path, mode);
}
}
path.append(script_extensions[0]);
string package_loader = "__load__" + script_extensions[0];
reporter->Error("Failed to open package '%s': missing '%s' file",
arg_path.c_str(), PACKAGE_LOADER);
arg_path.c_str(), package_loader.c_str());
return 0;
}
@ -1123,7 +1146,7 @@ string flatten_script_name(const string& name, const string& prefix)
if ( ! rval.empty() )
rval.append(".");
if ( SafeBasename(name).result == PACKAGE_LOADER )
if ( is_package_loader(name) )
rval.append(SafeDirname(name).result);
else
rval.append(name);
@ -1221,7 +1244,7 @@ string without_bropath_component(const string& path)
}
static string find_file_in_path(const string& filename, const string& path,
const string& opt_ext = "")
const vector<string>& opt_ext)
{
if ( filename.empty() )
return string();
@ -1239,10 +1262,13 @@ static string find_file_in_path(const string& filename, const string& path,
if ( ! opt_ext.empty() )
{
string with_ext = abs_path + '.' + opt_ext;
for ( const string& ext : opt_ext )
{
string with_ext = abs_path + ext;
if ( can_read(with_ext) )
return with_ext;
if ( can_read(with_ext) )
return with_ext;
}
}
if ( can_read(abs_path) )
@ -1257,9 +1283,31 @@ string find_file(const string& filename, const string& path_set,
vector<string> paths;
tokenize_string(path_set, ":", &paths);
vector<string> ext;
if ( ! opt_ext.empty() )
ext.push_back(opt_ext);
for ( size_t n = 0; n < paths.size(); ++n )
{
string f = find_file_in_path(filename, paths[n], opt_ext);
string f = find_file_in_path(filename, paths[n], ext);
if ( ! f.empty() )
return f;
}
return string();
}
string find_script_file(const string& filename, const string& path_set)
{
vector<string> paths;
tokenize_string(path_set, ":", &paths);
vector<string> ext(script_extensions.begin(), script_extensions.end());
for ( size_t n = 0; n < paths.size(); ++n )
{
string f = find_file_in_path(filename, paths[n], ext);
if ( ! f.empty() )
return f;