walkero
/
lite-xl
1
0
Fork 0
Code Issues 7 Pull Requests Projects Releases 14 Wiki Activity

Implemented @guldoman's suggestion for how to close file handles.

This commit is contained in:
Adam Harrison 2022-01-22 12:02:59 -05:00
parent 9cb25acd7b
commit 428c757a13
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/api/process.c
View File

@ -59,9 +59,9 @@ typedef enum {
#ifdef _WIN32 #ifdef _WIN32
static volatile long PipeSerialNumber; static volatile long PipeSerialNumber;
static void close_fd(HANDLE handle) { CloseHandle(handle); } static void close_fd(HANDLE* handle) { if (*handle) CloseHandle(*handle); *handle = NULL; }
#else #else
static void close_fd(int fd) { close(fd); } static void close_fd(int* fd) { if (*fd) close(*fd); *fd = 0; }
#endif #endif
static bool poll_process(process_t* proc, int timeout) { static bool poll_process(process_t* proc, int timeout) {
@ -90,12 +90,8 @@ static bool poll_process(process_t* proc, int timeout) {
if (timeout) if (timeout)
SDL_Delay(5); SDL_Delay(5);
} while (timeout == WAIT_INFINITE || SDL_GetTicks() - ticks < timeout); } while (timeout == WAIT_INFINITE || SDL_GetTicks() - ticks < timeout);
if (!proc->running) { if (!proc->running)
close_fd(proc->child_pipes[STDIN_FD ][1]);
close_fd(proc->child_pipes[STDOUT_FD][0]);
close_fd(proc->child_pipes[STDERR_FD][0]);
return false; return false;
}
return true; return true;
} }
@ -273,7 +269,7 @@ static int process_start(lua_State* L) {
for (size_t i = 0; i < env_len; ++i) for (size_t i = 0; i < env_len; ++i)
free((char*)env[i]); free((char*)env[i]);
for (int stream = 0; stream < 3; ++stream) for (int stream = 0; stream < 3; ++stream)
close_fd(self->child_pipes[stream][stream == STDIN_FD ? 0 : 1]); close_fd(&self->child_pipes[stream][stream == STDIN_FD ? 0 : 1]);
self->running = true; self->running = true;
return 1; return 1;
} }
@ -350,7 +346,7 @@ static int f_write(lua_State* L) {
static int f_close_stream(lua_State* L) { static int f_close_stream(lua_State* L) {
process_t* self = (process_t*) luaL_checkudata(L, 1, API_TYPE_PROCESS); process_t* self = (process_t*) luaL_checkudata(L, 1, API_TYPE_PROCESS);
int stream = luaL_checknumber(L, 2); int stream = luaL_checknumber(L, 2);
close_fd(self->child_pipes[stream][stream == STDIN_FD ? 1 : 0]); close_fd(&self->child_pipes[stream][stream == STDIN_FD ? 1 : 0]);
lua_pushboolean(L, 1); lua_pushboolean(L, 1);
return 1; return 1;
} }
@ -417,7 +413,14 @@ static int self_signal(lua_State* L, signal_e sig) {
static int f_terminate(lua_State* L) { return self_signal(L, SIGNAL_TERM); } static int f_terminate(lua_State* L) { return self_signal(L, SIGNAL_TERM); }
static int f_kill(lua_State* L) { return self_signal(L, SIGNAL_KILL); } static int f_kill(lua_State* L) { return self_signal(L, SIGNAL_KILL); }
static int f_interrupt(lua_State* L) { return self_signal(L, SIGNAL_INTERRUPT); } static int f_interrupt(lua_State* L) { return self_signal(L, SIGNAL_INTERRUPT); }
static int f_gc(lua_State* L) { return self_signal(L, SIGNAL_TERM); } static int f_gc(lua_State* L) {
process_t* self = (process_t*) luaL_checkudata(L, 1, API_TYPE_PROCESS);
signal_process(self, SIGNAL_TERM);
close_fd(&self->child_pipes[STDIN_FD ][1]);
close_fd(&self->child_pipes[STDOUT_FD][0]);
close_fd(&self->child_pipes[STDERR_FD][0]);
return 0;
}
static int f_running(lua_State* L) { static int f_running(lua_State* L) {
process_t* self = (process_t*)luaL_checkudata(L, 1, API_TYPE_PROCESS); process_t* self = (process_t*)luaL_checkudata(L, 1, API_TYPE_PROCESS);