From 9e0919fad11b375c15f50cc4558d8aa1dd3df061 Mon Sep 17 00:00:00 2001
From: David Shaw <dshaw@jabberwocky.com>
Date: Tue, 18 Nov 2008 17:09:07 +0000
Subject: [PATCH] * curl-shim.h (curl_version): No need to provide a version
 for curl-shim as it always matches the GnuPG version.

* gpgkeys_curl.c, gpgkeys_hkp.c (main): Show which version of curl
we're using as part of --version.

* gpgkeys_curl.c, gpgkeys_finger.c, gpgkeys_hkp.c, gpgkeys_ldap.c
(show_help): Document --version.
---
 keyserver/ChangeLog        | 11 +++++++++++
 keyserver/curl-shim.h      |  2 +-
 keyserver/gpgkeys_curl.c   |  9 +++++----
 keyserver/gpgkeys_finger.c |  7 ++++---
 keyserver/gpgkeys_hkp.c    |  9 +++++----
 keyserver/gpgkeys_ldap.c   |  7 ++++---
 6 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/keyserver/ChangeLog b/keyserver/ChangeLog
index 05d18c8d6..e601fd559 100644
--- a/keyserver/ChangeLog
+++ b/keyserver/ChangeLog
@@ -1,3 +1,14 @@
+2008-11-18  David Shaw  <dshaw@jabberwocky.com>
+
+	* curl-shim.h (curl_version): No need to provide a version for
+	curl-shim as it always matches the GnuPG version.
+
+	* gpgkeys_curl.c, gpgkeys_hkp.c (main): Show which version of curl
+	we're using as part of --version.
+
+	* gpgkeys_curl.c, gpgkeys_finger.c, gpgkeys_hkp.c,
+	gpgkeys_ldap.c (show_help): Document --version.
+
 2008-04-14  David Shaw  <dshaw@jabberwocky.com>
 
 	* gpgkeys_curl.c (main), gpgkeys_hkp.c (main): Make sure all
diff --git a/keyserver/curl-shim.h b/keyserver/curl-shim.h
index 9865b6024..33fe78fec 100644
--- a/keyserver/curl-shim.h
+++ b/keyserver/curl-shim.h
@@ -91,7 +91,7 @@ CURLcode curl_easy_perform(CURL *curl);
 void curl_easy_cleanup(CURL *curl);
 char *curl_easy_escape(CURL *curl,char *str,int len);
 #define curl_free(x) free(x)
-#define curl_version() "GnuPG curl-shim "VERSION
+#define curl_version() "GnuPG curl-shim"
 curl_version_info_data *curl_version_info(int type);
 
 #endif /* !_CURL_SHIM_H_ */
diff --git a/keyserver/gpgkeys_curl.c b/keyserver/gpgkeys_curl.c
index 912536faf..fe91ecaa9 100644
--- a/keyserver/gpgkeys_curl.c
+++ b/keyserver/gpgkeys_curl.c
@@ -103,9 +103,10 @@ get_key(char *getkey)
 static void 
 show_help (FILE *fp)
 {
-  fprintf (fp,"-h\thelp\n");
-  fprintf (fp,"-V\tversion\n");
-  fprintf (fp,"-o\toutput to this file\n");
+  fprintf (fp,"-h, --help\thelp\n");
+  fprintf (fp,"-V\t\tmachine readable version\n");
+  fprintf (fp,"--version\thuman readable version\n");
+  fprintf (fp,"-o\t\toutput to this file\n");
 }
 
 int
@@ -123,7 +124,7 @@ main(int argc,char *argv[])
   /* Kludge to implement standard GNU options.  */
   if (argc > 1 && !strcmp (argv[1], "--version"))
     {
-      fputs ("gpgkeys_curl (GnuPG) " VERSION"\n", stdout);
+      printf("gpgkeys_curl (GnuPG) "VERSION" (uses %s)\n",curl_version());
       return 0;
     }
   else if (argc > 1 && !strcmp (argv[1], "--help"))
diff --git a/keyserver/gpgkeys_finger.c b/keyserver/gpgkeys_finger.c
index f5aa3f587..0848f425d 100644
--- a/keyserver/gpgkeys_finger.c
+++ b/keyserver/gpgkeys_finger.c
@@ -352,9 +352,10 @@ get_key (char *getkey)
 static void 
 show_help (FILE *fp)
 {
-  fprintf (fp,"-h\thelp\n");
-  fprintf (fp,"-V\tversion\n");
-  fprintf (fp,"-o\toutput to this file\n");
+  fprintf (fp,"-h, --help\thelp\n");
+  fprintf (fp,"-V\t\tmachine readable version\n");
+  fprintf (fp,"--version\thuman readable version\n");
+  fprintf (fp,"-o\t\toutput to this file\n");
 }
 
 int
diff --git a/keyserver/gpgkeys_hkp.c b/keyserver/gpgkeys_hkp.c
index 1d0853dbb..7e9a62d62 100644
--- a/keyserver/gpgkeys_hkp.c
+++ b/keyserver/gpgkeys_hkp.c
@@ -497,9 +497,10 @@ fail_all(struct keylist *keylist,int err)
 static void 
 show_help (FILE *fp)
 {
-  fprintf (fp,"-h\thelp\n");
-  fprintf (fp,"-V\tversion\n");
-  fprintf (fp,"-o\toutput to this file\n");
+  fprintf (fp,"-h, --help\thelp\n");
+  fprintf (fp,"-V\t\tmachine readable version\n");
+  fprintf (fp,"--version\thuman readable version\n");
+  fprintf (fp,"-o\t\toutput to this file\n");
 }
 
 int
@@ -516,7 +517,7 @@ main(int argc,char *argv[])
   /* Kludge to implement standard GNU options.  */
   if (argc > 1 && !strcmp (argv[1], "--version"))
     {
-      fputs ("gpgkeys_hkp (GnuPG) " VERSION"\n", stdout);
+      printf("gpgkeys_hkp (GnuPG) "VERSION" (uses %s)\n",curl_version());
       return 0;
     }
   else if (argc > 1 && !strcmp (argv[1], "--help"))
diff --git a/keyserver/gpgkeys_ldap.c b/keyserver/gpgkeys_ldap.c
index c10c50661..17b585f84 100644
--- a/keyserver/gpgkeys_ldap.c
+++ b/keyserver/gpgkeys_ldap.c
@@ -1778,9 +1778,10 @@ find_basekeyspacedn(void)
 static void 
 show_help (FILE *fp)
 {
-  fprintf (fp,"-h\thelp\n");
-  fprintf (fp,"-V\tversion\n");
-  fprintf (fp,"-o\toutput to this file\n");
+  fprintf (fp,"-h, --help\thelp\n");
+  fprintf (fp,"-V\t\tmachine readable version\n");
+  fprintf (fp,"--version\thuman readable version\n");
+  fprintf (fp,"-o\t\toutput to this file\n");
 }
 
 int