mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-03 22:56:33 +02:00
gpg: Make --no-literal work again for -c and --store.
* g10/dearmor.c (dearmor_file): Check for errors of iobuf_copy.
(enarmor_file): Ditto.
* g10/encrypt.c (encrypt_simple): Fix error check of iobuf_copy
(encrypt_crypt): Use iobuf_copy.
--
Fixes-commit: 756c0bd5d8
GnuPG-bug-id: 5852
This commit is contained in:
parent
1eaf1e236e
commit
9a741aba3d
2 changed files with 29 additions and 18 deletions
|
@ -67,6 +67,12 @@ dearmor_file( const char *fname )
|
|||
goto leave;
|
||||
|
||||
iobuf_copy (out, inp);
|
||||
if ((rc = iobuf_error (inp)))
|
||||
log_error (_("error reading '%s': %s\n"),
|
||||
iobuf_get_fname_nonnull (inp), gpg_strerror (rc));
|
||||
else if ((rc = iobuf_error (out)))
|
||||
log_error (_("error writing '%s': %s\n"),
|
||||
iobuf_get_fname_nonnull (out), gpg_strerror (rc));
|
||||
|
||||
leave:
|
||||
if( rc )
|
||||
|
@ -115,6 +121,12 @@ enarmor_file( const char *fname )
|
|||
push_armor_filter ( afx, out );
|
||||
|
||||
iobuf_copy (out, inp);
|
||||
if ((rc = iobuf_error (inp)))
|
||||
log_error (_("error reading '%s': %s\n"),
|
||||
iobuf_get_fname_nonnull (inp), gpg_strerror (rc));
|
||||
else if ((rc = iobuf_error (out)))
|
||||
log_error (_("error writing '%s': %s\n"),
|
||||
iobuf_get_fname_nonnull (out), gpg_strerror (rc));
|
||||
|
||||
leave:
|
||||
if( rc )
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue