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

Replace uses of std::filesystem with zeek::filesystem

Browse source
This commit is contained in:
Tim Wojtulewicz 2022-10-28 21:53:22 +00:00 • committed by Tomer Lev
parent 42575a63db
commit baee0d8026
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/util.cc
View file

@ -672,7 +672,7 @@ string normalize_path(std::string_view path)
{ {
stringPath.erase(0, 2); stringPath.erase(0, 2);
} }
return std::filesystem::path(stringPath).lexically_normal().string(); return zeek::filesystem::path(stringPath).lexically_normal().string();
#else #else
if ( path.find("/.") == std::string_view::npos && path.find("//") == std::string_view::npos ) if ( path.find("/.") == std::string_view::npos && path.find("//") == std::string_view::npos )
{ {
@ -772,7 +772,7 @@ std::string get_exe_path(const std::string& invocation)
{ {
if ( invocation.empty() ) if ( invocation.empty() )
return ""; return "";
std::filesystem::path invocation_path(invocation); zeek::filesystem::path invocation_path(invocation);
if ( invocation_path.is_absolute() || invocation_path.root_directory() == "~" ) if ( invocation_path.is_absolute() || invocation_path.root_directory() == "~" )
// Absolute path // Absolute path
@ -789,7 +789,7 @@ std::string get_exe_path(const std::string& invocation)
exit(1); exit(1);
} }
return (std::filesystem::path(cwd) / invocation_path).string(); return (zeek::filesystem::path(cwd) / invocation_path).string();
} }
auto path = getenv("PATH"); auto path = getenv("PATH");
@ -1967,7 +1967,7 @@ static string find_file_in_path(const string& filename, const string& path,
if ( filename.empty() ) if ( filename.empty() )
return string(); return string();
std::filesystem::path filepath(filename); zeek::filesystem::path filepath(filename);
// If file name is an absolute path, searching within *path* is pointless. // If file name is an absolute path, searching within *path* is pointless.
if ( filepath.is_absolute() ) if ( filepath.is_absolute() )
@ -1978,7 +1978,7 @@ static string find_file_in_path(const string& filename, const string& path,
return string(); return string();
} }
auto abs_path = (std::filesystem::path(path) / filepath).string(); auto abs_path = (zeek::filesystem::path(path) / filepath).string();
if ( ! opt_ext.empty() ) if ( ! opt_ext.empty() )
{ {