(_gpgme_map_gnupg_error): Handle numerical codes as

used by GnuPG 1.9.x

diff --git a/trunk/gpgme/ChangeLog b/trunk/gpgme/ChangeLog
index 923166f8f945e4cfa79863aec5922de1a301dc1a..a9703b7d0928dadab6aad23c6f837d941126cc61 100644 (file)
--- a/trunk/gpgme/ChangeLog
+++ b/trunk/gpgme/ChangeLog
@@ -1,6 +1,11 @@
+2004-01-16  Werner Koch  <wk@gnupg.org>
+
+       * conversion.c (_gpgme_map_gnupg_error): Handle numerical codes as
+       used by GnuPG 1.9.x
+
 2004-01-13  Marcus Brinkmann  <marcus@g10code.de>
 
-       * gpgme.h (struct _gpgme_key_sig): Fix comment on REVOKED>
+       * gpgme.h (struct _gpgme_key_sig): Fix comment on REVOKED.
 
 2004-01-12  Werner Koch  <wk@gnupg.org>
 

diff --git a/trunk/gpgme/conversion.c b/trunk/gpgme/conversion.c
index f55e9a667101728662689b4aaf0a0ee563cfa31f..8faf8522041ddbba877618096dbfea14c949364c 100644 (file)
--- a/trunk/gpgme/conversion.c
+++ b/trunk/gpgme/conversion.c
@@ -393,6 +393,16 @@ _gpgme_map_gnupg_error (char *err)
 {
   unsigned int i;
 
+  /* Future version of GnuPG might return the error code directly, so
+     we first test for a a numerical value and use that verbatim.
+     Note that this numerical value might be followed by an
+     udnerschore and the textual representation of the error code. */
+  if (*err >= '0' && *err <= '9')
+    return strtoul (err, NULL, 10);
+
+  /* Well, this is a token, use the mapping table to get the error.
+     The drawback is that we won't receive an error source and have to
+     use GPG as source. */
   for (i = 0; i < DIM (gnupg_errors); i++)
     if (!strcmp (gnupg_errors[i].name, err))
       return gpg_err_make (GPG_ERR_SOURCE_GPG, gnupg_errors[i].err);

diff --git a/trunk/gpgme/gpgme.h b/trunk/gpgme/gpgme.h
index c8e590a0dc44cf5de620eb87e5ab84c1a738db5f..110fad0b019e724a089849873b96765f2462b0d3 100644 (file)
--- a/trunk/gpgme/gpgme.h
+++ b/trunk/gpgme/gpgme.h
@@ -473,7 +473,7 @@ struct _gpgme_key_sig
 {
   struct _gpgme_key_sig *next;
 
-  /* True if the signature is a revokation signature.  */
+  /* True if the signature is a revocation signature.  */
   unsigned int revoked : 1;
 
   /* True if the signature is expired.  */