2003-02-04 Marcus Brinkmann <marcus@g10code.de>

	* rungpg.c (read_status): If he status handler returns an error,
	return it.
	(status_handler): If read_status fails, just return the error.

diff --git a/trunk/gpgme/ChangeLog b/trunk/gpgme/ChangeLog
index a122a7e9ce5712aae445dd789f1a799509d2f9cd..3c5070069ab294e9240491af9af9b8772793eca3 100644 (file)
--- a/trunk/gpgme/ChangeLog
+++ b/trunk/gpgme/ChangeLog
@@ -1,3 +1,9 @@
+2003-02-04  Marcus Brinkmann  <marcus@g10code.de>
+
+       * rungpg.c (read_status): If he status handler returns an error,
+       return it.
+       (status_handler): If read_status fails, just return the error.
+
 2003-02-01  Marcus Brinkmann  <marcus@g10code.de>
 
        * engine-gpgsm.c (start): Handle all errors, not only most of

diff --git a/trunk/gpgme/rungpg.c b/trunk/gpgme/rungpg.c
index 74723e6a702817750e47cdf9db5ec0ee4005cb79..d55fbc69a3560a3adbff3e59de351b3c615eee3a 100644 (file)
--- a/trunk/gpgme/rungpg.c
+++ b/trunk/gpgme/rungpg.c
@@ -808,7 +808,12 @@ read_status (GpgObject gpg)
     {
       gpg->status.eof = 1;
       if (gpg->status.fnc)
-       gpg->status.fnc (gpg->status.fnc_value, GPGME_STATUS_EOF, "");
+       {
+         GpgmeError err;
+         err = gpg->status.fnc (gpg->status.fnc_value, GPGME_STATUS_EOF, "");
+         if (err)
+           return err;
+       }
       return 0;
     }
 
@@ -886,8 +891,11 @@ read_status (GpgObject gpg)
                         }
                      else if (gpg->status.fnc)
                        {
-                         gpg->status.fnc (gpg->status.fnc_value, 
-                                          r->code, rest);
+                         GpgmeError err;
+                         err = gpg->status.fnc (gpg->status.fnc_value, 
+                                                r->code, rest);
+                         if (err)
+                           return err;
                         }
                     
                      if (r->code == GPGME_STATUS_END_STREAM)
@@ -939,11 +947,7 @@ status_handler (void *opaque, int fd)
   assert (fd == gpg->status.fd[0]);
   err = read_status (gpg);
   if (err)
-    {
-      DEBUG1 ("gpg_handler: read_status problem %d\n - stop", err);
-      _gpgme_io_close (fd);
-      return err;
-    }
+    return err;
   if (gpg->status.eof)
     _gpgme_io_close (fd);
   return 0;