security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-02 22:46:30 +02:00
Code Activity

* curl-shim.h (curl_version): No need to provide a version for

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

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