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

Make sure that io redirections are respected by the '.' builtin. This was not the case earlier, which caused various bugs, especially after eval was made into a function that internally used '.'

Browse Source 
darcs-hash:20070425183002-ac50b-d7d93e3b74e7274fe3e0aad98e95dd608bb903ae.gz
This commit is contained in:
axel
2007-04-26 04:30:02 +10:00
parent 784c5d9fa3
commit d0585befb3
6 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
builtin.c
View File

@@ -137,6 +137,13 @@ static int builtin_stdin;
*/
static hash_table_t *desc=0;
/**
The underyion IO redirections behind the current builtin. This
should normally not be used - sb_out and friends are already
configured to handle everything.
*/
static io_data_t *real_io;
/**
Counts the number of non null pointers in the specified array
*/
@@ -2292,7 +2299,7 @@ static int builtin_source( wchar_t ** argv )
parse_util_set_argv( (argc>2)?(argv+2):(argv+1), 0);
res = reader_read( fd );
res = reader_read( fd, real_io );
parser_pop_block();
@@ -2877,7 +2884,7 @@ static int builtin_breakpoint( wchar_t **argv )
{
parser_push_block( BREAKPOINT );
reader_read( 0 );
reader_read( 0, real_io );
parser_pop_block();
@@ -3262,10 +3269,11 @@ static int internal_help( wchar_t *cmd )
}
int builtin_run( wchar_t **argv )
int builtin_run( wchar_t **argv, io_data_t *io )
{
int (*cmd)(wchar_t **argv)=0;
real_io = io;
CHECK( argv, STATUS_BUILTIN_ERROR );
CHECK( argv[0], STATUS_BUILTIN_ERROR );