aboutsummaryrefslogtreecommitdiff
path: root/sysdeps/mach/hurd/recvfrom.c
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>1999-02-28 13:01:23 +0000
committerRoland McGrath <roland@gnu.org>1999-02-28 13:01:23 +0000
commit0fd43249a0c6d180a3a2ffc0ff850f6718592a6f (patch)
tree25253a7385e1c97e4c48b83263ccfd8f338080e0 /sysdeps/mach/hurd/recvfrom.c
parent5615c549e26bd30b4a9dc2a80b8c380926cf6972 (diff)
downloadglibc-0fd43249a0c6d180a3a2ffc0ff850f6718592a6f.tar
glibc-0fd43249a0c6d180a3a2ffc0ff850f6718592a6f.tar.gz
glibc-0fd43249a0c6d180a3a2ffc0ff850f6718592a6f.tar.bz2
glibc-0fd43249a0c6d180a3a2ffc0ff850f6718592a6f.zip
1999-02-28 Mark Kettenis <kettenis@gnu.org>
* sysdeps/mach/hurd/getsockname.c (getsockname): Set *LEN to the actual length if the adress length is smaller than the input value. Change type of *LEN paramater to socklen_t. * sysdeps/mach/hurd/getpeername.c (getpeername): Likewise. * sysdeps/mach/hurd/accept.c (accept): Likewise. * sysdeps/mach/hurd/recvfrom.c (recvfrom): Likewise. * sysdeps/mach/hurd/sendto.c (sendto): Change type of ADDR_LEN paramater to socklen_t.
Diffstat (limited to 'sysdeps/mach/hurd/recvfrom.c')
-rw-r--r--sysdeps/mach/hurd/recvfrom.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/sysdeps/mach/hurd/recvfrom.c b/sysdeps/mach/hurd/recvfrom.c
index 981b922654..ab41612d71 100644
--- a/sysdeps/mach/hurd/recvfrom.c
+++ b/sysdeps/mach/hurd/recvfrom.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1994, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1994, 1997, 1999 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -17,17 +17,15 @@
Boston, MA 02111-1307, USA. */
#include <errno.h>
+#include <string.h>
#include <sys/socket.h>
#include <hurd.h>
#include <hurd/fd.h>
#include <hurd/socket.h>
-#include <string.h>
/* Read N bytes into BUF through socket FD from peer
at address ADDR (which is ADDR_LEN bytes long).
Returns the number read or -1 for errors. */
-
-/* XXX should be __recvfrom ? */
int
recvfrom (fd, buf, n, flags, addrarg, addr_len)
int fd;
@@ -35,7 +33,7 @@ recvfrom (fd, buf, n, flags, addrarg, addr_len)
size_t n;
int flags;
__SOCKADDR_ARG addrarg;
- size_t *addr_len;
+ socklen_t *addr_len;
{
error_t err;
mach_port_t addrport;
@@ -74,10 +72,11 @@ recvfrom (fd, buf, n, flags, addrarg, addr_len)
if (err)
return __hurd_dfail (fd, err);
+ if (*addr_len > buflen)
+ *addr_len = buflen;
+
if (buf != (char *) addr)
{
- if (*addr_len < buflen)
- *addr_len = buflen;
memcpy (addr, buf, *addr_len);
__vm_deallocate (__mach_task_self (), (vm_address_t) buf, buflen);
}