diff options
| author | Werner Koch <wk@gnupg.org> | 2009-05-11 11:20:57 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2009-05-11 11:20:57 +0200 |
| commit | 74300e64f52bc74af58dcbb6f44712aa8f3290d2 (patch) | |
| tree | 812657cdfc70e7c4f7c06d02a267c7f74aa35c56 /g10 | |
| parent | * keyserver.c (keyserver_typemap): gpgkeys_hkp handles hkps as well. (diff) | |
| download | gnupg2-74300e64f52bc74af58dcbb6f44712aa8f3290d2.tar.xz gnupg2-74300e64f52bc74af58dcbb6f44712aa8f3290d2.zip | |
Print 'empty file' warning only with --verbose.
Diffstat (limited to 'g10')
| -rw-r--r-- | g10/ChangeLog | 7 | ||||
| -rw-r--r-- | g10/encode.c | 4 | ||||
| -rw-r--r-- | g10/sign.c | 2 |
3 files changed, 10 insertions, 3 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index c3cd0e860..5a6b5df63 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,10 @@ +2009-05-11 Werner Koch <wk@g10code.com> + + * encode.c (encode_simple): Print empty file warning only in + verbose mode. Closes bug#1039. + (encode_crypt): Ditto. + * sign.c (write_plaintext_packet): Ditto. + 2009-05-10 David Shaw <dshaw@jabberwocky.com> * keyserver.c (keyserver_typemap): gpgkeys_hkp handles hkps as diff --git a/g10/encode.c b/g10/encode.c index 92aa9b27d..10c638f89 100644 --- a/g10/encode.c +++ b/g10/encode.c @@ -307,7 +307,7 @@ encode_simple( const char *filename, int mode, int use_seskey ) int overflow; if ( !(tmpsize = iobuf_get_filelength(inp, &overflow)) - && !overflow ) + && !overflow && opt.verbose) log_info(_("WARNING: `%s' is an empty file\n"), filename ); /* We can't encode the length of very large files because OpenPGP uses only 32 bit for file sizes. So if the the @@ -607,7 +607,7 @@ encode_crypt( const char *filename, strlist_t remusr, int use_symkey ) int overflow; if ( !(tmpsize = iobuf_get_filelength(inp, &overflow)) - && !overflow ) + && !overflow && opt.verbose) log_info(_("WARNING: `%s' is an empty file\n"), filename ); /* We can't encode the length of very large files because OpenPGP uses only 32 bit for file sizes. So if the the diff --git a/g10/sign.c b/g10/sign.c index 597aba786..0528427db 100644 --- a/g10/sign.c +++ b/g10/sign.c @@ -557,7 +557,7 @@ write_plaintext_packet (IOBUF out, IOBUF inp, const char *fname, int ptmode) int overflow; if( !(tmpsize = iobuf_get_filelength(inp, &overflow)) - && !overflow ) + && !overflow && opt.verbose) log_info (_("WARNING: `%s' is an empty file\n"), fname); /* We can't encode the length of very large files because |