Fix flakes in runitd and popen_test

This commit is contained in:
Justine Tunney 2023-07-30 04:26:34 -07:00
parent 801224df67
commit 2ebc5781a1
No known key found for this signature in database
GPG key ID: BE714B4575D6E328
18 changed files with 123 additions and 34 deletions

View file

@ -20,6 +20,7 @@
#include "libc/limits.h"
#include "libc/macros.internal.h"
#include "libc/nt/struct/linger.h"
#include "libc/nt/thunk/msabi.h"
#include "libc/sock/internal.h"
#include "libc/sock/struct/linger.h"
#include "libc/sock/syscall_fd.internal.h"
@ -28,6 +29,8 @@
#include "libc/sysv/consts/sol.h"
#include "libc/sysv/errfuns.h"
__msabi extern typeof(__sys_setsockopt_nt) *const __imp_setsockopt;
textwindows int sys_setsockopt_nt(struct Fd *fd, int level, int optname,
const void *optval, uint32_t optlen) {
int64_t ms, micros;
@ -70,7 +73,7 @@ textwindows int sys_setsockopt_nt(struct Fd *fd, int level, int optname,
}
}
if (__sys_setsockopt_nt(fd->handle, level, optname, optval, optlen) != -1) {
if (__imp_setsockopt(fd->handle, level, optname, optval, optlen) != -1) {
return 0;
} else {
return __winsockerr();