X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Fpipe.cpp;h=4b3dde1d3e6ab9001c719764479074e7c65126db;hb=1cf9a9d0bc8a553f67994f845d2ee2ea4223879c;hp=2c11cd40bed05ca243b28e6fe0961ae2074b00d1;hpb=1e61b0aa05e2351e33d909f7503eaf936a2d9bb0;p=metaproxy-moved-to-github.git

diff --git a/src/pipe.cpp b/src/pipe.cpp
index 2c11cd4..4b3dde1 100644
--- a/src/pipe.cpp
+++ b/src/pipe.cpp
@@ -1,5 +1,5 @@
-/* $Id: pipe.cpp,v 1.8 2006-06-10 14:29:12 adam Exp $
-   Copyright (c) 2005-2006, Index Data.
+/* $Id: pipe.cpp,v 1.11 2007-02-26 13:19:23 adam Exp $
+   Copyright (c) 2005-2007, Index Data.
 
    See the LICENSE file for details
  */
@@ -9,6 +9,7 @@
 #include <unistd.h>
 #endif
 
+#include <signal.h>
 #include <errno.h>
 #ifdef WIN32
 #include <winsock.h>
@@ -97,6 +98,8 @@ Pipe::Pipe(int port_to_use) : m_p(new Rep)
     WORD wVersionRequested = MAKEWORD(2, 0);
     if (WSAStartup( wVersionRequested, &wsaData ))
         throw Pipe::Error("WSAStartup failed");
+#else
+    port_to_use = 0;  // we'll just use pipe on Unix
 #endif
     if (port_to_use)
     {
@@ -172,7 +175,13 @@ Pipe::Pipe(int port_to_use) : m_p(new Rep)
     else
     {
 #ifndef WIN32
-        pipe(m_p->m_fd);
+        if (pipe(m_p->m_fd))
+            throw Pipe::Error("pipe failed");
+        else
+        {
+            assert(m_p->m_fd[0] >= 0);
+            assert(m_p->m_fd[1] >= 0);
+        }
 #endif
     }
 }