Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-30 14:53:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove wreaddir and wreaddir_resolving

Browse source 
dir_iter_t has replaced these functions; we can remove them.
This commit is contained in:
ridiculousfish 2022-09-26 10:23:09 -07:00
parent a2d816710f
commit 0b47ba0642
2 changed files with 0 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
src/wutil.cpp
View file

@ -43,67 +43,6 @@ const file_id_t kInvalidFileID{};
/// Map used as cache by wgettext. /// Map used as cache by wgettext.
static owning_lock<std::unordered_map<wcstring, wcstring>> wgettext_map; static owning_lock<std::unordered_map<wcstring, wcstring>> wgettext_map;
bool wreaddir_resolving(DIR *dir, const wcstring &dir_path, wcstring &out_name, bool *out_is_dir) {
struct dirent *result = readdir(dir);
if (!result) {
out_name.clear();
return false;
}
out_name = str2wcstring(result->d_name);
if (!out_is_dir) {
return true;
}
// The caller cares if this is a directory, so check.
bool is_dir = false;
// We may be able to skip stat, if the readdir can tell us the file type directly.
bool check_with_stat = true;
#ifdef HAVE_STRUCT_DIRENT_D_TYPE
if (result->d_type == DT_DIR) {
// Known directory.
is_dir = true;
check_with_stat = false;
} else if (result->d_type == DT_LNK || result->d_type == DT_UNKNOWN) {
// We want to treat symlinks to directories as directories. Use stat to resolve it.
check_with_stat = true;
} else {
// Regular file.
is_dir = false;
check_with_stat = false;
}
#endif // HAVE_STRUCT_DIRENT_D_TYPE
if (check_with_stat) {
// We couldn't determine the file type from the dirent; check by stat'ing it.
cstring fullpath = wcs2string(dir_path);
if (!fullpath.empty()) {
// If the dir_path was empty, we just use the name.
// This ends up as a relative path which is fine.
fullpath.push_back('/');
}
fullpath.append(result->d_name);
struct stat buf;
if (stat(fullpath.c_str(), &buf) != 0) {
is_dir = false;
} else {
is_dir = S_ISDIR(buf.st_mode);
}
}
*out_is_dir = is_dir;
return true;
}
bool wreaddir(DIR *dir, wcstring &out_name) {
struct dirent *result = readdir(dir);
if (!result) {
out_name.clear();
return false;
}
out_name = str2wcstring(result->d_name);
return true;
}
wcstring wgetcwd() { wcstring wgetcwd() {
char cwd[PATH_MAX]; char cwd[PATH_MAX];
char *res = getcwd(cwd, sizeof(cwd)); char *res = getcwd(cwd, sizeof(cwd));

5
src/wutil.h
View file

@ -67,11 +67,6 @@ wcstring normalize_path(const wcstring &path, bool allow_leading_double_slashes
/// allowing 'cd' into a directory that may not exist; see #5341. /// allowing 'cd' into a directory that may not exist; see #5341.
wcstring path_normalize_for_cd(const wcstring &wd, const wcstring &path); wcstring path_normalize_for_cd(const wcstring &wd, const wcstring &path);
/// Wide character version of readdir().
bool wreaddir(DIR *dir, wcstring &out_name);
bool wreaddir_resolving(DIR *dir, const std::wstring &dir_path, wcstring &out_name,
bool *out_is_dir);
/// Wide character version of dirname(). /// Wide character version of dirname().
std::wstring wdirname(std::wstring path); std::wstring wdirname(std::wstring path);