From c3f08dcb7266efeac84f5f720ec0a353a45e950d Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Wed, 9 Jun 2010 16:53:51 +0000 Subject: Merged Dirmngr with GnuPG. A few code changes to support dirmngr. --- g13/be-encfs.c | 3 ++- g13/runner.c | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'g13') diff --git a/g13/be-encfs.c b/g13/be-encfs.c index 524f09e6b..fb695e1be 100644 --- a/g13/be-encfs.c +++ b/g13/be-encfs.c @@ -304,7 +304,8 @@ run_encfs_tool (ctrl_t ctrl, enum encfs_cmds cmd, close (outbound[1]); if (pid != (pid_t)(-1)) { - gnupg_wait_process (pgmname, pid, NULL); + gnupg_wait_process (pgmname, pid, 0, NULL); + gnupg_release_process (pid); } runner_release (runner); encfs_handler_cleanup (parm); diff --git a/g13/runner.c b/g13/runner.c index 18293e10c..3ffe523ca 100644 --- a/g13/runner.c +++ b/g13/runner.c @@ -165,7 +165,8 @@ runner_release (runner_t runner) arbitrary NAME of the runner object. However it does not matter because that information is only used for diagnostics.) */ - gnupg_wait_process (runner->name, runner->pid, NULL); + gnupg_wait_process (runner->name, runner->pid, 0, NULL); + gnupg_release_process (runner->pid); } xfree (runner->name); @@ -370,7 +371,8 @@ runner_thread (void *arg) int exitcode; log_debug ("runner thread waiting ...\n"); - err = gnupg_wait_process (runner->name, runner->pid, &exitcode); + err = gnupg_wait_process (runner->name, runner->pid, 0, &exitcode); + gnupg_release_process (runner->pid); runner->pid = (pid_t)(-1); if (err) log_error ("running `%s' failed (exitcode=%d): %s\n", -- cgit v1.2.3