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-20 01:25:17 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Further tweaks to jobs builtin

Browse Source 
darcs-hash:20051212155001-ac50b-bb6d180d8e0ca5150173a3dc3aa6cd7e021fa770.gz
This commit is contained in:
axel 2005-12-13 01:50:01 +10:00
parent ddbb50acd7
commit 0a8284c981
2 changed files with 70 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

130
builtin.c
View File

@ -2434,6 +2434,7 @@ static void builtin_jobs_print( job_t *j, int mode, int header )
#endif
sb_append2( sb_out, job_is_stopped(j)?L"stopped\t":L"running\t",
j->command, L"\n", (void *)0 );
break;
}
case JOBS_PRINT_GROUP:
@ -2481,8 +2482,7 @@ static void builtin_jobs_print( job_t *j, int mode, int header )
sb_printf( sb_out, L"%ls\n", p->argv[0] );
}
break;
}
}
}
}
@ -2494,17 +2494,13 @@ static void builtin_jobs_print( job_t *j, int mode, int header )
*/
static int builtin_jobs( wchar_t **argv )
{
int argc=0;
int found=0;
int mode=JOBS_DEFAULT;
job_t *print_me=0;
int print_last = 0;
job_t *j;
argc = builtin_count_args( argv );
woptind=0;
while( 1 )
@ -2577,17 +2573,8 @@ static int builtin_jobs( wchar_t **argv )
case 'l':
{
job_t *j;
for( j=first_job; j; j=j->next )
{
if( j->constructed )
{
print_me = j;
break;
}
}
print_last = 1;
break;
}
@ -2599,63 +2586,82 @@ static int builtin_jobs( wchar_t **argv )
}
}
if( woptind < argc-1 )
{
sb_append2( sb_err, argv[0], L": zero or one arguments\n", (void *)0 );
return 1;
}
if( woptind == argc-1 )
{
long pid;
wchar_t *end;
errno=0;
pid=wcstol( argv[woptind], &end, 10 );
if( errno || *end )
{
sb_append2( sb_err, argv[0], L": Not a process id: ", argv[woptind], L"\n", (void *)0 );
return 1;
}
print_me = job_get_from_pid( pid );
if( !print_me )
{
sb_printf( sb_err, L"%ls: No suitable job: %d\n", argv[0], pid );
return 1;
}
}
/*
Do not babble if not interactive
*/
if( builtin_out_redirect )
found=1;
if( !print_me )
{
job_t *j;
for( j= first_job; j; j=j->next )
found=1;
}
if( print_last )
{
/*
Ignore unconstructed jobs, i.e. ourself.
*/
for( j=first_job; j; j=j->next )
{
/*
Ignore unconstructed jobs, i.e. ourself.
*/
if( j->constructed /*&& j->skip_notification*/ )
if( j->constructed )
{
builtin_jobs_print( j, mode, !found );
found = 1;
}
}
if( !found )
{
sb_append2( sb_out, argv[0], L": There are no running jobs\n", (void *)0 );
return 0;
}
}
}
else
{
builtin_jobs_print( print_me, mode, !found );
if( woptind < argc )
{
int i;
found = 1;
for( i=woptind; i<argc; i++ )
{
long pid;
wchar_t *end;
errno=0;
pid=wcstol( argv[i], &end, 10 );
if( errno || *end )
{
sb_append2( sb_err, argv[0], L": Not a process id: ", argv[i], L"\n", (void *)0 );
return 1;
}
j = job_get_from_pid( pid );
if( j )
{
builtin_jobs_print( j, mode, !found );
}
else
{
sb_printf( sb_err, L"%ls: No suitable job: %d\n", argv[0], pid );
return 1;
}
}
}
else
{
for( j= first_job; j; j=j->next )
{
/*
Ignore unconstructed jobs, i.e. ourself.
*/
if( j->constructed /*&& j->skip_notification*/ )
{
builtin_jobs_print( j, mode, !found );
found = 1;
}
}
}
}
if( !found )
{
sb_append2( sb_out, argv[0], L": There are no running jobs\n", (void *)0 );
}
return 0;

4
doc_src/jobs.txt
View File

@ -9,9 +9,9 @@ running jobs and their status.
jobs accepts the following switches:
- <tt>-l</tt> or <tt>--last</tt> only the last job to be started is printed
- <tt>-c</tt> or <tt>--command</tt> print the command name for each process in jobs
- <tt>-g</tt> or <tt>--group</tt> only print the group id of each job
- <tt>-c</tt> or <tt>--command</tt> print the commandname for each process in all jobs
- <tt>-l</tt> or <tt>--last</tt> only the last job to be started is printed
- <tt>-p</tt> or <tt>--process</tt> print the procces id for each process in all jobs
On systems that supports this feature, jobs will print the CPU usage