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

Update.

Browse Source 
* posix/unistd.h (socklen_t): Define if it has not yet happened.
	(gethostname): Change type of second parameter to socklen_t.
	* include/unistd.h (__gethostname): Change type of second
	parameter to socklen_t.
	* sysdeps/generic/gethostname.c (__gethostname): Likewise.
	* sysdeps/mach/hurd/gethostname.c (__gethostname): Likewise.
	* sysdeps/unix/sysv/gethostname.c (__gethostname): Likewise.
	* sysdeps/unix/sysv/sysv4/solaris2/gethostname.c (__gethostname):
	Likewise.
	* sysdeps/unix/sysv/linux/gethostname.c: Removed.
	* sysdeps/generic/bits/socket.h: Use __socklen_t to define socklen_t.
	Allow definition elsewhere.
	* sysdeps/unix/sysv/aix/bits/socket.h: Likewise.
	* sysdeps/unix/sysv/linux/bits/socket.h: Likewise.
	* sysdeps/unix/sysv/linux/mips/bits/socket.h: Likewise.
	* sysdeps/generic/bits/types.h: Define __socklen_t.
	* sysdeps/unix/sysv/aix/bits/types.h: Likewise.
	* sysdeps/unix/sysv/hpux/bits/types.h: Likewise.
	* sysdeps/unix/sysv/linux/alpha/bits/types.h: Likewise.
	* sysdeps/unix/sysv/linux/bits/types.h: Likewise.
	* sysdeps/unix/sysv/linux/mips/bits/types.h: Likewise.
	* sysdeps/unix/sysv/linux/sparc/bits/types.h: Likewise.
	* sysdeps/unix/sysv/sysv4/solaris2/bits/types.h: Likewise.
This commit is contained in:
Ulrich Drepper 2000-04-02 08:05:36 +00:00
parent ad483238a1
commit 750f9af619
22 changed files with 112 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ChangeLog
View File

@ -1,5 +1,29 @@
2000-04-01 Ulrich Drepper <drepper@redhat.com> 2000-04-01 Ulrich Drepper <drepper@redhat.com>
* posix/unistd.h (socklen_t): Define if it has not yet happened.
(gethostname): Change type of second parameter to socklen_t.
* include/unistd.h (__gethostname): Change type of second
parameter to socklen_t.
* sysdeps/generic/gethostname.c (__gethostname): Likewise.
* sysdeps/mach/hurd/gethostname.c (__gethostname): Likewise.
* sysdeps/unix/sysv/gethostname.c (__gethostname): Likewise.
* sysdeps/unix/sysv/sysv4/solaris2/gethostname.c (__gethostname):
Likewise.
* sysdeps/unix/sysv/linux/gethostname.c: Removed.
* sysdeps/generic/bits/socket.h: Use __socklen_t to define socklen_t.
Allow definition elsewhere.
* sysdeps/unix/sysv/aix/bits/socket.h: Likewise.
* sysdeps/unix/sysv/linux/bits/socket.h: Likewise.
* sysdeps/unix/sysv/linux/mips/bits/socket.h: Likewise.
* sysdeps/generic/bits/types.h: Define __socklen_t.
* sysdeps/unix/sysv/aix/bits/types.h: Likewise.
* sysdeps/unix/sysv/hpux/bits/types.h: Likewise.
* sysdeps/unix/sysv/linux/alpha/bits/types.h: Likewise.
* sysdeps/unix/sysv/linux/bits/types.h: Likewise.
* sysdeps/unix/sysv/linux/mips/bits/types.h: Likewise.
* sysdeps/unix/sysv/linux/sparc/bits/types.h: Likewise.
* sysdeps/unix/sysv/sysv4/solaris2/bits/types.h: Likewise.
* inet/arpa/inet.h (inet_addr): Change return type to in_addr_t. * inet/arpa/inet.h (inet_addr): Change return type to in_addr_t.
(inet_lnaof): Likewise. (inet_lnaof): Likewise.
(inet_netof): Likewise. (inet_netof): Likewise.

5
bits/socket.h
View File

@ -31,7 +31,10 @@
#include <stddef.h> #include <stddef.h>
/* Type for length arguments in socket calls. */ /* Type for length arguments in socket calls. */
typedef unsigned int socklen_t; #ifndef __socklen_t_defined
typedef __socklen_t socklen_t;
# define __socklen_t_defined
#endif
/* Types of sockets. */ /* Types of sockets. */

