diff options
| author | Roland McGrath <roland@gnu.org> | 2008-07-02 09:53:29 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2008-07-02 09:53:29 +0000 |
| commit | e66ecb226ed6991d0c39a0daf7730e65fe555c6c (patch) | |
| tree | ca2f000a788dc0c929ffd79917fbd39fa56406f3 /sysdeps/mach | |
| parent | cc9f65ce82d4995e776464a1656587c39f6b14bb (diff) | |
| download | glibc-e66ecb226ed6991d0c39a0daf7730e65fe555c6c.tar.gz glibc-e66ecb226ed6991d0c39a0daf7730e65fe555c6c.tar.xz glibc-e66ecb226ed6991d0c39a0daf7730e65fe555c6c.zip | |
2008-07-01 Samuel Thibault <samuel.thibault@ens-lyon.org>
* sysdeps/unix/bsd/bsd4.4/bits/socket.h: Define MSG_NOSIGNAL. * hurd/hurd/fd.h (__hurd_sockfail): Add extern inline function. * sysdeps/mach/hurd/recv.c (__recv): Use __hurd_sockfail instead of __hurd_dfail. * sysdeps/mach/hurd/recvfrom.c (__recvfrom): Likewise * sysdeps/mach/hurd/recvmsg.c (__recvmsg): Likewise * sysdeps/mach/hurd/send.c (__send): Likewise * sysdeps/mach/hurd/sendfrom.c (__sendfrom): Likewise * sysdeps/mach/hurd/sendmsg.c (__sendmsg): Likewise
Diffstat (limited to 'sysdeps/mach')
| -rw-r--r-- | sysdeps/mach/hurd/recv.c | 2 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/recvfrom.c | 4 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/recvmsg.c | 4 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/send.c | 2 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/sendmsg.c | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/sysdeps/mach/hurd/recv.c b/sysdeps/mach/hurd/recv.c index b001729d18..a01e6090d3 100644 --- a/sysdeps/mach/hurd/recv.c +++ b/sysdeps/mach/hurd/recv.c @@ -48,7 +48,7 @@ __recv (fd, buf, n, flags) &cdata, &clen, &flags, n))) - return __hurd_dfail (fd, err); + return __hurd_sockfail (fd, flags, err); __mach_port_deallocate (__mach_task_self (), addrport); __vm_deallocate (__mach_task_self (), (vm_address_t) cdata, clen); diff --git a/sysdeps/mach/hurd/recvfrom.c b/sysdeps/mach/hurd/recvfrom.c index d5c73f4441..d30bc40c06 100644 --- a/sysdeps/mach/hurd/recvfrom.c +++ b/sysdeps/mach/hurd/recvfrom.c @@ -52,7 +52,7 @@ __recvfrom (fd, buf, n, flags, addrarg, addr_len) &cdata, &clen, &flags, n))) - return __hurd_dfail (fd, err); + return __hurd_sockfail (fd, flags, err); /* Get address data for the returned address port if requested. */ if (addr != NULL) @@ -74,7 +74,7 @@ __recvfrom (fd, buf, n, flags, addrarg, addr_len) if (err) { __mach_port_deallocate (__mach_task_self (), addrport); - return __hurd_dfail (fd, err); + return __hurd_sockfail (fd, flags, err); } if (*addr_len > buflen) diff --git a/sysdeps/mach/hurd/recvmsg.c b/sysdeps/mach/hurd/recvmsg.c index c6874e8bd8..15f9fb14d6 100644 --- a/sysdeps/mach/hurd/recvmsg.c +++ b/sysdeps/mach/hurd/recvmsg.c @@ -63,7 +63,7 @@ __libc_recvmsg (int fd, struct msghdr *message, int flags) &ports, &nports, &cdata, &clen, &message->msg_flags, amount))) - return __hurd_dfail (fd, err); + return __hurd_sockfail (fd, flags, err); if (message->msg_name != NULL) { @@ -84,7 +84,7 @@ __libc_recvmsg (int fd, struct msghdr *message, int flags) if (err) { __mach_port_deallocate (__mach_task_self (), aport); - return __hurd_dfail (fd, err); + return __hurd_sockfail (fd, flags, err); } if (message->msg_namelen > buflen) diff --git a/sysdeps/mach/hurd/send.c b/sysdeps/mach/hurd/send.c index 4810cd68c3..bb45c50696 100644 --- a/sysdeps/mach/hurd/send.c +++ b/sysdeps/mach/hurd/send.c @@ -38,7 +38,7 @@ __send (fd, buf, n, flags) NULL, MACH_MSG_TYPE_COPY_SEND, 0, NULL, 0, &wrote)); - return err ? __hurd_dfail (fd, err) : wrote; + return err ? __hurd_sockfail (fd, flags, err) : wrote; } libc_hidden_def (__send) weak_alias (__send, send) diff --git a/sysdeps/mach/hurd/sendmsg.c b/sysdeps/mach/hurd/sendmsg.c index 5fdfd734ec..a9d1c8c1d4 100644 --- a/sysdeps/mach/hurd/sendmsg.c +++ b/sysdeps/mach/hurd/sendmsg.c @@ -149,7 +149,7 @@ __libc_sendmsg (int fd, const struct msghdr *message, int flags) if (dealloc) __vm_deallocate (__mach_task_self (), data.addr, len); - return err ? __hurd_dfail (fd, err) : amount; + return err ? __hurd_sockfail (fd, flags, err) : amount; } weak_alias (__libc_sendmsg, sendmsg) |