mirrors/janet
1
0
Fork 0
mirror of https://github.com/janet-lang/janet synced 2024-12-27 00:40:26 +00:00
Code Issues 1 Releases Wiki Activity

Fix os/spawn - os/execute switch.

Browse Source
This commit is contained in:
Calvin Rose 2020-09-04 14:54:58 -05:00
parent 0145b133a1
commit 821a8dca3b
2 changed files with 1709 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/core/os.c
View File

@ -332,6 +332,25 @@ typedef struct {
JanetFile *err;
} JanetProc;
static int janet_proc_gc(void *p, size_t s) {
(void) s;
JanetProc *proc = (JanetProc *) p;
#ifdef JANET_WINDOWS
if (!(proc->flags & JANET_PROC_CLOSED)) {
CloseHandle(proc->pHandle);
CloseHandle(proc->tHandle);
}
#else
if (!(proc->flags & JANET_PROC_WAITED)) {
/* Kill and wait to prevent zombies */
kill(proc->pid, SIGKILL);
int status;
waitpid(proc->pid, &status, 0);
}
#endif
return 0;
}
static int janet_proc_mark(void *p, size_t s) {
(void) s;
JanetProc *proc = (JanetProc *)p;
@ -371,6 +390,9 @@ static Janet os_proc_wait(int32_t argc, Janet *argv) {
static Janet os_proc_kill(int32_t argc, Janet *argv) {
janet_arity(argc, 1, 2);
JanetProc *proc = janet_getabstract(argv, 0, &ProcAT);
if (proc->flags & JANET_PROC_WAITED) {
janet_panicf("cannot kill process that has already finished");
}
#ifdef JANET_WINDOWS
if (proc->flags & JANET_PROC_CLOSED) {
janet_panicf("cannot close process handle that is already closed");
@ -422,7 +444,7 @@ static int janet_proc_get(void *p, Janet key, Janet *out) {
static const JanetAbstractType ProcAT = {
"core/process",
NULL,
janet_proc_gc,
janet_proc_mark,
janet_proc_get,
JANET_ATEND_GET
@ -608,11 +630,11 @@ static Janet os_execute_impl(int32_t argc, Janet *argv, int is_async) {
}
static Janet os_execute(int32_t argc, Janet *argv) {
return os_execute_impl(argc, argv, 1);
return os_execute_impl(argc, argv, 0);
}
static Janet os_spawn(int32_t argc, Janet *argv) {
return os_execute_impl(argc, argv, 0);
return os_execute_impl(argc, argv, 1);
}
static Janet os_shell(int32_t argc, Janet *argv) {
@ -1534,11 +1556,11 @@ static const JanetReg os_cfuns[] = {
"These arguments should be core/file values. "
"Returns the exit status of the program.")
},
{
{
"os/spawn", os_spawn,
JDOC("(os/spawn args &opts flags env)\n\n"
"Execute a program on the system and return a handle to the process. Otherwise, the "
"same arguments as os/execute. Does not wait for the process.")
"same arguments as os/execute. Does not wait for the process.")
},
{
"os/shell", os_shell,

1682
src/core/os.c.orig Normal file
View File

File diff suppressed because it is too large Load Diff