diff options
| -rw-r--r-- | keyserver/ChangeLog | 6 | ||||
| -rw-r--r-- | keyserver/curl-shim.h | 2 | ||||
| -rw-r--r-- | keyserver/gpgkeys_curl.c | 5 | ||||
| -rw-r--r-- | keyserver/gpgkeys_hkp.c | 5 |
4 files changed, 16 insertions, 2 deletions
diff --git a/keyserver/ChangeLog b/keyserver/ChangeLog index e601fd559..169ce77e4 100644 --- a/keyserver/ChangeLog +++ b/keyserver/ChangeLog @@ -1,3 +1,9 @@ +2008-11-18 Werner Koch <[email protected]> + + * gpgkeys_curl.c (main): Print curl version according to GNU standards. + * gpgkeys_hkp.c (main): Ditto. + * curl-shim.h (curl_is_gnupg_curl_shim): New. + 2008-11-18 David Shaw <[email protected]> * curl-shim.h (curl_version): No need to provide a version for diff --git a/keyserver/curl-shim.h b/keyserver/curl-shim.h index 33fe78fec..9de7d75ea 100644 --- a/keyserver/curl-shim.h +++ b/keyserver/curl-shim.h @@ -83,6 +83,8 @@ typedef struct #define CURL_GLOBAL_DEFAULT 0 #define CURLVERSION_NOW 0 +#define curl_is_gnupg_curl_shim 1 + CURLcode curl_global_init(long flags); void curl_global_cleanup(void); CURL *curl_easy_init(void); diff --git a/keyserver/gpgkeys_curl.c b/keyserver/gpgkeys_curl.c index fe91ecaa9..323593e2f 100644 --- a/keyserver/gpgkeys_curl.c +++ b/keyserver/gpgkeys_curl.c @@ -124,7 +124,10 @@ main(int argc,char *argv[]) /* Kludge to implement standard GNU options. */ if (argc > 1 && !strcmp (argv[1], "--version")) { - printf("gpgkeys_curl (GnuPG) "VERSION" (uses %s)\n",curl_version()); + printf ("gpgkeys_curl (GnuPG) %s\n", VERSION); +#ifndef curl_is_gnupg_curl_shim + printf ("libcurl %s\n", curl_version()); +#endif /*curl_is_gnupg_curl_shim*/ return 0; } else if (argc > 1 && !strcmp (argv[1], "--help")) diff --git a/keyserver/gpgkeys_hkp.c b/keyserver/gpgkeys_hkp.c index 7e9a62d62..c21168aa1 100644 --- a/keyserver/gpgkeys_hkp.c +++ b/keyserver/gpgkeys_hkp.c @@ -517,7 +517,10 @@ main(int argc,char *argv[]) /* Kludge to implement standard GNU options. */ if (argc > 1 && !strcmp (argv[1], "--version")) { - printf("gpgkeys_hkp (GnuPG) "VERSION" (uses %s)\n",curl_version()); + printf ("gpgkeys_hkp (GnuPG) %s\n", VERSION); +#ifndef curl_is_gnupg_curl_shim + printf ("libcurl %s\n", curl_version()); +#endif /*curl_is_gnupg_curl_shim*/ return 0; } else if (argc > 1 && !strcmp (argv[1], "--help")) |