github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2025-02-18 09:52:44 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix acidentally quadratic wildcard_match

Browse Source 
The "linear" wildcard_match actually contained a bug that compared two
strings on every iteration, causing this to be much slower than
necessary. Fix this.
This commit is contained in:
ridiculousfish 2021-09-16 17:33:32 -07:00
parent d6075885ef
commit 5a6b966bfe
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/wildcard.cpp
View File

@ -101,21 +101,21 @@ bool wildcard_has(const wcstring &str, bool internal) {
bool wildcard_match(const wcstring &str, const wcstring &wc, bool leading_dots_fail_to_match) { bool wildcard_match(const wcstring &str, const wcstring &wc, bool leading_dots_fail_to_match) {
// Hackish fix for issue #270. Prevent wildcards from matching . or .., but we must still allow // Hackish fix for issue #270. Prevent wildcards from matching . or .., but we must still allow
// literal matches. // literal matches.
if (leading_dots_fail_to_match && str[0] == L'.' && if (leading_dots_fail_to_match && (str == L"." || str == L"..")) {
(str[1] == L'\0' || (str[1] == L'.' && str[2] == L'\0'))) {
// The string is '.' or '..' so the only possible match is an exact match. // The string is '.' or '..' so the only possible match is an exact match.
return str == wc; return str == wc;
} }
// Near Linear implementation as proposed here https://research.swtch.com/glob. // Near Linear implementation as proposed here https://research.swtch.com/glob.
const wchar_t *const str_start = str.c_str();
const wchar_t *wc_x = wc.c_str(); const wchar_t *wc_x = wc.c_str();
const wchar_t *str_x = str.c_str(); const wchar_t *str_x = str_start;
const wchar_t *restart_wc_x = wc.c_str(); const wchar_t *restart_wc_x = wc.c_str();
const wchar_t *restart_str_x = str.c_str(); const wchar_t *restart_str_x = str_start;
bool restart_is_out_of_str = false; bool restart_is_out_of_str = false;
for (; *wc_x != 0 || *str_x != 0;) { for (; *wc_x != 0 || *str_x != 0;) {
bool is_first = (str_x == str); bool is_first = (str_x == str_start);
if (*wc_x != 0) { if (*wc_x != 0) {
if (*wc_x == ANY_STRING || *wc_x == ANY_STRING_RECURSIVE) { if (*wc_x == ANY_STRING || *wc_x == ANY_STRING_RECURSIVE) {
// Ignore hidden file // Ignore hidden file