github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2024-11-30 06:03:49 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Use the new array_list functions in exec.c

Browse Source 
darcs-hash:20060731163548-ac50b-3b503e0457b33c6bb2eda0040a9fa7f15e6afe32.gz
This commit is contained in:
axel 2006-08-01 02:35:48 +10:00
parent 474f6e90ff
commit 2700a9b697
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
exec.c
View File

@ -79,7 +79,6 @@ static array_list_t *open_fds=0;
static int set_child_group( job_t *j, process_t *p, int print_errors ); static int set_child_group( job_t *j, process_t *p, int print_errors );
void exec_close( int fd ) void exec_close( int fd )
{ {
int i; int i;
@ -98,13 +97,12 @@ void exec_close( int fd )
{ {
for( i=0; i<al_get_count( open_fds ); i++ ) for( i=0; i<al_get_count( open_fds ); i++ )
{ {
int n = (int)(long)al_get( open_fds, i ); int n = (int)al_get_long( open_fds, i );
if( n == fd ) if( n == fd )
{ {
al_set( open_fds, al_set_long( open_fds,
i, i,
al_get( open_fds, al_get_long( open_fds, al_get_count( open_fds ) -1 ) );
al_get_count( open_fds ) -1 ) );
al_truncate( open_fds, al_truncate( open_fds,
al_get_count( open_fds ) -1 ); al_get_count( open_fds ) -1 );
break; break;
@ -134,8 +132,8 @@ int exec_pipe( int fd[2])
open_fds = al_halloc( global_context ); open_fds = al_halloc( global_context );
} }
al_push( open_fds, (void *)(long)fd[0] ); al_push_long( open_fds, (long)fd[0] );
al_push( open_fds, (void *)(long)fd[1] ); al_push_long( open_fds, (long)fd[1] );
return res; return res;
} }
@ -180,7 +178,7 @@ static void close_unused_internal_pipes( io_data_t *io )
{ {
for( ;i<al_get_count( open_fds ); i++ ) for( ;i<al_get_count( open_fds ); i++ )
{ {
int n = (int)(long)al_get( open_fds, i ); int n = (long)al_get_long( open_fds, i );
if( !use_fd_in_pipe( n, io) ) if( !use_fd_in_pipe( n, io) )
{ {
debug( 4, L"Close fd %d, used in other context", n ); debug( 4, L"Close fd %d, used in other context", n );