aboutsummaryrefslogtreecommitdiffstats
path: root/tools/gpgtar-extract.c
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--tools/gpgtar-extract.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/tools/gpgtar-extract.c b/tools/gpgtar-extract.c
index 19db0eb42..594f2571b 100644
--- a/tools/gpgtar-extract.c
+++ b/tools/gpgtar-extract.c
@@ -265,7 +265,7 @@ create_directory (const char *dirprefix)
-void
+gpg_error_t
gpgtar_extract (const char *filename, int decrypt)
{
gpg_error_t err;
@@ -285,7 +285,7 @@ gpgtar_extract (const char *filename, int decrypt)
{
err = gpg_error_from_syserror ();
log_error ("error opening '%s': %s\n", filename, gpg_strerror (err));
- return;
+ return err;
}
}
else
@@ -344,11 +344,12 @@ gpgtar_extract (const char *filename, int decrypt)
for (;;)
{
- header = gpgtar_read_header (stream);
- if (!header)
+ err = gpgtar_read_header (stream, &header);
+ if (err || header == NULL)
goto leave;
- if (extract (stream, dirname, header))
+ err = extract (stream, dirname, header);
+ if (err)
goto leave;
xfree (header);
header = NULL;
@@ -362,5 +363,5 @@ gpgtar_extract (const char *filename, int decrypt)
es_fclose (stream);
if (stream != cipher_stream)
es_fclose (cipher_stream);
- return;
+ return err;
}