Bananymous
/
banan-os
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Shell: use process groups more properly

This commit is contained in:
Bananymous 2023-08-22 14:54:50 +03:00
parent 38e72019c7
commit c4210b5810
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
userspace/Shell/main.cpp
View File

@ -418,7 +418,7 @@ BAN::Optional<int> execute_builtin(BAN::Vector<BAN::String>& args, int fd_in, in
return 0; return 0;
} }
pid_t execute_command_no_wait(BAN::Vector<BAN::String>& args, int fd_in, int fd_out, bool set_pgrp) pid_t execute_command_no_wait(BAN::Vector<BAN::String>& args, int fd_in, int fd_out, pid_t pgrp)
{ {
if (args.empty()) if (args.empty())
return 0; return 0;
@ -451,15 +451,23 @@ pid_t execute_command_no_wait(BAN::Vector<BAN::String>& args, int fd_in, int fd_
close(fd_out); close(fd_out);
} }
if (set_pgrp) if (pgrp == 0)
{ {
pid_t pgrp = setpgrp(); if(setpgid(0, 0) == -1)
if (tcsetpgrp(0, pgrp) == -1) {
perror("setpgid");
exit(1);
}
if (tcsetpgrp(0, getpgrp()) == -1)
{ {
perror("tcsetpgrp"); perror("tcsetpgrp");
exit(1); exit(1);
} }
} }
else
{
setpgid(0, pgrp);
}
execv(cmd_args.front(), cmd_args.data()); execv(cmd_args.front(), cmd_args.data());
perror("execv"); perror("execv");
@ -471,7 +479,7 @@ pid_t execute_command_no_wait(BAN::Vector<BAN::String>& args, int fd_in, int fd_
int execute_command(BAN::Vector<BAN::String>& args, int fd_in, int fd_out) int execute_command(BAN::Vector<BAN::String>& args, int fd_in, int fd_out)
{ {
pid_t pid = execute_command_no_wait(args, fd_in, fd_out, true); pid_t pid = execute_command_no_wait(args, fd_in, fd_out, 0);
if (pid == -1) if (pid == -1)
ERROR_RETURN("fork", 1); ERROR_RETURN("fork", 1);
@ -503,6 +511,7 @@ int execute_piped_commands(BAN::Vector<BAN::Vector<BAN::String>>& commands)
BAN::Vector<int> exit_codes(commands.size(), 0); BAN::Vector<int> exit_codes(commands.size(), 0);
BAN::Vector<pid_t> processes(commands.size(), -1); BAN::Vector<pid_t> processes(commands.size(), -1);
pid_t pgrp = 0;
int next_stdin = STDIN_FILENO; int next_stdin = STDIN_FILENO;
for (size_t i = 0; i < commands.size(); i++) for (size_t i = 0; i < commands.size(); i++)
@ -524,8 +533,10 @@ int execute_piped_commands(BAN::Vector<BAN::Vector<BAN::String>>& commands)
exit_codes[i] = builtin_ret.value(); exit_codes[i] = builtin_ret.value();
else else
{ {
pid_t pid = execute_command_no_wait(commands[i], next_stdin, pipefd[1], first); pid_t pid = execute_command_no_wait(commands[i], next_stdin, pipefd[1], pgrp);
processes[i] = pid; processes[i] = pid;
if (pgrp == 0)
pgrp = pid;
} }
if (next_stdin != STDIN_FILENO) if (next_stdin != STDIN_FILENO)