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

Try to report IO redirection errors resulting from redirection stderr

Browse source 
darcs-hash:20051129101206-ac50b-970569a8b710d74b6e16a3c09b8848618cec4a7e.gz
This commit is contained in:
axel 2005-11-29 20:12:06 +10:00
parent 8fcacdd5df
commit c2e6b07b35
2 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
exec.c
View file

@ -261,17 +261,13 @@ static void handle_child_io( io_data_t *io )
free_fd( io, io->fd );
}
/*
We don't mind if this fails, it is just a speculative close
to make sure no unexpected untracked fd causes us to fail
*/
close(io->fd);
switch( io->io_mode )
{
case IO_CLOSE:
close(io->fd);
break;
case IO_FILE:
{
if( (tmp=wopen( io->param1.filename,
io->param2.flags, 0777 ) )==-1 )
{
@ -284,6 +280,8 @@ static void handle_child_io( io_data_t *io )
}
else if( tmp != io->fd)
{
close(io->fd);
if(dup2( tmp, io->fd ) == -1 )
{
debug( 1,
@ -295,7 +293,11 @@ static void handle_child_io( io_data_t *io )
exec_close( tmp );
}
break;
}
case IO_FD:
{
close(io->fd);
/* debug( 3, L"Redirect fd %d in process %ls (%d) from fd %d",
io->fd,
p->actual_cmd,
@ -311,10 +313,12 @@ static void handle_child_io( io_data_t *io )
exit(1);
}
break;
}
case IO_BUFFER:
case IO_PIPE:
{
close(io->fd);
/* debug( 3, L"Pipe fd %d in process %ls (%d) (Through fd %d)",
io->fd,

2
wildcard.c
View file

@ -73,7 +73,7 @@ static int wildcard_match2( const wchar_t *str,
/* Ignore hidden file */
if( is_first && *str == L'.' )
return 0;
/* Try all submatches */
do
{