* fhandler_socket.cc (fhandler_socket::recvfrom): Use original flags

	value in each WSARecvFrom call.
	(fhandler_socket::recvmsg): Ditto.  Reformat slightly.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 2be8558556b927e02b0e44d69f2fbeca24d9e7f6..b79d488e2b0e1fae68034dbc948b853f9bd057f4 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,9 @@
+2004-05-16  Corinna Vinschen  <corinna@vinschen.de>
+
+       * fhandler_socket.cc (fhandler_socket::recvfrom): Use original flags
+       value in each WSARecvFrom call.
+       (fhandler_socket::recvmsg): Ditto.  Reformat slightly.
+
 2004-05-15  Christopher Faylor  <cgf@alum.bu.edu>
 
        * cygthread.cc (cygthread::is): Eliminate.

diff --git a/winsup/cygwin/fhandler_socket.cc b/winsup/cygwin/fhandler_socket.cc
index 56b068cc5e0d8e29d2dc0b36c4e1d47255808b17..a0b6727f04514123c5bffd95f3c33849ee8e894f 100644 (file)
--- a/winsup/cygwin/fhandler_socket.cc
+++ b/winsup/cygwin/fhandler_socket.cc
@@ -843,8 +843,8 @@ fhandler_socket::recvfrom (void *ptr, size_t len, int flags,
            {
               do
                 {
-                 res = WSARecvFrom (get_socket (), &wsabuf, 1,
-                                    &ret, (DWORD *) &flags,
+                 DWORD lflags = (DWORD) flags;
+                 res = WSARecvFrom (get_socket (), &wsabuf, 1, &ret, &lflags,
                                     from, fromlen, NULL, NULL);
                 }
               while (res == SOCKET_ERROR
@@ -895,8 +895,7 @@ fhandler_socket::recvmsg (struct msghdr *msg, int flags, ssize_t tot)
   if (!winsock2_active)
     {
       if (iovcnt == 1)
-       res = recvfrom (iov->iov_base, iov->iov_len, flags,
-                       from, fromlen);
+       res = recvfrom (iov->iov_base, iov->iov_len, flags, from, fromlen);
       else
        {
          if (tot == -1)        // i.e. if not pre-calculated by the caller.
@@ -920,8 +919,7 @@ fhandler_socket::recvmsg (struct msghdr *msg, int flags, ssize_t tot)
            }
          else
            {
-             res = recvfrom (buf, tot, flags,
-                             from, fromlen);
+             res = recvfrom (buf, tot, flags, from, fromlen);
 
              const struct iovec *iovptr = iov;
              int nbytes = res;
@@ -958,9 +956,8 @@ fhandler_socket::recvmsg (struct msghdr *msg, int flags, ssize_t tot)
       DWORD ret;
 
       if (is_nonblocking () || closed () || async_io ())
-       res = WSARecvFrom (get_socket (),
-                          wsabuf, iovcnt, (ret = 0, &ret), (DWORD *) &flags,
-                          from, fromlen, NULL, NULL);
+       res = WSARecvFrom (get_socket (), wsabuf, iovcnt, (ret = 0, &ret),
+                          (DWORD *) &flags, from, fromlen, NULL, NULL);
       else
        {
          HANDLE evt;
@@ -968,9 +965,9 @@ fhandler_socket::recvmsg (struct msghdr *msg, int flags, ssize_t tot)
            {
               do
                 {
-                 res = WSARecvFrom (get_socket (), wsabuf, iovcnt,
-                                    &ret, (DWORD *) &flags,
-                                    from, fromlen, NULL, NULL);
+                 DWORD lflags = (DWORD) flags;
+                 res = WSARecvFrom (get_socket (), wsabuf, iovcnt, &ret,
+                                    &lflags, from, fromlen, NULL, NULL);
                 }
               while (res == SOCKET_ERROR
                     && WSAGetLastError () == WSAEWOULDBLOCK