Make the p11-kit tool have distinct commands

 * Change the -l argument into the list-modules command.
 * Add proper functions for printing usage
 * Support for external commands in the path or /usr/share/p11-kit

1 files changed, 56 insertions, 0 deletions

diff --git a/tools/tool.h b/tools/tool.h
new file mode 100644
index 0000000..709e668
--- /dev/null
+++ b/tools/tool.h
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2013 Red Hat Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *     * Redistributions of source code must retain the above
+ *       copyright notice, this list of conditions and the
+ *       following disclaimer.
+ *     * Redistributions in binary form must reproduce the
+ *       above copyright notice, this list of conditions and
+ *       the following disclaimer in the documentation and/or
+ *       other materials provided with the distribution.
+ *     * The names of contributors to this software may not be
+ *       used to endorse or promote products derived from this
+ *       software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+ * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ *
+ * Author: Stef Walter <stefw@collabora.co.uk>
+ */
+
+#ifndef P11_TOOL_H_
+#define P11_TOOL_H_
+
+#include <getopt.h>
+
+typedef struct  {
+	int option;
+	const char *text;
+	const char *arg;
+} p11_tool_desc;
+
+int        p11_tool_getopt            (int argc,
+                                       char *argv[],
+                                       const struct option *longopts);
+
+void       p11_tool_usage             (const p11_tool_desc *usages,
+                                       const struct option *longopts);
+
+int        p11_tool_list_modules      (int argc,
+                                       char *argv[]);
+
+#endif /* P11_TOOL_H_ */