[svn] GnuPG - r4877 - branches/STABLE-BRANCH-1-4/keyserver

[svn author wk]

Author: wk
Date: 2008-11-18 19:17:10 +0100 (Tue, 18 Nov 2008)
New Revision: 4877

Modified:
   branches/STABLE-BRANCH-1-4/keyserver/ChangeLog
   branches/STABLE-BRANCH-1-4/keyserver/curl-shim.h
   branches/STABLE-BRANCH-1-4/keyserver/gpgkeys_curl.c
   branches/STABLE-BRANCH-1-4/keyserver/gpgkeys_hkp.c
Log:
Make --version close to GNU standards.


Modified: branches/STABLE-BRANCH-1-4/keyserver/ChangeLog
===================================================================
--- branches/STABLE-BRANCH-1-4/keyserver/ChangeLog	2008-11-18 18:01:03 UTC (rev 4876)
+++ branches/STABLE-BRANCH-1-4/keyserver/ChangeLog	2008-11-18 18:17:10 UTC (rev 4877)
@@ -1,3 +1,9 @@
+2008-11-18  Werner Koch  <wk at 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 at jabberwocky.com>
 
 	* curl-shim.h (curl_version): No need to provide a version for

Modified: branches/STABLE-BRANCH-1-4/keyserver/curl-shim.h
===================================================================
--- branches/STABLE-BRANCH-1-4/keyserver/curl-shim.h	2008-11-18 18:01:03 UTC (rev 4876)
+++ branches/STABLE-BRANCH-1-4/keyserver/curl-shim.h	2008-11-18 18:17:10 UTC (rev 4877)
@@ -83,6 +83,8 @@
 #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);

Modified: branches/STABLE-BRANCH-1-4/keyserver/gpgkeys_curl.c
===================================================================
--- branches/STABLE-BRANCH-1-4/keyserver/gpgkeys_curl.c	2008-11-18 18:01:03 UTC (rev 4876)
+++ branches/STABLE-BRANCH-1-4/keyserver/gpgkeys_curl.c	2008-11-18 18:17:10 UTC (rev 4877)
@@ -124,7 +124,10 @@
   /* 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"))

Modified: branches/STABLE-BRANCH-1-4/keyserver/gpgkeys_hkp.c
===================================================================
--- branches/STABLE-BRANCH-1-4/keyserver/gpgkeys_hkp.c	2008-11-18 18:01:03 UTC (rev 4876)
+++ branches/STABLE-BRANCH-1-4/keyserver/gpgkeys_hkp.c	2008-11-18 18:17:10 UTC (rev 4877)
@@ -517,7 +517,10 @@
   /* 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"))