mirror of
https://github.com/RGBCube/serenity
synced 2025-07-27 19:47:34 +00:00
Fix some bugs in execve() and make sh use it for process launching.
Interrupting children of sh now always works with ^C :^)
This commit is contained in:
parent
202bdb553c
commit
20fb1fc377
4 changed files with 24 additions and 24 deletions
|
@ -5,7 +5,6 @@
|
|||
|
||||
int main(int argc, char** argv)
|
||||
{
|
||||
setpgid(0, 0);
|
||||
if (argc != 2) {
|
||||
printf("usage: cat <file>\n");
|
||||
return 1;
|
||||
|
|
|
@ -142,16 +142,15 @@ static bool handle_builtin(int argc, const char** argv, int& retval)
|
|||
return false;
|
||||
}
|
||||
|
||||
static int try_spawn(const char* path, const char** argv)
|
||||
static int try_exec(const char* path, const char** argv)
|
||||
{
|
||||
int ret = spawn(path, argv);
|
||||
if (ret >= 0)
|
||||
return ret;
|
||||
int ret = execve(path, argv, nullptr);
|
||||
assert(ret < 0);
|
||||
|
||||
const char* search_path = "/bin";
|
||||
char pathbuf[128];
|
||||
sprintf(pathbuf, "%s/%s", search_path, argv[0]);
|
||||
ret = spawn(pathbuf, argv);
|
||||
ret = execve(pathbuf, argv, nullptr);
|
||||
if (ret == -1)
|
||||
return -1;
|
||||
return ret;
|
||||
|
@ -181,21 +180,24 @@ static int runcmd(char* cmd)
|
|||
return 0;
|
||||
}
|
||||
|
||||
int ret = try_spawn(argv[0], argv);
|
||||
if (ret < 0) {
|
||||
printf("spawn failed: %s (%s)\n", cmd, strerror(errno));
|
||||
return 1;
|
||||
pid_t child = fork();
|
||||
if (!child) {
|
||||
setpgid(0, 0);
|
||||
tcsetpgrp(0, getpid());
|
||||
int ret = try_exec(argv[0], argv);
|
||||
if (ret < 0) {
|
||||
printf("exec failed: %s (%s)\n", cmd, strerror(errno));
|
||||
exit(1);
|
||||
}
|
||||
// We should never get here!
|
||||
assert(false);
|
||||
}
|
||||
|
||||
// FIXME: This is racy, since spawn has already started the new process.
|
||||
// Once I have fork()+exec(), pgrp setup can be done in the child before exec()ing.
|
||||
tcsetpgrp(0, ret);
|
||||
|
||||
// FIXME: waitpid should give us the spawned process's exit status
|
||||
int wstatus = 0;
|
||||
waitpid(ret, &wstatus, 0);
|
||||
waitpid(child, &wstatus, 0);
|
||||
|
||||
// FIXME: Racy as mentioned above. Rework once we have fork()+exec().
|
||||
// FIXME: Should I really have to tcsetpgrp() after my child has exited?
|
||||
// Is the terminal controlling pgrp really still the PGID of the dead process?
|
||||
tcsetpgrp(0, getpid());
|
||||
|
||||
if (WIFEXITED(wstatus)) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue