spawn: Fix spawn_cb of gpgrt_spawn_process_fd.

* src/gpg-error.def.in (gpgrt_close_all_fds): New.
* src/gpg-error.vers (gpgrt_close_all_fds): New.
* src/gpg-error.h.in (GPGRT_SPAWN_INHERIT_FILE): New.
(gpgrt_spawn_process_fd): SPAWN_CB having return value.
* src/gpgrt-int.h (_gpgrt_spawn_process_fd): SPAWN_CB change.
* src/spawn-posix.c (_gpgrt_close_all_fds): Rename from close_all_fds,
and export it.
(do_exec): Support the case not closing fds.
(_gpgrt_spawn_process_fd): Handle return value of SPAWN_CB to
determine closing all fds or not.
* src/spawn-w32.c (_gpgrt_spawn_process_fd): Run SPAWN_CB.
(_gpgrt_close_all_fds): New.
* src/visibility.c (gpgrt_close_all_fds): New.
* src/visibility.h (gpgrt_close_all_fds): New.

--

Now, we have the API of gpgrt_spawn_process_fd for POSIX and Windows.
Giving portable semantics for spawning a process is difficult, and it
is still difficult for users to writing a function for SPAWN_CB with
portability, but gpgrt_spawn_process_fd gives the feature of spawning
a process.

GnuPG-bug-id: 6249
Signed-off-by: NIIBE Yutaka <[email protected]>

1 files changed, 9 insertions, 3 deletions

diff --git a/src/visibility.c b/src/visibility.c
index dba48b8..577a2be 100644
--- a/src/visibility.c
+++ b/src/visibility.c
@@ -1112,12 +1112,12 @@ gpgrt_spawn_process (const char *pgmname, const char *argv[],
 gpg_err_code_t
 gpgrt_spawn_process_fd (const char *pgmname, const char *argv[],
                         int infd, int outfd, int errfd,
-                        void (*after_fork_cb)(void *),
-                        void *after_fork_cb_arg,
+                        int (*spawn_cb)(void *),
+                        void *spawn_cb_arg,
                         pid_t *pid)
 {
   return _gpgrt_spawn_process_fd (pgmname, argv, infd, outfd, errfd,
-                                  after_fork_cb, after_fork_cb_arg, pid);
+                                  spawn_cb, spawn_cb_arg, pid);
 }
 
 gpg_err_code_t
@@ -1152,6 +1152,12 @@ gpgrt_release_process (pid_t pid)
   _gpgrt_release_process (pid);
 }
 
+void
+gpgrt_close_all_fds (int from, int *keep_fds)
+{
+  _gpgrt_close_all_fds (from, keep_fds);
+}
+
 
 int
 gpgrt_argparse (estream_t fp, gpgrt_argparse_t *arg, gpgrt_opt_t *opts)