Merge pull request #304 from bgamari/wip/posix_spawn_addchrdir

posix_spawn: Add support for posix_spawn_file_actions_addchdir_np
haskell · Feb 13, 2024 · 53c6905 · 53c6905
2 parents dfdae0a + e4b4638
commit 53c6905
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/cbits/posix/posix_spawn.c b/cbits/posix/posix_spawn.c
@@ -135,14 +135,20 @@ do_spawn_posix (char *const args[],
     }
 
     if (workingDirectory) {
-#if defined(HAVE_posix_spawn_file_actions_addchdir_np)
-        // N.B. this function is broken on macOS.
-        // See https://github.com/rust-lang/rust/pull/80537.
+#if defined(HAVE_posix_spawn_file_actions_addchdir)
         r = posix_spawn_file_actions_addchdir(&fa, workingDirectory);
         if (r != 0) {
             *failed_doing = "posix_spawn_file_actions_addchdir";
             goto fail;
         }
+#elif defined(HAVE_posix_spawn_file_actions_addchdir_np)
+        // N.B. this function is broken on macOS.
+        // See https://github.com/rust-lang/rust/pull/80537.
+        r = posix_spawn_file_actions_addchdir_np(&fa, workingDirectory);
+        if (r != 0) {
+            *failed_doing = "posix_spawn_file_actions_addchdir_np";
+            goto fail;
+        }
 #else
         goto not_supported;
 #endif

diff --git a/configure.ac b/configure.ac
@@ -23,7 +23,7 @@ AC_CHECK_FUNCS([pipe2],[],[],[
 
 # posix_spawn checks
 AC_CHECK_HEADERS([spawn.h])
-AC_CHECK_FUNCS([posix_spawnp posix_spawn_file_actions_addchdir],[],[],[
+AC_CHECK_FUNCS([posix_spawnp posix_spawn_file_actions_addchdir_np posix_spawn_file_actions_addchdir],[],[],[
   #define _GNU_SOURCE
   #include <spawn.h>
 ])