Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-26 12:53:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Correctly unescape tokens when performing switch completion

Browse source 
darcs-hash:20070118164528-ac50b-fcaa59d247c4c6b430ab47b293d5eb173a97e9fc.gz
This commit is contained in:
axel 2007-01-19 02:45:28 +10:00
parent e6409a88d5
commit 4930db35e2
1 changed files with 29 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
complete.c
View file

@ -1536,7 +1536,7 @@ static void complete_from_args( const wchar_t *str,
Match against an old style long option Match against an old style long option
*/ */
static int param_match_old( complete_entry_opt_t *e, static int param_match_old( complete_entry_opt_t *e,
wchar_t *optstr ) const wchar_t *optstr )
{ {
return (optstr[0] == L'-') && (wcscmp( e->long_opt, &optstr[1] ) == 0); return (optstr[0] == L'-') && (wcscmp( e->long_opt, &optstr[1] ) == 0);
} }
@ -1544,8 +1544,8 @@ static int param_match_old( complete_entry_opt_t *e,
/** /**
Match a parameter Match a parameter
*/ */
static int param_match( complete_entry_opt_t *e, static int param_match( const complete_entry_opt_t *e,
wchar_t *optstr ) const wchar_t *optstr )
{ {
if( e->short_opt != L'\0' && if( e->short_opt != L'\0' &&
e->short_opt == optstr[1] ) e->short_opt == optstr[1] )
@ -1565,11 +1565,11 @@ static int param_match( complete_entry_opt_t *e,
/** /**
Test if a string is an option with an argument, like --color=auto or -I/usr/include Test if a string is an option with an argument, like --color=auto or -I/usr/include
*/ */
static wchar_t *param_match2( complete_entry_opt_t *e, static wchar_t *param_match2( const complete_entry_opt_t *e,
wchar_t *optstr ) const wchar_t *optstr )
{ {
if( e->short_opt != L'\0' && e->short_opt == optstr[1] ) if( e->short_opt != L'\0' && e->short_opt == optstr[1] )
return &optstr[2]; return (wchar_t *)&optstr[2];
if( !e->old_mode && (wcsncmp( L"--", optstr, 2 ) == 0) ) if( !e->old_mode && (wcsncmp( L"--", optstr, 2 ) == 0) )
{ {
int len = wcslen( e->long_opt ); int len = wcslen( e->long_opt );
@ -1577,7 +1577,7 @@ static wchar_t *param_match2( complete_entry_opt_t *e,
if( wcsncmp( e->long_opt, &optstr[2],len ) == 0 ) if( wcsncmp( e->long_opt, &optstr[2],len ) == 0 )
{ {
if( optstr[len+2] == L'=' ) if( optstr[len+2] == L'=' )
return &optstr[len+3]; return (wchar_t *)&optstr[len+3];
} }
} }
return 0; return 0;
@ -1586,11 +1586,11 @@ static wchar_t *param_match2( complete_entry_opt_t *e,
/** /**
Tests whether a short option is a viable completion Tests whether a short option is a viable completion
*/ */
static int short_ok( wchar_t *arg, static int short_ok( const wchar_t *arg,
wchar_t nextopt, wchar_t nextopt,
wchar_t *allopt ) const wchar_t *allopt )
{ {
wchar_t *ptr; const wchar_t *ptr;
if( arg[0] != L'-') if( arg[0] != L'-')
return arg[0] == L'\0'; return arg[0] == L'\0';
@ -1649,9 +1649,9 @@ void complete_load( const wchar_t *name, int reload )
previous option popt. Insert results into comp_out. Return 0 if file previous option popt. Insert results into comp_out. Return 0 if file
completion should be disabled, 1 otherwise. completion should be disabled, 1 otherwise.
*/ */
static int complete_param( wchar_t *cmd_orig, static int complete_param( const wchar_t *cmd_orig,
wchar_t *popt, const wchar_t *popt,
wchar_t *str, const wchar_t *str,
int use_switches, int use_switches,
array_list_t *comp_out ) array_list_t *comp_out )
{ {
@ -2282,18 +2282,22 @@ void complete( const wchar_t *cmd,
} }
else else
{ {
/*
Complete parameter. Parameter expansion should be
performed against both the globbed and the unglobbed
version of the string, so we create a list containing
all possible versions of the string that is to be
expanded. This is potentially very slow.
*/
int do_file=0; int do_file=0;
do_file = complete_param( current_command, prev_token, current_token, !had_ddash, comp ); wchar_t *current_command_unescape = unescape( current_command, 0 );
wchar_t *prev_token_unescape = unescape( prev_token, 0 );
wchar_t *current_token_unescape = unescape( current_token, UNESCAPE_INCOMPLETE );
do_file = complete_param( current_command_unescape,
prev_token_unescape,
current_token_unescape,
!had_ddash,
comp );
free( current_command_unescape );
free( prev_token_unescape );
free( current_token_unescape );
/* /*
If we have found no command specific completions at If we have found no command specific completions at
all, fall back to using file completions. all, fall back to using file completions.
@ -2301,6 +2305,9 @@ void complete( const wchar_t *cmd,
if( !al_get_count( comp ) ) if( !al_get_count( comp ) )
do_file = 1; do_file = 1;
/*
This function wants the unescaped string
*/
complete_param_expand( current_token, comp, do_file ); complete_param_expand( current_token, comp, do_file );
} }
} }