win32: move UCRT hack to process.c

Only apply the UCRT hack if we're about to call spawnve() with
a non-NULL environment pointer.

Add the pid of the process to the name of the environment variable
to provide greater assurance that the environment will be changed.

1 files changed, 8 insertions, 0 deletions

diff --git a/win32/process.c b/win32/process.c
index 812e259f4..137cb6a39 100644
--- a/win32/process.c
+++ b/win32/process.c
@@ -268,6 +268,14 @@ spawnveq(int mode, const char *path, char *const *argv, char *const *env)
                 new_path = xasprintf("%s.", path);
         }
 
+#if defined(_UCRT)
+        if (env) {
+                char buffer[64];
+
+                sprintf(buffer, "BB_HELLO_%d", getpid());
+                SetEnvironmentVariable(buffer, "1");
+        }
+#endif
         errno = 0;
         ret = spawnve(mode, new_path ? new_path : path, new_argv, env);