2009-10-26 Marcus Brinkmann <[email protected]>

	* configure.ac (NEED_GPG_VERSION_DEFAULT): Bump to 1.4.0 as 1.3.0
	was development versions only.

tests/
2009-10-26  Marcus Brinkmann  <[email protected]>

	* opassuan/t-command.c: Update to new interface.

src/
2009-10-26  Marcus Brinkmann  <[email protected]>

	* gpgme.h.in (struct gpgme_io_event_done_data)
	(gpgme_io_event_done_data_t): New types.
	(struct _gpgme_op_assuan_result): Deprecate the err member.
	(gpgme_op_assuan_result): Deprecate (for now).
	(gpgme_op_assuan_transact_ext): New prototype.
	(gpgme_op_assuan_transact): Deprecate.
	(struct _gpgme_op_g13_result): Replace with ...
	(struct _gpgme_op_vfs_mount_result): ... this.
	(gpgme_op_g13_mount): Replace with ...
	(gpgme_op_vfs_mount): ... this.
	* gpgme.def (gpgme_op_assuan_transact_ext, gpgme_wait_ext)
	(gpgme_op_vfs_mount_result, gpgme_op_vfs_mount): New.
	(gpgme_op_g13_mount): Remove.
	* libgpgme.vers: Likewise.
	* engine-backend.h (struct engine_ops): Remove RESULT_CB and
	RESULT_CB_VALUE args in opassuan_transact member.  Add CANCEL_OP
	member.
	* ops.h (_gpgme_cancel_with_err, _gpgme_wait_on_condition): Add
	OP_ERR argument.
	(_gpgme_wait_one_ext): New prototype.
	* context.h (ctx_op_data_id_t): Add OPDATA_VFS_MOUNT.
	* engine-g13.c (g13_cancel_op): New function.
	(parse_status): Remove declaration.
	(g13_assuan_simple_command): Do nothing with status lines for now.
	(status_handler): Update opaque value access.
	(_gpgme_engine_ops_g13): Add new cancel_op member.
	* gpgme.c (_gpgme_cancel_with_err): Add new parameter OP_ERR.
	Handle operational errors.
	(gpgme_cancel, gpgme_io_read, gpgme_io_write): Add debug output.
	* data.c (_gpgme_data_inbound_handler)
	(_gpgme_data_outbound_handler): Adjust opaque value access.
	* engine-gpg.c (command_handler, status_handler)
	(colon_line_handler): Likewise.
	* engine-gpgsm.c (status_handler): Likewise.
	* engine-gpg.c (_gpgme_engine_ops_gpg): Add cancel_op member.
	* engine-gpgsm.c (_gpgme_engine_ops_gpgsm): Likewise.
	* g13.c: Rewritten (and will be rewritten again).
	* engine.h (_gpgme_engine_op_assuan_transact): Remove result_cb
	and result_cb_value parameters from prototype.
	(_gpgme_engine_cancel_op): New prototype.
	* engine.c (engine_ops) [! ENABLE_ASSUAN]: Add missing comma.
	(_gpgme_engine_op_assuan_transact): Remove result_cb and
	result_cb_value parameter.
	(_gpgme_engine_cancel_op): New function.
	* wait.h (_gpgme_run_io_cb): Add new argument OP_ERR.
	(struct io_cb_data): New struct to pass opaque data and get a
	op_err return value.  Needed because we can't modify I/O callback
	handler signature because it is exposed to the user.
	* wait.c (_gpgme_run_io_cb): Add OP_ERR parameter.  Handle
	operational errors.
	* wait-user.c (_gpgme_user_io_cb_handler): Handle operational
	errors.
	* wait-private.c (_gpgme_wait_on_condition): New argument to
	retrieve the operational result.  Handle operational errors in
	session based protocols.
	(_gpgme_wait_one_ext): New function.
	(_gpgme_wait_one): Pass argument in invocation of
	_gpgme_wait_on_condition.
	* wait-global.c (struct ctx_list_item): Add member OP_ERR.
	(ctx_done): New argument OP_ERR.
	(ctx_wait): New argument OP_ERR.
	(gpgme_wait_ext): New function based on gpgme_wait but handling
	operational errors.
	(gpgme_wait): Implement in term of gpgme_wait_ext.
	* keylist.c (gpgme_op_keylist_next): Pass argument in invocation
	of _gpgme_wait_on_condition.
	* trustlist.c (gpgme_op_trustlist_next): Pass argument in
	invocation of _gpgme_wait_on_condition.
	* engine-assuan.c (struct engine_llass): Replace members RESULT_CB
	and RESULT_CB_VALUE by LAST_OP_ERR.
	(_gpgme_engine_assuan_last_op_err): Add this hack function.
	(llass_cancel_op): New function.
	(_gpgme_engine_llass_ops): Add cancel_op member.
	(llass_status_handler): Update opaque value access.
	(llass_transact): Remove RESULT_CB and RESULT_CB_VALUE arguments.
	* opassuan.c: Move compat hacks to the end of file.
	(opassuan_start): Do not set OPD->result.err.
	Do not pass RESULT_Cb and CTX to _gpgme_engine_op_assuan_transact.
	(gpgme_op_assuan_transact_ext): New function.

