aboutsummaryrefslogtreecommitdiffstats
path: root/agent
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2012-02-07 11:46:32 +0000
committerWerner Koch <[email protected]>2012-02-07 11:46:32 +0000
commite78585cd0f553d92f332e33810ab636758bc88a2 (patch)
treea2685ce99e3f76607c0d5cfe0b05398e3dcd330e /agent
parentAdd an item to NEWS. (diff)
downloadgnupg-e78585cd0f553d92f332e33810ab636758bc88a2.tar.gz
gnupg-e78585cd0f553d92f332e33810ab636758bc88a2.zip
agent: New function agent_print_status.
* common/asshelp2.c (vprint_assuan_status): New. (print_assuan_status): Re-implement using above func. * agent/command.c (agent_print_status): New.
Diffstat (limited to 'agent')
-rw-r--r--agent/agent.h3
-rw-r--r--agent/command.c16
2 files changed, 19 insertions, 0 deletions
diff --git a/agent/agent.h b/agent/agent.h
index 4f4e477a6..d345c66a1 100644
--- a/agent/agent.h
+++ b/agent/agent.h
@@ -288,6 +288,9 @@ int map_pk_openpgp_to_gcry (int openpgp_algo);
gpg_error_t agent_inq_pinentry_launched (ctrl_t ctrl, unsigned long pid);
gpg_error_t agent_write_status (ctrl_t ctrl, const char *keyword, ...)
GNUPG_GCC_A_SENTINEL(0);
+gpg_error_t agent_print_status (ctrl_t ctrl, const char *keyword,
+ const char *format, ...)
+ JNLIB_GCC_A_PRINTF(3,4);
void bump_key_eventcounter (void);
void bump_card_eventcounter (void);
void start_command_handler (ctrl_t, gnupg_fd_t, gnupg_fd_t);
diff --git a/agent/command.c b/agent/command.c
index a369c4fb7..6fd3f65ff 100644
--- a/agent/command.c
+++ b/agent/command.c
@@ -413,6 +413,22 @@ agent_write_status (ctrl_t ctrl, const char *keyword, ...)
}
+/* This function is similar to print_assuan_status but takes a CTRL
+ arg instead of an assuan context as first argument. */
+gpg_error_t
+agent_print_status (ctrl_t ctrl, const char *keyword, const char *format, ...)
+{
+ gpg_error_t err;
+ va_list arg_ptr;
+ assuan_context_t ctx = ctrl->server_local->assuan_ctx;
+
+ va_start (arg_ptr, format);
+ err = vprint_assuan_status (ctx, keyword, format, arg_ptr);
+ va_end (arg_ptr);
+ return err;
+}
+
+
/* Helper to notify the client about a launched Pinentry. Because
that might disturb some older clients, this is only done if enabled
via an option. Returns an gpg error code. */