Don't define __STRICT_ANSI__, we should build both with and without it.

[wxWidgets.git] / include / wx / unix / pipe.h

diff --git a/include/wx/unix/pipe.h b/include/wx/unix/pipe.h
index a142b752a98585d3c1034bb3bae157e908047ce8..e8e2d427cb389e46913e3674cc9826074d412179 100644 (file)
--- a/include/wx/unix/pipe.h
+++ b/include/wx/unix/pipe.h
@@ -4,8 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     24.06.2003 (extracted from src/unix/utilsunx.cpp)
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     24.06.2003 (extracted from src/unix/utilsunx.cpp)

-// RCS-ID:      $Id$
-// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>

 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 


@@ -13,6 +12,10 @@
 #define _WX_UNIX_PIPE_H_
 
 #include <unistd.h>
 #define _WX_UNIX_PIPE_H_
 
 #include <unistd.h>

+#include <fcntl.h>
+
+#include "wx/log.h"
+#include "wx/intl.h"

 
 // ----------------------------------------------------------------------------
 // wxPipe: this class encapsulates pipe() system call
 
 // ----------------------------------------------------------------------------
 // wxPipe: this class encapsulates pipe() system call


@@ -43,31 +46,32 @@ public:
         {
             wxLogSysError(_("Pipe creation failed"));
 
         {
             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
     }
 
     // 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)
     {
 
     // 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;
 
         int fd = m_fds[which];
         m_fds[which] = INVALID_FD;
 


@@ -80,7 +84,10 @@ public:
         for ( size_t n = 0; n < WXSIZEOF(m_fds); n++ )
         {
             if ( m_fds[n] != INVALID_FD )
         for ( size_t n = 0; n < WXSIZEOF(m_fds); n++ )
         {
             if ( m_fds[n] != INVALID_FD )

+            {

                 close(m_fds[n]);
                 close(m_fds[n]);

+                m_fds[n] = INVALID_FD;
+            }

         }
     }
 
         }
     }