1 files changed, 80 insertions, 77 deletions

diff --git a/src/opassuan.c b/src/opassuan.c
index 09f69ee8..2db9f6cf 100644
--- a/src/opassuan.c
+++ b/src/opassuan.c
@@ -26,58 +26,6 @@
 #include "ops.h"
 #include "util.h"
 
-
-typedef struct
-{
-  struct _gpgme_op_assuan_result result;
-
-} *op_data_t;
-
-
-
-
-/* This callback is used to return the status of the assuan command
-   back.  Note that this is different from the error code returned
-   from gpgme_op_assuan_transact because the later only reflects error
-   with the connection.  */
-static gpgme_error_t
-result_cb (void *priv, gpgme_error_t result)
-{
-  gpgme_ctx_t ctx = (gpgme_ctx_t)priv;
-  gpgme_error_t err;
-  void *hook;
-  op_data_t opd;
-
-  err = _gpgme_op_data_lookup (ctx, OPDATA_ASSUAN, &hook, -1, NULL);
-  opd = hook;
-  if (err)
-    return err;
-  if (!opd)
-    return gpg_error (GPG_ERR_INTERNAL);
-
-  opd->result.err = result;
-  return 0;
-}
-
-
-gpgme_assuan_result_t
-gpgme_op_assuan_result (gpgme_ctx_t ctx)
-{
-  gpgme_error_t err;
-  void *hook;
-  op_data_t opd;
-
-  err = _gpgme_op_data_lookup (ctx, OPDATA_ASSUAN, &hook, -1, NULL);
-  opd = hook;
-  /* Check in case this function is used without having run a command
-     before.  */
-  if (err || !opd)
-    return NULL;
-
-  return &opd->result;
-}
-
-
 static gpgme_error_t
 opassuan_start (gpgme_ctx_t ctx, int synchronous,
                 const char *command,
@@ -89,8 +37,6 @@ opassuan_start (gpgme_ctx_t ctx, int synchronous,
                 void *status_cb_value)
 {
   gpgme_error_t err;
-  void *hook;
-  op_data_t opd;
 
   if (!command || !*command)
     return gpg_error (GPG_ERR_INV_VALUE);
@@ -101,14 +47,7 @@ opassuan_start (gpgme_ctx_t ctx, int synchronous,
   if (err)
     return err;
 
-  err = _gpgme_op_data_lookup (ctx, OPDATA_ASSUAN, &hook, sizeof (*opd), NULL);
-  opd = hook;
-  if (err)
-    return err;
-  opd->result.err = gpg_error (GPG_ERR_UNFINISHED);
-
   return _gpgme_engine_op_assuan_transact (ctx->engine, command,
-                                           result_cb, ctx,
                                            data_cb, data_cb_value,
                                            inq_cb, inq_cb_value,
                                            status_cb, status_cb_value);
@@ -119,13 +58,13 @@ opassuan_start (gpgme_ctx_t ctx, int synchronous,
 /* XXXX.  This is the asynchronous variant. */
 gpgme_error_t
 gpgme_op_assuan_transact_start (gpgme_ctx_t ctx, 
-                                const char *command,
-                                gpgme_assuan_data_cb_t data_cb,
-                                void *data_cb_value,
-                                gpgme_assuan_inquire_cb_t inq_cb,
-                                void *inq_cb_value,
-                                gpgme_assuan_status_cb_t status_cb,
-                                void *status_cb_value)
+				const char *command,
+				gpgme_assuan_data_cb_t data_cb,
+				void *data_cb_value,
+				gpgme_assuan_inquire_cb_t inq_cb,
+				void *inq_cb_value,
+				gpgme_assuan_status_cb_t status_cb,
+				void *status_cb_value)
 {
   return opassuan_start (ctx, 0, command, 
                          data_cb, data_cb_value,
@@ -136,14 +75,15 @@ gpgme_op_assuan_transact_start (gpgme_ctx_t ctx,
 
 /* XXXX.  This is the synchronous variant. */
 gpgme_error_t
-gpgme_op_assuan_transact (gpgme_ctx_t ctx,
-                          const char *command,
-                          gpgme_assuan_data_cb_t data_cb,
-                          void *data_cb_value,
-                          gpgme_assuan_inquire_cb_t inq_cb,
-                          void *inq_cb_value,
-                          gpgme_assuan_status_cb_t status_cb,
-                          void *status_cb_value)
+gpgme_op_assuan_transact_ext (gpgme_ctx_t ctx,
+			      const char *command,
+			      gpgme_assuan_data_cb_t data_cb,
+			      void *data_cb_value,
+			      gpgme_assuan_inquire_cb_t inq_cb,
+			      void *inq_cb_value,
+			      gpgme_assuan_status_cb_t status_cb,
+			      void *status_cb_value,
+			      gpgme_error_t *op_err)
 {
   gpgme_error_t err;
 
@@ -152,7 +92,70 @@ gpgme_op_assuan_transact (gpgme_ctx_t ctx,
                         inq_cb, inq_cb_value,
                         status_cb, status_cb_value);
   if (!err)
-    err = _gpgme_wait_one (ctx);
+    err = _gpgme_wait_one_ext (ctx, op_err);
   return err;
 }
 
+
+
+
+/* Compatibility code for old interface.  */
+
+/* Evil hack breaking abstractions for the purpose of localizing our
+   other hack.  This is copied from engine.c.  */
+struct engine
+{
+  struct engine_ops *ops;
+  void *engine;
+};
+
+typedef struct
+{
+  struct _gpgme_op_assuan_result result;
+} *op_data_t;
+
+gpg_error_t _gpgme_engine_assuan_last_op_err (void *engine);
+
+gpgme_assuan_result_t
+gpgme_op_assuan_result (gpgme_ctx_t ctx)
+{
+  gpgme_error_t err;
+  void *hook;
+  op_data_t opd;
+
+  err = _gpgme_op_data_lookup (ctx, OPDATA_ASSUAN, &hook, -1, NULL);
+  opd = hook;
+  /* Check in case this function is used without having run a command
+     before.  */
+  if (err || !opd)
+    return NULL;
+
+  /* All of this is a hack for the old style interface.  The new style
+     interface returns op errors directly.  */
+  opd->result.err = _gpgme_engine_assuan_last_op_err (ctx->engine->engine);
+
+  return &opd->result;
+}
+
+
+gpgme_error_t
+gpgme_op_assuan_transact (gpgme_ctx_t ctx,
+			  const char *command,
+			  gpgme_assuan_data_cb_t data_cb,
+			  void *data_cb_value,
+			  gpgme_assuan_inquire_cb_t inq_cb,
+			  void *inq_cb_value,
+			  gpgme_assuan_status_cb_t status_cb,
+			  void *status_cb_value)
+{
+  gpgme_error_t op_err;
+  gpgme_error_t err;
+
+  /* Users of the old-style session based interfaces need to look at
+     the result structure.  */
+  gpgme_op_assuan_transact_ext (ctx, command, data_cb, data_cb_value,
+				inq_cb, inq_cb_value,
+				status_cb, status_cb_value, &op_err);
+
+  return err;
+}