Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-11-11 07:34:32 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix bug breaking filename completions, introduced by csh wildcard syntax

Browse source 
darcs-hash:20051204015402-ac50b-911c6188f6c8213a733f4e967fc903f5290f1772.gz
This commit is contained in:
axel 2005-12-04 11:54:02 +10:00
parent 86230813de
commit 754d8d3712
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
complete.c
View file

@ -1771,7 +1771,10 @@ static void complete_param_expand( wchar_t *str,
else
comp_str = str;
// fwprintf( stderr, L"expand_string( \"%ls\", [list], EXPAND_SKIP_SUBSHELL | ACCEPT_INCOMPLETE | %ls )\n", comp_str, do_file?L"0":L"EXPAND_SKIP_WILDCARDS" );
debug( 2,
L"expand_string( \"%ls\", comp_out, EXPAND_SKIP_SUBSHELL | ACCEPT_INCOMPLETE | %ls );",
comp_str,
do_file?L"0":L"EXPAND_SKIP_WILDCARDS" );
expand_string( wcsdup(comp_str), comp_out, EXPAND_SKIP_SUBSHELL | ACCEPT_INCOMPLETE | (do_file?0:EXPAND_SKIP_WILDCARDS) );
}

7
expand.c
View file

@ -1392,7 +1392,8 @@ int expand_string( wchar_t *str,
int subshell_ok = 1;
int res = EXPAND_OK;
// debug( 1, L"Expand %ls", str );
if( (!(flags & ACCEPT_INCOMPLETE)) && is_clean( str ) )
{
@ -1560,11 +1561,9 @@ int expand_string( wchar_t *str,
{
if( res == EXPAND_OK )
res = EXPAND_WILDCARD_NO_MATCH;
break;
}
break;
case 1:
res = EXPAND_WILDCARD_MATCH;
sort_list( out );