From: Werner Koch <wk@gnupg.org>
Date: Wed, 4 Nov 2009 10:43:42 +0000 (+0000)
Subject: Adjust for changed assuan_register_command.
X-Git-Tag: gpgme-1.3.0~33
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=574086bf19095c0e73c5360564ebe8eeb9e5e78b;p=gpgme.git

Adjust for changed assuan_register_command.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 9f6bb00..9b9df7c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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>
 
 	* gpgme.h.in (GPGME_PROTOCOL_UISERVER): New.
diff --git a/src/gpgme-tool.c b/src/gpgme-tool.c
index 7a41be0..307558a 100644
--- a/src/gpgme-tool.c
+++ b/src/gpgme-tool.c
@@ -1174,7 +1174,10 @@ reset_notify (assuan_context_t ctx, char *line)
   return 0;
 }
 
-
+static const char hlp_version[] = 
+  "VERSION [<string>]\n"
+  "\n"
+  "Call the function gpgme_check_version.";
 static gpg_error_t
 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
 cmd_protocol (assuan_context_t ctx, char *line)
 {
@@ -1911,13 +1918,14 @@ register_commands (assuan_context_t ctx)
   gpg_error_t err;
   static struct {
     const char *name;
-    gpg_error_t (*handler)(assuan_context_t, char *line);
+    assuan_handler_t handler;
+    const char * const help;
   } table[] = {
     // RESET, BYE are implicit.
-    { "VERSION", cmd_version },
+    { "VERSION", cmd_version, hlp_version },
     // TODO: Set engine info.
     { "ENGINE", cmd_engine },
-    { "PROTOCOL", cmd_protocol },
+    { "PROTOCOL", cmd_protocol, hlp_protocol },
     { "ARMOR", cmd_armor },
     { "TEXTMODE", cmd_textmode },
     { "INCLUDE_CERTS", cmd_include_certs },
@@ -1964,7 +1972,8 @@ register_commands (assuan_context_t ctx)
 
   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)
         return err;
     }