X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Fpipe.cpp;h=bf54df5f6d050cd3aaa4cdb03a6cc6d3835288b1;hb=da353f48b13fd79e446570d120369423f9c496dd;hp=42f009bb51827ae262868bfdcd464ddb00386773;hpb=5cc9145ea95e0a778bef7ad2a0ea9c1a4824bcc4;p=metaproxy-moved-to-github.git

diff --git a/src/pipe.cpp b/src/pipe.cpp
index 42f009b..bf54df5 100644
--- a/src/pipe.cpp
+++ b/src/pipe.cpp
@@ -1,7 +1,7 @@
-/* $Id: pipe.cpp,v 1.5 2005-11-10 23:10:42 adam Exp $
-   Copyright (c) 2005, Index Data.
+/* $Id: pipe.cpp,v 1.10 2007-02-19 12:51:08 adam Exp $
+   Copyright (c) 2005-2007, Index Data.
 
-%LICENSE%
+   See the LICENSE file for details
  */
 #include "config.hpp"
 
@@ -36,12 +36,14 @@
 
 #include <deque>
 
-#include <yaz++/socket-observer.h>
+#include <yazpp/socket-observer.h>
 #include <yaz/log.h>
 
 #include "pipe.hpp"
 
-namespace yp2 {
+namespace mp = metaproxy_1;
+
+namespace metaproxy_1 {
     class Pipe::Rep : public boost::noncopyable {
         friend class Pipe;
         Rep();
@@ -52,7 +54,7 @@ namespace yp2 {
     };
 }
 
-using namespace yp2;
+using namespace mp;
 
 void Pipe::Rep::close(int &fd)
 {
@@ -95,6 +97,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)
     {
@@ -170,7 +174,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
     }
 }