h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-06-20 14:11:14 -03:00
Code Issues Packages Projects Releases Wiki Activity

path: drop path_get_paths_ffi

Browse Source 
f77dc24 provides the pieces to call path_get_paths directly from Rust
code. Drop the C++ implementation and its FFI.
This commit is contained in:
David Adam
2023-06-21 21:39:45 +08:00
parent 1f67bcbb39
commit 14cfd268d8
5 changed files with 5 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/path.cpp
View File

@@ -97,16 +97,6 @@ get_path_result_t path_try_get_path(const wcstring &cmd, const environment_t &va
return path_get_path_core(cmd, pathvar ? pathvar->as_list() : kDefaultPath);
}
static bool path_is_executable(const std::string &path) {
if (access(path.c_str(), X_OK)) return false;
struct stat buff;
if (stat(path.c_str(), &buff) == -1) {
if (errno != EACCES) wperror(L" stat");
return false;
}
return S_ISREG(buff.st_mode);
}
/// \return whether the given path is on a remote filesystem.
static dir_remoteness_t path_remoteness(const wcstring &path) {
std::string narrow = wcs2zstring(path);
@@ -143,36 +133,6 @@ static dir_remoteness_t path_remoteness(const wcstring &path) {
#endif
}
std::vector<wcstring> path_get_paths(const wcstring &cmd, const environment_t &vars) {
FLOGF(path, L"path_get_paths('%ls')", cmd.c_str());
std::vector<wcstring> paths;
// If the command has a slash, it must be an absolute or relative path and thus we don't bother
// looking for matching commands in the PATH var.
if (cmd.find(L'/') != wcstring::npos) {
std::string narrow = wcs2zstring(cmd);
if (path_is_executable(narrow)) paths.push_back(cmd);
return paths;
}
auto path_var = vars.get(L"PATH");
if (!path_var) return paths;
const std::vector<wcstring> &pathsv = path_var->as_list();
for (auto path : pathsv) {
if (path.empty()) continue;
append_path_component(path, cmd);
std::string narrow = wcs2zstring(path);
if (path_is_executable(narrow)) paths.push_back(path);
}
return paths;
}
wcstring_list_ffi_t path_get_paths_ffi(const wcstring &cmd, const parser_t &parser) {
return path_get_paths(cmd, parser.vars());
}
std::vector<wcstring> path_apply_cdpath(const wcstring &dir, const wcstring &wd,
const environment_t &env_vars) {
std::vector<wcstring> paths;