Fix for bug #948. Other problem is that frontend session was terminated

[metaproxy-moved-to-github.git] / src / pipe.cpp

diff --git a/src/pipe.cpp b/src/pipe.cpp
index eb4c4e2..4b3dde1 100644 (file)
--- a/src/pipe.cpp
+++ b/src/pipe.cpp
@@ -1,7 +1,7 @@
-/* $Id: pipe.cpp,v 1.7 2006-03-29 13:44:45 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.
 
-%LICENSE%
+   See the LICENSE file for details
  */
 #include "config.hpp"
 
@@ -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
     }
 }