common: Rename tool.h to options.h

As the interface provided by tool.h is sorely for command-line option parsing, options.h would be a better name. This also allows consumers (the p11-kit and trust commands) to factor out shared utilities under the name of p11-kit/tool.[ch] or trust/tool.[ch]. Signed-off-by: Daiki Ueno <[email protected]>
ueno · Jan 2, 2024 · a50af66 · a50af66
1 parent 81715a2
commit a50af66
Show file tree

Hide file tree

Showing 27 changed files with 29 additions and 29 deletions.
diff --git a/common/Makefile.am b/common/Makefile.am
@@ -47,8 +47,8 @@ libp11_test_la_SOURCES = \
 	$(NULL)
 
 libp11_tool_la_SOURCES = \
+	common/options.c common/options.h \
 	common/print.c common/print.h \
-	common/tool.c common/tool.h \
 	$(NULL)
 
 if !OS_WIN32

diff --git a/common/meson.build b/common/meson.build
@@ -52,8 +52,8 @@ if get_option('test')
 endif
 
 libp11_tool_sources = [
+  'options.c'
   'print.c',
-  'tool.c'
 ]
 
 if host_system != 'windows'

diff --git a/common/tool.c → common/options.c b/common/tool.c → common/options.c
@@ -59,7 +59,7 @@
 #define _(x) (x)
 #endif
 
-#include "tool.h"
+#include "options.h"
 
 static char
 short_option (int opt)

diff --git a/common/tool.h → common/options.h b/common/tool.h → common/options.h
@@ -32,8 +32,8 @@
  * Author: Stef Walter <[email protected]>
  */
 
-#ifndef P11_TOOL_H_
-#define P11_TOOL_H_
+#ifndef P11_OPTIONS_H_
+#define P11_OPTIONS_H_
 
 #include <getopt.h>
 
