2006-02-28 Marcus Brinkmann <marcus@g10code.de>

	* w32-glib-io.c (O_BINARY) [!O_BINARY]: New macro.
	(_gpgme_io_pipe): Open pipes in binary mode.

diff --git a/trunk/gpgme/ChangeLog b/trunk/gpgme/ChangeLog
index cf149c2da8428cbfb22ed06407a6c46c9eee8672..20c5d0a3aacc678af33b5e87165382bc33c3c7f2 100644 (file)
--- a/trunk/gpgme/ChangeLog
+++ b/trunk/gpgme/ChangeLog
@@ -1,3 +1,8 @@
+2006-02-28  Marcus Brinkmann  <marcus@g10code.de>
+
+       * w32-glib-io.c (O_BINARY) [!O_BINARY]: New macro.
+       (_gpgme_io_pipe): Open pipes in binary mode.
+
 2006-02-22  Marcus Brinkmann  <marcus@g10code.de>
 
        * engine.c (gpgme_engine_check_version): Reimplemented to allow

diff --git a/trunk/gpgme/w32-glib-io.c b/trunk/gpgme/w32-glib-io.c
index 593cfba866cd81494e73ad7ed8f33f7341a4031c..97758babb8273b33644de88409ca9616e303fd73 100644 (file)
--- a/trunk/gpgme/w32-glib-io.c
+++ b/trunk/gpgme/w32-glib-io.c
@@ -41,6 +41,13 @@
 #include "sema.h"
 #include "debug.h"
 
+#ifndef O_BINARY
+#ifdef _O_BINARY
+#define O_BINARY       _O_BINARY
+#else
+#define O_BINARY       0
+#endif
+#endif
 
 \f
 /* This file is an ugly hack to get GPGME working with glib on Windows
@@ -206,7 +213,7 @@ _gpgme_io_pipe (int filedes[2], int inherit_idx)
   GIOChannel *chan;
 
 #define PIPEBUF_SIZE  4096
-  if (_pipe (filedes, PIPEBUF_SIZE, O_NOINHERIT) == -1)
+  if (_pipe (filedes, PIPEBUF_SIZE, O_NOINHERIT | O_BINARY) == -1)
     return -1;
 
   /* Make one end inheritable. */