github-mirror/fish-shell
github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2025-03-16 15:41:38 +08:00
Code Issues Actions2 Packages Projects Releases Wiki Activity

Fix crash bugs in fg and bg builtins, and make sure bg doesn't consider background jobs when run without an argument

Browse Source 
darcs-hash:20060119131515-ac50b-d080ffde013419e2a461cf860b4858b88404ff33.gz
This commit is contained in:
axel 2006-01-19 23:15:15 +10:00
parent e0c2ce24fb
commit d2c12e760c
1 changed files with 60 additions and 33 deletions

93
builtin.c

@ -2321,14 +2321,18 @@ static int builtin_fg( wchar_t **argv )
if( argv[1] == 0 ) if( argv[1] == 0 )
{ {
/* /*
Last constructed job in the job que by default Select last constructed job (I.e. first job in the job que)
that is possible to put in the foreground
*/ */
for( j=first_job; ((j!=0) && (!j->constructed)); j=j->next ) for( j=first_job; j; j=j->next )
; {
if( j->constructed && (!job_is_completed(j)) && (job_is_stopped(j) || !j->fg))
break;
}
if( !j ) if( !j )
{ {
sb_printf( sb_err, sb_printf( sb_err,
_( L"%ls: There are no jobs\n" ), _( L"%ls: There are no suitable jobs\n" ),
argv[0] ); argv[0] );
builtin_print_help( argv[0], sb_err ); builtin_print_help( argv[0], sb_err );
} }
@ -2358,20 +2362,24 @@ static int builtin_fg( wchar_t **argv )
} }
builtin_print_help( argv[0], sb_err ); builtin_print_help( argv[0], sb_err );
return 1; j=0;
} }
else else
{ {
int pid = abs(wcstol( argv[1], 0, 10 )); int pid = abs(wcstol( argv[1], 0, 10 ));
j = job_get_from_pid( pid ); j = job_get_from_pid( pid );
sb_printf( sb_err, if( !j )
_( L"%ls: No suitable job: %d\n" ), {
argv[0], sb_printf( sb_err,
pid ); _( L"%ls: No suitable job: %d\n" ),
builtin_print_help( argv[0], sb_err ); argv[0],
pid );
builtin_print_help( argv[0], sb_err );
}
} }
if( j != 0 ) if( j )
{ {
if( builtin_err_redirect ) if( builtin_err_redirect )
{ {
@ -2392,25 +2400,25 @@ static int builtin_fg( wchar_t **argv )
j->job_id, j->job_id,
j->command ); j->command );
} }
}
wchar_t *ft = tok_first( j->command );
if( ft != 0 )
env_set( L"_", ft, ENV_EXPORT );
free(ft);
reader_write_title();
make_first( j ); wchar_t *ft = tok_first( j->command );
j->fg=1; if( ft != 0 )
env_set( L"_", ft, ENV_EXPORT );
free(ft);
reader_write_title();
job_continue( j, job_is_stopped(j) ); make_first( j );
return 0; j->fg=1;
job_continue( j, job_is_stopped(j) );
}
return j != 0;
} }
/** /**
Helper function for builtin_bg() Helper function for builtin_bg()
*/ */
static void send_to_bg( job_t *j, const wchar_t *name ) static int send_to_bg( job_t *j, const wchar_t *name )
{ {
if( j == 0 ) if( j == 0 )
{ {
@ -2419,7 +2427,7 @@ static void send_to_bg( job_t *j, const wchar_t *name )
L"bg", L"bg",
name ); name );
builtin_print_help( L"bg", sb_err ); builtin_print_help( L"bg", sb_err );
return; return 1;
} }
else else
{ {
@ -2431,6 +2439,7 @@ static void send_to_bg( job_t *j, const wchar_t *name )
make_first( j ); make_first( j );
j->fg=0; j->fg=0;
job_continue( j, job_is_stopped(j) ); job_continue( j, job_is_stopped(j) );
return 0;
} }
@ -2439,20 +2448,38 @@ static void send_to_bg( job_t *j, const wchar_t *name )
*/ */
static int builtin_bg( wchar_t **argv ) static int builtin_bg( wchar_t **argv )
{ {
int res = 0;
if( argv[1] == 0 ) if( argv[1] == 0 )
{ {
job_t *j; job_t *j;
for( j=first_job; ((j!=0) && (!j->constructed) && (!job_is_stopped(j))); j=j->next ) for( j=first_job; j; j=j->next )
; {
send_to_bg( j, _(L"(default)" ) ); if( job_is_stopped(j) )
return 0; break;
}
if( !j )
{
sb_printf( sb_err,
_( L"%ls: There are no suitable jobs\n" ),
argv[0] );
res = 1;
}
else
{
res = send_to_bg( j, _(L"(default)" ) );
}
} }
for( argv++; *argv != 0; argv++ ) else
{ {
int pid = wcstol( *argv, 0, 10 ); for( argv++; !res && *argv != 0; argv++ )
send_to_bg( job_get_from_pid( pid ), *argv); {
int pid = wcstol( *argv, 0, 10 );
res |= send_to_bg( job_get_from_pid( pid ), *argv);
}
} }
return 0; return res;
} }