security-and-privacy/gnupg
security-and-privacy
/
gnupg
mirror of git://git.gnupg.org/gnupg.git
1
0
Fork 0
Code Activity

* 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.
This commit is contained in:
David Shaw 2008-11-18 17:09:07 +00:00
parent 5671409a5b
commit 9e0919fad1
6 changed files with 30 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
keyserver/ChangeLog
View File

@ -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

2
keyserver/curl-shim.h
View File

@ -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_ */

9
keyserver/gpgkeys_curl.c
View File

@ -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"))

7
keyserver/gpgkeys_finger.c
View File

@ -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

9
keyserver/gpgkeys_hkp.c
View File

@ -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"))

7
keyserver/gpgkeys_ldap.c
View File

@ -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