5
bits/types.h
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1991,92,94,95,96,97,98,99 Free Software Foundation, Inc. /* Copyright (C) 1991,92,94,95,96,97,98,99, 2000 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
@ -139,4 +139,7 @@ typedef unsigned int __t_uscalar_t;
/* Duplicates info from stdint.h but this is used in unistd.h. */ /* Duplicates info from stdint.h but this is used in unistd.h. */
typedef long int __intptr_t; typedef long int __intptr_t;
/* Duplicate info from sys/socket.h. */
typedef unsigned int __socklen_t;
#endif /* bits/types.h */ #endif /* bits/types.h */

2
include/unistd.h
View File

@ -70,7 +70,7 @@ extern int __link (__const char *__from, __const char *__to);
extern int __symlink (__const char *__from, __const char *__to); extern int __symlink (__const char *__from, __const char *__to);
extern int __readlink (__const char *__path, char *__buf, size_t __len); extern int __readlink (__const char *__path, char *__buf, size_t __len);
extern int __unlink (__const char *__name); extern int __unlink (__const char *__name);
extern int __gethostname (char *__name, size_t __len); extern int __gethostname (char *__name, socklen_t __len);
extern int __profil (unsigned short int *__sample_buffer, size_t __size, extern int __profil (unsigned short int *__sample_buffer, size_t __size,
size_t __offset, unsigned int __scale); size_t __offset, unsigned int __scale);
extern int __getdtablesize (void); extern int __getdtablesize (void);

9
posix/unistd.h
View File

@ -242,6 +242,13 @@ typedef __intptr_t intptr_t;
# endif # endif
#endif #endif
#if defined __USE_BSD || defined __USE_XOPEN
# ifndef __socklen_t_defined
typedef __socklen_t socklen_t;
# define __socklen_t_defined
# endif
#endif
/* Values for the second argument to access. /* Values for the second argument to access.
These may be OR'd together. */ These may be OR'd together. */
#define R_OK 4 /* Test for read permission. */ #define R_OK 4 /* Test for read permission. */
@ -735,7 +742,7 @@ extern int setlogin (__const char *__name) __THROW;
/* Put the name of the current host in no more than LEN bytes of NAME. /* Put the name of the current host in no more than LEN bytes of NAME.
The result is null-terminated if LEN is large enough for the full The result is null-terminated if LEN is large enough for the full
name and the terminator. */ name and the terminator. */
extern int gethostname (char *__name, size_t __len) __THROW; extern int gethostname (char *__name, socklen_t __len) __THROW;
/* Set the name of the current host to NAME, which is LEN bytes long. /* Set the name of the current host to NAME, which is LEN bytes long.
This call is restricted to the super-user. */ This call is restricted to the super-user. */

5
sysdeps/generic/bits/socket.h
View File

@ -31,7 +31,10 @@
#include <stddef.h> #include <stddef.h>
/* Type for length arguments in socket calls. */ /* Type for length arguments in socket calls. */
typedef unsigned int socklen_t; #ifndef __socklen_t_defined
typedef __socklen_t socklen_t;
# define __socklen_t_defined
#endif
/* Types of sockets. */ /* Types of sockets. */

5
sysdeps/generic/bits/types.h
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1991,92,94,95,96,97,98,99 Free Software Foundation, Inc. /* Copyright (C) 1991,92,94,95,96,97,98,99, 2000 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
@ -139,4 +139,7 @@ typedef unsigned int __t_uscalar_t;
/* Duplicates info from stdint.h but this is used in unistd.h. */ /* Duplicates info from stdint.h but this is used in unistd.h. */
typedef long int __intptr_t; typedef long int __intptr_t;
/* Duplicate info from sys/socket.h. */
typedef unsigned int __socklen_t;
#endif /* bits/types.h */ #endif /* bits/types.h */

4
sysdeps/generic/gethostname.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1991, 1995, 1996, 1997 Free Software Foundation, Inc. /* Copyright (C) 1991, 1995, 1996, 1997, 2000 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
@ -25,7 +25,7 @@
int int
__gethostname (name, len) __gethostname (name, len)
char *name; char *name;
size_t len; socklen_t len;
{ {
__set_errno (ENOSYS); __set_errno (ENOSYS);
return -1; return -1;

4
sysdeps/mach/hurd/gethostname.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1991, 92, 93, 94, 95, 96, 97 Free Software Foundation, Inc. /* Copyright (C) 1991-1997, 2000 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
@ -25,7 +25,7 @@
int int
__gethostname (name, len) __gethostname (name, len)
char *name; char *name;
size_t len; socklen_t len;
{ {
/* The host name is just the contents of the file /etc/hostname. */ /* The host name is just the contents of the file /etc/hostname. */
ssize_t n = _hurd_get_host_config ("/etc/hostname", name, len); ssize_t n = _hurd_get_host_config ("/etc/hostname", name, len);

5
sysdeps/unix/sysv/aix/bits/socket.h
View File

