diff options
| author | Werner Koch <[email protected]> | 2009-05-11 09:20:39 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2009-05-11 09:20:39 +0000 |
| commit | 750990401cf0bc5de673cf31ff9506db03b4895c (patch) | |
| tree | c4ac4ae1fd19dd301a9e34e1f064246f0756cea1 | |
| parent | Fix for bug#1034. (diff) | |
| download | gnupg-750990401cf0bc5de673cf31ff9506db03b4895c.tar.gz gnupg-750990401cf0bc5de673cf31ff9506db03b4895c.zip | |
Print 'empty file' warning only with --verbose.
| -rw-r--r-- | g10/ChangeLog | 6 | ||||
| -rw-r--r-- | g10/encode.c | 4 | ||||
| -rw-r--r-- | g10/sign.c | 2 |
3 files changed, 9 insertions, 3 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index 7c4d57875..31806378d 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,9 @@ +2009-05-11 Werner Koch <[email protected]> + + * encode.c (encode_simple, encode_crypt): Print empty file warning + only in verbose mode. Closes bug#1039. + * sign.c (write_plaintext_packet): + 2009-05-06 Werner Koch <[email protected]> * keyring.c (keyring_get_keyblock): Fix memory leak due to diff --git a/g10/encode.c b/g10/encode.c index fb40a53cd..a579c428d 100644 --- a/g10/encode.c +++ b/g10/encode.c @@ -286,7 +286,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 @@ -564,7 +564,7 @@ encode_crypt( const char *filename, STRLIST 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 09c26628f..cdc848dec 100644 --- a/g10/sign.c +++ b/g10/sign.c @@ -555,7 +555,7 @@ write_plaintext_packet (IOBUF out, IOBUF inp, const char *fname, 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 |