security-and-privacy/gnupg
security-and-privacy
/
gnupg
mirror of git://git.gnupg.org/gnupg.git
1
0
Fork 0
Code Activity

build: Fixes recent commits to still build with gpgrt 1.27. 

* agent/gpg-agent.c (main): Use gnupg_argparse.
* tools/gpgconf-comp.c: Use gnupg_opt_t.
* tools/gpgconf.c (show_version_gnupg): Use strusage.
--
This commit is contained in:
Werner Koch 2021-12-30 10:48:44 +01:00
parent c69c51bce0
commit c4153f7021
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
agent/gpg-agent.c
View File

@ -1320,7 +1320,7 @@ main (int argc, char **argv )
log_info (_("Note: '%s' is not considered an option\n"), argv[i]); log_info (_("Note: '%s' is not considered an option\n"), argv[i]);
} }
gpgrt_argparse (NULL, &pargs, NULL); /* Release internal state. */ gnupg_argparse (NULL, &pargs, NULL); /* Release internal state. */
if (!last_configname) if (!last_configname)
config_filename = make_filename (gnupg_homedir (), config_filename = make_filename (gnupg_homedir (),

4
tools/gpgconf-comp.c
View File

@ -592,7 +592,7 @@ static struct
* header lines and such. This is suitable to be passed to * header lines and such. This is suitable to be passed to
* gpgrt_argparser. Will be filled in by * gpgrt_argparser. Will be filled in by
* retrieve_options_from_program. */ * retrieve_options_from_program. */
gpgrt_opt_t *opt_table; gnupg_opt_t *opt_table;
/* The full table including data from OPT_TABLE. The end of the /* The full table including data from OPT_TABLE. The end of the
* table is marked by NULL entry for NAME. Will be filled in by * table is marked by NULL entry for NAME. Will be filled in by
@ -1538,7 +1538,7 @@ retrieve_options_from_program (gc_component_id_t component, int only_installed)
gnupg_argparse_t pargs; gnupg_argparse_t pargs;
int dummy_argc; int dummy_argc;
char *twopartconfig_name = NULL; char *twopartconfig_name = NULL;
gpgrt_opt_t *opt_table = NULL; /* A malloced option table. */ gnupg_opt_t *opt_table = NULL; /* A malloced option table. */
size_t opt_table_used = 0; /* Its current length. */ size_t opt_table_used = 0; /* Its current length. */
size_t opt_table_size = 0; /* Its allocated length. */ size_t opt_table_size = 0; /* Its allocated length. */
gc_option_t *opt_info = NULL; /* A malloced options table. */ gc_option_t *opt_info = NULL; /* A malloced options table. */

2
tools/gpgconf.c
View File

@ -1042,7 +1042,7 @@ static void
show_version_gnupg (estream_t fp, const char *prefix) show_version_gnupg (estream_t fp, const char *prefix)
{ {
es_fprintf (fp, "%s%sGnuPG %s (%s)\n%s%s\n", prefix, *prefix?"":"* ", es_fprintf (fp, "%s%sGnuPG %s (%s)\n%s%s\n", prefix, *prefix?"":"* ",
strusage (13), BUILD_REVISION, prefix, gpgrt_strusage (17)); strusage (13), BUILD_REVISION, prefix, strusage (17));
#ifdef HAVE_W32_SYSTEM #ifdef HAVE_W32_SYSTEM
{ {
OSVERSIONINFO osvi = { sizeof (osvi) }; OSVERSIONINFO osvi = { sizeof (osvi) };