@ -32,7 +32,10 @@
#include <sys/types.h> #include <sys/types.h>
/* Type for length arguments in socket calls. */ /* Type for length arguments in socket calls. */
typedef unsigned int socklen_t; #ifndef __socklen_t_defined
typedef __socklen_t socklen_t;
# define __socklen_t_defined
#endif
/* Types of sockets. */ /* Types of sockets. */
enum __socket_type enum __socket_type

5
sysdeps/unix/sysv/aix/bits/types.h
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1991,92,94,95,96,97,98,99 Free Software Foundation, Inc. /* Copyright (C) 1991,92,94,95,96,97,98,99, 2000 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
@ -145,4 +145,7 @@ typedef unsigned int __t_uscalar_t;
/* Duplicates info from stdint.h but this is used in unistd.h. */ /* Duplicates info from stdint.h but this is used in unistd.h. */
typedef int __intptr_t; typedef int __intptr_t;
/* Duplicate info from sys/socket.h. */
typedef unsigned int __socklen_t;
#endif /* bits/types.h */ #endif /* bits/types.h */

17
sysdeps/unix/sysv/gethostname.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1992, 1995, 1997 Free Software Foundation, Inc. /* Copyright (C) 1992, 1995, 1997, 2000 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,6 +17,7 @@
Boston, MA 02111-1307, USA. */ Boston, MA 02111-1307, USA. */
#include <errno.h> #include <errno.h>
#include <string.h>
#include <unistd.h> #include <unistd.h>
#include <sys/utsname.h> #include <sys/utsname.h>
@ -26,12 +27,22 @@
int int
__gethostname (name, len) __gethostname (name, len)
char *name; char *name;
size_t len; socklen_t len;
{ {
struct utsname buf; struct utsname buf;
size_t node_len;
if (uname (&buf)) if (uname (&buf))
return -1; return -1;
strncpy (name, buf.nodename, len);
node_len = strlen (buf.nodename) + 1;
if (node_len > len)
{
__set_errno (ENAMETOOLONG);
return -1;
}
memcpy (name, buf.nodename, node_len);
return 0; return 0;
} }

5
sysdeps/unix/sysv/hpux/bits/types.h
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1991, 92, 94, 95, 96, 97, 98 Free Software Foundation, Inc. /* Copyright (C) 1991, 1992, 1994-1998, 2000 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
@ -144,4 +144,7 @@ typedef unsigned int __t_uscalar_t;
/* Duplicates info from stdint.h but this is used in unistd.h. */ /* Duplicates info from stdint.h but this is used in unistd.h. */
typedef int __intptr_t; typedef int __intptr_t;
/* Duplicate info from sys/socket.h. */
typedef unsigned int __socklen_t;
#endif /* bits/types.h */ #endif /* bits/types.h */

5
sysdeps/unix/sysv/linux/alpha/bits/types.h
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1991,92,94,95,96,97,98,99 Free Software Foundation, Inc. /* Copyright (C) 1991,92,94,95,96,97,98,99, 2000 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
@ -123,6 +123,9 @@ typedef unsigned long int __t_uscalar_t;
/* Duplicates info from stdint.h but this is used in unistd.h. */ /* Duplicates info from stdint.h but this is used in unistd.h. */
typedef long int __intptr_t; typedef long int __intptr_t;
/* Duplicate info from sys/socket.h. */
typedef unsigned int __socklen_t;
/* Now add the thread types. */ /* Now add the thread types. */
#ifdef __USE_UNIX98 #ifdef __USE_UNIX98

7
sysdeps/unix/sysv/linux/bits/socket.h
View File

@ -1,5 +1,5 @@
/* System-specific socket constants and types. Linux version. /* System-specific socket constants and types. Linux version.
Copyright (C) 1991,92,94,95,96,97,98,99 Free Software Foundation, Inc. Copyright (C) 1991, 1992, 1994-1999, 2000 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
@ -32,7 +32,10 @@
#include <sys/types.h> #include <sys/types.h>
/* Type for length arguments in socket calls. */ /* Type for length arguments in socket calls. */
typedef unsigned int socklen_t; #ifndef __socklen_t_defined
typedef __socklen_t socklen_t;
# define __socklen_t_defined
#endif
/* Types of sockets. */ /* Types of sockets. */
enum __socket_type enum __socket_type

5
sysdeps/unix/sysv/linux/bits/types.h
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1991,92,94,95,96,97,98,99 Free Software Foundation, Inc. /* Copyright (C) 1991,92,94,95,96,97,98,99, 2000 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
@ -149,6 +149,9 @@ typedef unsigned long int __t_uscalar_t;
/* Duplicates info from stdint.h but this is used in unistd.h. */ /* Duplicates info from stdint.h but this is used in unistd.h. */
typedef int __intptr_t; typedef int __intptr_t;
/* Duplicate info from sys/socket.h. */
typedef unsigned int __socklen_t;
/* Now add the thread types. */ /* Now add the thread types. */
#ifdef __USE_UNIX98 #ifdef __USE_UNIX98

