Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2025-01-27 20:25:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Replaced some calls to unescape with unescape_string

Browse source
This commit is contained in:
ridiculousfish 2012-05-09 02:55:36 -07:00
parent 9bcc7df96f
commit 294fbc8309
4 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
builtin_complete.cpp
View file

@ -423,15 +423,13 @@ static int builtin_complete( parser_t &parser, wchar_t **argv )
case 'p': case 'p':
case 'c': case 'c':
{ {
wchar_t *a = unescape( woptarg, 1); wcstring tmp = woptarg;
if( a ) if (unescape_string(tmp, 1))
{ {
if (opt=='p') if (opt=='p')
path.push_back(a); path.push_back(tmp);
else else
cmd.push_back(a); cmd.push_back(tmp);
free(a);
} }
else else
{ {

2
common.cpp
View file

@ -496,7 +496,7 @@ const wchar_t *wcsfuncname( const wchar_t *str )
int wcsvarchr( wchar_t chr ) int wcsvarchr( wchar_t chr )
{ {
return ( (iswalnum(chr)) || (chr == L'_' )); return iswalnum(chr) || chr == L'_';
} }

2
exec.cpp
View file

@ -359,7 +359,7 @@ static void safe_launch_process( process_t *p, const char *actual_cmd, char **ar
} }
/** /**
This function is similar to launch_process, except it is not called after a fork (i.e. it is only calls exec) and therefore it can allocate memory. This function is similar to launch_process, except it is not called after a fork (i.e. it only calls exec) and therefore it can allocate memory.
*/ */
static void launch_process_nofork( process_t *p ) static void launch_process_nofork( process_t *p )
{ {

11
fish_indent.cpp
View file

@ -108,22 +108,23 @@ static int indent( wcstring &out, const wcstring &in, int flags )
int next_indent = indent; int next_indent = indent;
is_command = 0; is_command = 0;
wchar_t *unesc = unescape( last, UNESCAPE_SPECIAL ); wcstring unesc = last;
unescape_string(unesc, UNESCAPE_SPECIAL);
if( parser_keywords_is_block( unesc ) ) if( parser_keywords_is_block(unesc))
{ {
next_indent++; next_indent++;
} }
else if( wcscmp( unesc, L"else" ) == 0 ) else if (unesc == L"else")
{ {
indent--; indent--;
} }
/* case should have the same indent level as switch*/ /* case should have the same indent level as switch*/
else if( wcscmp( unesc, L"case" ) == 0 ) else if (unesc == L"case")
{ {
indent--; indent--;
} }
else if( wcscmp( unesc, L"end" ) == 0 ) else if (unesc == L"end")
{ {
indent--; indent--;
next_indent--; next_indent--;