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

Update gengetopt generated code with a new version to remove hardcoded paths

This commit is contained in:
Jakub Jelen 2020-03-02 18:22:36 +01:00 committed by Frank Morgner
parent 44bc324864
commit c3924859a9
12 changed files with 183 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/tools/egk-tool-cmdline.c
View File

@ -1,5 +1,5 @@
/*
File autogenerated by gengetopt version 2.22.6
File autogenerated by gengetopt version 2.23
generated with the following command:
/usr/bin/gengetopt --file-name=egk-tool-cmdline --output-dir=.
@ -27,7 +27,7 @@
const char *gengetopt_args_info_purpose = "";
const char *gengetopt_args_info_usage = "Usage: egk-tool [OPTIONS]...";
const char *gengetopt_args_info_usage = "Usage: egk-tool [OPTION]...";
const char *gengetopt_args_info_versiontext = "";
@ -122,19 +122,25 @@ cmdline_parser_print_version (void)
printf("\n%s\n", gengetopt_args_info_versiontext);
}
static void print_help_common(void) {
cmdline_parser_print_version ();
static void print_help_common(void)
{
size_t len_purpose = strlen(gengetopt_args_info_purpose);
size_t len_usage = strlen(gengetopt_args_info_usage);
if (strlen(gengetopt_args_info_purpose) > 0)
printf("\n%s\n", gengetopt_args_info_purpose);
if (len_usage > 0) {
printf("%s\n", gengetopt_args_info_usage);
}
if (len_purpose > 0) {
printf("%s\n", gengetopt_args_info_purpose);
}
if (strlen(gengetopt_args_info_usage) > 0)
printf("\n%s\n", gengetopt_args_info_usage);
if (len_usage || len_purpose) {
printf("\n");
}
printf("\n");
if (strlen(gengetopt_args_info_description) > 0)
printf("%s\n\n", gengetopt_args_info_description);
if (strlen(gengetopt_args_info_description) > 0) {
printf("%s\n\n", gengetopt_args_info_description);
}
}
void
@ -507,7 +513,8 @@ int update_arg(void *field, char **orig_field,
break;
};
FIX_UNUSED(stop_char);
/* store the original value */
switch(arg_type) {
case ARG_NO:
@ -546,10 +553,16 @@ cmdline_parser_internal (
package_name = argv[0];
/* TODO: Why is this here? It is not used anywhere. */
override = params->override;
FIX_UNUSED(override);
initialize = params->initialize;
check_required = params->check_required;
/* TODO: Why is this here? It is not used anywhere. */
check_ambiguity = params->check_ambiguity;
FIX_UNUSED(check_ambiguity);
if (initialize)
cmdline_parser_init (args_info);
@ -694,3 +707,4 @@ failure:
cmdline_parser_release (&local_args_info);
return (EXIT_FAILURE);
}
/* vim: set ft=c noet ts=8 sts=8 sw=8 tw=80 nojs spell : */

4
src/tools/egk-tool-cmdline.h
View File

@ -1,9 +1,9 @@
/** @file egk-tool-cmdline.h
* @brief The header file for the command line option parser
* generated by GNU Gengetopt version 2.22.6
* generated by GNU Gengetopt version 2.23
* http://www.gnu.org/software/gengetopt.
* DO NOT modify this file, since it can be overwritten
* @author GNU Gengetopt by Lorenzo Bettini */
* @author GNU Gengetopt */
#ifndef EGK_TOOL_CMDLINE_H
#define EGK_TOOL_CMDLINE_H

37
src/tools/goid-tool-cmdline.c
View File

@ -1,5 +1,5 @@
/*
File autogenerated by gengetopt version 2.22.6
File autogenerated by gengetopt version 2.23
generated with the following command:
/usr/bin/gengetopt --file-name=goid-tool-cmdline --output-dir=.
@ -27,7 +27,7 @@
const char *gengetopt_args_info_purpose = "";
const char *gengetopt_args_info_usage = "Usage: goid-tool [OPTIONS]...";
const char *gengetopt_args_info_usage = "Usage: goid-tool [OPTION]...";
const char *gengetopt_args_info_versiontext = "";
@ -231,19 +231,25 @@ cmdline_parser_print_version (void)
printf("\n%s\n", gengetopt_args_info_versiontext);
}
static void print_help_common(void) {
cmdline_parser_print_version ();
static void print_help_common(void)
{
size_t len_purpose = strlen(gengetopt_args_info_purpose);
size_t len_usage = strlen(gengetopt_args_info_usage);
if (strlen(gengetopt_args_info_purpose) > 0)
printf("\n%s\n", gengetopt_args_info_purpose);
if (len_usage > 0) {
printf("%s\n", gengetopt_args_info_usage);
}
if (len_purpose > 0) {
printf("%s\n", gengetopt_args_info_purpose);
}
if (strlen(gengetopt_args_info_usage) > 0)
printf("\n%s\n", gengetopt_args_info_usage);
if (len_usage || len_purpose) {
printf("\n");
}
printf("\n");
if (strlen(gengetopt_args_info_description) > 0)
printf("%s\n\n", gengetopt_args_info_description);
if (strlen(gengetopt_args_info_description) > 0) {
printf("%s\n\n", gengetopt_args_info_description);
}
}
void
@ -1142,10 +1148,16 @@ cmdline_parser_internal (
package_name = argv[0];
/* TODO: Why is this here? It is not used anywhere. */
override = params->override;
FIX_UNUSED(override);
initialize = params->initialize;
check_required = params->check_required;
/* TODO: Why is this here? It is not used anywhere. */
check_ambiguity = params->check_ambiguity;
FIX_UNUSED(check_ambiguity);
if (initialize)
cmdline_parser_init (args_info);
@ -1634,3 +1646,4 @@ failure:
cmdline_parser_release (&local_args_info);
return (EXIT_FAILURE);
}
/* vim: set ft=c noet ts=8 sts=8 sw=8 tw=80 nojs spell : */

