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

Remove support for the ? wildcard

Browse Source 
Fixes #4520
This commit is contained in:
ridiculousfish
2018-03-31 16:48:57 -07:00
parent 4b079e16e5
commit 6e56637cf0
15 changed files with 74 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/parse_util.cpp
View File

@@ -423,9 +423,7 @@ wcstring parse_util_unescape_wildcards(const wcstring &str) {
for (size_t i = 0; cs[i] != L'\0'; i++) {
if (cs[i] == L'*') {
result.push_back(ANY_STRING);
} else if (cs[i] == L'?') {
result.push_back(ANY_CHAR);
} else if (cs[i] == L'\\' && (cs[i + 1] == L'*' || cs[i + 1] == L'?')) {
} else if (cs[i] == L'\\' && cs[i + 1] == L'*') {
result.push_back(cs[i + 1]);
i += 1;
} else if (cs[i] == L'\\' && cs[i + 1] == L'\\') {
@@ -892,9 +890,7 @@ void parse_util_expand_variable_error(const wcstring &token, size_t global_token
default: {
wchar_t token_stop_char = char_after_dollar;
// Unescape (see issue #50).
if (token_stop_char == ANY_CHAR)
token_stop_char = L'?';
else if (token_stop_char == ANY_STRING || token_stop_char == ANY_STRING_RECURSIVE)
if (token_stop_char == ANY_STRING || token_stop_char == ANY_STRING_RECURSIVE)
token_stop_char = L'*';
// Determine which error message to use. The format string may not consume all the