mirrors/cosmopolitan
1
0
Fork 0
mirror of https://github.com/jart/cosmopolitan.git synced 2025-05-28 00:02:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix test failure on Windows

Browse source 
The send{,to,msg} and recv{,from,msg} functions have been updated to
delegate to WriteFile and ReadFile when appropriate, due to the fact
that socketpair(AF_UNIX) is implemented using kFdFile.

Thanks @fabriziobertocci for writing the test that caught this.

See #148 and #122
This commit is contained in:
Justine Tunney 2021-04-07 23:36:05 -07:00
parent 24d79599cc
commit f40f97bd07
4 changed files with 65 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

20
libc/sock/sendmsg.c
View file

@ -29,7 +29,7 @@
* Sends a message on a socket.
*
* @param fd is the file descriptor returned by socket()
* @param msg is a pointer to a struct msghdr containing all the required
* @param msg is a pointer to a struct msghdr containing all the required
* parameters (the destination address, buffers, ...)
* @param flags MSG_OOB, MSG_DONTROUTE, MSG_PARTIAL, MSG_NOSIGNAL, etc.
* @return number of bytes transmitted, or -1 w/ errno
@ -54,11 +54,19 @@ ssize_t sendmsg(int fd, const struct msghdr *msg, int flags) {
}
/* else do the syscall */
return sys_sendmsg(fd, msg, flags);
} else if (__isfdkind(fd, kFdSocket)) {
if (msg->msg_control != NULL) return einval(); /* Control msg not supported */
return sys_sendto_nt(&g_fds.p[fd], msg->msg_iov, msg->msg_iovlen, flags,
msg->msg_name, msg->msg_namelen);
} else {
return ebadf();
if (__isfdopen(fd)) {
if (msg->msg_control) return einval(); /* control msg not supported */
if (__isfdkind(fd, kFdSocket)) {
return sys_sendto_nt(&g_fds.p[fd], msg->msg_iov, msg->msg_iovlen, flags,
msg->msg_name, msg->msg_namelen);
} else if (__isfdkind(fd, kFdFile)) {
return sys_write_nt(&g_fds.p[fd], msg->msg_iov, msg->msg_iovlen, -1);
} else {
return enotsock();
}
} else {
return ebadf();
}
}
}