MrMonopoly/raylib
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove unnecessary Process util functions

Browse Source
This commit is contained in:
moe li 2026-05-26 13:03:59 +08:00
parent 81712a891d
commit bf20b6761e
1 changed files with 23 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/rcore.c
View File

@ -4301,31 +4301,11 @@ struct rProcessData {
void *pipeStdoutRead; // Process stdout and stderr read pipe void *pipeStdoutRead; // Process stdout and stderr read pipe
void *pipeStdinWrite; // Process stdin write pipe void *pipeStdinWrite; // Process stdin write pipe
}; };
static bool CreatePipeWindows(void** readPipe, void** writePipe) {
struct _SECURITY_ATTRIBUTES sa = { 0 };
sa.nLength = sizeof(struct _SECURITY_ATTRIBUTES);
sa.bInheritHandle = 1;
sa.lpSecurityDescriptor = NULL;
return CreatePipe(readPipe, writePipe, &sa, 0) != 0;
}
static void CloseAllPipesWindows(void** pipes, int count) {
for (int i = 0; i < count; i++) {
if (pipes[i] != NULL) CloseHandle(pipes[i]);
}
}
#elif defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__APPLE__) #elif defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__APPLE__)
struct rProcessData { struct rProcessData {
int pipefdStdout[2]; // Process stdout and stderr pipe file descriptors int pipefdStdout[2]; // Process stdout and stderr pipe file descriptors
int pipefdStdin[2]; // Process stdin pipe file descriptors int pipefdStdin[2]; // Process stdin pipe file descriptors
}; };
static void CloseAllPipesUnix(int* pipefds, int count) {
for (int i = 0; i < count; i++) {
if (pipefds[i] != -1) close(pipefds[i]);
}
}
#endif #endif
// Initialize a new process, returns a Process struct // Initialize a new process, returns a Process struct
@ -4361,15 +4341,22 @@ RLAPI Process InitProcess(const char *command, char *const args[])
// For stdout/stderr, read handles reserved for Raylib side, write handles passed to child process // For stdout/stderr, read handles reserved for Raylib side, write handles passed to child process
// For stdin, write handle reserved for Raylib side, read handle passed to child process // For stdin, write handle reserved for Raylib side, read handle passed to child process
// NOTE: stdout and stderr are merged into a single pipe // NOTE: stdout and stderr are merged into a single pipe
void *pipeStdoutRead, *pipeStdoutWrite; void *pipeStdoutRead = NULL, *pipeStdoutWrite = NULL;
void *pipeStdinRead, *pipeStdinWrite; void *pipeStdinRead = NULL, *pipeStdinWrite = NULL;
if ((!CreatePipeWindows(&pipeStdoutRead, &pipeStdoutWrite)) || struct _SECURITY_ATTRIBUTES sa = { 0 };
(!CreatePipeWindows(&pipeStdinRead, &pipeStdinWrite))) sa.nLength = sizeof(struct _SECURITY_ATTRIBUTES);
sa.bInheritHandle = 1;
sa.lpSecurityDescriptor = NULL;
if ((!CreatePipe(&pipeStdoutRead, &pipeStdoutWrite, &sa, 0)) ||
(!CreatePipe(&pipeStdinRead, &pipeStdinWrite, &sa, 0)))
{ {
TRACELOG(LOG_WARNING, "PROCESS: Failed to create pipes for process I/O redirection"); TRACELOG(LOG_WARNING, "PROCESS: Failed to create pipes for process I/O redirection");
void *pipes[] = { pipeStdoutRead, pipeStdoutWrite, pipeStdinRead, pipeStdinWrite }; void *pipes[] = { pipeStdoutRead, pipeStdoutWrite, pipeStdinRead, pipeStdinWrite };
CloseAllPipesWindows(pipes, sizeof(pipes) / sizeof(pipes[0])); for (int i = 0; i < 4; i++) {
if (pipes[i] != NULL) CloseHandle(pipes[i]);
}
return process; return process;
} }
@ -4412,7 +4399,9 @@ RLAPI Process InitProcess(const char *command, char *const args[])
(pipe(&pipefd[2]) == -1)) (pipe(&pipefd[2]) == -1))
{ {
TRACELOG(LOG_WARNING, "PROCESS: Failed to create pipes"); TRACELOG(LOG_WARNING, "PROCESS: Failed to create pipes");
CloseAllPipesUnix(pipefd, 4); for (int i = 0; i < 4; i++) {
if (pipefd[i] != -1) close(pipefd[i]);
}
return process; return process;
} }
@ -4425,8 +4414,10 @@ RLAPI Process InitProcess(const char *command, char *const args[])
if (pid < 0) if (pid < 0)
{ {
TRACELOG(LOG_WARNING, "PROCESS: Failed to create process"); TRACELOG(LOG_WARNING, "PROCESS: Failed to create process");
CloseAllPipesUnix(pipefd, 4);
for (int i = 0; i < 4; i++) close(pipefd[i]);
RL_FREE(process.processData); RL_FREE(process.processData);
return process; return process;
} }
else if (pid == 0) else if (pid == 0)
@ -4786,8 +4777,8 @@ RLAPI void CloseProcess(Process process)
CloseHandle(hProcess); CloseHandle(hProcess);
// Clean up pipes // Clean up pipes
void *pipes[] = { process.processData->pipeStdoutRead, process.processData->pipeStdinWrite }; if (process.processData->pipeStdoutRead != NULL) CloseHandle(process.processData->pipeStdoutRead);
CloseAllPipesWindows(pipes, sizeof(pipes) / sizeof(pipes[0])); if (process.processData->pipeStdinWrite != NULL) CloseHandle(process.processData->pipeStdinWrite);
RL_FREE(process.processData); RL_FREE(process.processData);
@ -4813,8 +4804,9 @@ RLAPI void CloseProcess(Process process)
// Wait process termination // Wait process termination
waitpid(process.pid, NULL, 0); waitpid(process.pid, NULL, 0);
int pipefd[2] = { process.processData->pipefdStdout[0], process.processData->pipefdStdin[1] }; close(process.processData->pipefdStdout[0]);
CloseAllPipesUnix(pipefd, 2); close(process.processData->pipefdStdin[1]);
RL_FREE(process.processData); RL_FREE(process.processData);
#else #else
TRACELOG(LOG_WARNING, "PROCESS: Process management not supported on this platform"); TRACELOG(LOG_WARNING, "PROCESS: Process management not supported on this platform");