[ViewVC] Diff of: cvs/IO-FDPass/FDPass.xs

Comparing IO-FDPass/FDPass.xs (file contents):
Revision 1.5 by root, Fri Apr 5 08:20:36 2013 UTC vs.
Revision 1.7 by root, Mon Jul 11 23:00:00 2016 UTC

   #include <sys/types.h>
   #include <sys/uio.h>
   #include <sys/socket.h>
   #ifndef CMSG_SPACE
-  # define CMSG_SPACE(len) (sizeof (cmsghdr) + len)
+  # define CMSG_SPACE(len) (sizeof (struct cmsghdr) + len)
   #endif
   #ifndef CMSG_LEN
-  # define CMSG_LEN(len) (sizeof (cmsghdr) + len)
+  # define CMSG_LEN(len) (sizeof (struct cmsghdr) + len)
   #endif
 #endif
 #if defined(WIN32)
   if (recvmsg (socket, &msg, 0) <= 0)
     return -1;
   int fd = -1;
   errno = EDOM;
-  if (
-     data == 0
-#if __OpenBSD__
-     && msg.msg_controllen >= CMSG_LEN   (sizeof (int)) /* work around a bug in at least openbsd 4.5 and 4.8 */
-#else
-     && msg.msg_controllen >= CMSG_SPACE (sizeof (int))
-#endif
-  ) {
-      struct cmsghdr *cmsg = CMSG_FIRSTHDR (&msg);
+  struct cmsghdr *cmsg = CMSG_FIRSTHDR (&msg);
+  if (data == 0
+      && cmsg
-      if (cmsg->cmsg_level   == SOL_SOCKET
+      && cmsg->cmsg_level == SOL_SOCKET
-          && cmsg->cmsg_type == SCM_RIGHTS
+      && cmsg->cmsg_type  == SCM_RIGHTS
-          && cmsg->cmsg_len  >= CMSG_LEN (sizeof (int)))
+      && cmsg->cmsg_len   >= CMSG_LEN (sizeof (int)))
-        fd = *(int *)CMSG_DATA (cmsg);
+    fd = *(int *)CMSG_DATA (cmsg);
-    }
   free (buf);
   return fd;
 #endif

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines