[svn] GnuPG - r4999 - trunk/keyserver
svn author dshaw
cvs at cvs.gnupg.org
Mon May 11 05:21:42 CEST 2009
Author: dshaw
Date: 2009-05-11 05:21:41 +0200 (Mon, 11 May 2009)
New Revision: 4999
Modified:
trunk/keyserver/ChangeLog
trunk/keyserver/curl-shim.h
trunk/keyserver/gpgkeys_curl.c
trunk/keyserver/gpgkeys_finger.c
trunk/keyserver/gpgkeys_hkp.c
trunk/keyserver/gpgkeys_ldap.c
Log:
>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.
Modified: trunk/keyserver/ChangeLog
===================================================================
--- trunk/keyserver/ChangeLog 2009-05-08 15:08:37 UTC (rev 4998)
+++ trunk/keyserver/ChangeLog 2009-05-11 03:21:41 UTC (rev 4999)
@@ -1,3 +1,16 @@
+2009-05-10 David Shaw <dshaw at jabberwocky.com>
+
+ 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 <dshaw at jabberwocky.com>
* gpgkeys_mailto.in: Set 'mail-from' as a keyserver-option, rather
Modified: trunk/keyserver/curl-shim.h
===================================================================
--- trunk/keyserver/curl-shim.h 2009-05-08 15:08:37 UTC (rev 4998)
+++ trunk/keyserver/curl-shim.h 2009-05-11 03:21:41 UTC (rev 4999)
@@ -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 @@
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_ */
Modified: trunk/keyserver/gpgkeys_curl.c
===================================================================
--- trunk/keyserver/gpgkeys_curl.c 2009-05-08 15:08:37 UTC (rev 4998)
+++ trunk/keyserver/gpgkeys_curl.c 2009-05-11 03:21:41 UTC (rev 4999)
@@ -102,9 +102,10 @@
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 @@
/* 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"))
Modified: trunk/keyserver/gpgkeys_finger.c
===================================================================
--- trunk/keyserver/gpgkeys_finger.c 2009-05-08 15:08:37 UTC (rev 4998)
+++ trunk/keyserver/gpgkeys_finger.c 2009-05-11 03:21:41 UTC (rev 4999)
@@ -319,9 +319,10 @@
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
Modified: trunk/keyserver/gpgkeys_hkp.c
===================================================================
--- trunk/keyserver/gpgkeys_hkp.c 2009-05-08 15:08:37 UTC (rev 4998)
+++ trunk/keyserver/gpgkeys_hkp.c 2009-05-11 03:21:41 UTC (rev 4999)
@@ -492,9 +492,10 @@
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 @@
/* 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"))
Modified: trunk/keyserver/gpgkeys_ldap.c
===================================================================
--- trunk/keyserver/gpgkeys_ldap.c 2009-05-08 15:08:37 UTC (rev 4998)
+++ trunk/keyserver/gpgkeys_ldap.c 2009-05-11 03:21:41 UTC (rev 4999)
@@ -1773,9 +1773,10 @@
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
More information about the Gnupg-commits
mailing list