AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-01-03 00:10:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

1999-02-28 Mark Kettenis <kettenis@gnu.org>

Browse Source 
* 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.
This commit is contained in:
Roland McGrath 1999-02-28 13:01:23 +00:00
parent 5615c549e2
commit 0fd43249a0
5 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sysdeps/mach/hurd/accept.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1992, 1993, 1994, 1997 Free Software Foundation, Inc. /* Copyright (C) 1992, 1993, 1994, 1997, 1999 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -17,12 +17,12 @@
Boston, MA 02111-1307, USA. */ Boston, MA 02111-1307, USA. */
#include <errno.h> #include <errno.h>
#include <hurd.h>
#include <hurd/fd.h>
#include <sys/socket.h>
#include <hurd/socket.h>
#include <fcntl.h> #include <fcntl.h>
#include <string.h> #include <string.h>
#include <sys/socket.h>
#include <hurd.h>
#include <hurd/fd.h>
#include <hurd/socket.h>
/* Await a connection on socket FD. /* Await a connection on socket FD.
When a connection arrives, open a new socket to communicate with it, When a connection arrives, open a new socket to communicate with it,
@ -33,7 +33,7 @@ int
accept (fd, addrarg, addr_len) accept (fd, addrarg, addr_len)
int fd; int fd;
__SOCKADDR_ARG addrarg; __SOCKADDR_ARG addrarg;
size_t *addr_len; socklen_t *addr_len;
{ {
error_t err; error_t err;
socket_t new; socket_t new;
@ -69,10 +69,11 @@ accept (fd, addrarg, addr_len)
if (addr != NULL) if (addr != NULL)
{ {
if (*addr_len > buflen)
*addr_len = buflen;
if (buf != (char *) addr) if (buf != (char *) addr)
{ {
if (*addr_len < buflen)
*addr_len = buflen;
memcpy (addr, buf, *addr_len); memcpy (addr, buf, *addr_len);
__vm_deallocate (__mach_task_self (), (vm_address_t) buf, buflen); __vm_deallocate (__mach_task_self (), (vm_address_t) buf, buflen);
} }

13
sysdeps/mach/hurd/getpeername.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1992, 1994, 1997 Free Software Foundation, Inc. /* Copyright (C) 1992, 1994, 1997, 1999 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -17,21 +17,19 @@
Boston, MA 02111-1307, USA. */ Boston, MA 02111-1307, USA. */
#include <errno.h> #include <errno.h>
#include <string.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <hurd.h> #include <hurd.h>
#include <hurd/fd.h> #include <hurd/fd.h>
#include <hurd/socket.h> #include <hurd/socket.h>
#include <string.h>
/* Put the address of the peer connected to socket FD into *ADDR /* Put the address of the peer connected to socket FD into *ADDR
(which is *LEN bytes long), and its actual length into *LEN. */ (which is *LEN bytes long), and its actual length into *LEN. */
/* XXX should be __getpeername ? */
int int
getpeername (fd, addrarg, len) getpeername (fd, addrarg, len)
int fd; int fd;
__SOCKADDR_ARG addrarg; __SOCKADDR_ARG addrarg;
size_t *len; socklen_t *len;
{ {
error_t err; error_t err;
mach_msg_type_number_t buflen = *len; mach_msg_type_number_t buflen = *len;
@ -49,10 +47,11 @@ getpeername (fd, addrarg, len)
if (err) if (err)
return __hurd_dfail (fd, err); return __hurd_dfail (fd, err);
if (*len > buflen)
*len = buflen;
if (buf != (char *) addr) if (buf != (char *) addr)
{ {
if (*len < buflen)
*len = buflen;
memcpy (addr, buf, *len); memcpy (addr, buf, *len);
__vm_deallocate (__mach_task_self (), (vm_address_t) buf, buflen); __vm_deallocate (__mach_task_self (), (vm_address_t) buf, buflen);
} }

11
sysdeps/mach/hurd/getsockname.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1992, 1994, 1997 Free Software Foundation, Inc. /* Copyright (C) 1992, 1994, 1997, 1999 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -17,18 +17,18 @@
Boston, MA 02111-1307, USA. */ Boston, MA 02111-1307, USA. */
#include <errno.h> #include <errno.h>
#include <string.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <hurd.h> #include <hurd.h>
#include <hurd/fd.h> #include <hurd/fd.h>
#include <hurd/socket.h> #include <hurd/socket.h>
#include <string.h>
/* Put the local address of FD into *ADDR and its length in *LEN. */ /* Put the local address of FD into *ADDR and its length in *LEN. */
int int
getsockname (fd, addrarg, len) getsockname (fd, addrarg, len)
int fd; int fd;
__SOCKADDR_ARG addrarg; __SOCKADDR_ARG addrarg;
size_t *len; socklen_t *len;
{ {
error_t err; error_t err;
struct sockaddr *addr = addrarg.__sockaddr__; struct sockaddr *addr = addrarg.__sockaddr__;
@ -46,10 +46,11 @@ getsockname (fd, addrarg, len)
if (err) if (err)
return __hurd_dfail (fd, err); return __hurd_dfail (fd, err);
if (*len > buflen)
*len = buflen;
if (buf != (char *) addr) if (buf != (char *) addr)
{ {
if (*len < buflen)
*len = buflen;
memcpy (addr, buf, *len); memcpy (addr, buf, *len);
__vm_deallocate (__mach_task_self (), (vm_address_t) buf, buflen); __vm_deallocate (__mach_task_self (), (vm_address_t) buf, buflen);
} }

13
sysdeps/mach/hurd/recvfrom.c
View File

@ -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. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -17,17 +17,15 @@
Boston, MA 02111-1307, USA. */ Boston, MA 02111-1307, USA. */
#include <errno.h> #include <errno.h>
#include <string.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <hurd.h> #include <hurd.h>
#include <hurd/fd.h> #include <hurd/fd.h>
#include <hurd/socket.h> #include <hurd/socket.h>
#include <string.h>
/* Read N bytes into BUF through socket FD from peer /* Read N bytes into BUF through socket FD from peer
at address ADDR (which is ADDR_LEN bytes long). at address ADDR (which is ADDR_LEN bytes long).
Returns the number read or -1 for errors. */ Returns the number read or -1 for errors. */
/* XXX should be __recvfrom ? */
int int
recvfrom (fd, buf, n, flags, addrarg, addr_len) recvfrom (fd, buf, n, flags, addrarg, addr_len)
int fd; int fd;
@ -35,7 +33,7 @@ recvfrom (fd, buf, n, flags, addrarg, addr_len)
size_t n; size_t n;
int flags; int flags;
__SOCKADDR_ARG addrarg; __SOCKADDR_ARG addrarg;
size_t *addr_len; socklen_t *addr_len;
{ {
error_t err; error_t err;
mach_port_t addrport; mach_port_t addrport;
@ -74,10 +72,11 @@ recvfrom (fd, buf, n, flags, addrarg, addr_len)
if (err) if (err)
return __hurd_dfail (fd, err); return __hurd_dfail (fd, err);
if (*addr_len > buflen)
*addr_len = buflen;
if (buf != (char *) addr) if (buf != (char *) addr)
{ {
if (*addr_len < buflen)
*addr_len = buflen;
memcpy (addr, buf, *addr_len); memcpy (addr, buf, *addr_len);
__vm_deallocate (__mach_task_self (), (vm_address_t) buf, buflen); __vm_deallocate (__mach_task_self (), (vm_address_t) buf, buflen);
} }

10
sysdeps/mach/hurd/sendto.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc. /* Copyright (C) 1994, 1995, 1996, 1997, 1999 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -18,11 +18,11 @@
#include <errno.h> #include <errno.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <hurd.h>
#include <hurd/socket.h>
#include <hurd/fd.h>
#include <sys/un.h> #include <sys/un.h>
#include <hurd.h>
#include <hurd/fd.h>
#include <hurd/ifsock.h> #include <hurd/ifsock.h>
#include <hurd/socket.h>
/* Send N bytes of BUF on socket FD to peer at address ADDR (which is /* Send N bytes of BUF on socket FD to peer at address ADDR (which is
ADDR_LEN bytes long). Returns the number sent, or -1 for errors. */ ADDR_LEN bytes long). Returns the number sent, or -1 for errors. */
@ -32,7 +32,7 @@ sendto (int fd,
size_t n, size_t n,
int flags, int flags,
const struct sockaddr_un *addr, const struct sockaddr_un *addr,
size_t addr_len) socklen_t addr_len)
{ {
addr_port_t aport; addr_port_t aport;
error_t err; error_t err;