h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-04-21 08:51:14 -03:00
Code Issues Packages Projects Releases Wiki Activity

Make escaping consistent for fish <-> fishd protocol

Browse Source 
Fix fork guards to work in fishd
https://github.com/fish-shell/fish-shell/issues/339
This commit is contained in:
ridiculousfish
2012-10-08 14:47:25 -07:00
parent b67526aae8
commit 51de26960c
7 changed files with 69 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
fish.cpp
View File

@@ -410,10 +410,34 @@ static int fish_parse_opt( int argc, char **argv, const char **cmd_ptr )
parses commands from stdin or files, depending on arguments
*/
static wcstring full_escape( const wchar_t *in )
{
wcstring out;
for( ; *in; in++ )
{
if( *in < 32 )
{
append_format( out, L"\\x%.2x", *in );
}
else if( *in < 128 )
{
out.push_back(*in);
}
else if( *in < 65536 )
{
append_format( out, L"\\u%.4x", *in );
}
else
{
append_format( out, L"\\U%.8x", *in );
}
}
return out;
}
extern int g_fork_count;
int main( int argc, char **argv )
{
struct stat tmp;
int res=1;
const char *cmd=0;
int my_optind=0;
@@ -425,7 +449,8 @@ int main( int argc, char **argv )
is_interactive_session=1;
program_name=L"fish";
stat("----------FISH_HIT_MAIN----------", &tmp);
//struct stat tmp;
//stat("----------FISH_HIT_MAIN----------", &tmp);
my_optind = fish_parse_opt( argc, argv, &cmd );