security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-02 22:46:30 +02:00
Code Activity

tools/gpgtar: Use the new exectool helper.

Browse source 
* tools/Makefile.am: gpgtar now requires neither npth nor libassuan.
* tools/gpgtar-create.c (gpgtar_create): Use the new 'sh-exectool'
helper.
* tools/gpgtar-extract.c (gpgtar_extract): Likewise.
* tools/gpgtar-list.c (gpgtar_list): Likewise.
* tools/gpgtar.c (main): Set default gpg program.  Drop the
initialization of npth and libassuan.

Signed-off-by: Justus Winter <justus@g10code.com>
This commit is contained in:
Justus Winter 2015-11-30 16:21:22 +01:00
parent a81aca6e1c
commit 0c0dafd8e8
5 changed files with 82 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

26
tools/gpgtar-extract.c
View file

@ -28,7 +28,7 @@
#include <assert.h>
#include "i18n.h"
#include "../common/call-gpg.h"
#include "../common/sh-exectool.h"
#include "../common/sysutils.h"
#include "gpgtar.h"
@ -299,6 +299,10 @@ gpgtar_extract (const char *filename, int decrypt)
if (decrypt)
{
int i;
strlist_t arg;
const char **argv;
cipher_stream = stream;
stream = es_fopenmem (0, "rwb");
if (! stream)
@ -306,8 +310,24 @@ gpgtar_extract (const char *filename, int decrypt)
err = gpg_error_from_syserror ();
goto leave;
}
err = gpg_decrypt_stream (NULL, opt.gpg_program, opt.gpg_arguments,
cipher_stream, stream);
argv = xtrycalloc (strlist_length (opt.gpg_arguments) + 2,
sizeof *argv);
if (argv == NULL)
{
err = gpg_error_from_syserror ();
goto leave;
}
i = 0;
argv[i++] = "--decrypt";
for (arg = opt.gpg_arguments; arg; arg = arg->next)
argv[i++] = arg->d;
argv[i++] = NULL;
assert (i == strlist_length (opt.gpg_arguments) + 2);
err = sh_exec_tool_stream (opt.gpg_program, argv,
cipher_stream, stream);
xfree (argv);
if (err)
goto leave;