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

	* kdpipeiodevice.cpp: New version from Frank Osterfeld.

diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog
index 580b6062f3520529500004a24d354071975c8333..dbe43fda0b036eab97c9e16e639a15b6fce097e7 100644 (file)
--- a/gpgme/ChangeLog
+++ b/gpgme/ChangeLog
@@ -1,3 +1,7 @@
+2007-10-11  Marcus Brinkmann  <marcus@g10code.de>
+
+       * kdpipeiodevice.cpp: New version from Frank Osterfeld.
+
 2007-10-09  Marcus Brinkmann  <marcus@g10code.de>
 
        * kdpipeiodevice.cpp: New version from Frank Osterfeld and Marc

diff --git a/gpgme/kdpipeiodevice.cpp b/gpgme/kdpipeiodevice.cpp
index 032b62b9057f039ec9f6e651ae20cfd67f937676..67f8bf50d469a3d45180bc602f87d9cdcfafec33 100644 (file)
--- a/gpgme/kdpipeiodevice.cpp
+++ b/gpgme/kdpipeiodevice.cpp
@@ -728,7 +728,12 @@ void Reader::run() {
             DWORD numRead;
            const bool ok = ReadFile( handle, buffer + wptr, numBytes, &numRead, 0 );
            mutex.lock();
-           if ( !ok ) {
+           if ( ok ) {
+                if ( numRead == 0 ) {
+                    qDebug( "%p: Reader::run: got eof (numRead==0)", this );
+                    eof = true;
+                } 
+            } else { // !ok
                errorCode = static_cast<int>( GetLastError() );
                if ( errorCode == ERROR_BROKEN_PIPE ) {
                     assert( numRead == 0 );
@@ -758,7 +763,7 @@ void Reader::run() {
             }
 #endif
            qDebug( "%p: Reader::run: read %ld bytes", this, static_cast<long>(numRead) );
-           qDebug( "%p (fd=%d): KDPipeIODevice::readData: %s", this, fd, buffer );
+           qDebug( "%p: Reader::run(fd=%d): %s", this, fd, buffer );
 
            if ( numRead > 0 ) {
                qDebug( "%p: Reader::run: buffer before: rptr=%4d, wptr=%4d", this, rptr, wptr );