[svn] GnuPG - r4492 - trunk/g10

[svn author dshaw]

Author: dshaw
Date: 2007-05-03 06:44:12 +0200 (Thu, 03 May 2007)
New Revision: 4492

Modified:
   trunk/g10/ChangeLog
   trunk/g10/decrypt.c
   trunk/g10/mainproc.c
   trunk/g10/packet.h
   trunk/g10/verify.c
Log:
* packet.h, mainproc.c (reset_literals_seen): New function to reset
the literals count.

* verify.c (verify_one_file), decrypt.c (decrypt_messages): Call it
here so we allow multiple literals in --multifile mode (in different
files - not concatenated together).


Modified: trunk/g10/ChangeLog
===================================================================
--- trunk/g10/ChangeLog	2007-05-03 00:54:28 UTC (rev 4491)
+++ trunk/g10/ChangeLog	2007-05-03 04:44:12 UTC (rev 4492)
@@ -1,3 +1,12 @@
+2007-05-02  David Shaw  <dshaw at jabberwocky.com>
+
+	* packet.h, mainproc.c (reset_literals_seen): New function to
+	reset the literals count.
+
+	* verify.c (verify_one_file), decrypt.c (decrypt_messages): Call
+	it here so we allow multiple literals in --multifile mode (in
+	different files - not concatenated together).
+
 2007-04-26  Marcus Brinkmann  <marcus at g10code.de>
 
 	* passphrase.c (passphrase_to_dek): Write missing passphrase

Modified: trunk/g10/decrypt.c
===================================================================
--- trunk/g10/decrypt.c	2007-05-03 00:54:28 UTC (rev 4491)
+++ trunk/g10/decrypt.c	2007-05-03 04:44:12 UTC (rev 4492)
@@ -1,6 +1,6 @@
 /* decrypt.c - verify signed data
- * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003
- *               2004 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ *               2007 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -192,6 +192,7 @@
       /* Note that we emit file_done even after an error. */
       write_status( STATUS_FILE_DONE );
       xfree(output);
+      reset_literals_seen();
     }
 
   set_next_passphrase(NULL);  

Modified: trunk/g10/mainproc.c
===================================================================
--- trunk/g10/mainproc.c	2007-05-03 00:54:28 UTC (rev 4491)
+++ trunk/g10/mainproc.c	2007-05-03 04:44:12 UTC (rev 4492)
@@ -1,6 +1,6 @@
 /* mainproc.c - handle packets
- * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
- *               2005, 2006 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ *               2007 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -102,6 +102,12 @@
 static void proc_tree( CTX c, KBNODE node );
 static int literals_seen;
 
+void
+reset_literals_seen(void)
+{
+  literals_seen=0;
+}
+
 static void
 release_list( CTX c )
 {

Modified: trunk/g10/packet.h
===================================================================
--- trunk/g10/packet.h	2007-05-03 00:54:28 UTC (rev 4491)
+++ trunk/g10/packet.h	2007-05-03 04:44:12 UTC (rev 4492)
@@ -1,6 +1,6 @@
 /* packet.h - OpenPGP packet definitions
- * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
- *               2006 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ *               2007 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -368,6 +368,7 @@
 };
 
 /*-- mainproc.c --*/
+void reset_literals_seen(void);
 int proc_packets( void *ctx, iobuf_t a );
 int proc_signature_packets( void *ctx, iobuf_t a,
 			    strlist_t signedfiles, const char *sigfile );

Modified: trunk/g10/verify.c
===================================================================
--- trunk/g10/verify.c	2007-05-03 00:54:28 UTC (rev 4491)
+++ trunk/g10/verify.c	2007-05-03 04:44:12 UTC (rev 4492)
@@ -1,5 +1,6 @@
 /* verify.c - Verify signed data
- * Copyright (C) 1998, 1999, 2000, 2001, 2004 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2005, 2006,
+ *               2007 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -178,6 +179,8 @@
     iobuf_close(fp);
     write_status( STATUS_FILE_DONE );
 
+    reset_literals_seen();
+
  leave:
     release_armor_context (afx);
     release_progress_context (pfx);