From 9f24e6c9010e171fd11c5cdac797cb8ce2e501dd Mon Sep 17 00:00:00 2001 From: Marcus Brinkmann Date: Tue, 15 Aug 2017 19:40:12 +0200 Subject: gpgconf: Add access to --list-dirs for non-default engine. * src/engine-assuan.c (_gpgme_engine_ops_assuan): Add conf_dir. * src/engine-g13.c (_gpgme_engine_ops_g13): Likewise. * src/engine-gpg.c (_gpgme_engine_ops_gpg): Likewise. * src/engine-gpgsm.c (_gpgme_engine_ops_gpgsm): Likewise. * src/engine-spawn.c (_gpgme_engine_ops_spawn): Likewise. * src/engine-uiserver.c (_gpgme_engine_ops_uiserver): Likewise. * src/engine-backend.h (struct engine_ops): Likewise. * src/engine-gpgconf.c (gpgconf_config_dir_cb, gpgconf_conf_dir): New functions. (struct engine_ops): Add gpgconf_conf_dir. * src/engine.c (_gpgme_engine_op_conf_dir): New function. * src/engine.h (_gpgme_engine_op_conf_dir): New prototype. * src/gpgconf.c (gpgme_op_conf_dir): New function. * src/gpgme.def (gpgme_op_conf_save): New symbol. * src/gpgme.h.in (gpgme_op_conf_dir): New prototype. * src/libgpgme.vers (gpgme_op_conf_dir): New symbol. * tests/gpg/t-gpgconf.c (main): Test gpgme_op_conf_dir. Signed-off-by: Marcus Brinkmann GnuPG-bug-id: 3018 --- tests/gpg/t-gpgconf.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'tests/gpg/t-gpgconf.c') diff --git a/tests/gpg/t-gpgconf.c b/tests/gpg/t-gpgconf.c index 67bb8861..8c81de69 100644 --- a/tests/gpg/t-gpgconf.c +++ b/tests/gpg/t-gpgconf.c @@ -263,6 +263,23 @@ main (void) err = gpgme_new (&ctx); fail_if_err (err); + /* Let's check getting the agent-socket directory for different homedirs. */ + char *result1 = NULL; + err = gpgme_ctx_set_engine_info (ctx, GPGME_PROTOCOL_GPGCONF, NULL, "/tmp/foo"); + fail_if_err (err); + err = gpgme_op_conf_dir (ctx, "agent-socket", &result1); + fail_if_err (err); + + char *result2 = NULL; + err = gpgme_ctx_set_engine_info (ctx, GPGME_PROTOCOL_GPGCONF, NULL, NULL); + fail_if_err (err); + err = gpgme_op_conf_dir (ctx, "agent-socket", &result2); + fail_if_err (err); + + /* They have to be different. */ + test (strcmp(result1, result2)); + + err = gpgme_op_conf_load (ctx, &conf); fail_if_err (err); -- cgit v1.2.3