Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-04 15:48:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Make @load statements recognize relative paths.

Browse source 
For example a script can do "@load ./foo" to load a script named
foo.bro that lives in the same directory or "@load ../bar" to load
a script named bar.bro in the parent directory, even if those
directories are not contained in BROPATH.
This commit is contained in:
Jon Siwek 2011-07-14 11:35:23 -05:00
parent 2045f1e366
commit e5e3bf28ec
4 changed files with 38 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/util.cc
View file

@ -868,11 +868,20 @@ void get_policy_subpath(const char* dir, const char* file, const char** subpath)
delete [] tmp;
}
extern string current_scanned_file_path;
FILE* search_for_file(const char* filename, const char* ext,
const char** full_filename, bool load_pkgs,
const char** bropath_subpath)
{
if ( filename[0] == '/' || filename[0] == '.' )
// If the file is a literal absolute path we don't have to search,
// just return the result of trying to open it. If the file is
// might be a relative path, check first if it's a real file that
// can be referenced from cwd, else we'll try to search for it based
// on what path the currently-loading script is in as well as the
// standard BROPATH paths.
if ( filename[0] == '/' ||
(filename[0] == '.' && access(filename, R_OK) == 0) )
{
if ( bropath_subpath )
{
@ -886,6 +895,12 @@ FILE* search_for_file(const char* filename, const char* ext,
char path[1024], full_filename_buf[1024];
safe_strncpy(path, bro_path(), sizeof(path));
// append the currently loading script's path to BROPATH so that
// @loads can be referenced relatively
if ( current_scanned_file_path != "" )
safe_snprintf(path, sizeof(path), "%s:%s", path,
current_scanned_file_path.c_str());
char* dir_beginning = path;
char* dir_ending = path;
int more = *dir_beginning != '\0';