Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-25 12:23:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

Support job expansion for jobs builtin

Browse source 
This brings back expansion of `%n` where `n` is a job id, but not as a
general parser syntax. This makes `jobs -p %n` work, which can be used
as part of the job control command chain, i.e.

```
cat &
fg (jobs -p %1)
```

fg/bg/wait can either be wrapped in a function to call `jobs -p` for
`%n` arguments, or they can be updated to take `%n` arguments
themselves.
This commit is contained in:
Mahmoud Al-Qudsi 2018-04-14 16:47:05 -05:00
parent facdc88c0c
commit 1c8bbfdb6d
1 changed files with 20 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/builtin_jobs.cpp
View file

@ -188,19 +188,31 @@ int builtin_jobs(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
int i; int i;
for (i = w.woptind; i < argc; i++) { for (i = w.woptind; i < argc; i++) {
int pid = fish_wcstoi(argv[i]); const job_t *j = nullptr;
if (errno || pid < 0) {
streams.err.append_format(_(L"%ls: '%ls' is not a job\n"), cmd, argv[i]); if (argv[i][0] == L'%') {
return STATUS_INVALID_ARGS; int jobId = -1;
jobId = fish_wcstoi(argv[i] + 1);
if (errno || jobId < -1) {
streams.err.append_format(_(L"%ls: '%ls' is not a valid job id"), cmd, argv[i]);
return STATUS_INVALID_ARGS;
}
j = job_get(jobId);
}
else {
int pid = fish_wcstoi(argv[i]);
if (errno || pid < 0) {
streams.err.append_format(_(L"%ls: '%ls' is not a valid process id\n"), cmd, argv[i]);
return STATUS_INVALID_ARGS;
}
j = job_get_from_pid(pid);
} }
const job_t *j = job_get_from_pid(pid); if (j && !job_is_completed(j) && (j->flags & JOB_CONSTRUCTED)) {
if (j && !job_is_completed(j)) {
builtin_jobs_print(j, mode, false, streams); builtin_jobs_print(j, mode, false, streams);
found = 1; found = 1;
} else { } else {
streams.err.append_format(_(L"%ls: No suitable job: %d\n"), cmd, pid); streams.err.append_format(_(L"%ls: No suitable job: %ls\n"), cmd, argv[i]);
return STATUS_CMD_ERROR; return STATUS_CMD_ERROR;
} }
} }