Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2025-01-26 03:35:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

lint: replace readdir() with readdir_r()

Browse source
This commit is contained in:
Kurtis Rader 2017-05-09 21:02:05 -07:00
parent 3a0bb6b19a
commit f00084f28b
2 changed files with 32 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
src/wutil.cpp
View file

@ -40,12 +40,16 @@ const file_id_t kInvalidFileID = {(dev_t)-1LL, (ino_t)-1LL, (uint64_t)-1LL, -1,
/// Map used as cache by wgettext. /// Map used as cache by wgettext.
static owning_lock<std::map<wcstring, wcstring>> wgettext_map; static owning_lock<std::map<wcstring, wcstring>> wgettext_map;
bool wreaddir_resolving(DIR *dir, const std::wstring &dir_path, std::wstring &out_name, bool wreaddir_resolving(DIR *dir, const wcstring &dir_path, wcstring &out_name, bool *out_is_dir) {
bool *out_is_dir) { struct dirent d;
struct dirent *d = readdir(dir); struct dirent *result = NULL;
if (!d) return false; int retval = readdir_r(dir, &d, &result);
if (retval || !result) {
out_name = L"";
return false;
}
out_name = str2wcstring(d->d_name); out_name = str2wcstring(d.d_name);
if (!out_is_dir) return true; if (!out_is_dir) return true;
// The caller cares if this is a directory, so check. // The caller cares if this is a directory, so check.
@ -53,11 +57,11 @@ bool wreaddir_resolving(DIR *dir, const std::wstring &dir_path, std::wstring &ou
// We may be able to skip stat, if the readdir can tell us the file type directly. // We may be able to skip stat, if the readdir can tell us the file type directly.
bool check_with_stat = true; bool check_with_stat = true;
#ifdef HAVE_STRUCT_DIRENT_D_TYPE #ifdef HAVE_STRUCT_DIRENT_D_TYPE
if (d->d_type == DT_DIR) { if (d.d_type == DT_DIR) {
// Known directory. // Known directory.
is_dir = true; is_dir = true;
check_with_stat = false; check_with_stat = false;
} else if (d->d_type == DT_LNK || d->d_type == DT_UNKNOWN) { } else if (d.d_type == DT_LNK || d.d_type == DT_UNKNOWN) {
// We want to treat symlinks to directories as directories. Use stat to resolve it. // We want to treat symlinks to directories as directories. Use stat to resolve it.
check_with_stat = true; check_with_stat = true;
} else { } else {
@ -70,7 +74,7 @@ bool wreaddir_resolving(DIR *dir, const std::wstring &dir_path, std::wstring &ou
// We couldn't determine the file type from the dirent; check by stat'ing it. // We couldn't determine the file type from the dirent; check by stat'ing it.
cstring fullpath = wcs2string(dir_path); cstring fullpath = wcs2string(dir_path);
fullpath.push_back('/'); fullpath.push_back('/');
fullpath.append(d->d_name); fullpath.append(d.d_name);
struct stat buf; struct stat buf;
if (stat(fullpath.c_str(), &buf) != 0) { if (stat(fullpath.c_str(), &buf) != 0) {
is_dir = false; is_dir = false;
@ -82,39 +86,43 @@ bool wreaddir_resolving(DIR *dir, const std::wstring &dir_path, std::wstring &ou
return true; return true;
} }
bool wreaddir(DIR *dir, std::wstring &out_name) { bool wreaddir(DIR *dir, wcstring &out_name) {
struct dirent *d = readdir(dir); struct dirent d;
if (!d) return false; struct dirent *result = NULL;
int retval = readdir_r(dir, &d, &result);
out_name = str2wcstring(d->d_name); if (retval || !result) {
out_name = L"";
return false;
}
out_name = str2wcstring(d.d_name);
return true; return true;
} }
bool wreaddir_for_dirs(DIR *dir, wcstring *out_name) { bool wreaddir_for_dirs(DIR *dir, wcstring *out_name) {
struct dirent d;
struct dirent *result = NULL; struct dirent *result = NULL;
while (result == NULL) { while (!result) {
struct dirent *d = readdir(dir); int retval = readdir_r(dir, &d, &result);
if (!d) break; if (retval || !result) break;
#if HAVE_STRUCT_DIRENT_D_TYPE #if HAVE_STRUCT_DIRENT_D_TYPE
switch (d->d_type) { switch (d.d_type) {
case DT_DIR: case DT_DIR:
case DT_LNK: case DT_LNK:
case DT_UNKNOWN: { case DT_UNKNOWN: {
// These may be directories. break; // these may be directories
result = d;
break;
} }
default: { default: {
// Nothing else can. break; // nothing else can
break;
} }
} }
#else #else
// We can't determine if it's a directory or not, so just return it. // We can't determine if it's a directory or not, so just return it.
result = d; break;
#endif #endif
} }
if (result && out_name) { if (result && out_name) {
*out_name = str2wcstring(result->d_name); *out_name = str2wcstring(result->d_name);
} }

4
src/wutil.h
View file

@ -64,8 +64,8 @@ int wchdir(const wcstring &dir);
wchar_t *wrealpath(const wcstring &pathname, wchar_t *resolved_path); wchar_t *wrealpath(const wcstring &pathname, wchar_t *resolved_path);
/// Wide character version of readdir(). /// Wide character version of readdir().
bool wreaddir(DIR *dir, std::wstring &out_name); bool wreaddir(DIR *dir, wcstring &out_name);
bool wreaddir_resolving(DIR *dir, const std::wstring &dir_path, std::wstring &out_name, bool wreaddir_resolving(DIR *dir, const std::wstring &dir_path, wcstring &out_name,
bool *out_is_dir); bool *out_is_dir);
/// Like wreaddir, but skip items that are known to not be directories. If this requires a stat /// Like wreaddir, but skip items that are known to not be directories. If this requires a stat