X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2887179b1fa36f13e7686aae3043893735667dca..9c34a216817028bc533e07873d047208a96b05a2:/include/wx/unix/pipe.h?ds=sidebyside diff --git a/include/wx/unix/pipe.h b/include/wx/unix/pipe.h index 972113ae36..8e4af9824f 100644 --- a/include/wx/unix/pipe.h +++ b/include/wx/unix/pipe.h @@ -5,7 +5,7 @@ // Modified by: // Created: 24.06.2003 (extracted from src/unix/utilsunx.cpp) // RCS-ID: $Id$ -// Copyright: (c) 2003 Vadim Zeitlin +// Copyright: (c) 2003 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -13,6 +13,7 @@ #define _WX_UNIX_PIPE_H_ #include +#include #include "wx/log.h" #include "wx/intl.h" @@ -46,31 +47,32 @@ public: { wxLogSysError(_("Pipe creation failed")); - return FALSE; + return false; } - return TRUE; + return true; + } + + // switch the given end of the pipe to non-blocking IO + bool MakeNonBlocking(Direction which) + { + const int flags = fcntl(m_fds[which], F_GETFL, 0); + if ( flags == -1 ) + return false; + + return fcntl(m_fds[which], F_SETFL, flags | O_NONBLOCK) == 0; } // return TRUE if we were created successfully bool IsOk() const { return m_fds[Read] != INVALID_FD; } // return the descriptor for one of the pipe ends - int operator[](Direction which) const - { - wxASSERT_MSG( which >= 0 && (size_t)which < WXSIZEOF(m_fds), - _T("invalid pipe index") ); - - return m_fds[which]; - } + int operator[](Direction which) const { return m_fds[which]; } // detach a descriptor, meaning that the pipe dtor won't close it, and // return it int Detach(Direction which) { - wxASSERT_MSG( which >= 0 && (size_t)which < WXSIZEOF(m_fds), - _T("invalid pipe index") ); - int fd = m_fds[which]; m_fds[which] = INVALID_FD; @@ -83,7 +85,10 @@ public: for ( size_t n = 0; n < WXSIZEOF(m_fds); n++ ) { if ( m_fds[n] != INVALID_FD ) + { close(m_fds[n]); + m_fds[n] = INVALID_FD; + } } } @@ -94,27 +99,5 @@ private: int m_fds[2]; }; -#if wxUSE_STREAMS - -#include "wx/wfstream.h" - -// ---------------------------------------------------------------------------- -// wxPipeInputStream: stream for reading from a pipe -// ---------------------------------------------------------------------------- - -class wxPipeInputStream : public wxFileInputStream -{ -public: - wxPipeInputStream(int fd) : wxFileInputStream(fd) { } - - // return TRUE if the pipe is still opened - bool IsOpened() const { return !Eof(); } - - // return TRUE if we have anything to read, don't block - virtual bool CanRead() const; -}; - -#endif // wxUSE_STREAMS - #endif // _WX_UNIX_PIPE_H_