mirror
/
SDL
mirror of https://github.com/libsdl-org/SDL.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Just use normal stdio for the child process 

Make sure we flush all output so it's seen by the parent as it happens.
This commit is contained in:
Sam Lantinga 2024-10-04 12:50:38 -07:00
parent 8c3f88b495
commit 8db3b47482
1 changed files with 19 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
test/childprocess.c
View File

@ -5,13 +5,6 @@
#include <stdio.h> #include <stdio.h>
#include <errno.h> #include <errno.h>
#ifdef SDL_PLATFORM_WINDOWS
#include <windows.h>
#else
#include <fcntl.h>
#include <unistd.h>
#endif
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {
SDLTest_CommonState *state; SDLTest_CommonState *state;
int i; int i;
@ -101,6 +94,7 @@ int main(int argc, char *argv[]) {
for (print_i = 0; i + print_i < argc; print_i++) { for (print_i = 0; i + print_i < argc; print_i++) {
fprintf(stdout, "|%d=%s|\r\n", print_i, argv[i + print_i]); fprintf(stdout, "|%d=%s|\r\n", print_i, argv[i + print_i]);
} }
fflush(stdout);
} }
if (print_environment) { if (print_environment) {
@ -111,19 +105,9 @@ int main(int argc, char *argv[]) {
} }
SDL_free(env); SDL_free(env);
} }
fflush(stdout);
} }
#ifdef SDL_PLATFORM_WINDOWS
{
DWORD mode;
HANDLE stdout_handle = GetStdHandle(STD_INPUT_HANDLE);
GetConsoleMode(stdout_handle, &mode);
SetConsoleMode(stdout_handle, mode & ~(ENABLE_LINE_INPUT));
}
#else
fcntl(STDIN_FILENO, F_SETFL, fcntl(STDIN_FILENO, F_GETFL, 0) & ~(O_NONBLOCK));
#endif
if (stdin_to_stdout || stdin_to_stderr || read_stdin) { if (stdin_to_stdout || stdin_to_stderr || read_stdin) {
for (;;) { for (;;) {
char buffer[4 * 4096]; char buffer[4 * 4096];
@ -131,10 +115,23 @@ int main(int argc, char *argv[]) {
result = fread(buffer, 1, sizeof(buffer), stdin); result = fread(buffer, 1, sizeof(buffer), stdin);
if (result == 0) { if (result == 0) {
if (errno == EAGAIN) { if (!feof(stdin)) {
clearerr(stdin); char error[128];
SDL_Delay(20);
continue; if (errno == EAGAIN) {
clearerr(stdin);
SDL_Delay(20);
continue;
}
#ifdef SDL_PLATFORM_WINDOWS
if (strerror_s(error, sizeof(error), errno) != 0) {
SDL_strlcpy(error, "Unknown error", sizeof(error));
}
#else
SDL_strlcpy(error, strerror(errno), sizeof(error));
#endif
SDL_Log("Error reading from stdin: %s\n", error);
} }
break; break;
} }