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

Rationalize null handling in disown_job

Browse source 
disown_job had some extraneous null checks that could not happen in
practice. Simplify this code.
This commit is contained in:
ridiculousfish 2021-10-25 16:13:00 -07:00
parent ec244c3975
commit e84dad5432
2 changed files with 13 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/builtin_disown.cpp
View file

@ -16,12 +16,11 @@
#include "wutil.h" // IWYU pragma: keep #include "wutil.h" // IWYU pragma: keep
/// Helper for builtin_disown. /// Helper for builtin_disown.
static int disown_job(const wchar_t *cmd, parser_t &parser, io_streams_t &streams, job_t *j) { static void disown_job(const wchar_t *cmd, io_streams_t &streams, job_t *j) {
if (j == nullptr) { assert(j && "Null job");
streams.err.append_format(_(L"%ls: Unknown job '%ls'\n"), L"bg");
builtin_print_error_trailer(parser, streams.err, cmd); // Nothing to do if already disowned.
return STATUS_INVALID_ARGS; if (j->flags().disown_requested) return;
}
// Stopped disowned jobs must be manually signaled; explain how to do so. // Stopped disowned jobs must be manually signaled; explain how to do so.
auto pgid = j->get_pgid(); auto pgid = j->get_pgid();
@ -37,8 +36,6 @@ static int disown_job(const wchar_t *cmd, parser_t &parser, io_streams_t &stream
// Instead, we set a flag and the parser removes the job from the jobs list later. // Instead, we set a flag and the parser removes the job from the jobs list later.
j->mut_flags().disown_requested = true; j->mut_flags().disown_requested = true;
add_disowned_job(j); add_disowned_job(j);
return STATUS_CMD_OK;
} }
/// Builtin for removing jobs from the job list. /// Builtin for removing jobs from the job list.
@ -70,13 +67,14 @@ maybe_t<int> builtin_disown(parser_t &parser, io_streams_t &streams, const wchar
} }
if (job) { if (job) {
retval = disown_job(cmd, parser, streams, job); disown_job(cmd, streams, job);
retval = STATUS_CMD_OK;
} else { } else {
streams.err.append_format(_(L"%ls: There are no suitable jobs\n"), cmd); streams.err.append_format(_(L"%ls: There are no suitable jobs\n"), cmd);
retval = STATUS_CMD_ERROR; retval = STATUS_CMD_ERROR;
} }
} else { } else {
std::set<job_t *> jobs; std::vector<job_t *> jobs;
// If one argument is not a valid pid (i.e. integer >= 0), fail without disowning anything, // If one argument is not a valid pid (i.e. integer >= 0), fail without disowning anything,
// but still print errors for all of them. // but still print errors for all of them.
@ -90,7 +88,7 @@ maybe_t<int> builtin_disown(parser_t &parser, io_streams_t &streams, const wchar
retval = STATUS_INVALID_ARGS; retval = STATUS_INVALID_ARGS;
} else { } else {
if (job_t *j = parser.job_get_from_pid(pid)) { if (job_t *j = parser.job_get_from_pid(pid)) {
jobs.insert(j); jobs.push_back(j);
} else { } else {
streams.err.append_format(_(L"%ls: Could not find job '%d'\n"), cmd, pid); streams.err.append_format(_(L"%ls: Could not find job '%d'\n"), cmd, pid);
} }
@ -100,9 +98,9 @@ maybe_t<int> builtin_disown(parser_t &parser, io_streams_t &streams, const wchar
return retval; return retval;
} }
// Disown all target jobs // Disown all target jobs.
for (const auto &j : jobs) { for (job_t *j : jobs) {
retval |= disown_job(cmd, parser, streams, j); disown_job(cmd, streams, j);
} }
} }

2
src/proc.cpp
View file

@ -344,7 +344,7 @@ bool job_t::has_external_proc() const {
static owning_lock<std::vector<pid_t>> s_disowned_pids; static owning_lock<std::vector<pid_t>> s_disowned_pids;
void add_disowned_job(const job_t *j) { void add_disowned_job(const job_t *j) {
if (j == nullptr) return; assert(j && "Null job");
// Never add our own (or an invalid) pgid as it is not unique to only // Never add our own (or an invalid) pgid as it is not unique to only
// one job, and may result in a deadlock if we attempt the wait. // one job, and may result in a deadlock if we attempt the wait.