diff options
| author |  mitchell <70453897+667e-11@users.noreply.github.com> | 2018-10-17 14:52:22 -0400 |
|---|---|---|
| committer | mitchell <70453897+667e-11@users.noreply.github.com> | 2018-10-17 14:52:22 -0400 |
| commit | 3e8ea367d7ae1a6a9e6eb72c631713f02fa504ca (patch) | |
| tree | c0d29d26ade4820d6dff0a027a47d44ed5702dc4 /src/lua.patch | |
| parent | ea879e5562112ce1de268b146680691f41b1dda1 (diff) | |
Return spawned process' exit code in `spawn_proc:wait()`.
Diffstat (limited to 'src/lua.patch')
| -rw-r--r-- | src/lua.patch | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/src/lua.patch b/src/lua.patch index 0a4801c9..0e9f587b 100644 --- a/src/lua.patch +++ b/src/lua.patch @@ -47,8 +47,8 @@ diff -r 8a23edc91533 src/luaconf.h #endif /* } */ ---- a/src/loslib.c 2017-04-19 13:29:57.000000000 -0400 -+++ b/src/loslib.c 2018-10-17 09:15:35.000000000 -0400 +--- a/src/loslib.c 2018-10-15 09:22:45.000000000 -0400 ++++ b/src/loslib.c 2018-10-17 14:06:59.000000000 -0400 @@ -4,6 +4,15 @@ ** See Copyright Notice in lua.h */ @@ -85,7 +85,7 @@ diff -r 8a23edc91533 src/luaconf.h {"time", os_time}, {"tmpname", os_tmpname}, {NULL, NULL} -@@ -404,6 +419,618 @@ +@@ -404,6 +419,625 @@ LUAMOD_API int luaopen_os (lua_State *L) { luaL_newlib(L, syslib); @@ -120,7 +120,6 @@ diff -r 8a23edc91533 src/luaconf.h +#endif + +#if _WIN32 -+#define waitpid(pid, ...) WaitForSingleObject(pid, INFINITE) +#define kill(pid, _) TerminateProcess(pid, 1) +#define g_io_channel_unix_new g_io_channel_win32_new_fd +#define close CloseHandle @@ -163,8 +162,16 @@ diff -r 8a23edc91533 src/luaconf.h +static int lp_wait(lua_State *L) { + PStream *p = (PStream *)luaL_checkudata(L, 1, "ta_spawn"); + luaL_argcheck(L, p->pid, 1, "process terminated"); -+ waitpid(p->pid, NULL, 0); -+ return 0; ++#if !_WIN32 ++ int status; ++ waitpid(p->pid, &status, 0); ++ status = WIFEXITED(status) ? WEXITSTATUS(status) : 1; ++#else ++ DWORD status; ++ WaitForSingleObject(p->pid, INFINITE); ++ GetExitCodeProcess(p->pid, &status); ++#endif ++ return (lua_pushinteger(L, status), 1); +} + +/** p:read() Lua function. */ |