handle truncated data

diff --git a/trunk/gpgmeplug/ChangeLog b/trunk/gpgmeplug/ChangeLog
index d7a838167776f607df3dcd152e6eceece0f88489..ddc7f335d94a4ab55befde9dd909c4de6a7568dd 100644 (file)
--- a/trunk/gpgmeplug/ChangeLog
+++ b/trunk/gpgmeplug/ChangeLog
@@ -1,3 +1,7 @@
+2002-06-27  Steffen Hansen  <steffen@hrhansen.dk>
+
+       * Handle truncated data from dirmngr.
+
 2002-06-25  Steffen Hansen  <steffen@hrhansen.dk>
 
        * cryptplug.h, gpgmeplug.c: New function importCertificate() for importing a 

diff --git a/trunk/gpgmeplug/cryptplug.h b/trunk/gpgmeplug/cryptplug.h
index b978fb706089df9eb48cadf57fb34e3c4c896118..6d901d9407ec45e2882645a07a397636ee57d4b5 100644 (file)
--- a/trunk/gpgmeplug/cryptplug.h
+++ b/trunk/gpgmeplug/cryptplug.h
@@ -1832,7 +1832,7 @@ struct CertificateInfo {
     dont free() it, the struct will be reused
     by the next call to nextCertificate()
   }
-  endListCertificates( it );
+  int truncated = endListCertificates( it );
 \endverbatim
 */
 struct CertIterator*
@@ -1841,7 +1841,7 @@ startListCertificates( const char* pattern, int remote );
 int
 nextCertificate( struct CertIterator*, struct CertificateInfo** result );
 
-void
+int
 endListCertificates( struct CertIterator* );
 
 /*!

diff --git a/trunk/gpgmeplug/gpgmeplug.c b/trunk/gpgmeplug/gpgmeplug.c
index 25f7e2aee570f85bd2947f4141e744754485b7a1..48ce8106ef0a51799119f7cfff718ac9008ef2be 100644 (file)
--- a/trunk/gpgmeplug/gpgmeplug.c
+++ b/trunk/gpgmeplug/gpgmeplug.c
@@ -2402,19 +2402,25 @@ nextCertificate( struct CertIterator* it, struct CertificateInfo** result )
     gpgme_key_release (key);
     /*return &(it->info);*/
     *result =  &(it->info);
-  } else *result = NULL;
+  } else {
+    *result = NULL;
+  }
   return retval;
 }
 
-void 
+int
 endListCertificates( struct CertIterator* it )
 {
   /*fprintf( stderr,  "endListCertificates()\n" );*/
+  char *s = gpgme_get_op_info (it->ctx, 0);
+  int truncated = s && strstr (s, "<truncated/>");
+  if( s ) free( s );
   assert(it);
   freeInfo( &(it->info) );
   gpgme_op_keylist_end(it->ctx);
   gpgme_release (it->ctx);
   free( it );
+  return truncated;
 }
 
 int