diff options
| author | Werner Koch <[email protected]> | 2023-01-18 09:42:53 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2023-01-18 09:42:53 +0000 |
| commit | f79d9b9310cf9e6c33b42d91aa11ceb51df3135e (patch) | |
| tree | 664e95dfdcac228e2f8f88f7820221b0cb6d5585 /tools/gpgtar-list.c | |
| parent | sm: Fix compliance checking for ECC signature verification. (diff) | |
| download | gnupg-f79d9b9310cf9e6c33b42d91aa11ceb51df3135e.tar.gz gnupg-f79d9b9310cf9e6c33b42d91aa11ceb51df3135e.zip | |
gpgtar: Make --status-fd option for fds > 2 work
* tools/gpgtar-create.c (gpgtar_create): Do not close the status_fd in
spawn.
* tools/gpgtar-extract.c (gpgtar_extract): Ditto.
* tools/gpgtar-list.c (gpgtar_list): Ditto.
--
Note that this fix does not handle file descripotors passed via the
--gpg-args options.
GnuPG-bug-id: 6348
Diffstat (limited to 'tools/gpgtar-list.c')
| -rw-r--r-- | tools/gpgtar-list.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tools/gpgtar-list.c b/tools/gpgtar-list.c index a536b05f2..c5bf25825 100644 --- a/tools/gpgtar-list.c +++ b/tools/gpgtar-list.c @@ -468,6 +468,7 @@ gpgtar_list (const char *filename, int decrypt) { strlist_t arg; ccparray_t ccp; + int except[2] = { -1, -1 }; const char **argv; ccparray_init (&ccp, 0); @@ -481,6 +482,7 @@ gpgtar_list (const char *filename, int decrypt) snprintf (tmpbuf, sizeof tmpbuf, "--status-fd=%d", opt.status_fd); ccparray_put (&ccp, tmpbuf); + except[0] = opt.status_fd; } ccparray_put (&ccp, "--output"); ccparray_put (&ccp, "-"); @@ -501,7 +503,8 @@ gpgtar_list (const char *filename, int decrypt) goto leave; } - err = gnupg_spawn_process (opt.gpg_program, argv, NULL, + err = gnupg_spawn_process (opt.gpg_program, argv, + except[0] == -1? NULL : except, ((filename? 0 : GNUPG_SPAWN_KEEP_STDIN) | GNUPG_SPAWN_KEEP_STDERR), NULL, &stream, NULL, &pid); |