diff options
| author | David Shaw <[email protected]> | 2009-05-11 03:21:41 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2009-05-11 03:21:41 +0000 |
| commit | 07390d3f80966f2028bd3a2a78e89e184578f162 (patch) | |
| tree | 7d878a6e4868f1067a31c6524dcb355ab2278e27 /keyserver/gpgkeys_curl.c | |
| parent | Doc fixes. (diff) | |
| download | gnupg-07390d3f80966f2028bd3a2a78e89e184578f162.tar.gz gnupg-07390d3f80966f2028bd3a2a78e89e184578f162.zip | |
From 1.4:
* 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.
Diffstat (limited to 'keyserver/gpgkeys_curl.c')
| -rw-r--r-- | keyserver/gpgkeys_curl.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/keyserver/gpgkeys_curl.c b/keyserver/gpgkeys_curl.c index d66bee033..6183556e7 100644 --- a/keyserver/gpgkeys_curl.c +++ b/keyserver/gpgkeys_curl.c @@ -102,9 +102,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 @@ -122,7 +123,8 @@ 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) %s\n", VERSION); + printf ("Uses: %s\n", curl_version()); return 0; } else if (argc > 1 && !strcmp (argv[1], "--help")) |