4
src/tools/goid-tool-cmdline.h
View File

@ -1,9 +1,9 @@
/** @file goid-tool-cmdline.h
* @brief The header file for the command line option parser
* generated by GNU Gengetopt version 2.22.6
* generated by GNU Gengetopt version 2.23
* http://www.gnu.org/software/gengetopt.
* DO NOT modify this file, since it can be overwritten
* @author GNU Gengetopt by Lorenzo Bettini */
* @author GNU Gengetopt */
#ifndef GOID_TOOL_CMDLINE_H
#define GOID_TOOL_CMDLINE_H

52
src/tools/npa-tool-cmdline.c
View File

@ -1,5 +1,5 @@
/*
File autogenerated by gengetopt version 2.22.6
File autogenerated by gengetopt version 2.23
generated with the following command:
/usr/bin/gengetopt --file-name=npa-tool-cmdline --output-dir=.
@ -27,7 +27,7 @@
const char *gengetopt_args_info_purpose = "";
const char *gengetopt_args_info_usage = "Usage: npa-tool [OPTIONS]...";
const char *gengetopt_args_info_usage = "Usage: npa-tool [OPTION]...";
const char *gengetopt_args_info_versiontext = "";
@ -54,8 +54,8 @@ const char *gengetopt_args_info_help[] = {
" --chat=HEX_STRING Card holder authorization template to use\n (default is terminal's CHAT). Use\n 7F4C0E060904007F000703010203530103 to trigger\n EAC on the CAT-C (Komfortleser).",
" -A, --auxiliary-data=HEX_STRING\n Terminal's auxiliary data (default is\n determined by verification of validity, age\n and community ID).",
" -P, --private-key=FILENAME Terminal's private key",
" --cvc-dir=DIRECTORY Where to look for the CVCA's certificate\n (default=`/home/fm/.local/etc/eac/cvc')",
" --x509-dir=DIRECTORY Where to look for the CSCA's certificate\n (default=`/home/fm/.local/etc/eac/x509')",
" --cvc-dir=DIRECTORY Where to look for the CVCA's certificate\n (default=`')",
" --x509-dir=DIRECTORY Where to look for the CSCA's certificate\n (default=`')",
" --disable-ta-checks Disable checking the validity period of CV\n certificates (default=off)",
" --disable-ca-checks Disable passive authentication (default=off)",
"\nRead and write data groups:",
@ -206,9 +206,9 @@ void clear_args (struct gengetopt_args_info *args_info)
args_info->auxiliary_data_orig = NULL;
args_info->private_key_arg = NULL;
args_info->private_key_orig = NULL;
args_info->cvc_dir_arg = gengetopt_strdup ("/home/fm/.local/etc/eac/cvc");
args_info->cvc_dir_arg = gengetopt_strdup ("");
args_info->cvc_dir_orig = NULL;
args_info->x509_dir_arg = gengetopt_strdup ("/home/fm/.local/etc/eac/x509");
args_info->x509_dir_arg = gengetopt_strdup ("");
args_info->x509_dir_orig = NULL;
args_info->disable_ta_checks_flag = 0;
args_info->disable_ca_checks_flag = 0;
@ -334,19 +334,25 @@ cmdline_parser_print_version (void)
printf("\n%s\n", gengetopt_args_info_versiontext);
}
static void print_help_common(void) {
cmdline_parser_print_version ();
static void print_help_common(void)
{
size_t len_purpose = strlen(gengetopt_args_info_purpose);
size_t len_usage = strlen(gengetopt_args_info_usage);
if (strlen(gengetopt_args_info_purpose) > 0)
printf("\n%s\n", gengetopt_args_info_purpose);
if (len_usage > 0) {
printf("%s\n", gengetopt_args_info_usage);
}
if (len_purpose > 0) {
printf("%s\n", gengetopt_args_info_purpose);
}
if (strlen(gengetopt_args_info_usage) > 0)
printf("\n%s\n", gengetopt_args_info_usage);
if (len_usage || len_purpose) {
printf("\n");
}
printf("\n");
if (strlen(gengetopt_args_info_description) > 0)
printf("%s\n\n", gengetopt_args_info_description);
if (strlen(gengetopt_args_info_description) > 0) {
printf("%s\n\n", gengetopt_args_info_description);
}
}
void
@ -978,7 +984,8 @@ int update_arg(void *field, char **orig_field,
break;
};
FIX_UNUSED(stop_char);
/* store the original value */
switch(arg_type) {
case ARG_NO:
@ -1139,10 +1146,16 @@ cmdline_parser_internal (
package_name = argv[0];
/* TODO: Why is this here? It is not used anywhere. */
override = params->override;
FIX_UNUSED(override);
initialize = params->initialize;
check_required = params->check_required;
/* TODO: Why is this here? It is not used anywhere. */
check_ambiguity = params->check_ambiguity;
FIX_UNUSED(check_ambiguity);
if (initialize)
cmdline_parser_init (args_info);
@ -1433,7 +1446,7 @@ cmdline_parser_internal (
if (update_arg( (void *)&(args_info->cvc_dir_arg),
&(args_info->cvc_dir_orig), &(args_info->cvc_dir_given),
&(local_args_info.cvc_dir_given), optarg, 0, "/home/fm/.local/etc/eac/cvc", ARG_STRING,
&(local_args_info.cvc_dir_given), optarg, 0, "", ARG_STRING,
check_ambiguity, override, 0, 0,
"cvc-dir", '-',
additional_error))
@ -1447,7 +1460,7 @@ cmdline_parser_internal (
if (update_arg( (void *)&(args_info->x509_dir_arg),
&(args_info->x509_dir_orig), &(args_info->x509_dir_given),
&(local_args_info.x509_dir_given), optarg, 0, "/home/fm/.local/etc/eac/x509", ARG_STRING,
&(local_args_info.x509_dir_given), optarg, 0, "", ARG_STRING,
check_ambiguity, override, 0, 0,
"x509-dir", '-',
additional_error))
@ -1907,3 +1920,4 @@ failure:
cmdline_parser_release (&local_args_info);
return (EXIT_FAILURE);
}
/* vim: set ft=c noet ts=8 sts=8 sw=8 tw=80 nojs spell : */

8
src/tools/npa-tool-cmdline.h
View File

@ -1,9 +1,9 @@
/** @file npa-tool-cmdline.h
* @brief The header file for the command line option parser
* generated by GNU Gengetopt version 2.22.6
* generated by GNU Gengetopt version 2.23
* http://www.gnu.org/software/gengetopt.
* DO NOT modify this file, since it can be overwritten
* @author GNU Gengetopt by Lorenzo Bettini */
* @author GNU Gengetopt */
#ifndef NPA_TOOL_CMDLINE_H
#define NPA_TOOL_CMDLINE_H
@ -83,10 +83,10 @@ struct gengetopt_args_info
char * private_key_arg; /**< @brief Terminal's private key. */
char * private_key_orig; /**< @brief Terminal's private key original value given at command line. */
const char *private_key_help; /**< @brief Terminal's private key help description. */
char * cvc_dir_arg; /**< @brief Where to look for the CVCA's certificate (default='/home/fm/.local/etc/eac/cvc'). */
char * cvc_dir_arg; /**< @brief Where to look for the CVCA's certificate (default=''). */
char * cvc_dir_orig; /**< @brief Where to look for the CVCA's certificate original value given at command line. */
const char *cvc_dir_help; /**< @brief Where to look for the CVCA's certificate help description. */
char * x509_dir_arg; /**< @brief Where to look for the CSCA's certificate (default='/home/fm/.local/etc/eac/x509'). */
char * x509_dir_arg; /**< @brief Where to look for the CSCA's certificate (default=''). */
char * x509_dir_orig; /**< @brief Where to look for the CSCA's certificate original value given at command line. */
const char *x509_dir_help; /**< @brief Where to look for the CSCA's certificate help description. */
int disable_ta_checks_flag; /**< @brief Disable checking the validity period of CV certificates (default=off). */

38
src/tools/opensc-asn1-cmdline.c
View File

@ -1,5 +1,5 @@
/*
File autogenerated by gengetopt version 2.22.6
File autogenerated by gengetopt version 2.23
generated with the following command:
/usr/bin/gengetopt --file-name=opensc-asn1-cmdline --output-dir=. --unamed-opts
@ -27,7 +27,7 @@
const char *gengetopt_args_info_purpose = "";
const char *gengetopt_args_info_usage = "Usage: opensc-asn1 [OPTIONS]... [FILES]...";
const char *gengetopt_args_info_usage = "Usage: opensc-asn1 [OPTION]... [FILE]...";
const char *gengetopt_args_info_versiontext = "";
@ -91,19 +91,25 @@ cmdline_parser_print_version (void)
printf("\n%s\n", gengetopt_args_info_versiontext);
}
static void print_help_common(void) {
cmdline_parser_print_version ();
static void print_help_common(void)
{
size_t len_purpose = strlen(gengetopt_args_info_purpose);
size_t len_usage = strlen(gengetopt_args_info_usage);
if (strlen(gengetopt_args_info_purpose) > 0)
printf("\n%s\n", gengetopt_args_info_purpose);
if (len_usage > 0) {
printf("%s\n", gengetopt_args_info_usage);
}
if (len_purpose > 0) {
printf("%s\n", gengetopt_args_info_purpose);
}
if (strlen(gengetopt_args_info_usage) > 0)
printf("\n%s\n", gengetopt_args_info_usage);
if (len_usage || len_purpose) {
printf("\n");
}
printf("\n");
if (strlen(gengetopt_args_info_description) > 0)
printf("%s\n\n", gengetopt_args_info_description);
if (strlen(gengetopt_args_info_description) > 0) {
printf("%s\n\n", gengetopt_args_info_description);
}
}
void
@ -315,10 +321,16 @@ cmdline_parser_internal (
package_name = argv[0];
/* TODO: Why is this here? It is not used anywhere. */
override = params->override;
FIX_UNUSED(override);
initialize = params->initialize;
check_required = params->check_required;
/* TODO: Why is this here? It is not used anywhere. */
check_ambiguity = params->check_ambiguity;
FIX_UNUSED(check_ambiguity);
if (initialize)
cmdline_parser_init (args_info);
@ -370,6 +382,7 @@ cmdline_parser_internal (
FIX_UNUSED(check_required);
cmdline_parser_release (&local_args_info);
@ -407,3 +420,4 @@ failure:
cmdline_parser_release (&local_args_info);
return (EXIT_FAILURE);
}
/* vim: set ft=c noet ts=8 sts=8 sw=8 tw=80 nojs spell : */

8
src/tools/opensc-asn1-cmdline.h
View File

@ -1,9 +1,9 @@
/** @file opensc-asn1-cmdline.h
* @brief The header file for the command line option parser
* generated by GNU Gengetopt version 2.22.6
* generated by GNU Gengetopt version 2.23
* http://www.gnu.org/software/gengetopt.
* DO NOT modify this file, since it can be overwritten
* @author GNU Gengetopt by Lorenzo Bettini */
* @author GNU Gengetopt */
#ifndef OPENSC_ASN1_CMDLINE_H
#define OPENSC_ASN1_CMDLINE_H
@ -43,8 +43,8 @@ struct gengetopt_args_info
unsigned int help_given ; /**< @brief Whether help was given. */
unsigned int version_given ; /**< @brief Whether version was given. */
char **inputs ; /**< @brief unamed options (options without names) */
unsigned inputs_num ; /**< @brief unamed options number */
char **inputs ; /**< @brief unnamed options (options without names) */
unsigned inputs_num ; /**< @brief unnamed options number */
} ;
/** @brief The additional parameters to pass to parser functions */

41
src/tools/opensc-notify-cmdline.c
View File

@ -1,5 +1,5 @@
/*
File autogenerated by gengetopt version 2.22.6
File autogenerated by gengetopt version 2.23
generated with the following command:
/usr/bin/gengetopt --file-name=opensc-notify-cmdline --output-dir=.
@ -27,7 +27,7 @@
const char *gengetopt_args_info_purpose = "";
const char *gengetopt_args_info_usage = "Usage: opensc-notify [OPTIONS]...";
const char *gengetopt_args_info_usage = "Usage: opensc-notify [OPTION]...";
const char *gengetopt_args_info_versiontext = "";
@ -124,19 +124,25 @@ cmdline_parser_print_version (void)
printf("\n%s\n", gengetopt_args_info_versiontext);
}
static void print_help_common(void) {
cmdline_parser_print_version ();
static void print_help_common(void)
{
size_t len_purpose = strlen(gengetopt_args_info_purpose);
size_t len_usage = strlen(gengetopt_args_info_usage);
if (strlen(gengetopt_args_info_purpose) > 0)
printf("\n%s\n", gengetopt_args_info_purpose);
if (len_usage > 0) {
printf("%s\n", gengetopt_args_info_usage);
}
if (len_purpose > 0) {
printf("%s\n", gengetopt_args_info_purpose);
}
if (strlen(gengetopt_args_info_usage) > 0)
printf("\n%s\n", gengetopt_args_info_usage);
if (len_usage || len_purpose) {
printf("\n");
}
printf("\n");
if (strlen(gengetopt_args_info_description) > 0)
printf("%s\n\n", gengetopt_args_info_description);
if (strlen(gengetopt_args_info_description) > 0) {
printf("%s\n\n", gengetopt_args_info_description);
}
}
void
@ -424,7 +430,8 @@ int update_arg(void *field, char **orig_field,
break;
};
FIX_UNUSED(stop_char);
/* store the original value */
switch(arg_type) {
case ARG_NO:
@ -486,10 +493,16 @@ cmdline_parser_internal (
package_name = argv[0];
/* TODO: Why is this here? It is not used anywhere. */
override = params->override;
FIX_UNUSED(override);
initialize = params->initialize;
check_required = params->check_required;
/* TODO: Why is this here? It is not used anywhere. */
check_ambiguity = params->check_ambiguity;
FIX_UNUSED(check_ambiguity);
if (initialize)
cmdline_parser_init (args_info);
@ -625,6 +638,7 @@ cmdline_parser_internal (
error_occurred += check_modes(customized_given, customized_desc, standard_given, standard_desc);
}
FIX_UNUSED(check_required);
cmdline_parser_release (&local_args_info);
@ -638,3 +652,4 @@ failure:
cmdline_parser_release (&local_args_info);
return (EXIT_FAILURE);
}
/* vim: set ft=c noet ts=8 sts=8 sw=8 tw=80 nojs spell : */

4
src/tools/opensc-notify-cmdline.h
View File

@ -1,9 +1,9 @@
/** @file opensc-notify-cmdline.h
* @brief The header file for the command line option parser
* generated by GNU Gengetopt version 2.22.6
* generated by GNU Gengetopt version 2.23
* http://www.gnu.org/software/gengetopt.
* DO NOT modify this file, since it can be overwritten
* @author GNU Gengetopt by Lorenzo Bettini */
* @author GNU Gengetopt */
#ifndef OPENSC_NOTIFY_CMDLINE_H
#define OPENSC_NOTIFY_CMDLINE_H

41
src/tools/pkcs11-register-cmdline.c
View File

@ -1,5 +1,5 @@
/*
File autogenerated by gengetopt version 2.22.6
File autogenerated by gengetopt version 2.23
generated with the following command:
/usr/bin/gengetopt --file-name=pkcs11-register-cmdline --output-dir=.
@ -27,7 +27,7 @@
const char *gengetopt_args_info_purpose = "";
const char *gengetopt_args_info_usage = "Usage: pkcs11-register [OPTIONS]...";
const char *gengetopt_args_info_usage = "Usage: pkcs11-register [OPTION]...";
const char *gengetopt_args_info_versiontext = "";
@ -114,19 +114,25 @@ cmdline_parser_print_version (void)
printf("\n%s\n", gengetopt_args_info_versiontext);
}
static void print_help_common(void) {
cmdline_parser_print_version ();
static void print_help_common(void)
{
size_t len_purpose = strlen(gengetopt_args_info_purpose);
size_t len_usage = strlen(gengetopt_args_info_usage);
if (strlen(gengetopt_args_info_purpose) > 0)
printf("\n%s\n", gengetopt_args_info_purpose);
if (len_usage > 0) {
printf("%s\n", gengetopt_args_info_usage);
}
if (len_purpose > 0) {
printf("%s\n", gengetopt_args_info_purpose);
}
if (strlen(gengetopt_args_info_usage) > 0)
printf("\n%s\n", gengetopt_args_info_usage);
if (len_usage || len_purpose) {
printf("\n");
}
printf("\n");
if (strlen(gengetopt_args_info_description) > 0)
printf("%s\n\n", gengetopt_args_info_description);
if (strlen(gengetopt_args_info_description) > 0) {
printf("%s\n\n", gengetopt_args_info_description);
}
}
void
@ -410,7 +416,8 @@ int update_arg(void *field, char **orig_field,
break;
};
FIX_UNUSED(stop_char);
/* store the original value */
switch(arg_type) {
case ARG_NO:
@ -449,10 +456,16 @@ cmdline_parser_internal (
package_name = argv[0];
/* TODO: Why is this here? It is not used anywhere. */
override = params->override;
FIX_UNUSED(override);
initialize = params->initialize;
check_required = params->check_required;
/* TODO: Why is this here? It is not used anywhere. */
check_ambiguity = params->check_ambiguity;
FIX_UNUSED(check_ambiguity);
if (initialize)
cmdline_parser_init (args_info);
@ -571,6 +584,7 @@ cmdline_parser_internal (
FIX_UNUSED(check_required);
cmdline_parser_release (&local_args_info);
@ -584,3 +598,4 @@ failure:
cmdline_parser_release (&local_args_info);
return (EXIT_FAILURE);
}
/* vim: set ft=c noet ts=8 sts=8 sw=8 tw=80 nojs spell : */

4
src/tools/pkcs11-register-cmdline.h
View File

@ -1,9 +1,9 @@
/** @file pkcs11-register-cmdline.h
* @brief The header file for the command line option parser
* generated by GNU Gengetopt version 2.22.6
* generated by GNU Gengetopt version 2.23
* http://www.gnu.org/software/gengetopt.
* DO NOT modify this file, since it can be overwritten
* @author GNU Gengetopt by Lorenzo Bettini */
* @author GNU Gengetopt */
#ifndef PKCS11_REGISTER_CMDLINE_H
#define PKCS11_REGISTER_CMDLINE_H