mirror/libowfat
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

... but if errno==EINVAL still fall back to socket+fcntl (Robert Henney)

Browse Source
This commit is contained in:
leitner 2015-03-20 03:34:37 +00:00
parent 35f5a9692a
commit 6e022f98c9
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -27,6 +27,7 @@
mmap_read/mmap_shared on zero length files no longer fail but return a mmap_read/mmap_shared on zero length files no longer fail but return a
zero length buffer zero length buffer
if SOCK_NONBLOCK is defined, use it instead of socket+fcntl if SOCK_NONBLOCK is defined, use it instead of socket+fcntl
... but if errno==EINVAL still fall back to socket+fcntl (Robert Henney)
0.29: 0.29:
save 8 bytes in taia.h for 64-bit systems save 8 bytes in taia.h for 64-bit systems

9
socket/socket_tcp4.c
View File

@ -6,14 +6,15 @@
#endif #endif
#include "socket.h" #include "socket.h"
#include "ndelay.h" #include "ndelay.h"
#include <errno.h>
int socket_tcp4(void) { int socket_tcp4(void) {
int s;
#ifdef SOCK_NONBLOCK #ifdef SOCK_NONBLOCK
return socket(PF_INET,SOCK_STREAM|SOCK_NONBLOCK,IPPROTO_TCP); if ((s=socket(PF_INET,SOCK_STREAM|SOCK_NONBLOCK,IPPROTO_TCP))>-1 || errno!=EINVAL) return -1;
#else #endif
int s=socket_tcp4b(); s=socket_tcp4b();
if (s==-1) return -1; if (s==-1) return -1;
if (ndelay_on(s) == -1) { close(s); return -1; } if (ndelay_on(s) == -1) { close(s); return -1; }
return s; return s;
#endif
} }

8
socket/socket_tcp6.c
View File

@ -10,12 +10,12 @@
#include "ndelay.h" #include "ndelay.h"
int socket_tcp6(void) { int socket_tcp6(void) {
int s;
#if defined(LIBC_HAS_IP6) && defined(SOCK_NONBLOCK) #if defined(LIBC_HAS_IP6) && defined(SOCK_NONBLOCK)
return socket(PF_INET6,SOCK_STREAM|SOCK_NONBLOCK,IPPROTO_TCP); if ((s=socket(PF_INET6,SOCK_STREAM|SOCK_NONBLOCK,IPPROTO_TCP))>-1 || errno!=EINVAL) return -1;
#else #endif
int s=socket_tcp6b(); s=socket_tcp6b();
if (s==-1) return -1; if (s==-1) return -1;
if (ndelay_on(s) == -1) { close(s); return -1; } if (ndelay_on(s) == -1) { close(s); return -1; }
return s; return s;
#endif
} }