giomba
/
opensc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

pkcs11-tool: move --module to the first position in help text and make it mandatory. 

git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5447 c6295689-39f2-0310-b995-f0e70906c6a9
This commit is contained in:
martin 2011-05-17 13:27:09 +00:00
parent ce79a61d30
commit 18baf42780
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/tools/pkcs11-tool.c
View File

@ -76,6 +76,7 @@ enum {
};
static const struct option options[] = {
{ "module", 1, NULL, OPT_MODULE },
{ "show-info", 0, NULL, 'I' },
{ "list-slots", 0, NULL, 'L' },
{ "list-token-slots", 0, NULL, 'T' },
@ -113,7 +114,6 @@ static const struct option options[] = {
{ "attr-from", 1, NULL, OPT_ATTR_FROM },
{ "input-file", 1, NULL, 'i' },
{ "output-file", 1, NULL, 'o' },
{ "module", 1, NULL, OPT_MODULE },
{ "test", 0, NULL, 't' },
{ "test-hotplug", 0, NULL, OPT_TEST_HOTPLUG },
@ -125,6 +125,7 @@ static const struct option options[] = {
};
static const char *option_help[] = {
"Specify the module to load (mandatory)",
"Show global token information",
"List available slots",
"List slots with tokens",
@ -162,7 +163,6 @@ static const char *option_help[] = {
"Use <arg> to create some attributes when writing an object",
"Specify the input file",
"Specify the output file",
"Specify the module to load",
"Test (best used with the --login or --pin option)",
"Test hotplug capabilities (C_GetSlotList + C_WaitForSlotEvent)",
@ -544,6 +544,10 @@ int main(int argc, char * argv[])
util_print_usage_and_die(app_name, options, option_help);
}
}
if (opt_module == NULL)
util_print_usage_and_die(app_name, options, option_help);
if (action_count == 0)
util_print_usage_and_die(app_name, options, option_help);