Fixed a gpgconf problem under Windows.

This commit is contained in:
Werner Koch 2008-05-09 08:26:28 +00:00
parent b72c001283
commit bae4861914
3 changed files with 11 additions and 3 deletions

View File

@ -1,3 +1,8 @@
2008-05-09 Werner Koch <wk@g10code.com>
* engine-gpgconf.c (gpgconf_read): Do not pass empty lines to the
callback.
2008-05-07 Werner Koch <wk@g10code.com> 2008-05-07 Werner Koch <wk@g10code.com>
* engine-gpgconf.c (gpgconf_write): Change argv[0] to a * engine-gpgconf.c (gpgconf_write): Change argv[0] to a

View File

@ -247,8 +247,11 @@ gpgconf_read (void *engine, char *arg1, char *arg2,
mark--; mark--;
*mark = '\0'; *mark = '\0';
/* Got a full line. */ /* Got a full line. Due to the CR removal code (which
err = (*cb) (hook, line); occurs only on Windows) we might be one-off and thus
would see empty lines. Don't pass them to the
callback. */
err = *line? (*cb) (hook, line) : NULL;
if (err) if (err)
goto leave; goto leave;
} }

View File

@ -72,7 +72,7 @@ extern "C" {
AM_PATH_GPGME macro) check that this header matches the installed AM_PATH_GPGME macro) check that this header matches the installed
library. Warning: Do not edit the next line. configure will do library. Warning: Do not edit the next line. configure will do
that for you! */ that for you! */
#define GPGME_VERSION "1.1.7-svn1311" #define GPGME_VERSION "1.1.7-svn1312"