* keydctl.c - A simple program to control a running keyd instance
*
* Copyright 2011 Jonathan McDowell <noodles@earth.li>
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include <errno.h>
#include "version.h"
/* HACK: We need to stop onak-conf.o requiring this. */
-void *DBFUNCS = NULL;
+void *DBINIT = NULL;
static int keyd_fd = -1;
static int verbose = 0;
printf("Command statistics:\n");
printf(" Version: %d\n",
stats.command_stats[KEYD_CMD_VERSION]);
- printf(" Get key: %d\n", stats.command_stats[KEYD_CMD_GET]);
+ printf(" Get key by ID: %d\n",
+ stats.command_stats[KEYD_CMD_GET_ID]);
+ printf(" Get key by FP: %d\n",
+ stats.command_stats[KEYD_CMD_GET_FP]);
printf(" Store key: %d\n",
stats.command_stats[KEYD_CMD_STORE]);
printf(" Delete key: %d\n",
stats.command_stats[KEYD_CMD_DELETE]);
printf(" Search key: %d\n",
- stats.command_stats[KEYD_CMD_GETTEXT]);
+ stats.command_stats[KEYD_CMD_GET_TEXT]);
printf(" Get full keyid: %d\n",
stats.command_stats[KEYD_CMD_GETFULLKEYID]);
printf(" Iterate all keys: %d\n",
{
puts("keydctl " ONAK_VERSION " - control an onak keyd instance.\n");
puts("Usage:\n");
- puts("\tonak [options] <command> <parameters>\n");
+ puts("\tkeydctl [options] <command> <parameters>\n");
puts("\tCommands:\n");
puts("\tcheck - check if keyd is running");
puts("\tquit - request that keyd cleanly shuts down");
configfile = NULL;
if ((argc - optind) < 1) {
+ cleanupconfig();
usage();
} else if (!strcmp("check", argv[optind])) {
/* Just do the connect and close quietly */
keyd_do_command(KEYD_CMD_QUIT, NULL, 0);
keyd_close();
} else {
+ cleanupconfig();
usage();
}
+ cleanupconfig();
exit(EXIT_SUCCESS);
}