diff options
| author | Werner Koch <[email protected]> | 2023-04-17 12:02:02 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2023-04-17 12:05:35 +0000 |
| commit | 0c29119e061cbdcb7342380938a25af91290f1a0 (patch) | |
| tree | aa6447e859b6c375bbc39054acfe13c597775272 /src/dirinfo.c | |
| parent | build: Update gpg-error.m4. (diff) | |
| download | gpgme-0c29119e061cbdcb7342380938a25af91290f1a0.tar.gz gpgme-0c29119e061cbdcb7342380938a25af91290f1a0.zip | |
core,w32: Fix invocation of gpgtar
* src/dirinfo.c (EXEEXT_S): New.
(get_gpgconf_item): Append ".exe" to gpg-wks-client and gpgtar.
* src/gpgme-w32spawn.c (mystderr): Add code to ease debugging.
Diffstat (limited to 'src/dirinfo.c')
| -rw-r--r-- | src/dirinfo.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/dirinfo.c b/src/dirinfo.c index 009bd580..de2a9180 100644 --- a/src/dirinfo.c +++ b/src/dirinfo.c @@ -32,6 +32,12 @@ #include "sema.h" #include "sys-util.h" +#ifdef HAVE_DOSISH_SYSTEM +# define EXEEXT_S ".exe" +#else +# define EXEEXT_S "" +#endif + DEFINE_STATIC_LOCK (dirinfo_lock); /* Constants used internally to select the data. */ @@ -404,16 +410,18 @@ get_gpgconf_item (int what) case WANT_GPG_WKS_CLIENT_NAME: if (!dirinfo.gpg_wks_client_name && dirinfo.libexecdir) dirinfo.gpg_wks_client_name = _gpgme_strconcat (dirinfo.libexecdir, - "/", + DIRSEP_S, "gpg-wks-client", + EXEEXT_S, NULL); result = dirinfo.gpg_wks_client_name; break; case WANT_GPGTAR_NAME: if (!dirinfo.gpgtar_name && dirinfo.bindir) dirinfo.gpgtar_name = _gpgme_strconcat (dirinfo.bindir, - "/", + DIRSEP_S, "gpgtar", + EXEEXT_S, NULL); result = dirinfo.gpgtar_name; break; |