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

Make sure all internal file descriptors are closed when spawning children

Browse Source 
darcs-hash:20051003130937-ac50b-95fb750b3c26f1c03a2a877770bbeee536ea3b74.gz
This commit is contained in:
axel
2005-10-03 23:09:37 +10:00
parent c39fed1f37
commit 101205900b
7 changed files with 193 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
env_universal.c
View File

@@ -167,6 +167,21 @@ static void check_connection()
}
}
static void reconnect()
{
if( get_socket_count >= RECONNECT_COUNT )
return 0;
debug( 2, L"Get new fishd connection" );
init = 0;
env_universal_server.fd = get_socket(1);
init = 1;
if( env_universal_server.fd >= 0 )
{
env_universal_barrier();
}
}
void env_universal_init( wchar_t * p, wchar_t *u, void (*sf)() )
@@ -223,20 +238,7 @@ int env_universal_read_all()
if( env_universal_server.fd == -1 )
{
if( get_socket_count >= RECONNECT_COUNT )
return 0;
debug( 2, L"Get new fishd connection" );
init = 0;
env_universal_server.fd = get_socket(1);
init = 1;
if( env_universal_server.fd >= 0 )
{
env_universal_barrier();
}
reconnect();
}
if( env_universal_server.fd != -1 )
@@ -296,6 +298,13 @@ void env_universal_barrier()
if( q_empty( &env_universal_server.unsent ) )
break;
if( env_universal_server.fd == -1 )
{
reconnect();
return;
}
FD_ZERO( &fds );
FD_SET( env_universal_server.fd, &fds );
select( env_universal_server.fd+1, 0, &fds, 0, 0 );
@@ -307,6 +316,11 @@ void env_universal_barrier()
debug( 3, L"Sent barrier request" );
while( !barrier_reply )
{
if( env_universal_server.fd == -1 )
{
reconnect();
return;
}
FD_ZERO( &fds );
FD_SET( env_universal_server.fd, &fds );
select( env_universal_server.fd+1, &fds, 0, 0, 0 );