GpgFrontend/gpgme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adjust for changed assuan_register_command.

Browse Source
This commit is contained in:
Werner Koch 2009-11-04 10:43:42 +00:00
parent fc0fd88d7f
commit 574086bf19
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ChangeLog
View File

@ -1,3 +1,7 @@
2009-11-04 Werner Koch <wk@g10code.com>
* gpgme-tool.c (register_commands): Add HELP feature.
2009-11-03 Werner Koch <wk@g10code.com> 2009-11-03 Werner Koch <wk@g10code.com>
* gpgme.h.in (GPGME_PROTOCOL_UISERVER): New. * gpgme.h.in (GPGME_PROTOCOL_UISERVER): New.

19
src/gpgme-tool.c
View File

@ -1174,7 +1174,10 @@ reset_notify (assuan_context_t ctx, char *line)
return 0; return 0;
} }
static const char hlp_version[] =
"VERSION [<string>]\n"
"\n"
"Call the function gpgme_check_version.";
static gpg_error_t static gpg_error_t
cmd_version (assuan_context_t ctx, char *line) cmd_version (assuan_context_t ctx, char *line)
{ {
@ -1199,6 +1202,10 @@ cmd_engine (assuan_context_t ctx, char *line)
} }
static const char hlp_protocol[] =
"PROTOCOL [<name>]\n"
"\n"
"With NAME, set the protocol. Without return the current protocol.";
static gpg_error_t static gpg_error_t
cmd_protocol (assuan_context_t ctx, char *line) cmd_protocol (assuan_context_t ctx, char *line)
{ {
@ -1911,13 +1918,14 @@ register_commands (assuan_context_t ctx)
gpg_error_t err; gpg_error_t err;
static struct { static struct {
const char *name; const char *name;
gpg_error_t (*handler)(assuan_context_t, char *line); assuan_handler_t handler;
const char * const help;
} table[] = { } table[] = {
// RESET, BYE are implicit. // RESET, BYE are implicit.
{ "VERSION", cmd_version }, { "VERSION", cmd_version, hlp_version },
// TODO: Set engine info. // TODO: Set engine info.
{ "ENGINE", cmd_engine }, { "ENGINE", cmd_engine },
{ "PROTOCOL", cmd_protocol }, { "PROTOCOL", cmd_protocol, hlp_protocol },
{ "ARMOR", cmd_armor }, { "ARMOR", cmd_armor },
{ "TEXTMODE", cmd_textmode }, { "TEXTMODE", cmd_textmode },
{ "INCLUDE_CERTS", cmd_include_certs }, { "INCLUDE_CERTS", cmd_include_certs },
@ -1964,7 +1972,8 @@ register_commands (assuan_context_t ctx)
for (idx = 0; table[idx].name; idx++) for (idx = 0; table[idx].name; idx++)
{ {
err = assuan_register_command (ctx, table[idx].name, table[idx].handler); err = assuan_register_command (ctx, table[idx].name, table[idx].handler,
table[idx].help);
if (err) if (err)
return err; return err;
} }