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

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.
This commit is contained in:
David Shaw 2009-05-11 03:21:41 +00:00
parent 8e7e6f124b
commit 07390d3f80
6 changed files with 35 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
keyserver/ChangeLog
View File

@ -1,3 +1,16 @@
2009-05-10 David Shaw <dshaw@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@jabberwocky.com> 2009-05-04 David Shaw <dshaw@jabberwocky.com>
* gpgkeys_mailto.in: Set 'mail-from' as a keyserver-option, rather * gpgkeys_mailto.in: Set 'mail-from' as a keyserver-option, rather

4
keyserver/curl-shim.h
View File

@ -1,5 +1,5 @@
/* curl-shim.h /* 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. * This file is part of GNUPG.
* *
@ -91,7 +91,7 @@ CURLcode curl_easy_perform(CURL *curl);
void curl_easy_cleanup(CURL *curl); void curl_easy_cleanup(CURL *curl);
char *curl_escape(char *str,int len); char *curl_escape(char *str,int len);
#define curl_free(x) free(x) #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); curl_version_info_data *curl_version_info(int type);
#endif /* !_CURL_SHIM_H_ */ #endif /* !_CURL_SHIM_H_ */

10
keyserver/gpgkeys_curl.c
View File

@ -102,9 +102,10 @@ get_key(char *getkey)
static void static void
show_help (FILE *fp) show_help (FILE *fp)
{ {
fprintf (fp,"-h\thelp\n"); fprintf (fp,"-h, --help\thelp\n");
fprintf (fp,"-V\tversion\n"); fprintf (fp,"-V\t\tmachine readable version\n");
fprintf (fp,"-o\toutput to this file\n"); fprintf (fp,"--version\thuman readable version\n");
fprintf (fp,"-o\t\toutput to this file\n");
} }
int int
@ -122,7 +123,8 @@ main(int argc,char *argv[])
/* Kludge to implement standard GNU options. */ /* Kludge to implement standard GNU options. */
if (argc > 1 && !strcmp (argv[1], "--version")) 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; return 0;
} }
else if (argc > 1 && !strcmp (argv[1], "--help")) else if (argc > 1 && !strcmp (argv[1], "--help"))

7
keyserver/gpgkeys_finger.c
View File

@ -319,9 +319,10 @@ get_key (char *getkey)
static void static void
show_help (FILE *fp) show_help (FILE *fp)
{ {
fprintf (fp,"-h\thelp\n"); fprintf (fp,"-h, --help\thelp\n");
fprintf (fp,"-V\tversion\n"); fprintf (fp,"-V\t\tmachine readable version\n");
fprintf (fp,"-o\toutput to this file\n"); fprintf (fp,"--version\thuman readable version\n");
fprintf (fp,"-o\t\toutput to this file\n");
} }
int int

10
keyserver/gpgkeys_hkp.c
View File

@ -492,9 +492,10 @@ fail_all(struct keylist *keylist,int err)
static void static void
show_help (FILE *fp) show_help (FILE *fp)
{ {
fprintf (fp,"-h\thelp\n"); fprintf (fp,"-h, --help\thelp\n");
fprintf (fp,"-V\tversion\n"); fprintf (fp,"-V\t\tmachine readable version\n");
fprintf (fp,"-o\toutput to this file\n"); fprintf (fp,"--version\thuman readable version\n");
fprintf (fp,"-o\t\toutput to this file\n");
} }
int int
@ -511,7 +512,8 @@ main(int argc,char *argv[])
/* Kludge to implement standard GNU options. */ /* Kludge to implement standard GNU options. */
if (argc > 1 && !strcmp (argv[1], "--version")) 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; return 0;
} }
else if (argc > 1 && !strcmp (argv[1], "--help")) else if (argc > 1 && !strcmp (argv[1], "--help"))

7
keyserver/gpgkeys_ldap.c
View File

@ -1773,9 +1773,10 @@ find_basekeyspacedn(void)
static void static void
show_help (FILE *fp) show_help (FILE *fp)
{ {
fprintf (fp,"-h\thelp\n"); fprintf (fp,"-h, --help\thelp\n");
fprintf (fp,"-V\tversion\n"); fprintf (fp,"-V\t\tmachine readable version\n");
fprintf (fp,"-o\toutput to this file\n"); fprintf (fp,"--version\thuman readable version\n");
fprintf (fp,"-o\t\toutput to this file\n");
} }
int int