[svn] GnuPG - r5002 - branches/STABLE-BRANCH-1-4/g10

[svn author wk]

Author: wk
Date: 2009-05-11 11:20:39 +0200 (Mon, 11 May 2009)
New Revision: 5002

Modified:
   branches/STABLE-BRANCH-1-4/g10/ChangeLog
   branches/STABLE-BRANCH-1-4/g10/encode.c
   branches/STABLE-BRANCH-1-4/g10/sign.c
Log:
Print 'empty file' warning only with --verbose.


Modified: branches/STABLE-BRANCH-1-4/g10/ChangeLog
===================================================================
--- branches/STABLE-BRANCH-1-4/g10/ChangeLog	2009-05-11 03:56:34 UTC (rev 5001)
+++ branches/STABLE-BRANCH-1-4/g10/ChangeLog	2009-05-11 09:20:39 UTC (rev 5002)
@@ -1,3 +1,9 @@
+2009-05-11  Werner Koch  <wk at g10code.com>
+
+	* 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  <wk at g10code.com>
 
 	* keyring.c (keyring_get_keyblock): Fix memory leak due to

Modified: branches/STABLE-BRANCH-1-4/g10/encode.c
===================================================================
--- branches/STABLE-BRANCH-1-4/g10/encode.c	2009-05-11 03:56:34 UTC (rev 5001)
+++ branches/STABLE-BRANCH-1-4/g10/encode.c	2009-05-11 09:20:39 UTC (rev 5002)
@@ -286,7 +286,7 @@
         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 @@
         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

Modified: branches/STABLE-BRANCH-1-4/g10/sign.c
===================================================================
--- branches/STABLE-BRANCH-1-4/g10/sign.c	2009-05-11 03:56:34 UTC (rev 5001)
+++ branches/STABLE-BRANCH-1-4/g10/sign.c	2009-05-11 09:20:39 UTC (rev 5002)
@@ -555,7 +555,7 @@
         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