diff options
author | Marcus Brinkmann <[email protected]> | 2009-10-22 16:44:07 +0000 |
---|---|---|
committer | Marcus Brinkmann <[email protected]> | 2009-10-22 16:44:07 +0000 |
commit | a6f3857128220cc413434d5fb56cdd7f9a890c4c (patch) | |
tree | 50478606bd9a1f87a61e8df224f8c4260ad2e5a2 /src/w32-util.c | |
parent | Really add file. (diff) | |
download | gpgme-a6f3857128220cc413434d5fb56cdd7f9a890c4c.tar.gz gpgme-a6f3857128220cc413434d5fb56cdd7f9a890c4c.zip |
2009-10-22 Marcus Brinkmann <[email protected]>
* configure.ac: Add support for G13.
src/
2009-10-22 Marcus Brinkmann <[email protected]>
* Makefile.am: Remove @NETLIBS@ from LIBADDs.
(g13_components): New variable.
(main_sources): Add $(g13_components).
* g13.c, engine-g13.c: New files.
* engine.c (engine_ops): Check for assuan for assuan engine, add
g13 engine.
* util.h (_gpgme_get_g13_path, _gpgme_encode_percent_string): New
prototypes.
* conversion.c (_gpgme_encode_percent_string): New function.
* gpgme.h.in (gpgme_protocol_t): Add GPGME_PROTOCOL_G13.
(struct _gpgme_op_g13_result, gpgme_g13_result_t): New types.
(gpgme_op_g13_mount): New function.
* gpgme.def, libgpgme.vers: Add gpgme_op_g13_mount.
* gpgme.c (gpgme_set_protocol): Allow GPGME_PROTOCOL_G13.
(gpgme_get_protocol_name): Add GPGME_PROTOCOL_G13.
* posix-util.c (_gpgme_get_g13_path): New function.
* w32-util.c (_gpgme_get_g13_path): New function.
* engine-backend.h (_gpgme_engine_ops_g13): New declaration.
Diffstat (limited to 'src/w32-util.c')
-rw-r--r-- | src/w32-util.c | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/src/w32-util.c b/src/w32-util.c index a4b713ed..d7fc06f3 100644 --- a/src/w32-util.c +++ b/src/w32-util.c @@ -362,6 +362,25 @@ _gpgme_get_gpgconf_path (void) const char * +_gpgme_get_g13_path (void) +{ + static char *g13_program; + + LOCK (get_path_lock); +#if 0 + if (!g13_program) + g13_program = find_program_in_registry ("g13Program"); +#endif + if (!g13_program) + g13_program = find_program_in_inst_dir ("g13.exe"); + if (!g13_program) + g13_program = find_program_at_standard_place ("GNU\\GnuPG\\g13.exe"); + UNLOCK (get_path_lock); + return g13_program; +} + + +const char * _gpgme_get_w32spawn_path (void) { static char *w32spawn_program; |