[svn] gpgme - r1313 - trunk/gpgme

[svn author wk]

Author: wk
Date: 2008-05-09 10:26:28 +0200 (Fri, 09 May 2008)
New Revision: 1313

Modified:
   trunk/gpgme/ChangeLog
   trunk/gpgme/engine-gpgconf.c
   trunk/gpgme/gpgme.h
Log:
Fixed a gpgconf problem under Windows.


Modified: trunk/gpgme/ChangeLog
===================================================================
--- trunk/gpgme/ChangeLog	2008-05-07 15:41:14 UTC (rev 1312)
+++ trunk/gpgme/ChangeLog	2008-05-09 08:26:28 UTC (rev 1313)
@@ -1,3 +1,8 @@
+2008-05-09  Werner Koch  <wk at g10code.com>
+
+	* engine-gpgconf.c (gpgconf_read): Do not pass empty lines to the
+	callback.
+
 2008-05-07  Werner Koch  <wk at g10code.com>
 
 	* engine-gpgconf.c (gpgconf_write): Change argv[0] to a

Modified: trunk/gpgme/engine-gpgconf.c
===================================================================
--- trunk/gpgme/engine-gpgconf.c	2008-05-07 15:41:14 UTC (rev 1312)
+++ trunk/gpgme/engine-gpgconf.c	2008-05-09 08:26:28 UTC (rev 1313)
@@ -247,8 +247,11 @@
 		mark--;
 	      *mark = '\0';
 
-	      /* Got a full line.  */
-	      err = (*cb) (hook, line);
+	      /* Got a full line.  Due to the CR removal code (which
+                 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)
 		goto leave;
 	    }

Modified: trunk/gpgme/gpgme.h
===================================================================
--- trunk/gpgme/gpgme.h	2008-05-07 15:41:14 UTC (rev 1312)
+++ trunk/gpgme/gpgme.h	2008-05-09 08:26:28 UTC (rev 1313)
@@ -72,7 +72,7 @@
    AM_PATH_GPGME macro) check that this header matches the installed
    library.  Warning: Do not edit the next line.  configure will do
    that for you!  */
-#define GPGME_VERSION "1.1.7-svn1311"
+#define GPGME_VERSION "1.1.7-svn1312"