@@ -62,4 +62,4 @@ int        p11_tool_getopt            (int argc,
 void       p11_tool_usage             (const p11_tool_desc *usages,
                                        const struct option *longopts);
 
-#endif /* P11_TOOL_H_ */
+#endif /* P11_OPTIONS_H_ */
diff --git a/p11-kit/add-profile.c b/p11-kit/add-profile.c
@@ -41,7 +41,7 @@
 #include "debug.h"
 #include "iter.h"
 #include "message.h"
-#include "tool.h"
+#include "options.h"
 
 #ifdef OS_UNIX
 #include "tty.h"

diff --git a/p11-kit/delete-object.c b/p11-kit/delete-object.c
@@ -39,7 +39,7 @@
 #include "debug.h"
 #include "iter.h"
 #include "message.h"
-#include "tool.h"
+#include "options.h"
 
 #ifdef OS_UNIX
 #include "tty.h"

diff --git a/p11-kit/delete-profile.c b/p11-kit/delete-profile.c
@@ -41,7 +41,7 @@
 #include "debug.h"
 #include "iter.h"
 #include "message.h"
-#include "tool.h"
+#include "options.h"
 
 #ifdef OS_UNIX
 #include "tty.h"

diff --git a/p11-kit/export-object.c b/p11-kit/export-object.c
@@ -44,7 +44,7 @@
 #include "iter.h"
 #include "message.h"
 #include "pem.h"
-#include "tool.h"
+#include "options.h"
 
 #ifdef OS_UNIX
 #include "tty.h"

diff --git a/p11-kit/generate-keypair.c b/p11-kit/generate-keypair.c
@@ -41,7 +41,7 @@
 #include "debug.h"
 #include "iter.h"
 #include "message.h"
-#include "tool.h"
+#include "options.h"
 
 #ifdef OS_UNIX
 #include "tty.h"

diff --git a/p11-kit/import-object.c b/p11-kit/import-object.c
@@ -43,7 +43,7 @@
 #include "iter.h"
 #include "message.h"
 #include "pem.h"
-#include "tool.h"
+#include "options.h"
 
 #ifdef OS_UNIX
 #include "tty.h"

diff --git a/p11-kit/list-mechanisms.c b/p11-kit/list-mechanisms.c
@@ -43,7 +43,7 @@
 #include "message.h"
 #include "pkcs11.h"
 #include "print.h"
-#include "tool.h"
+#include "options.h"
 #include "uri.h"
 
 #include <assert.h>

diff --git a/p11-kit/list-objects.c b/p11-kit/list-objects.c
@@ -44,7 +44,7 @@
 #include "iter.h"
 #include "message.h"
 #include "print.h"
-#include "tool.h"
+#include "options.h"
 
 #ifdef OS_UNIX
 #include "tty.h"

diff --git a/p11-kit/list-profiles.c b/p11-kit/list-profiles.c
@@ -40,7 +40,7 @@
 #include "debug.h"
 #include "iter.h"
 #include "message.h"
-#include "tool.h"
+#include "options.h"
 
 #ifdef OS_UNIX
 #include "tty.h"

diff --git a/p11-kit/list-tokens.c b/p11-kit/list-tokens.c
@@ -39,7 +39,7 @@
 #include "iter.h"
 #include "message.h"
 #include "print.h"
-#include "tool.h"
+#include "options.h"
 
 #include <assert.h>
 #include <limits.h>

diff --git a/p11-kit/lists.c b/p11-kit/lists.c
@@ -50,7 +50,7 @@
 #include "message.h"
 #include "p11-kit.h"
 #include "print.h"
-#include "tool.h"
+#include "options.h"
 #include "uri.h"
 
 #ifdef ENABLE_NLS

diff --git a/p11-kit/p11-kit.c b/p11-kit/p11-kit.c
@@ -57,7 +57,7 @@
 #endif
 #define N_(x) (x)
 
-#include "tool.h"
+#include "options.h"
 
 int       p11_kit_list_modules     (int argc,
                                     char *argv[]);

diff --git a/p11-kit/print-config.c b/p11-kit/print-config.c
@@ -39,7 +39,7 @@
 #include "conf.h"
 #include "debug.h"
 #include "message.h"
-#include "tool.h"
+#include "options.h"
 
 #include <assert.h>
 #include <stdio.h>

diff --git a/p11-kit/remote.c b/p11-kit/remote.c
@@ -40,7 +40,7 @@
 #include "message.h"
 #include "p11-kit.h"
 #include "remote.h"
-#include "tool.h"
+#include "options.h"
 
 #include <assert.h>
 #include <errno.h>

diff --git a/p11-kit/server.c b/p11-kit/server.c
@@ -40,7 +40,7 @@
 #include "path.h"
 #include "p11-kit.h"
 #include "remote.h"
-#include "tool.h"
+#include "options.h"
 
 #include <assert.h>
 #include <errno.h>

diff --git a/po/POTFILES.in b/po/POTFILES.in
@@ -1,6 +1,6 @@
 # List of source files which contain translatable strings.
+common/options.c
 common/persist.c
-common/tool.c
 p11-kit/add-profile.c
 p11-kit/conf.c
 p11-kit/delete-object.c

diff --git a/subprojects/pkcs11-json b/subprojects/pkcs11-json
diff --git a/trust/anchor.c b/trust/anchor.c
@@ -43,7 +43,7 @@
 #include "extract.h"
 #include "message.h"
 #include "parser.h"
-#include "tool.h"
+#include "options.h"
 #include "pkcs11x.h"
 
 #include "p11-kit/iter.h"

diff --git a/trust/check-format.c b/trust/check-format.c
@@ -41,7 +41,7 @@
 #include "message.h"
 #include "persist.h"
 #include "print.h"
-#include "tool.h"
+#include "options.h"
 
 #include <assert.h>
 #include <errno.h>

diff --git a/trust/dump.c b/trust/dump.c
@@ -42,7 +42,7 @@
 #include "enumerate.h"
 #include "message.h"
 #include "persist.h"
-#include "tool.h"
+#include "options.h"
 #include "url.h"
 
 #include "p11-kit/iter.h"

diff --git a/trust/extract.c b/trust/extract.c
@@ -43,7 +43,7 @@
 #include "path.h"
 #include "pkcs11x.h"
 #include "save.h"
-#include "tool.h"
+#include "options.h"
 #include "digest.h"
 
 #include "p11-kit/iter.h"

diff --git a/trust/list.c b/trust/list.c
@@ -44,7 +44,7 @@
 #include "message.h"
 #include "pkcs11x.h"
 #include "print.h"
-#include "tool.h"
+#include "options.h"
 #include "url.h"
 
 #include "p11-kit/iter.h"

diff --git a/trust/trust.c b/trust/trust.c
@@ -45,7 +45,7 @@
 #include "debug.h"
 #include "message.h"
 #include "path.h"
-#include "tool.h"
+#include "options.h"
 
 #include <assert.h>
 #include <ctype.h>