security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-03 12:11:33 +01:00
Code Activity

Some preparations to eventuallt use gpgrt_argparse.

Browse Source 
* configure.ac (GNUPG_DEF_COPYRIGHT_LINE: New.
* tools/watchgnupg.c (print_version): USe this macro.
* common/init.c (_init_common_subsystems): Register argparse
functions.

Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2018-06-12 16:11:19 +02:00
parent 440472663d
commit cb52eb76b3
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
4 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/init.c
View File

@ -210,7 +210,11 @@ _init_common_subsystems (gpg_err_source_t errsource, int *argcp, char ***argvp)
} }
/* --version et al shall use estream as well. */ /* --version et al shall use estream as well. */
argparse_register_outfnc (writestring_via_estream); argparse_register_outfnc (writestring_via_estream); /* legacy. */
gpgrt_set_usage_outfnc (writestring_via_estream);
/* Register our string mapper with gpgrt. */
gpgrt_set_fixed_string_mapper (map_static_macro_string);
/* Logging shall use the standard socket directory as fallback. */ /* Logging shall use the standard socket directory as fallback. */
log_set_socket_dir_cb (gnupg_socketdir); log_set_socket_dir_cb (gnupg_socketdir);

3
configure.ac
View File

@ -507,6 +507,9 @@ AH_BOTTOM([
#define GNUPG_PRIVATE_KEYS_DIR "private-keys-v1.d" #define GNUPG_PRIVATE_KEYS_DIR "private-keys-v1.d"
#define GNUPG_OPENPGP_REVOC_DIR "openpgp-revocs.d" #define GNUPG_OPENPGP_REVOC_DIR "openpgp-revocs.d"
#define GNUPG_DEF_COPYRIGHT_LINE \
"Copyright (C) 2018 Free Software Foundation, Inc."
/* For some systems (DOS currently), we hardcode the path here. For /* For some systems (DOS currently), we hardcode the path here. For
POSIX systems the values are constructed by the Makefiles, so that POSIX systems the values are constructed by the Makefiles, so that
the values may be overridden by the make invocations; this is to the values may be overridden by the make invocations; this is to

2
g10/gpg.c
View File

@ -3625,7 +3625,7 @@ main (int argc, char **argv)
else else
{ {
pargs.err = ARGPARSE_PRINT_ERROR; pargs.err = ARGPARSE_PRINT_ERROR;
/* The argparse fucntion calls a plain exit and thus /* The argparse function calls a plain exit and thus
* we need to print a status here. */ * we need to print a status here. */
write_status_failure ("option-parser", write_status_failure ("option-parser",
gpg_error(GPG_ERR_GENERAL)); gpg_error(GPG_ERR_GENERAL));

2
tools/watchgnupg.c
View File

@ -253,7 +253,7 @@ static void
print_version (int with_help) print_version (int with_help)
{ {
fputs (MYVERSION_LINE "\n" fputs (MYVERSION_LINE "\n"
"Copyright (C) 2017 Free Software Foundation, Inc.\n" GNUPG_DEF_COPYRIGHT_LINE "\n"
"License GPLv3+: " "License GPLv3+: "
"GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n" "GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
"This is free software: you are free to change and redistribute it.\n" "This is free software: you are free to change and redistribute it.\n"