github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2024-11-26 10:43:47 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Correct reporting of setpgid (parent vs child)

Browse Source 
Previously, it always said "own process" (e.g. child error).
This commit is contained in:
Mahmoud Al-Qudsi 2020-11-20 14:22:42 -06:00
parent e4c052330f
commit 06f1b34553
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/exec.cpp
View File

@ -337,7 +337,7 @@ static bool fork_child_for_process(const std::shared_ptr<job_t> &job, process_t
// The child attempts to join the pgroup. // The child attempts to join the pgroup.
if (int err = execute_setpgid(p->pid, pgid, false /* not parent */)) { if (int err = execute_setpgid(p->pid, pgid, false /* not parent */)) {
report_setpgid_error(err, pgid, job.get(), p); report_setpgid_error(err, false /* is_parent */, pgid, job.get(), p);
} }
child_setup_process(claim_tty ? pgid : INVALID_PID, fish_pgrp, *job, true, dup2s); child_setup_process(claim_tty ? pgid : INVALID_PID, fish_pgrp, *job, true, dup2s);
child_action(); child_action();
@ -362,7 +362,7 @@ static bool fork_child_for_process(const std::shared_ptr<job_t> &job, process_t
// The parent attempts to send the child to its pgroup. // The parent attempts to send the child to its pgroup.
// EACCESS is an expected benign error as the child may have called exec(). // EACCESS is an expected benign error as the child may have called exec().
if (int err = execute_setpgid(p->pid, pgid, true /* is parent */)) { if (int err = execute_setpgid(p->pid, pgid, true /* is parent */)) {
if (err != EACCES) report_setpgid_error(err, pgid, job.get(), p); if (err != EACCES) report_setpgid_error(err, true /* is_parent */, pgid, job.get(), p);
} }
terminal_maybe_give_to_job_group(job->group.get(), false); terminal_maybe_give_to_job_group(job->group.get(), false);
return true; return true;

8
src/postfork.cpp
View File

@ -42,7 +42,8 @@
static char *get_interpreter(const char *command, char *buffer, size_t buff_size); static char *get_interpreter(const char *command, char *buffer, size_t buff_size);
/// Report the error code \p err for a failed setpgid call. /// Report the error code \p err for a failed setpgid call.
void report_setpgid_error(int err, pid_t desired_pgid, const job_t *j, const process_t *p) { void report_setpgid_error(int err, bool is_parent, pid_t desired_pgid, const job_t *j,
const process_t *p) {
char pid_buff[128]; char pid_buff[128];
char job_id_buff[128]; char job_id_buff[128];
char getpgid_buff[128]; char getpgid_buff[128];
@ -57,8 +58,9 @@ void report_setpgid_error(int err, pid_t desired_pgid, const job_t *j, const pro
narrow_string_safe(argv0, p->argv0()); narrow_string_safe(argv0, p->argv0());
narrow_string_safe(command, j->command_wcstr()); narrow_string_safe(command, j->command_wcstr());
debug_safe(1, "Could not send own process %s, '%s' in job %s, '%s' from group %s to group %s", debug_safe(1, "Could not send %s %s, '%s' in job %s, '%s' from group %s to group %s",
pid_buff, argv0, job_id_buff, command, getpgid_buff, job_pgid_buff); is_parent ? "child" : "self", pid_buff, argv0, job_id_buff, command, getpgid_buff,
job_pgid_buff);
if (is_windows_subsystem_for_linux() && errno == EPERM) { if (is_windows_subsystem_for_linux() && errno == EPERM) {
debug_safe(1, debug_safe(1,

3
src/postfork.h
View File

@ -30,7 +30,8 @@ int execute_setpgid(pid_t pid, pid_t pgroup, bool is_parent);
/// Report the error code \p err for a failed setpgid call. /// Report the error code \p err for a failed setpgid call.
/// Note not all errors should be reported; in particular EACCESS is expected and benign in the /// Note not all errors should be reported; in particular EACCESS is expected and benign in the
/// parent only. /// parent only.
void report_setpgid_error(int err, pid_t desired_pgid, const job_t *j, const process_t *p); void report_setpgid_error(int err, bool is_parent, pid_t desired_pgid, const job_t *j,
const process_t *p);
/// Initialize a new child process. This should be called right away after forking in the child /// Initialize a new child process. This should be called right away after forking in the child
/// process. If job control is enabled for this job, the process is put in the process group of the /// process. If job control is enabled for this job, the process is put in the process group of the