Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add --provider option to p11-kit commands #611

Merged
merged 5 commits into from
Jan 2, 2024
Merged

Add --provider option to p11-kit commands #611

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ef614be
common: Rename tool.h to options.h
ueno Dec 28, 2023
2653471
p11-kit tool: Factor out common logic
ueno Dec 28, 2023
4ce17ab
doc: Fix DocBook validation errors
ueno Dec 31, 2023
2fd9f15
doc: Make option requirement clear for p11-kit subcommands
ueno Dec 29, 2023
ef42b99
p11-kit tool: Support --provider option
ueno Dec 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion common/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions common/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ if get_option('test')
endif

libp11_tool_sources = [
'print.c',
'tool.c'
'options.c',
'print.c'
]

if host_system != 'windows'
Expand Down
2 changes: 1 addition & 1 deletion common/tool.c → common/options.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
#define _(x) (x)
#endif

#include "tool.h"
#include "options.h"

static char
short_option (int opt)
Expand Down
6 changes: 3 additions & 3 deletions common/tool.h → common/options.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down Expand Up @@ -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_ */
Loading
Loading