diff options
| author | Marcus Brinkmann <[email protected]> | 2009-11-05 12:10:04 +0000 |
|---|---|---|
| committer | Marcus Brinkmann <[email protected]> | 2009-11-05 12:10:04 +0000 |
| commit | 4babea46e7ca1ee0f04323bf1bd414c120c0bcc6 (patch) | |
| tree | dae885ee22d36f5da74aa2ebdfef016aa90b3661 | |
| parent | 2009-11-05 Marcus Brinkmann <[email protected]> (diff) | |
| download | gpgme-4babea46e7ca1ee0f04323bf1bd414c120c0bcc6.tar.gz gpgme-4babea46e7ca1ee0f04323bf1bd414c120c0bcc6.zip | |
2009-11-05 Marcus Brinkmann <[email protected]>
* engine-assuan.c (llass_new): Update use of assuan_socket_connect.
* engine-gpgsm.c (gpgsm_new): Update use of assuan_pipe_connect.
* engine-g13.c (g13_new): Likewise.
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/engine-assuan.c | 2 | ||||
| -rw-r--r-- | src/engine-g13.c | 6 | ||||
| -rw-r--r-- | src/engine-gpgsm.c | 6 |
4 files changed, 11 insertions, 7 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 0ea3a1c3..1fe09919 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,9 @@ 2009-11-05 Marcus Brinkmann <[email protected]> + * engine-assuan.c (llass_new): Update use of assuan_socket_connect. + * engine-gpgsm.c (gpgsm_new): Update use of assuan_pipe_connect. + * engine-g13.c (g13_new): Likewise. + * priv-io.h (IOSPAWN_FLAG_NOCLOSE): New flag. * w32-io.c (_gpgme_io_spawn): Implement this flag. * posix-io.c (_gpgme_io_spawn): Likewise. diff --git a/src/engine-assuan.c b/src/engine-assuan.c index 38fb1adb..cd722cf0 100644 --- a/src/engine-assuan.c +++ b/src/engine-assuan.c @@ -240,7 +240,7 @@ llass_new (void **engine, const char *file_name, const char *home_dir) goto leave; assuan_ctx_set_system_hooks (llass->assuan_ctx, &_gpgme_assuan_system_hooks); - err = assuan_socket_connect (llass->assuan_ctx, file_name, 0); + err = assuan_socket_connect (llass->assuan_ctx, file_name, 0, 0); if (err) goto leave; diff --git a/src/engine-g13.c b/src/engine-g13.c index 34c6ac16..8ecdcdfe 100644 --- a/src/engine-g13.c +++ b/src/engine-g13.c @@ -248,13 +248,13 @@ g13_new (void **engine, const char *file_name, const char *home_dir) assuan_ctx_set_system_hooks (g13->assuan_ctx, &_gpgme_assuan_system_hooks); #if USE_DESCRIPTOR_PASSING - err = assuan_pipe_connect_ext + err = assuan_pipe_connect (g13->assuan_ctx, file_name ? file_name : _gpgme_get_g13_path (), - argv, NULL, NULL, NULL, 1); + argv, NULL, NULL, NULL, ASSUAN_PIPE_CONNECT_FDPASSING); #else err = assuan_pipe_connect (g13->assuan_ctx, file_name ? file_name : _gpgme_get_g13_path (), - argv, NULL); + argv, NULL, NULL, NULL, 0); #endif if (err) goto leave; diff --git a/src/engine-gpgsm.c b/src/engine-gpgsm.c index 04f49ed9..87d577bd 100644 --- a/src/engine-gpgsm.c +++ b/src/engine-gpgsm.c @@ -332,13 +332,13 @@ gpgsm_new (void **engine, const char *file_name, const char *home_dir) assuan_ctx_set_system_hooks (gpgsm->assuan_ctx, &_gpgme_assuan_system_hooks); #if USE_DESCRIPTOR_PASSING - err = assuan_pipe_connect_ext + err = assuan_pipe_connect (gpgsm->assuan_ctx, file_name ? file_name : _gpgme_get_gpgsm_path (), - argv, NULL, NULL, NULL, 1); + argv, NULL, NULL, NULL, ASSUAN_PIPE_CONNECT_FDPASSING); #else err = assuan_pipe_connect (gpgsm->assuan_ctx, file_name ? file_name : _gpgme_get_gpgsm_path (), - argv, child_fds); + argv, child_fds, NULL, NULL, 0); /* On Windows, handles are inserted in the spawned process with DuplicateHandle, and child_fds contains the server-local names |