diff options
Diffstat (limited to '')
| -rw-r--r-- | gpgme/ChangeLog | 4 | ||||
| -rw-r--r-- | gpgme/kdpipeiodevice.cpp | 9 |
2 files changed, 11 insertions, 2 deletions
diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog index 580b6062..dbe43fda 100644 --- a/gpgme/ChangeLog +++ b/gpgme/ChangeLog @@ -1,3 +1,7 @@ +2007-10-11 Marcus Brinkmann <[email protected]> + + * kdpipeiodevice.cpp: New version from Frank Osterfeld. + 2007-10-09 Marcus Brinkmann <[email protected]> * kdpipeiodevice.cpp: New version from Frank Osterfeld and Marc diff --git a/gpgme/kdpipeiodevice.cpp b/gpgme/kdpipeiodevice.cpp index 032b62b9..67f8bf50 100644 --- 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 ); |