github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2025-01-20 23:36:31 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fg: fix exit code (was 1 if success else 0)

Browse Source 
returning a C boolean for builtin_fg success was backwards
This commit is contained in:
Aaron Gyes 2016-06-18 07:41:27 -07:00
parent dc58edd521
commit 20d36f16d3
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/builtin.cpp
View File

@ -2586,7 +2586,7 @@ static int builtin_fg(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
streams.err.append_format(_(L"%ls: There are no suitable jobs\n"), argv[0]);
}
} else if (argv[2] != 0) {
// Specifying what more than one job to put to the foreground is a syntax error, we still
// Specifying more than one job to put to the foreground is a syntax error, we still
// try to locate the job argv[1], since we want to know if this is an ambigous job
// specification or if this is an malformed job id.
wchar_t *endptr;
@ -2604,6 +2604,7 @@ 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]);
} else {
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);
@ -2653,7 +2654,7 @@ static int builtin_fg(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
job_continue(j, job_is_stopped(j));
}
return j != 0;
return j ? STATUS_BUILTIN_OK : STATUS_BUILTIN_ERROR;
}
/// Helper function for builtin_bg().