aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2001-11-27 17:39:09 +0000
committerWerner Koch <[email protected]>2001-11-27 17:39:09 +0000
commit5a6a2ca2482bafe73a3ff4b8db584c3a8faa4710 (patch)
treee0075b142ba6e953f928f6eecfce8be53628ff33
parent* gpgsm.c: New option --agent-program (diff)
downloadgnupg-5a6a2ca2482bafe73a3ff4b8db584c3a8faa4710.tar.gz
gnupg-5a6a2ca2482bafe73a3ff4b8db584c3a8faa4710.zip
* assuan-handler.c (assuan_register_input_notify): New.
(assuan_register_output_notify): New.
-rw-r--r--assuan/ChangeLog5
-rw-r--r--assuan/assuan-defs.h4
-rw-r--r--assuan/assuan-handler.c24
-rw-r--r--assuan/assuan.h4
4 files changed, 36 insertions, 1 deletions
diff --git a/assuan/ChangeLog b/assuan/ChangeLog
index d1cc56010..dc7403a4a 100644
--- a/assuan/ChangeLog
+++ b/assuan/ChangeLog
@@ -1,3 +1,8 @@
+2001-11-27 Werner Koch <[email protected]>
+
+ * assuan-handler.c (assuan_register_input_notify): New.
+ (assuan_register_output_notify): New.
+
2001-11-26 Werner Koch <[email protected]>
* assuan.h: Added more status codes.
diff --git a/assuan/assuan-defs.h b/assuan/assuan-defs.h
index 2bbc9b8ac..2b64bf1cb 100644
--- a/assuan/assuan-defs.h
+++ b/assuan/assuan-defs.h
@@ -70,8 +70,10 @@ struct assuan_context_s {
size_t cmdtbl_size; /* allocated size of table */
void (*bye_notify_fnc)(ASSUAN_CONTEXT);
- void (*cancel_notify_fnc)(ASSUAN_CONTEXT);
void (*reset_notify_fnc)(ASSUAN_CONTEXT);
+ void (*cancel_notify_fnc)(ASSUAN_CONTEXT);
+ void (*input_notify_fnc)(ASSUAN_CONTEXT, const char *);
+ void (*output_notify_fnc)(ASSUAN_CONTEXT, const char *);
int input_fd; /* set by INPUT command */
diff --git a/assuan/assuan-handler.c b/assuan/assuan-handler.c
index 524a8cf96..13f1f9d3e 100644
--- a/assuan/assuan-handler.c
+++ b/assuan/assuan-handler.c
@@ -107,6 +107,8 @@ std_handler_input (ASSUAN_CONTEXT ctx, char *line)
if (rc)
return rc;
ctx->input_fd = fd;
+ if (ctx->input_notify_fnc)
+ ctx->input_notify_fnc (ctx, line);
return 0;
}
@@ -120,6 +122,8 @@ std_handler_output (ASSUAN_CONTEXT ctx, char *line)
if (rc)
return rc;
ctx->output_fd = fd;
+ if (ctx->output_notify_fnc)
+ ctx->output_notify_fnc (ctx, line);
return 0;
}
@@ -253,6 +257,26 @@ assuan_register_cancel_notify (ASSUAN_CONTEXT ctx, void (*fnc)(ASSUAN_CONTEXT))
return 0;
}
+int
+assuan_register_input_notify (ASSUAN_CONTEXT ctx,
+ void (*fnc)(ASSUAN_CONTEXT, const char *))
+{
+ if (!ctx)
+ return ASSUAN_Invalid_Value;
+ ctx->input_notify_fnc = fnc;
+ return 0;
+}
+
+int
+assuan_register_output_notify (ASSUAN_CONTEXT ctx,
+ void (*fnc)(ASSUAN_CONTEXT, const char *))
+{
+ if (!ctx)
+ return ASSUAN_Invalid_Value;
+ ctx->output_notify_fnc = fnc;
+ return 0;
+}
+
/* Helper to register the standards commands */
int
diff --git a/assuan/assuan.h b/assuan/assuan.h
index 66f546aee..10eb3a531 100644
--- a/assuan/assuan.h
+++ b/assuan/assuan.h
@@ -104,6 +104,10 @@ int assuan_register_reset_notify (ASSUAN_CONTEXT ctx,
void (*fnc)(ASSUAN_CONTEXT));
int assuan_register_cancel_notify (ASSUAN_CONTEXT ctx,
void (*fnc)(ASSUAN_CONTEXT));
+int assuan_register_input_notify (ASSUAN_CONTEXT ctx,
+ void (*fnc)(ASSUAN_CONTEXT, const char *));
+int assuan_register_output_notify (ASSUAN_CONTEXT ctx,
+ void (*fnc)(ASSUAN_CONTEXT, const char *));
int assuan_process (ASSUAN_CONTEXT ctx);
int assuan_process_next (ASSUAN_CONTEXT ctx);
int assuan_get_active_fds (ASSUAN_CONTEXT ctx, int what,