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

[svn author dshaw]

Author: dshaw
Date: 2007-04-17 06:00:38 +0200 (Tue, 17 Apr 2007)
New Revision: 4485

Modified:
   branches/STABLE-BRANCH-1-4/g10/ChangeLog
   branches/STABLE-BRANCH-1-4/g10/decrypt.c
   branches/STABLE-BRANCH-1-4/g10/mainproc.c
   branches/STABLE-BRANCH-1-4/g10/packet.h
   branches/STABLE-BRANCH-1-4/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: branches/STABLE-BRANCH-1-4/g10/ChangeLog
===================================================================
--- branches/STABLE-BRANCH-1-4/g10/ChangeLog	2007-04-16 22:47:20 UTC (rev 4484)
+++ branches/STABLE-BRANCH-1-4/g10/ChangeLog	2007-04-17 04:00:38 UTC (rev 4485)
@@ -1,5 +1,12 @@
 2007-04-16  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).
+
 	* gpg.c, pkclist.c: #include <strings.h> for strcasecmp if it is
 	present.  Note that autoconf protects us against a strings.h that
 	cannot be used together with string.h.

Modified: branches/STABLE-BRANCH-1-4/g10/decrypt.c
===================================================================
--- branches/STABLE-BRANCH-1-4/g10/decrypt.c	2007-04-16 22:47:20 UTC (rev 4484)
+++ branches/STABLE-BRANCH-1-4/g10/decrypt.c	2007-04-17 04:00:38 UTC (rev 4485)
@@ -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.
  *
@@ -185,6 +185,7 @@
       write_status( STATUS_FILE_DONE );
       iobuf_ioctl( NULL, 2, 0, NULL); /* Invalidate entire cache. */
       xfree(output);
+      reset_literals_seen();
     }
 
   set_next_passphrase(NULL);  

Modified: branches/STABLE-BRANCH-1-4/g10/mainproc.c
===================================================================
--- branches/STABLE-BRANCH-1-4/g10/mainproc.c	2007-04-16 22:47:20 UTC (rev 4484)
+++ branches/STABLE-BRANCH-1-4/g10/mainproc.c	2007-04-17 04:00:38 UTC (rev 4485)
@@ -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.
  *
@@ -88,6 +88,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: branches/STABLE-BRANCH-1-4/g10/packet.h
===================================================================
--- branches/STABLE-BRANCH-1-4/g10/packet.h	2007-04-16 22:47:20 UTC (rev 4484)
+++ branches/STABLE-BRANCH-1-4/g10/packet.h	2007-04-17 04:00:38 UTC (rev 4485)
@@ -1,6 +1,6 @@
 /* packet.h - 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.
  *
@@ -423,6 +423,7 @@
 };
 
 /*-- mainproc.c --*/
+void reset_literals_seen(void);
 int proc_packets( void *ctx, IOBUF a );
 int proc_signature_packets( void *ctx, IOBUF a,
 			    STRLIST signedfiles, const char *sigfile );

Modified: branches/STABLE-BRANCH-1-4/g10/verify.c
===================================================================
--- branches/STABLE-BRANCH-1-4/g10/verify.c	2007-04-16 22:47:20 UTC (rev 4484)
+++ branches/STABLE-BRANCH-1-4/g10/verify.c	2007-04-17 04:00:38 UTC (rev 4485)
@@ -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.
  *
@@ -169,6 +170,7 @@
     rc = proc_signature_packets( NULL, fp, NULL, name );
     iobuf_close(fp);
     write_status( STATUS_FILE_DONE );
+    reset_literals_seen();
     return rc;
 }