Guams/zzsh
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add: wait

Browse Source
This commit is contained in:
starnakin 2023-07-04 23:38:42 +02:00
parent 867d239d1a
commit 449bc574b1
2 changed files with 35 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/cmd/cmd.c
View File

@ -24,14 +24,14 @@ void cmd_close(void* ptr)
cmd_t* content = ptr; cmd_t* content = ptr;
if (content->input[0] > 2) if (content->input[0] > 2)
close(content->input[0]); close(content->input[0]);
content->input[0] = -1; // content->input[0] = -1;
if (content->input[1] > 2) if (content->input[1] > 2)
close(content->input[1]); close(content->input[1]);
content->input[1] = -1; // content->input[1] = -1;
if (content->output[0] > 2) if (content->output[0] > 2)
close(content->output[0]); close(content->output[0]);
content->output[0] = -1; // content->output[0] = -1;
if (content->output[1] > 2) if (content->output[1] > 2)
close(content->output[1]); close(content->output[1]);
content->output[1] = -1; // content->output[1] = -1;
} }

31
src/exec/exec.c
View File

@ -80,6 +80,36 @@ void add_fd(int fds[2], int fd)
fds[1] = fd; fds[1] = fd;
} }
void cmds_wait(lst** cmds, data_t* data)
{
lst* current = *cmds;
cmd_t* content;
int exit_status;
while (current)
{
content = current->content;
if (content->pid != -1 && content->input[0] != -2 && content->output[0] != -2)
{
waitpid(content->pid, &exit_status, 0);
if (WIFSIGNALED(exit_status))
{
if (exit_status == 131)
{
printf("Quit (core dumped)");
data->status_code = 131;
}
else
data->status_code = 130;
printf("\n");
}
else
data->status_code = WEXITSTATUS(exit_status);
}
current = current->next;
}
}
int cmds_list_exec(lst** cmds, data_t *data) int cmds_list_exec(lst** cmds, data_t *data)
{ {
lst* current = *cmds; lst* current = *cmds;
@ -110,5 +140,6 @@ int cmds_list_exec(lst** cmds, data_t *data)
} }
current = current->next; current = current->next;
} }
cmds_wait(cmds, data);
return 0; return 0;
} }