X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Fpipe.cpp;h=5f8f8baef6f7ce9cea249391ada78c067a00de7c;hb=637a685d61a9ff0e3f398a59da426979815c4d68;hp=e5ad9917dff6969a0ed8775f9b7f4f7d0f707b3e;hpb=7da1eb44b26f8d8ec6c3aaddb0086eaa2c9d39b9;p=metaproxy-moved-to-github.git

diff --git a/src/pipe.cpp b/src/pipe.cpp
index e5ad991..5f8f8ba 100644
--- a/src/pipe.cpp
+++ b/src/pipe.cpp
@@ -1,15 +1,31 @@
+/* $Id: pipe.cpp,v 1.12 2007-05-09 21:23:09 adam Exp $
+   Copyright (c) 2005-2007, Index Data.
 
-/* $Id: pipe.cpp,v 1.4 2005-11-08 08:55:41 adam Exp $
-   Copyright (c) 2005, Index Data.
+This file is part of Metaproxy.
 
-%LICENSE%
+Metaproxy is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Metaproxy is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with Metaproxy; see the file LICENSE.  If not, write to the
+Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+02111-1307, USA.
  */
+
 #include "config.hpp"
 
 #if HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 
+#include <signal.h>
 #include <errno.h>
 #ifdef WIN32
 #include <winsock.h>
@@ -37,12 +53,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();
@@ -53,7 +71,7 @@ namespace yp2 {
     };
 }
 
-using namespace yp2;
+using namespace mp;
 
 void Pipe::Rep::close(int &fd)
 {
@@ -96,6 +114,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)
     {
@@ -171,7 +191,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
     }
 }