Some preparations to eventuallt use gpgrt_argparse.

* 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>

diff --git a/common/init.c b/common/init.c
index 86b71e5..f62c5cd 100644 (file)
--- 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.  */
   }
 
   /* --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);
 
   /* Logging shall use the standard socket directory as fallback.  */
   log_set_socket_dir_cb (gnupg_socketdir);

diff --git a/configure.ac b/configure.ac
index 4916a5c..0d270a4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -507,6 +507,9 @@ AH_BOTTOM([
 #define GNUPG_PRIVATE_KEYS_DIR  "private-keys-v1.d"
 #define GNUPG_OPENPGP_REVOC_DIR "openpgp-revocs.d"
 
 #define GNUPG_PRIVATE_KEYS_DIR  "private-keys-v1.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
    POSIX systems the values are constructed by the Makefiles, so that
    the values may be overridden by the make invocations; this is to
 /* For some systems (DOS currently), we hardcode the path here.  For
    POSIX systems the values are constructed by the Makefiles, so that
    the values may be overridden by the make invocations; this is to

diff --git a/g10/gpg.c b/g10/gpg.c
index 8effc53..600f844 100644 (file)
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -3625,7 +3625,7 @@ main (int argc, char **argv)
             else
               {
                 pargs.err = ARGPARSE_PRINT_ERROR;
             else
               {
                 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.  */
                 write_status_failure ("option-parser",
                                       gpg_error(GPG_ERR_GENERAL));
                  * we need to print a status here.  */
                 write_status_failure ("option-parser",
                                       gpg_error(GPG_ERR_GENERAL));

diff --git a/tools/watchgnupg.c b/tools/watchgnupg.c
index fc58d14..1db1c78 100644 (file)
--- a/tools/watchgnupg.c
+++ b/tools/watchgnupg.c
@@ -253,7 +253,7 @@ static void
 print_version (int with_help)
 {
   fputs (MYVERSION_LINE "\n"
 print_version (int with_help)
 {
   fputs (MYVERSION_LINE "\n"

-         "Copyright (C) 2017 Free Software Foundation, Inc.\n"
+         GNUPG_DEF_COPYRIGHT_LINE "\n"

          "License GPLv3+: "
          "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"
          "License GPLv3+: "
          "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"