X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Fpipe.cpp;h=3964b79faf7dd52784daeaa23aa4ba0eb6c60372;hb=665559cbc22546e8df69be33a7d492294cab9fb1;hp=227f31d57ddc49422dfef458a71352a0612d9ea8;hpb=baa590770e6d3729fbaef99277c669ab417e6d8f;p=metaproxy-moved-to-github.git

diff --git a/src/pipe.cpp b/src/pipe.cpp
index 227f31d..3964b79 100644
--- a/src/pipe.cpp
+++ b/src/pipe.cpp
@@ -1,15 +1,28 @@
+/* This file is part of Metaproxy.
+   Copyright (C) 2005-2008 Index Data
 
-/* $Id: pipe.cpp,v 1.3 2005-11-07 22:43:17 adam Exp $
-   Copyright (c) 2005, Index Data.
+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 this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
 
-%LICENSE%
- */
 #include "config.hpp"
 
 #if HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 
+#include <signal.h>
 #include <errno.h>
 #ifdef WIN32
 #include <winsock.h>
@@ -37,12 +50,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 +68,7 @@ namespace yp2 {
     };
 }
 
-using namespace yp2;
+using namespace mp;
 
 void Pipe::Rep::close(int &fd)
 {
@@ -91,6 +106,14 @@ bool Pipe::Rep::nonblock(int s)
 
 Pipe::Pipe(int port_to_use) : m_p(new Rep)
 {
+#ifdef WIN32
+    WSADATA wsaData;
+    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)
     {
         // create server socket
@@ -165,7 +188,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
     }
 }
@@ -175,6 +204,9 @@ Pipe::~Pipe()
     m_p->close(m_p->m_fd[0]);
     m_p->close(m_p->m_fd[1]);
     m_p->close(m_p->m_socket);
+#ifdef WIN32
+    WSACleanup();
+#endif
 }
 
 int &Pipe::read_fd() const
@@ -190,8 +222,8 @@ int &Pipe::write_fd() const
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
- * c-file-style: "stroustrup"
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab
  */