mirrors/janet
1
0
Fork 0
mirror of https://github.com/janet-lang/janet synced 2025-07-05 03:22:54 +00:00
Code Issues 1 Releases Wiki Activity

Make os/execute on windows closer to posix version

Browse Source
This commit is contained in:
Calvin Rose 2019-05-31 15:02:44 -04:00
parent 1f30ea66e9
commit e1bd24c2ab
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/core/os.c
View File

@ -290,17 +290,26 @@ static Janet os_execute(int32_t argc, Janet *argv) {
/* Windows docs say do this before any spawns. */ /* Windows docs say do this before any spawns. */
_flushall(); _flushall();
if (flags & (JANET_OS_EFLAG_P | JANET_OS_EFLAG_E)) { /* Use an empty env instead when envp is NULL to be consistent with other implementation. */
status = (int) _spawnvpe(_P_WAIT, path, cargv, envp); char *empty_env[1] = {NULL};
char **envp1 = (NULL == envp) ? empty_env : envp;
if ((flags & JANET_OS_EFLAG_P) && (flags & JANET_OS_EFLAG_E)) {
status = (int) _spawnvpe(_P_WAIT, path, cargv, envp1);
} else if (flags & JANET_OS_EFLAG_P) { } else if (flags & JANET_OS_EFLAG_P) {
status = (int) _spawnvp(_P_WAIT, path, cargv); status = (int) _spawnvp(_P_WAIT, path, cargv);
} else if (flags & JANET_OS_EFLAG_E) { } else if (flags & JANET_OS_EFLAG_E) {
status = (int) _spawnve(_P_WAIT, path, cargv, envp); status = (int) _spawnve(_P_WAIT, path, cargv, envp1);
} else { } else {
status = (int) _spawnv(_P_WAIT, path, cargv); status = (int) _spawnv(_P_WAIT, path, cargv);
} }
os_execute_cleanup(envp, NULL); os_execute_cleanup(envp, NULL);
/* Check error */
if (-1 == status) {
janet_panic(strerror(errno));
}
return janet_wrap_integer(status); return janet_wrap_integer(status);
#else #else