diff options
| author | NIIBE Yutaka <[email protected]> | 2025-12-23 08:17:29 +0100 |
|---|---|---|
| committer | NIIBE Yutaka <[email protected]> | 2025-12-23 08:26:42 +0100 |
| commit | 936015d49c389a6cafc40025f7881625ded90120 (patch) | |
| tree | c651447cd0e285e947c54059011ae79f0e7e0c4e /src/dirinfo.c | |
| parent | Fix a regression wrt the auto-key-locate option. (diff) | |
| download | gpgme-936015d49c389a6cafc40025f7881625ded90120.tar.gz gpgme-936015d49c389a6cafc40025f7881625ded90120.zip | |
w32: Fix spawn for 64-bit machine.
* src/priv-io.h (struct spawn_fd_item_s): Use HANDLE for peer_name
field.
* src/dirinfo.c (read_gpgconf_dirs): Use ASSUAN_INVALID_FD for default
value for peer_name field of CFD.
* src/engine-gpgconf.c (gpgconf_read, gpgconf_write)
(gpgconf_query_swdb): Likewise.
* src/version.c (_gpgme_get_program_version): Likewise.
* src/w32-io.c (handle_to_fd): Remove.
(_gpgme_io_spawn): Assign HD to the peer_name field. Use %p for
printing the value of peer_name field.
* src/gpgme-w32spawn.c (my_spawn): Use peer_name field with no cast.
Use %p for printing the value of peer_name field. Remove wrong
CloseHandle calls.
(translate_get_from_file): Use HANDLE type for the TO variable.
Use strtoull on 64-bit machine. Use ASSUAN_INVALID_FD.
--
Signed-off-by: NIIBE Yutaka <[email protected]>
Diffstat (limited to 'src/dirinfo.c')
| -rw-r--r-- | src/dirinfo.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/dirinfo.c b/src/dirinfo.c index a0753191..0276962f 100644 --- a/src/dirinfo.c +++ b/src/dirinfo.c @@ -221,7 +221,8 @@ read_gpgconf_dirs (const char *pgmname, int components) int linelen = 0; char * argv[3]; int rp[2]; - struct spawn_fd_item_s cfd[] = { {-1, 1 /* STDOUT_FILENO */, -1, 0}, + struct spawn_fd_item_s cfd[] = { {-1, 1 /* STDOUT_FILENO */, + ASSUAN_INVALID_FD, 0}, {-1, -1} }; int status; int nread; |