security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-04-17 15:44:34 +02:00
Code Activity

Make --version close to GNU standards.

Browse Source
This commit is contained in:
Werner Koch 2008-11-18 18:17:10 +00:00
parent 9d76ee5147
commit 5452f53c5c
4 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
keyserver/ChangeLog
View File

@ -1,3 +1,9 @@
2008-11-18 Werner Koch <wk@g10code.com>
* 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 <dshaw@jabberwocky.com> 2008-11-18 David Shaw <dshaw@jabberwocky.com>
* curl-shim.h (curl_version): No need to provide a version for * curl-shim.h (curl_version): No need to provide a version for

2
keyserver/curl-shim.h
View File

@ -83,6 +83,8 @@ typedef struct
#define CURL_GLOBAL_DEFAULT 0 #define CURL_GLOBAL_DEFAULT 0
#define CURLVERSION_NOW 0 #define CURLVERSION_NOW 0
#define curl_is_gnupg_curl_shim 1
CURLcode curl_global_init(long flags); CURLcode curl_global_init(long flags);
void curl_global_cleanup(void); void curl_global_cleanup(void);
CURL *curl_easy_init(void); CURL *curl_easy_init(void);

5
keyserver/gpgkeys_curl.c
View File

@ -124,7 +124,10 @@ main(int argc,char *argv[])
/* Kludge to implement standard GNU options. */ /* Kludge to implement standard GNU options. */
if (argc > 1 && !strcmp (argv[1], "--version")) 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; return 0;
} }
else if (argc > 1 && !strcmp (argv[1], "--help")) else if (argc > 1 && !strcmp (argv[1], "--help"))

5
keyserver/gpgkeys_hkp.c
View File

@ -517,7 +517,10 @@ main(int argc,char *argv[])
/* Kludge to implement standard GNU options. */ /* Kludge to implement standard GNU options. */
if (argc > 1 && !strcmp (argv[1], "--version")) 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; return 0;
} }
else if (argc > 1 && !strcmp (argv[1], "--help")) else if (argc > 1 && !strcmp (argv[1], "--help"))