nortti
/
links
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixup! Sortix patches

This commit is contained in:
Juhani Krekelä 2022-02-16 20:53:26 +02:00
parent 658b89f5d8
commit 7b6c7de1fa
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
connect.c
View File

@ -672,7 +672,7 @@ static void try_connect(struct connection *c)
#if defined(__aarch64__) && defined(__ILP32__) #if defined(__aarch64__) && defined(__ILP32__)
errno = EINPROGRESS; /* arm64 ilp32 bug */ errno = EINPROGRESS; /* arm64 ilp32 bug */
#endif #endif
rs = connect(s, (struct sockaddr *)(void *)&sa, sizeof sa); EINTRLOOP(rs, connect(s, (struct sockaddr *)(void *)&sa, sizeof sa));
#ifdef SUPPORT_IPV6 #ifdef SUPPORT_IPV6
} else if (addr->af == AF_INET6) { } else if (addr->af == AF_INET6) {
struct sockaddr_in6 sa; struct sockaddr_in6 sa;
@ -686,14 +686,14 @@ static void try_connect(struct connection *c)
#if defined(__aarch64__) && defined(__ILP32__) #if defined(__aarch64__) && defined(__ILP32__)
errno = EINPROGRESS; /* arm64 ilp32 bug */ errno = EINPROGRESS; /* arm64 ilp32 bug */
#endif #endif
rs = connect(s, (struct sockaddr *)(void *)&sa, sizeof sa); EINTRLOOP(rs, connect(s, (struct sockaddr *)(void *)&sa, sizeof sa));
#endif #endif
} else { } else {
rs = -1; rs = -1;
errno = EINVAL; errno = EINVAL;
} }
if (rs) { if (rs) {
if (errno != EALREADY && errno != EINPROGRESS && errno != EINTR) { if (errno != EALREADY && errno != EINPROGRESS) {
#ifdef BEOS #ifdef BEOS
if (errno == EWOULDBLOCK) errno = ETIMEDOUT; if (errno == EWOULDBLOCK) errno = ETIMEDOUT;
#endif #endif