[svn] GnuPG - r5189 - in trunk: agent g10 g13 scd sm
svn author wk
cvs at cvs.gnupg.org
Wed Nov 4 11:06:39 CET 2009
Author: wk
Date: 2009-11-04 11:06:38 +0100 (Wed, 04 Nov 2009)
New Revision: 5189
Modified:
trunk/agent/ChangeLog
trunk/agent/command.c
trunk/g10/ChangeLog
trunk/g10/server.c
trunk/g13/ChangeLog
trunk/g13/server.c
trunk/scd/ChangeLog
trunk/scd/command.c
trunk/sm/ChangeLog
trunk/sm/server.c
Log:
Adjust for assuan_register_command change.
Modified: trunk/agent/ChangeLog
===================================================================
--- trunk/agent/ChangeLog 2009-11-02 17:47:11 UTC (rev 5188)
+++ trunk/agent/ChangeLog 2009-11-04 10:06:38 UTC (rev 5189)
@@ -1,3 +1,8 @@
+2009-11-04 Werner Koch <wk at g10code.com>
+
+ * command.c (register_commands): Add NULL arg to
+ assuan_register_command.
+
2009-11-02 Marcus Brinkmann <marcus at g10code.de>
* command.c (reset_notify): Take LINE arg and return error.
Modified: trunk/g10/ChangeLog
===================================================================
--- trunk/g10/ChangeLog 2009-11-02 17:47:11 UTC (rev 5188)
+++ trunk/g10/ChangeLog 2009-11-04 10:06:38 UTC (rev 5189)
@@ -1,3 +1,8 @@
+2009-11-04 Werner Koch <wk at g10code.com>
+
+ * server.c (register_commands): Add NULL arg to
+ assuan_register_command.
+
2009-11-02 Marcus Brinkmann <marcus at g10code.de>
* server.c (reset_notify, input_notify, output_notify): Update to
Modified: trunk/g13/ChangeLog
===================================================================
--- trunk/g13/ChangeLog 2009-11-02 17:47:11 UTC (rev 5188)
+++ trunk/g13/ChangeLog 2009-11-04 10:06:38 UTC (rev 5189)
@@ -1,2 +1,4 @@
+2009-11-04 Werner Koch <wk at g10code.com>
+
Under initial development - no need for a ChangeLog.
Modified: trunk/scd/ChangeLog
===================================================================
--- trunk/scd/ChangeLog 2009-11-02 17:47:11 UTC (rev 5188)
+++ trunk/scd/ChangeLog 2009-11-04 10:06:38 UTC (rev 5189)
@@ -1,3 +1,8 @@
+2009-11-04 Werner Koch <wk at g10code.com>
+
+ * command.c (register_commands): Add NULL arg to
+ assuan_register_command.
+
2009-11-02 Marcus Brinkmann <marcus at g10code.de>
* command.c (reset_notify): Take LINE arg and return error.
Modified: trunk/sm/ChangeLog
===================================================================
--- trunk/sm/ChangeLog 2009-11-02 17:47:11 UTC (rev 5188)
+++ trunk/sm/ChangeLog 2009-11-04 10:06:38 UTC (rev 5189)
@@ -1,3 +1,8 @@
+2009-11-04 Werner Koch <wk at g10code.com>
+
+ * server.c (register_commands): Add NULL arg to
+ assuan_register_command.
+
2009-11-02 Marcus Brinkmann <marcus at g10code.de>
* server.c (reset_notify, input_notify, output_notify): Update to
Modified: trunk/agent/command.c
===================================================================
--- trunk/agent/command.c 2009-11-02 17:47:11 UTC (rev 5188)
+++ trunk/agent/command.c 2009-11-04 10:06:38 UTC (rev 5189)
@@ -1865,7 +1865,7 @@
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;
}
Modified: trunk/g10/server.c
===================================================================
--- trunk/g10/server.c 2009-11-02 17:47:11 UTC (rev 5188)
+++ trunk/g10/server.c 2009-11-04 10:06:38 UTC (rev 5189)
@@ -634,7 +634,7 @@
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;
}
Modified: trunk/g13/server.c
===================================================================
--- trunk/g13/server.c 2009-11-02 17:47:11 UTC (rev 5188)
+++ trunk/g13/server.c 2009-11-04 10:06:38 UTC (rev 5189)
@@ -212,6 +212,15 @@
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 @@
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 @@
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;
}
Modified: trunk/scd/command.c
===================================================================
--- trunk/scd/command.c 2009-11-02 17:47:11 UTC (rev 5188)
+++ trunk/scd/command.c 2009-11-04 10:06:38 UTC (rev 5189)
@@ -1879,7 +1879,7 @@
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;
}
Modified: trunk/sm/server.c
===================================================================
--- trunk/sm/server.c 2009-11-02 17:47:11 UTC (rev 5188)
+++ trunk/sm/server.c 2009-11-04 10:06:38 UTC (rev 5189)
@@ -1132,7 +1132,7 @@
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;
}
More information about the Gnupg-commits
mailing list