diff options
| author | NIIBE Yutaka <[email protected]> | 2018-07-12 08:09:14 +0000 |
|---|---|---|
| committer | NIIBE Yutaka <[email protected]> | 2018-07-12 08:09:14 +0000 |
| commit | e8caa282d3d5f286919a1ed3db6699c555b7e89d (patch) | |
| tree | 1762014bacef69c542923f55dfe83a2f925d7999 /common/init.c | |
| parent | g10: Fix enum_secret_keys for card keys. (diff) | |
| parent | gpg: Remove multiple subkey bindings during export-clean. (diff) | |
| download | gnupg-e8caa282d3d5f286919a1ed3db6699c555b7e89d.tar.gz gnupg-e8caa282d3d5f286919a1ed3db6699c555b7e89d.zip | |
Merge branch 'master' into gniibe/decryption-keygniibe/decryption-key
Diffstat (limited to 'common/init.c')
| -rw-r--r-- | common/init.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/common/init.c b/common/init.c index 86b71e5ee..f62c5cd58 100644 --- a/common/init.c +++ b/common/init.c @@ -210,7 +210,11 @@ _init_common_subsystems (gpg_err_source_t errsource, int *argcp, char ***argvp) } /* --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. */ log_set_socket_dir_cb (gnupg_socketdir); |