diff options
| -rw-r--r-- | keyserver/ChangeLog | 13 | ||||
| -rw-r--r-- | keyserver/curl-shim.h | 4 | ||||
| -rw-r--r-- | keyserver/gpgkeys_curl.c | 10 | ||||
| -rw-r--r-- | keyserver/gpgkeys_finger.c | 7 | ||||
| -rw-r--r-- | keyserver/gpgkeys_hkp.c | 10 | ||||
| -rw-r--r-- | keyserver/gpgkeys_ldap.c | 7 |
6 files changed, 35 insertions, 16 deletions
diff --git a/keyserver/ChangeLog b/keyserver/ChangeLog index 6d980fe91..85eab3c89 100644 --- a/keyserver/ChangeLog +++ b/keyserver/ChangeLog @@ -1,3 +1,16 @@ +2009-05-10 David Shaw <[email protected]> + + 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. + 2009-05-04 David Shaw <[email protected]> * gpgkeys_mailto.in: Set 'mail-from' as a keyserver-option, rather diff --git a/keyserver/curl-shim.h b/keyserver/curl-shim.h index 0a70b4cc8..3b254ac03 100644 --- a/keyserver/curl-shim.h +++ b/keyserver/curl-shim.h @@ -1,5 +1,5 @@ /* curl-shim.h - * Copyright (C) 2005, 2006 Free Software Foundation, Inc. + * Copyright (C) 2005, 2006, 2007, 2008 Free Software Foundation, Inc. * * This file is part of GNUPG. * @@ -91,7 +91,7 @@ CURLcode curl_easy_perform(CURL *curl); void curl_easy_cleanup(CURL *curl); char *curl_escape(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 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")) diff --git a/keyserver/gpgkeys_finger.c b/keyserver/gpgkeys_finger.c index cdca85ef4..721cb9acf 100644 --- a/keyserver/gpgkeys_finger.c +++ b/keyserver/gpgkeys_finger.c @@ -319,9 +319,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 298ef7e98..3a4e57634 100644 --- a/keyserver/gpgkeys_hkp.c +++ b/keyserver/gpgkeys_hkp.c @@ -492,9 +492,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 @@ -511,7 +512,8 @@ 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) %s\n", VERSION); + printf ("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 f44a5c369..3fed8c590 100644 --- a/keyserver/gpgkeys_ldap.c +++ b/keyserver/gpgkeys_ldap.c @@ -1773,9 +1773,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 |