1
0
mirror of git://git.gnupg.org/gnupg.git synced 2025-02-22 19:58:29 +01:00

* gpgkeys_finger.c (main), gpgkeys_hkp.c (main): Fix --version output.

* gpgkeys_curl.c (main): Make sure the curl handle is cleaned up on
failure.
This commit is contained in:
David Shaw 2005-02-05 15:04:59 +00:00
parent 01f0036d23
commit 203e4835f6
4 changed files with 13 additions and 4 deletions

View File

@ -1,3 +1,11 @@
2005-02-05 David Shaw <dshaw@jabberwocky.com>
* gpgkeys_finger.c (main), gpgkeys_hkp.c (main): Fix --version
output.
* gpgkeys_curl.c (main): Make sure the curl handle is cleaned up
on failure.
2005-02-01 David Shaw <dshaw@jabberwocky.com> 2005-02-01 David Shaw <dshaw@jabberwocky.com>
* gpgkeys_hkp.c (get_key), gpgkeys_http.c (get_key): Fix missing * gpgkeys_hkp.c (get_key), gpgkeys_http.c (get_key): Fix missing

View File

@ -470,8 +470,6 @@ main(int argc,char *argv[])
ret=get_key(thekey); ret=get_key(thekey);
curl_easy_cleanup(curl);
fail: fail:
free(thekey); free(thekey);
@ -482,6 +480,9 @@ main(int argc,char *argv[])
if(output!=stdout) if(output!=stdout)
fclose(output); fclose(output);
if(curl)
curl_easy_cleanup(curl);
curl_global_cleanup(); curl_global_cleanup();
return ret; return ret;

View File

@ -372,7 +372,7 @@ 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_ldap (GnuPG) " VERSION"\n", stdout); fputs ("gpgkeys_finger (GnuPG) " VERSION"\n", stdout);
return 0; return 0;
} }
else if (argc > 1 && !strcmp (argv[1], "--help")) else if (argc > 1 && !strcmp (argv[1], "--help"))

View File

@ -763,7 +763,7 @@ 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_ldap (GnuPG) " VERSION"\n", stdout); fputs ("gpgkeys_hkp (GnuPG) " VERSION"\n", stdout);
return 0; return 0;
} }
else if (argc > 1 && !strcmp (argv[1], "--help")) else if (argc > 1 && !strcmp (argv[1], "--help"))