2007-10-05 Marcus Brinkmann <marcus@g10code.de>

	* kdpipeiodevice.cpp, w32-qt-io.cpp: New versions from Frank
	Osterfeld.

diff --git a/trunk/gpgme/ChangeLog b/trunk/gpgme/ChangeLog
index 77de5ea0d307d0029aedfa63171f6a454b50acc4..91c202cad588a36cf648a01c1297d1651372320e 100644 (file)
--- a/trunk/gpgme/ChangeLog
+++ b/trunk/gpgme/ChangeLog
@@ -1,3 +1,8 @@
+2007-10-05  Marcus Brinkmann  <marcus@g10code.de>
+
+       * kdpipeiodevice.cpp, w32-qt-io.cpp: New versions from Frank
+       Osterfeld.
+
 2007-10-04  Marcus Brinkmann  <marcus@g10code.de>
 
        * kdpipeiodevice.h, kdpipeiodevice.cpp, kdpipeiodevice.moc,

diff --git a/trunk/gpgme/kdpipeiodevice.cpp b/trunk/gpgme/kdpipeiodevice.cpp
index 1fd0ef02646544e3c8647e4e25cd95b000ff89cb..3e206c32ba3c519ea8d0f755e2576e46c11996af 100644 (file)
--- a/trunk/gpgme/kdpipeiodevice.cpp
+++ b/trunk/gpgme/kdpipeiodevice.cpp
@@ -493,7 +493,7 @@ bool KDPipeIODevice::writeWouldBlock() const
 {
    d->startWriterThread();
    LOCKED( d->writer );
-   return d->writer->bufferFull() && !d->writer->error;
+   return !d->writer->bufferEmpty() && !d->writer->error;
 }  
 
 
@@ -684,6 +684,7 @@ void Reader::run() {
         if ( !cancel && ( eof || error ) ) {
            qDebug( "%p: Reader::run: received eof(%d) or error(%d), waking everyone", this, eof, error );
             notifyReadyRead();
+            cancel = true;
         } else if ( !cancel && !bufferFull() && !bufferEmpty() ) {
            qDebug( "%p: Reader::run: buffer no longer empty, waking everyone", this );
             notifyReadyRead();

diff --git a/trunk/gpgme/w32-qt-io.cpp b/trunk/gpgme/w32-qt-io.cpp
index dd17e87f48f21ef0901632ec7f8ae3d85906bc66..ba43913c2467abcc950a94b35cff3f28c02e2d7a 100644 (file)
--- a/trunk/gpgme/w32-qt-io.cpp
+++ b/trunk/gpgme/w32-qt-io.cpp
@@ -85,8 +85,9 @@ using _gpgme_::KDPipeIODevice;
 #define MAX_SLAFD 1024
 
 struct DeviceEntry {
-  DeviceEntry() : iodev( 0 ), refCount( 1 ) {}
+  DeviceEntry() : iodev( 0 ), refCount( 1 ), blocking( true ) {}
     KDPipeIODevice* iodev;
+    bool blocking;
     mutable int refCount;
     void ref() const { ++refCount; }
     int unref() const { assert( refCount > 0 ); return --refCount; }
@@ -152,7 +153,11 @@ _gpgme_io_read (int fd, void *buffer, size_t count)
       return TRACE_SYSRES (-1);
     }
   TRACE_LOG1 ("channel %p", chan);
-
+  if ( iodevice_table[fd] && !iodevice_table[fd]->blocking && chan->readWouldBlock() ) {
+      errno = EAGAIN;
+      return TRACE_SYSRES( -1 );
+  }
+ 
   nread = chan->read ((char *) buffer, count);
   if (nread < 0)
     {
@@ -185,6 +190,11 @@ _gpgme_io_write (int fd, const void *buffer, size_t count)
       return -1;
     }
 
+  if ( iodevice_table[fd] && !iodevice_table[fd]->blocking && chan->writeWouldBlock() )
+  {
+      errno = EAGAIN;
+      return TRACE_SYSRES( -1 );
+  }
   nwritten = chan->write ((char *) buffer, count);
 
   if (nwritten < 0)
@@ -323,8 +333,9 @@ _gpgme_io_set_close_notify (int fd, _gpgme_close_notify_handler_t handler,
 int
 _gpgme_io_set_nonblocking (int fd)
 {
-  /* Qt always uses non-blocking IO, except for files, maybe, but who
-     uses that?  */
+  DeviceEntry* const entry = iodevice_table[fd];
+  assert( entry );
+  entry->blocking = false; 
   TRACE_BEG (DEBUG_SYSIO, "_gpgme_io_set_nonblocking", fd);
   return TRACE_SYSRES (0);
 }