Cygwin: spawn: Make system() thread-safe

POSIX states system() shall be thread-safe, however, it is not in
current cygwin. This is because ch_spawn is a global and is shared
between threads. With this patch, system() uses ch_spawn_local
instead which is local variable. popen() has the same problem, so
it has been fixed in the same way.

Addresses: https://cygwin.com/pipermail/cygwin/2025-June/258324.html
Fixes: 1fd5e000ac ("import winsup-2000-02-17 snapshot")
Reported-by: Takashi Yano <takashi.yano@nifty.ne.jp>
Reviewed-by: Corinna Vinschen <corinna@vinschen.de>
Signed-off-by: Takashi Yano <takashi.yano@nifty.ne.jp>
This commit is contained in:
Takashi Yano
2025-07-19 23:49:26 +09:00
parent 9b667234bf
commit 1f836c5f73
2 changed files with 5 additions and 3 deletions

View File

@@ -950,6 +950,7 @@ spawnve (int mode, const char *path, const char *const *argv,
if (!envp)
envp = empty_env;
child_info_spawn ch_spawn_local (_CH_NADA, false);
switch (_P_MODE (mode))
{
case _P_OVERLAY:
@@ -963,7 +964,7 @@ spawnve (int mode, const char *path, const char *const *argv,
case _P_WAIT:
case _P_DETACH:
case _P_SYSTEM:
ret = ch_spawn.worker (path, argv, envp, mode);
ret = ch_spawn_local.worker (path, argv, envp, mode);
break;
default:
set_errno (EINVAL);

View File

@@ -4535,8 +4535,9 @@ popen (const char *command, const char *in_type)
fcntl (stdchild, F_SETFD, stdchild_state | FD_CLOEXEC);
/* Start a shell process to run the given command without forking. */
pid_t pid = ch_spawn.worker ("/bin/sh", argv, environ, _P_NOWAIT,
__std[0], __std[1]);
child_info_spawn ch_spawn_local (_CH_NADA, false);
pid_t pid = ch_spawn_local.worker ("/bin/sh", argv, environ, _P_NOWAIT,
__std[0], __std[1]);
/* Reinstate the close-on-exec state */
fcntl (stdchild, F_SETFD, stdchild_state);