diff options
| author | Ritt Konstantin <ritt.ks@gmail.com> | 2011-01-11 10:31:44 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-01-11 10:31:44 (GMT) |
| commit | 7f2e9e43234a112e845568a4329a869975f73a21 (patch) | |
| tree | 66f140dfec72b06a9189ef88b2dbbee776e85e21 /src/corelib | |
| parent | 222fb565e28d5ba7f402755762c6a5df6ffcdd37 (diff) | |
| download | Qt-7f2e9e43234a112e845568a4329a869975f73a21.zip Qt-7f2e9e43234a112e845568a4329a869975f73a21.tar.gz Qt-7f2e9e43234a112e845568a4329a869975f73a21.tar.bz2 | |
handle O_NONBLOCK'ed pipes specific error on write()
according to the write(2) docs:
When write requests greater than {PIPE_BUF} bytes to a pipe that
has available space at least 1 byte, if O_NONBLOCK is set,
write transfers what it can and returns the number of bytes written.
When write requests of {PIPE_BUF} or less bytes to a pipe that has no
enough space, or write requests for greater than {PIPE_BUF} bytes
to a pipe that has no space, if O_NONBLOCK is set,
write returns -1 and sets errno to EAGAIN.
Merge-request: 997
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/io/qprocess.cpp | 12 | ||||
| -rw-r--r-- | src/corelib/io/qprocess_unix.cpp | 5 |
2 files changed, 12 insertions, 5 deletions
diff --git a/src/corelib/io/qprocess.cpp b/src/corelib/io/qprocess.cpp index da53014..1522f8e 100644 --- a/src/corelib/io/qprocess.cpp +++ b/src/corelib/io/qprocess.cpp @@ -971,11 +971,13 @@ bool QProcessPrivate::_q_canWrite() qDebug("QProcessPrivate::canWrite(), wrote %d bytes to the process input", int(written)); #endif - writeBuffer.free(written); - if (!emittedBytesWritten) { - emittedBytesWritten = true; - emit q->bytesWritten(written); - emittedBytesWritten = false; + if (written != 0) { + writeBuffer.free(written); + if (!emittedBytesWritten) { + emittedBytesWritten = true; + emit q->bytesWritten(written); + emittedBytesWritten = false; + } } if (stdinChannel.notifier && !writeBuffer.isEmpty()) stdinChannel.notifier->setEnabled(true); diff --git a/src/corelib/io/qprocess_unix.cpp b/src/corelib/io/qprocess_unix.cpp index 0d5464e..299280e 100644 --- a/src/corelib/io/qprocess_unix.cpp +++ b/src/corelib/io/qprocess_unix.cpp @@ -869,6 +869,11 @@ qint64 QProcessPrivate::writeToStdin(const char *data, qint64 maxlen) if (written == -1) qDebug("QProcessPrivate::writeToStdin(), failed to write (%s)", qt_error_string(errno)); #endif + // If the O_NONBLOCK flag is set and If some data can be written without blocking + // the process, write() will transfer what it can and return the number of bytes written. + // Otherwise, it will return -1 and set errno to EAGAIN + if (written == -1 && errno == EAGAIN) + written = 0; return written; } |