Adjust for assuan_register_command change.

10 files changed, 39 insertions, 6 deletions

diff --git a/agent/ChangeLog b/agent/ChangeLog
index 1d457cc95..9851226bc 100644
--- a/agent/ChangeLog
+++ b/agent/ChangeLog
@@ -1,3 +1,8 @@
+2009-11-04  Werner Koch  <[email protected]>
+
+	* command.c (register_commands): Add NULL arg to
+	assuan_register_command.
+
 2009-11-02  Marcus Brinkmann  <[email protected]>
 
 	* command.c (reset_notify): Take LINE arg and return error.
diff --git a/agent/command.c b/agent/command.c
index 17737ba8a..4b2d70248 100644
--- a/agent/command.c
+++ b/agent/command.c
@@ -1865,7 +1865,7 @@ register_commands (assuan_context_t ctx)
 
   for (i=0; table[i].name; i++)
     {
-      rc = assuan_register_command (ctx, table[i].name, table[i].handler);
+      rc = assuan_register_command (ctx, table[i].name, table[i].handler, NULL);
       if (rc)
         return rc;
     } 
diff --git a/g10/ChangeLog b/g10/ChangeLog
index b2ea64015..55048f200 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,8 @@
+2009-11-04  Werner Koch  <[email protected]>
+
+	* server.c (register_commands): Add NULL arg to
+	assuan_register_command.
+
 2009-11-02  Marcus Brinkmann  <[email protected]>
 
 	* server.c (reset_notify, input_notify, output_notify): Update to
diff --git a/g10/server.c b/g10/server.c
index bdd28f0f2..8b5694128 100644
--- a/g10/server.c
+++ b/g10/server.c
@@ -634,7 +634,7 @@ register_commands (assuan_context_t ctx)
 
   for (i=0; table[i].name; i++)
     {
-      rc = assuan_register_command (ctx, table[i].name, table[i].handler);
+      rc = assuan_register_command (ctx, table[i].name, table[i].handler, NULL);
       if (rc)
         return rc;
     } 
diff --git a/g13/ChangeLog b/g13/ChangeLog
index 615fb1c1c..cc51472cc 100644
--- a/g13/ChangeLog
+++ b/g13/ChangeLog
@@ -1,2 +1,4 @@
+2009-11-04  Werner Koch  <[email protected]>
+
 	Under initial development - no need for a ChangeLog.
 
diff --git a/g13/server.c b/g13/server.c
index 071e0326c..fd18b90cd 100644
--- a/g13/server.c
+++ b/g13/server.c
@@ -212,6 +212,15 @@ reset_notify (assuan_context_t ctx, char *line)
    further commands.  The filename is reset with the RESET command,
    another OPEN or the CREATE command.
  */
+static const char hlp_open[] = 
+  "OPEN [<options>] <filename>\n"
+  "\n"
+  "Open the container FILENAME.  FILENAME must be percent-plus\n"
+  "escaped.  A quick check to see whether this is a suitable G13\n"
+  "container file is done.  However no cryptographic check or any\n"
+  "other check is done.  This command is used to define the target for\n"
+  "further commands.  The filename is reset with the RESET command,\n"
+  "another OPEN or the CREATE command.";
 static gpg_error_t
 cmd_open (assuan_context_t ctx, char *line)
 {
@@ -543,8 +552,9 @@ register_commands (assuan_context_t ctx)
   static struct {
     const char *name;
     assuan_handler_t handler;
+    const char * const help;
   } table[] =  {
-    { "OPEN",          cmd_open },
+    { "OPEN",          cmd_open, hlp_open },
     { "MOUNT",         cmd_mount },
     { "UMOUNT",        cmd_umount },
     { "RECIPIENT",     cmd_recipient },
@@ -560,7 +570,8 @@ register_commands (assuan_context_t ctx)
 
   for (i=0; table[i].name; i++)
     {
-      err = assuan_register_command (ctx, table[i].name, table[i].handler);
+      err = assuan_register_command (ctx, table[i].name, table[i].handler,
+                                     table[i].help);
       if (err)
         return err;
     } 
diff --git a/scd/ChangeLog b/scd/ChangeLog
index db19feece..5aeabe019 100644
--- a/scd/ChangeLog
+++ b/scd/ChangeLog
@@ -1,3 +1,8 @@
+2009-11-04  Werner Koch  <[email protected]>
+
+	* command.c (register_commands): Add NULL arg to
+	assuan_register_command.
+
 2009-11-02  Marcus Brinkmann  <[email protected]>
 
 	* command.c (reset_notify): Take LINE arg and return error.
diff --git a/scd/command.c b/scd/command.c
index f12f11acf..46e0e42db 100644
--- a/scd/command.c
+++ b/scd/command.c
@@ -1879,7 +1879,7 @@ register_commands (assuan_context_t ctx)
 
   for (i=0; table[i].name; i++)
     {
-      rc = assuan_register_command (ctx, table[i].name, table[i].handler);
+      rc = assuan_register_command (ctx, table[i].name, table[i].handler, NULL);
       if (rc)
         return rc;
     } 
diff --git a/sm/ChangeLog b/sm/ChangeLog
index 7781d503c..cfbb944c1 100644
--- a/sm/ChangeLog
+++ b/sm/ChangeLog
@@ -1,3 +1,8 @@
+2009-11-04  Werner Koch  <[email protected]>
+
+	* server.c (register_commands): Add NULL arg to
+	assuan_register_command.
+
 2009-11-02  Marcus Brinkmann  <[email protected]>
 
 	* server.c (reset_notify, input_notify, output_notify): Update to
diff --git a/sm/server.c b/sm/server.c
index aaa4fd021..1f12a166c 100644
--- a/sm/server.c
+++ b/sm/server.c
@@ -1132,7 +1132,7 @@ register_commands (assuan_context_t ctx)
 
   for (i=0; table[i].name; i++)
     {
-      rc = assuan_register_command (ctx, table[i].name, table[i].handler);
+      rc = assuan_register_command (ctx, table[i].name, table[i].handler, NULL);
       if (rc)
         return rc;
     }