55
sysdeps/unix/sysv/linux/gethostname.c
View File

@ -1,55 +0,0 @@
/* Copyright (C) 1992, 1995, 1996, 1997, 1998 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
modify it under the terms of the GNU Library General Public License as
published by the Free Software Foundation; either version 2 of the
License, or (at your option) any later version.
The GNU C Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Library General Public License for more details.
You should have received a copy of the GNU Library General Public
License along with the GNU C Library; see the file COPYING.LIB. If not,
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
#include <errno.h>
#include <string.h>
#include <unistd.h>
#include <sys/utsname.h>
/* Put the name of the current host in no more than LEN bytes of NAME.
The result is null-terminated if LEN is large enough for the full
name and the terminator. */
int
__gethostname (name, len)
char *name;
size_t len;
{
struct utsname buf;
size_t node_len;
if (name == NULL)
{
__set_errno (EINVAL);
return -1;
}
if (uname (&buf))
return -1;
node_len = strlen (buf.nodename) + 1;
if (node_len > len)
{
__set_errno (ENAMETOOLONG);
return -1;
}
memcpy (name, buf.nodename, node_len);
return 0;
}
weak_alias (__gethostname, gethostname)

5
sysdeps/unix/sysv/linux/mips/bits/socket.h
View File

@ -32,7 +32,10 @@
#include <sys/types.h> #include <sys/types.h>
/* Type for length arguments in socket calls. */ /* Type for length arguments in socket calls. */
typedef unsigned int socklen_t; #ifndef __socklen_t_defined
typedef __socklen_t socklen_t;
# define __socklen_t_defined
#endif
/* Types of sockets. */ /* Types of sockets. */
enum __socket_type enum __socket_type

5
sysdeps/unix/sysv/linux/mips/bits/types.h
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1991,92,94,95,96,97,98,99 Free Software Foundation, Inc. /* Copyright (C) 1991,92,94,95,96,97,98,99, 2000 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
@ -149,6 +149,9 @@ typedef unsigned long int __t_uscalar_t;
/* Duplicates info from stdint.h but this is used in unistd.h. */ /* Duplicates info from stdint.h but this is used in unistd.h. */
typedef int __intptr_t; typedef int __intptr_t;
/* Duplicate info from sys/socket.h. */
typedef unsigned int __socklen_t;
/* Now add the thread types. */ /* Now add the thread types. */
#ifdef __USE_UNIX98 #ifdef __USE_UNIX98

5
sysdeps/unix/sysv/linux/sparc/bits/types.h
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1991,92,94,95,96,97,98,99 Free Software Foundation, Inc. /* Copyright (C) 1991,92,94,95,96,97,98,99, 2000 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
@ -173,6 +173,9 @@ typedef long int __intptr_t;
typedef int __intptr_t; typedef int __intptr_t;
#endif #endif
/* Duplicate info from sys/socket.h. */
typedef unsigned int __socklen_t;
/* Now add the thread types. */ /* Now add the thread types. */
#ifdef __USE_UNIX98 #ifdef __USE_UNIX98

6
sysdeps/unix/sysv/sysv4/gethostname.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1994, 1995, 1997 Free Software Foundation, Inc. /* Copyright (C) 1994, 1995, 1997, 2000 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
Contributed by Brendan Kehoe (brendan@zen.org). Contributed by Brendan Kehoe (brendan@zen.org).
@ -22,12 +22,12 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/systeminfo.h> #include <sys/systeminfo.h>
extern int __sysinfo __P ((int command, char *buf, long count)); extern int __sysinfo (int command, char *buf, long int count);
int int
__gethostname (name, namelen) __gethostname (name, namelen)
char *name; char *name;
size_t namelen; socklen_t namelen;
{ {
return __sysinfo (SI_HOSTNAME, name, namelen); return __sysinfo (SI_HOSTNAME, name, namelen);
} }

5
sysdeps/unix/sysv/sysv4/solaris2/bits/types.h
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1991,92,94,95,96,97,98,99 Free Software Foundation, Inc. /* Copyright (C) 1991,92,94,95,96,97,98,99, 2000 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
@ -134,4 +134,7 @@ typedef unsigned int __t_uscalar_t;
/* Duplicates info from stdint.h but this is used in unistd.h. */ /* Duplicates info from stdint.h but this is used in unistd.h. */
typedef long int __intptr_t; typedef long int __intptr_t;
/* Duplicate info from sys/socket.h. */
typedef unsigned int __socklen_t;
#endif /* bits/types.h */ #endif /* bits/types.h */