--- cvsroot/EV/schmorp.h	2009/07/14 00:09:59	1.1
+++ cvsroot/EV/schmorp.h	2009/07/14 20:31:21	1.3
@@ -1,8 +1,14 @@
 #ifndef SCHMORP_PERL_H_
 #define SCHMORP_PERL_H_
 
+/* WARNING
+ * This header file is a shared resource between many modules.
+ */
+
 /* useful stuff, used by schmorp mostly */
 
+#include "patchlevel.h"
+
 #define PERL_VERSION_ATLEAST(a,b,c)				\
   (PERL_REVISION > (a)						\
    || (PERL_REVISION == (a)					\
@@ -70,6 +76,7 @@
   static char sig_size [] = { SIG_NUM };
 # define SIG_SIZE (sizeof (sig_size) + 1)
 #endif
+  dTHX;
   int signum;
 
   SvGETMAGIC (sig);
@@ -92,7 +99,10 @@
   int signum = s_signum (sig);
 
   if (signum < 0)
-    croak ("%s: invalid signal name or number", SvPV_nolen (sig));
+    {
+      dTHX;
+      croak ("%s: invalid signal name or number", SvPV_nolen (sig));
+    }
 
   return signum;
 }
@@ -100,6 +110,7 @@
 static int
 s_fileno (SV *fh, int wr)
 {
+  dTHX;
   SvGETMAGIC (fh);
 
   if (SvROK (fh))
@@ -123,7 +134,10 @@
   int fd = s_fileno (fh, wr);
 
   if (fd < 0)
-    croak ("%s: illegal fh argument, either not an OS file or read/write mode mismatch", SvPV_nolen (fh));
+    {
+      dTHX;
+      croak ("%s: illegal fh argument, either not an OS file or read/write mode mismatch", SvPV_nolen (fh));
+    }
 
   return fd;
 }
@@ -131,22 +145,25 @@
 static SV *
 s_get_cv (SV *cb_sv)
 {
+  dTHX;
   HV *st;
   GV *gvp;
-  CV *cv = sv_2cv (cb_sv, &st, &gvp, 0);
 
-  return (SV *)cv;
+  return (SV *)sv_2cv (cb_sv, &st, &gvp, 0);
 }
 
 static SV *
 s_get_cv_croak (SV *cb_sv)
 {
-  cb_sv = s_get_cv (cb_sv);
+  SV *cv = s_get_cv (cb_sv);
 
-  if (!cb_sv)
-    croak ("%s: callback must be a CODE reference or another callable object", SvPV_nolen (cb_sv));
+  if (!cv)
+    {
+      dTHX;
+      croak ("%s: callback must be a CODE reference or another callable object", SvPV_nolen (cb_sv));
+    }
 
-  return cb_sv;
+  return cv;
 }
 
 /*****************************************************************************/
@@ -172,5 +189,107 @@
   return newRV_noinc ((SV *)cv);
 }
 
+/** portable pipe/socketpair */
+
+#ifdef USE_SOCKETS_AS_HANDLES
+# define S_TO_SOCKET(x) (win32_get_osfhandle (x))
+#else
+# define S_TO_SOCKET(x) (x)
+#endif
+
+#ifdef _WIN32
+/* taken almost verbatim from libev's ev_win32.c */
+/* oh, the humanity! */
+static int
+s_pipe (int filedes [2])
+{
+  struct sockaddr_in addr = { 0 };
+  int addr_size = sizeof (addr);
+  struct sockaddr_in adr2;
+  int adr2_size = sizeof (adr2);
+  SOCKET listener;
+  SOCKET sock [2] = { -1, -1 };
+
+  if ((listener = socket (AF_INET, SOCK_STREAM, 0)) == INVALID_SOCKET) 
+    return -1;
+
+  addr.sin_family = AF_INET;
+  addr.sin_addr.s_addr = htonl (INADDR_LOOPBACK);
+  addr.sin_port = 0;
+
+  if (bind (listener, (struct sockaddr *)&addr, addr_size))
+    goto fail;
+
+  if (getsockname (listener, (struct sockaddr *)&addr, &addr_size))
+    goto fail;
+
+  if (listen (listener, 1))
+    goto fail;
+
+  if ((sock [0] = socket (AF_INET, SOCK_STREAM, 0)) == INVALID_SOCKET) 
+    goto fail;
+
+  if (connect (sock [0], (struct sockaddr *)&addr, addr_size))
+    goto fail;
+
+  if ((sock [1] = accept (listener, 0, 0)) < 0)
+    goto fail;
+
+  /* windows vista returns fantasy port numbers for getpeername.
+   * example for two interconnected tcp sockets:
+   *
+   * (Socket::unpack_sockaddr_in getsockname $sock0)[0] == 53364
+   * (Socket::unpack_sockaddr_in getpeername $sock0)[0] == 53363
+   * (Socket::unpack_sockaddr_in getsockname $sock1)[0] == 53363
+   * (Socket::unpack_sockaddr_in getpeername $sock1)[0] == 53365
+   *
+   * wow! tridirectional sockets!
+   *
+   * this way of checking ports seems to work:
+   */
+  if (getpeername (sock [0], (struct sockaddr *)&addr, &addr_size))
+    goto fail;
+
+  if (getsockname (sock [1], (struct sockaddr *)&adr2, &adr2_size))
+    goto fail;
+
+  errno = WSAEINVAL;
+  if (addr_size != adr2_size
+      || addr.sin_addr.s_addr != adr2.sin_addr.s_addr /* just to be sure, I mean, it's windows */
+      || addr.sin_port        != adr2.sin_port)
+    goto fail;
+
+  closesocket (listener);
+
+#ifdef USE_SOCKETS_AS_HANDLES
+  /* when select isn't winsocket, we also expect socket, connect, accept etc.
+   * to work on fds */
+  filedes [0] = sock [0];
+  filedes [1] = sock [1];
+#else
+  filedes [0] = _open_osfhandle (sock [0], 0);
+  filedes [1] = _open_osfhandle (sock [1], 0);
+#endif
+
+  return 0;
+
+fail:
+  closesocket (listener);
+
+  if (sock [0] != INVALID_SOCKET) closesocket (sock [0]);
+  if (sock [1] != INVALID_SOCKET) closesocket (sock [1]);
+
+  return -1;
+}
+
+#define s_socketpair(domain,type,protocol,filedes) s_pipe (filedes)
+
+#else
+
+#define s_socketpair(domain,type,protocol,filedes) socketpair (domain, type, protocol, filedes)
+#define s_pipe(filedes) pipe (filedes)
+
+#endif
+
 #endif