From 883861544a879eb161b1186ba6c62335a923aaca Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Thu, 27 Jul 2006 09:18:28 +0000 Subject: * fhandler_socket.cc (fhandler_socket::recvmsg): Remove unused tot argument. All callers changed. (fhandler_socket::sendmsg): Likewise. * net.cc (cygwin_recvmsg): Likewise. (cygwin_sendmsg): Likewise, and prevent calling sendmsg whith an invalid iovec. * fhandler.h (fhandler_socket::recvmsg): Adjust prototype. (fhandler_socket::sendmsg): Likewise. --- winsup/cygwin/net.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'winsup/cygwin/net.cc') diff --git a/winsup/cygwin/net.cc b/winsup/cygwin/net.cc index 87a413556..5b8b78380 100644 --- a/winsup/cygwin/net.cc +++ b/winsup/cygwin/net.cc @@ -2071,7 +2071,7 @@ cygwin_recvmsg (int fd, struct msghdr *msg, int flags) { res = check_iovec_for_read (msg->msg_iov, msg->msg_iovlen); if (res > 0) - res = fh->recvmsg (msg, flags, res); // res == iovec tot + res = fh->recvmsg (msg, flags); } syscall_printf ("%d = recvmsg (%d, %p, %x)", res, fd, msg, flags); @@ -2093,7 +2093,8 @@ cygwin_sendmsg (int fd, const struct msghdr *msg, int flags) else { res = check_iovec_for_write (msg->msg_iov, msg->msg_iovlen); - res = fh->sendmsg (msg, flags, res); // res == iovec tot + if (res >= 0) + res = fh->sendmsg (msg, flags); } syscall_printf ("%d = sendmsg (%d, %p, %x)", res, fd, msg, flags); -- cgit v1.2.3