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

Convert jobs list to std::list

Browse Source
This commit is contained in:
ridiculousfish
2012-01-29 16:36:21 -08:00
parent 1a5d866a91
commit f243cd86c9
6 changed files with 123 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
builtin.cpp
View File

@@ -2906,25 +2906,7 @@ static int builtin_source( parser_t &parser, wchar_t ** argv )
*/
static void make_first( job_t *j )
{
job_t *prev=0;
job_t *curr;
for( curr = first_job; curr != j; curr = curr->next )
{
prev=curr;
}
if( curr == j )
{
if( prev == 0 )
{
return;
}
else
{
prev->next = curr->next;
curr->next = first_job;
first_job = curr;
}
}
job_promote(j);
}
@@ -2933,7 +2915,7 @@ static void make_first( job_t *j )
*/
static int builtin_fg( parser_t &parser, wchar_t **argv )
{
job_t *j=0;
job_t *j=NULL;
if( argv[1] == 0 )
{
@@ -2941,7 +2923,9 @@ static int builtin_fg( parser_t &parser, wchar_t **argv )
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; j=j->next )
job_iterator_t jobs;
while ((j = jobs.next()))
{
if( job_get_flag( j, JOB_CONSTRUCTED ) && (!job_is_completed(j)) &&
( (job_is_stopped(j) || (!job_get_flag(j, JOB_FOREGROUND)) ) && job_get_flag( j, JOB_CONTROL) ) )
@@ -3121,8 +3105,9 @@ static int builtin_bg( parser_t &parser, wchar_t **argv )
if( argv[1] == 0 )
{
job_t *j;
for( j=first_job; j; j=j->next )
{
job_iterator_t jobs;
while ((j = jobs.next()))
{
if( job_is_stopped(j) && job_get_flag( j, JOB_CONTROL ) && (!job_is_completed(j)) )
{
break;