mirrors/janet
1
0
Fork 0
mirror of https://github.com/janet-lang/janet synced 2025-01-14 17:35:41 +00:00
Code Issues 1 Releases Wiki Activity

Fix some issues on BSD and Windows.

Browse Source
This commit is contained in:
Calvin Rose 2020-09-01 21:47:08 -05:00
parent 7079cc43c9
commit 0485078c6c
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/core/os.c
View File

@ -37,6 +37,7 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <signal.h>
#ifdef JANET_APPLE #ifdef JANET_APPLE
#include <AvailabilityMacros.h> #include <AvailabilityMacros.h>
@ -438,9 +439,11 @@ static Janet os_execute(int32_t argc, Janet *argv) {
janet_panic("expected at least 1 command line argument"); janet_panic("expected at least 1 command line argument");
} }
/* Optional stdio redirections */
JanetFile *new_in = NULL, *new_out = NULL, *new_err = NULL;
#ifndef JANET_WINDOWS #ifndef JANET_WINDOWS
/* Get optional redirections */ /* Get optional redirections */
JanetFile *new_in = NULL, *new_out = NULL, *new_err = NULL;
if (argc > 2) { if (argc > 2) {
JanetDictView tab = janet_getdictionary(argv, 2); JanetDictView tab = janet_getdictionary(argv, 2);
Janet maybe_stdin = janet_dictionary_get(tab.kvs, tab.cap, janet_ckeywordv("in")); Janet maybe_stdin = janet_dictionary_get(tab.kvs, tab.cap, janet_ckeywordv("in"));
@ -475,7 +478,7 @@ static Janet os_execute(int32_t argc, Janet *argv) {
char *empty_env[1] = {NULL}; char *empty_env[1] = {NULL};
char **envp1 = (NULL == envp) ? empty_env : envp; char **envp1 = (NULL == envp) ? empty_env : envp;
int spawn_type = is_async ? : _P_NOWAIT : _P_WAIT; int spawn_type = is_async ? _P_NOWAIT : _P_WAIT;
intptr_t spawn_result; intptr_t spawn_result;
if (janet_flag_at(flags, 1) && janet_flag_at(flags, 0)) { if (janet_flag_at(flags, 1) && janet_flag_at(flags, 0)) {
spawn_result = (int) _spawnvpe(spawn_type, path, cargv, envp1); spawn_result = (int) _spawnvpe(spawn_type, path, cargv, envp1);