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

bg had also had wrong exit code for some errors

Browse source 
Stop printing usage information when error isn't a usage problem.
Add simple test for bg and fg
This commit is contained in:
Aaron Gyes 2016-06-18 08:00:40 -07:00
parent 20d36f16d3
commit 2cabcf4ad4
3 changed files with 7 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/builtin.cpp
View file

@ -2604,7 +2604,6 @@ static int builtin_fg(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
streams.err.append_format(_(L"%ls: Ambiguous job\n"), argv[0]); streams.err.append_format(_(L"%ls: Ambiguous job\n"), argv[0]);
} else { } else {
streams.err.append_format(_(L"%ls: '%ls' is not a job\n"), argv[0], argv[1]); streams.err.append_format(_(L"%ls: '%ls' is not a job\n"), argv[0], argv[1]);
} }
builtin_print_help(parser, streams, argv[0], streams.err); builtin_print_help(parser, streams, argv[0], streams.err);
@ -2624,13 +2623,11 @@ static int builtin_fg(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
j = job_get_from_pid(pid); j = job_get_from_pid(pid);
if (!j || !job_get_flag(j, JOB_CONSTRUCTED) || job_is_completed(j)) { if (!j || !job_get_flag(j, JOB_CONSTRUCTED) || job_is_completed(j)) {
streams.err.append_format(_(L"%ls: No suitable job: %d\n"), argv[0], pid); streams.err.append_format(_(L"%ls: No suitable job: %d\n"), argv[0], pid);
builtin_print_help(parser, streams, argv[0], streams.err);
j = 0; j = 0;
} else if (!job_get_flag(j, JOB_CONTROL)) { } else if (!job_get_flag(j, JOB_CONTROL)) {
streams.err.append_format(_(L"%ls: Can't put job %d, '%ls' to foreground because " streams.err.append_format(_(L"%ls: Can't put job %d, '%ls' to foreground because "
L"it is not under job control\n"), L"it is not under job control\n"),
argv[0], pid, j->command_wcstr()); argv[0], pid, j->command_wcstr());
builtin_print_help(parser, streams, argv[0], streams.err);
j = 0; j = 0;
} }
} }
@ -2694,7 +2691,7 @@ static int builtin_bg(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
if (!j) { if (!j) {
streams.err.append_format(_(L"%ls: There are no suitable jobs\n"), argv[0]); streams.err.append_format(_(L"%ls: There are no suitable jobs\n"), argv[0]);
res = 1; res = STATUS_BUILTIN_ERROR;
} else { } else {
res = send_to_bg(parser, streams, j, _(L"(default)")); res = send_to_bg(parser, streams, j, _(L"(default)"));
} }
@ -2702,23 +2699,15 @@ static int builtin_bg(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
wchar_t *end; wchar_t *end;
int i; int i;
int pid; int pid;
int err = 0;
for (i = 1; argv[i]; i++) { for (i = 1; argv[i]; i++) {
errno = 0; errno = 0;
pid = fish_wcstoi(argv[i], &end, 10); pid = fish_wcstoi(argv[i], &end, 10);
if (errno || pid < 0 || *end || !job_get_from_pid(pid)) { if (errno || pid < 0 || *end || !job_get_from_pid(pid)) {
streams.err.append_format(_(L"%ls: '%ls' is not a job\n"), argv[0], argv[i]); streams.err.append_format(_(L"%ls: '%ls' is not a job\n"), argv[0], argv[i]);
err = 1; return STATUS_BUILTIN_ERROR;
break;
}
}
if (!err) {
for (i = 1; !res && argv[i]; i++) {
pid = fish_wcstoi(argv[i], 0, 10);
res |= send_to_bg(parser, streams, job_get_from_pid(pid), *argv);
} }
res |= send_to_bg(parser, streams, job_get_from_pid(pid), *argv);
} }
} }

2
tests/jobs.err
View file

@ -0,0 +1,2 @@
bg: '3' is not a job
fg: No suitable job: 3

2
tests/jobs.in
View file

@ -1,3 +1,5 @@
sleep 1 & sleep 1 &
sleep 1 & sleep 1 &
jobs -c jobs -c
bg 3
fg 3