diff options
author | ridiculousfish <corydoras@ridiculousfish.com> | 2015-08-08 14:52:04 -0700 |
---|---|---|
committer | ridiculousfish <corydoras@ridiculousfish.com> | 2015-08-08 14:52:04 -0700 |
commit | 3a3a9f5cc15ccfc9f171f8916c5a0470a3585319 (patch) | |
tree | 3f9674f39650e5143a35db69577f4e23b840a3a6 /src/wildcard.cpp | |
parent | f87268e2acad39bcf27528b171bea49e50108dc2 (diff) |
Add wreaddir_for_dirs function
Eliminates some stat calls, speeding up wildcard expansion
Diffstat (limited to 'src/wildcard.cpp')
-rw-r--r-- | src/wildcard.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/wildcard.cpp b/src/wildcard.cpp index b8d30beb..3afbe84c 100644 --- a/src/wildcard.cpp +++ b/src/wildcard.cpp @@ -814,7 +814,7 @@ void wildcard_expander_t::expand_trailing_slash(const wcstring &base_dir) void wildcard_expander_t::expand_intermediate_segment(const wcstring &base_dir, DIR *base_dir_fp, const wcstring &wc_segment, const wchar_t *wc_remainder) { wcstring name_str; - while (!interrupted() && wreaddir(base_dir_fp, name_str)) + while (!interrupted() && wreaddir_for_dirs(base_dir_fp, &name_str)) { /* Note that it's critical we ignore leading dots here, else we may descend into . and .. */ if (! wildcard_match(name_str, wc_segment, true)) @@ -849,7 +849,7 @@ void wildcard_expander_t::expand_literal_intermediate_segment_with_fuzz(const wc // This only works with tab completions // Ordinary wildcard expansion should never go fuzzy wcstring name_str; - while (!interrupted() && wreaddir(base_dir_fp, name_str)) + while (!interrupted() && wreaddir_for_dirs(base_dir_fp, &name_str)) { /* Don't bother with . and .. */ if (contains(name_str, L".", L"..")) |