~ chicken-core (chicken-5) b203babf4691db5e5a6785ca6c340eb0d77694ce
commit b203babf4691db5e5a6785ca6c340eb0d77694ce Author: felix <felix@call-with-current-continuation.org> AuthorDate: Wed Jul 2 12:05:21 2025 +0100 Commit: felix <felix@call-with-current-continuation.org> CommitDate: Wed Jul 2 12:05:21 2025 +0100 resolve conflicts diff --git a/chicken-do.c b/chicken-do.c index 215253ae..5ea28d8b 100644 --- a/chicken-do.c +++ b/chicken-do.c @@ -88,7 +88,7 @@ static int execute(char **argv) /* quote command arguments */ while(*argv != NULL) { - len += snprintf(cmdline + len, sizeof(cmdline) - len, "\"%s\" ", *(argv++)); + len += snprintf(cmdline + len, sizeof(cmdline) - len, "%s ", *(argv++)); if(len > sizeof(cmdline)) { fprintf(stderr, "argument list too long\n"); exit(1); @@ -98,7 +98,7 @@ static int execute(char **argv) if(!CreateProcess(NULL, cmdline, NULL, NULL, TRUE, NORMAL_PRIORITY_CLASS, NULL, NULL, &startup_info, &process_info)) { - fprintf(stderr, "creating subprocess failed\n"); + fprintf(stderr, "creating subprocess failed (%ld)\n", GetLastError()); exit(1); } @@ -111,6 +111,9 @@ static int execute(char **argv) fprintf(stderr, "unable to obtain exit status of subprocess\n"); exit(1); } + CloseHandle(process_info.hProcess); + CloseHandle(process_info.hThread); + return code; #else diff --git a/rules.make b/rules.make index 659560c1..86a5e7eb 100644 --- a/rules.make +++ b/rules.make @@ -1014,7 +1014,7 @@ export PROGRAM_PREFIX export PROGRAM_SUFFIX check: $(TARGETS) - cd tests; sh runtests.sh + cd tests; sh -x runtests.sh # benchmarkTrap