Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2025-01-14 05:53:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix minor bug - the description would occasionally get appended to command specific tab completions in case insensitive mode

Browse source 
darcs-hash:20070420193430-ac50b-13e34ac41cf1662a74f0af329fb41d872df5d691.gz
This commit is contained in:
axel 2007-04-21 05:34:30 +10:00
parent 91d1dee06b
commit 4d5c50cbb3
1 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
wildcard.c
View file

@ -256,6 +256,15 @@ static int wildcard_complete_internal( const wchar_t *orig,
return 1; return 1;
} }
if( flags & COMPLETE_NO_CASE )
{
out_completion = wcsdup( orig );
}
else
{
out_completion = wcsdup( str );
}
if( wcschr( str, PROG_COMPLETE_SEP ) ) if( wcschr( str, PROG_COMPLETE_SEP ) )
{ {
/* /*
@ -263,10 +272,10 @@ static int wildcard_complete_internal( const wchar_t *orig,
*/ */
wchar_t *sep; wchar_t *sep;
out_completion = wcsdup( str );
sep = wcschr(out_completion, PROG_COMPLETE_SEP ); sep = wcschr(out_completion, PROG_COMPLETE_SEP );
*sep = 0; *sep = 0;
out_desc = sep + 1; out_desc = sep + 1;
} }
else else
{ {
@ -282,16 +291,6 @@ static int wildcard_complete_internal( const wchar_t *orig,
out_desc = func_desc; out_desc = func_desc;
} }
/*
Append description to item, if a description exists
*/
out_completion = wcsdup( str );
}
if( flags & COMPLETE_NO_CASE )
{
free( out_completion );
out_completion = wcsdup( orig );
} }
if( out_completion ) if( out_completion )
@ -1217,7 +1216,9 @@ int wildcard_expand( const wchar_t *wc,
sb_destroy( &sb ); sb_destroy( &sb );
if( wc_base_ptr ) if( wc_base_ptr )
{
free( wc_base ); free( wc_base );
}
} }
return res; return res;