diff options
Diffstat (limited to 'sysdeps/posix')
| -rw-r--r-- | sysdeps/posix/Makefile | 5 | ||||
| -rw-r--r-- | sysdeps/posix/clock_getres.c | 111 | ||||
| -rw-r--r-- | sysdeps/posix/euidaccess.c | 96 | ||||
| -rw-r--r-- | sysdeps/posix/gai_strerror-strs.h | 17 | ||||
| -rw-r--r-- | sysdeps/posix/gai_strerror.c | 70 | ||||
| -rw-r--r-- | sysdeps/posix/getaddrinfo.c | 806 | ||||
| -rw-r--r-- | sysdeps/posix/gettimeofday.c | 8 | ||||
| -rw-r--r-- | sysdeps/posix/libc_fatal.c | 7 | ||||
| -rw-r--r-- | sysdeps/posix/pause.c | 18 | ||||
| -rw-r--r-- | sysdeps/posix/posix_fallocate.c | 43 | ||||
| -rw-r--r-- | sysdeps/posix/posix_fallocate64.c | 47 | ||||
| -rw-r--r-- | sysdeps/posix/profil.c | 8 | ||||
| -rw-r--r-- | sysdeps/posix/shm_open.c | 4 | ||||
| -rw-r--r-- | sysdeps/posix/shm_unlink.c | 4 | ||||
| -rw-r--r-- | sysdeps/posix/sigignore.c | 4 | ||||
| -rw-r--r-- | sysdeps/posix/signal.c | 4 | ||||
| -rw-r--r-- | sysdeps/posix/sigset.c | 24 | ||||
| -rw-r--r-- | sysdeps/posix/spawni.c | 25 | ||||
| -rw-r--r-- | sysdeps/posix/sprofil.c | 8 | ||||
| -rw-r--r-- | sysdeps/posix/sysconf.c | 158 | ||||
| -rw-r--r-- | sysdeps/posix/system.c | 6 | ||||
| -rw-r--r-- | sysdeps/posix/sysv_signal.c | 4 | ||||
| -rw-r--r-- | sysdeps/posix/tempname.c | 10 |
23 files changed, 436 insertions, 1051 deletions
diff --git a/sysdeps/posix/Makefile b/sysdeps/posix/Makefile deleted file mode 100644 index b58aa6aadb..0000000000 --- a/sysdeps/posix/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -# These affect the generated bits/stdio_lim.h file. -L_tmpnam = 20 -TMP_MAX = 238328 -L_ctermid = 9 -L_cuserid = 9 diff --git a/sysdeps/posix/clock_getres.c b/sysdeps/posix/clock_getres.c index f4dc21f8af..a2d466607e 100644 --- a/sysdeps/posix/clock_getres.c +++ b/sysdeps/posix/clock_getres.c @@ -1,5 +1,4 @@ -/* clock_getres -- Get the resolution of a POSIX clockid_t. - Copyright (C) 1999, 2000, 2001, 2003, 2004 Free Software Foundation, Inc. +/* Copyright (C) 1999, 2000, 2001, 2003 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 @@ -25,55 +24,11 @@ #include <libc-internal.h> -#if HP_TIMING_AVAIL -static long int nsec; /* Clock frequency of the processor. */ - -static inline int -hp_timing_getres (struct timespec *res) -{ - if (__builtin_expect (nsec == 0, 0)) - { - hp_timing_t freq; - - /* This can only happen if we haven't initialized the `nsec' - variable yet. Do this now. We don't have to protect this - code against multiple execution since all of them should - lead to the same result. */ - freq = __get_clockfreq (); - if (__builtin_expect (freq == 0, 0)) - /* Something went wrong. */ - return -1; - - nsec = MAX (UINT64_C (1000000000) / freq, 1); - } - - /* Fill in the values. - The seconds are always zero (unless we have a 1Hz machine). */ - res->tv_sec = 0; - res->tv_nsec = nsec; - - return 0; -} +#if HP_TIMING_AVAIL && !defined HANDLED_CPUTIME +/* Clock frequency of the processor. */ +static long int nsec; #endif -static inline int -realtime_getres (struct timespec *res) -{ - long int clk_tck = sysconf (_SC_CLK_TCK); - - if (__builtin_expect (clk_tck != -1, 1)) - { - /* This implementation assumes that the realtime clock has a - resolution higher than 1 second. This is the case for any - reasonable implementation. */ - res->tv_sec = 0; - res->tv_nsec = 1000000000 / clk_tck; - return 0; - } - - return -1; -} - /* Get resolution of clock. */ int @@ -83,33 +38,69 @@ clock_getres (clockid_t clock_id, struct timespec *res) switch (clock_id) { +#define HANDLE_REALTIME \ + do { \ + long int clk_tck = sysconf (_SC_CLK_TCK); \ + \ + if (__builtin_expect (clk_tck != -1, 1)) \ + { \ + /* This implementation assumes that the realtime clock has a \ + resolution higher than 1 second. This is the case for any \ + reasonable implementation. */ \ + res->tv_sec = 0; \ + res->tv_nsec = 1000000000 / clk_tck; \ + \ + retval = 0; \ + } \ + } while (0) + #ifdef SYSDEP_GETRES SYSDEP_GETRES; #endif #ifndef HANDLED_REALTIME case CLOCK_REALTIME: - retval = realtime_getres (res); + HANDLE_REALTIME; break; #endif /* handled REALTIME */ default: -#ifdef SYSDEP_GETRES_CPU - SYSDEP_GETRES_CPU; -#endif #if HP_TIMING_AVAIL if ((clock_id & ((1 << CLOCK_IDFIELD_SIZE) - 1)) - == CLOCK_THREAD_CPUTIME_ID) - retval = hp_timing_getres (res); - else + != CLOCK_THREAD_CPUTIME_ID) #endif - __set_errno (EINVAL); - break; + { + __set_errno (EINVAL); + break; + } #if HP_TIMING_AVAIL && !defined HANDLED_CPUTIME + /* FALLTHROUGH. */ case CLOCK_PROCESS_CPUTIME_ID: - case CLOCK_THREAD_CPUTIME_ID: - retval = hp_timing_getres (res); + { + if (__builtin_expect (nsec == 0, 0)) + { + hp_timing_t freq; + + /* This can only happen if we haven't initialized the `freq' + variable yet. Do this now. We don't have to protect this + code against multiple execution since all of them should + lead to the same result. */ + freq = __get_clockfreq (); + if (__builtin_expect (freq == 0, 0)) + /* Something went wrong. */ + break; + + nsec = MAX (UINT64_C (1000000000) / freq, 1); + } + + /* File in the values. The seconds are always zero (unless we + have a 1Hz machine). */ + res->tv_sec = 0; + res->tv_nsec = nsec; + + retval = 0; + } break; #endif } diff --git a/sysdeps/posix/euidaccess.c b/sysdeps/posix/euidaccess.c index 333870cdde..8a2d826e95 100644 --- a/sysdeps/posix/euidaccess.c +++ b/sysdeps/posix/euidaccess.c @@ -1,5 +1,5 @@ /* Check if effective user id can access file - Copyright (C) 1990,1991,1995-2001,2005,2007 Free Software Foundation, Inc. + Copyright (C) 1990,91,95,96,97,98,99,2000,01 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 @@ -21,26 +21,26 @@ Adapted for GNU C library by Roland McGrath. */ #ifdef HAVE_CONFIG_H -# include <config.h> +#include <config.h> #endif #include <sys/types.h> #include <sys/stat.h> #ifdef S_IEXEC -# ifndef S_IXUSR -# define S_IXUSR S_IEXEC -# endif -# ifndef S_IXGRP -# define S_IXGRP (S_IEXEC >> 3) -# endif -# ifndef S_IXOTH -# define S_IXOTH (S_IEXEC >> 6) -# endif +#ifndef S_IXUSR +#define S_IXUSR S_IEXEC +#endif +#ifndef S_IXGRP +#define S_IXGRP (S_IEXEC >> 3) +#endif +#ifndef S_IXOTH +#define S_IXOTH (S_IEXEC >> 6) +#endif #endif /* S_IEXEC */ -#if defined HAVE_UNISTD_H || defined _LIBC -# include <unistd.h> +#if defined (HAVE_UNISTD_H) || defined (_LIBC) +#include <unistd.h> #endif #ifndef _POSIX_VERSION @@ -55,35 +55,35 @@ gid_t getegid (); extern int errno; #endif #ifndef __set_errno -# define __set_errno(val) errno = (val) +#define __set_errno(val) errno = (val) #endif -#if defined EACCES && !defined EACCESS -# define EACCESS EACCES +#if defined(EACCES) && !defined(EACCESS) +#define EACCESS EACCES #endif #ifndef F_OK -# define F_OK 0 -# define X_OK 1 -# define W_OK 2 -# define R_OK 4 +#define F_OK 0 +#define X_OK 1 +#define W_OK 2 +#define R_OK 4 #endif -#if !defined S_IROTH && defined R_OK +#if !defined (S_IROTH) && defined (R_OK) # define S_IROTH R_OK #endif -#if !defined S_IWOTH && defined W_OK +#if !defined (S_IWOTH) && defined (W_OK) # define S_IWOTH W_OK #endif -#if !defined S_IXOTH && defined X_OK +#if !defined (S_IXOTH) && defined (X_OK) # define S_IXOTH X_OK #endif #ifdef _LIBC -# define group_member __group_member -# define euidaccess __euidaccess +#define group_member __group_member +#define euidaccess __euidaccess #else @@ -93,6 +93,14 @@ static uid_t uid; /* The user's real group id. */ static gid_t gid; +#ifdef HAVE_GETGROUPS +int group_member (); +#else +#define group_member(gid) 0 +#endif + +#endif + /* The user's effective user id. */ static uid_t euid; @@ -102,14 +110,6 @@ static gid_t egid; /* Nonzero if UID, GID, EUID, and EGID have valid values. */ static int have_ids; -# ifdef HAVE_GETGROUPS -int group_member (); -# else -# define group_member(gid) 0 -# endif - -#endif - /* Return 0 if the user has permission of type MODE on file PATH; otherwise, return -1 and set `errno' to EACCESS. @@ -126,8 +126,9 @@ euidaccess (path, mode) int granted; #ifdef _LIBC - uid_t euid; - gid_t egid; + if (! __libc_enable_secure) + /* If we are not set-uid or set-gid, access does the same. */ + return __access (path, mode); #else if (have_ids == 0) { @@ -156,12 +157,12 @@ euidaccess (path, mode) #ifdef _LIBC /* Now we need the IDs. */ - euid = __geteuid (); - egid = __getegid (); - - if (__getuid () == euid && __getgid () == egid) - /* If we are not set-uid or set-gid, access does the same. */ - return __access (path, mode); + if (have_ids == 0) + { + have_ids = 1; + euid = __geteuid (); + egid = __getegid (); + } #endif /* The super-user can read and write any file, and execute any file @@ -171,28 +172,25 @@ euidaccess (path, mode) return 0; if (euid == stats.st_uid) - granted = (unsigned int) (stats.st_mode & (mode << 6)) >> 6; + granted = (unsigned) (stats.st_mode & (mode << 6)) >> 6; else if (egid == stats.st_gid || group_member (stats.st_gid)) - granted = (unsigned int) (stats.st_mode & (mode << 3)) >> 3; + granted = (unsigned) (stats.st_mode & (mode << 3)) >> 3; else granted = (stats.st_mode & mode); - /* XXX Add support for ACLs. */ if (granted == mode) return 0; __set_errno (EACCESS); return -1; } #undef euidaccess -#undef eaccess #ifdef weak_alias weak_alias (__euidaccess, euidaccess) -weak_alias (__euidaccess, eaccess) #endif #ifdef TEST -# include <stdio.h> -# include <errno.h> -# include "error.h" +#include <stdio.h> +#include <errno.h> +#include "error.h" char *program_name; diff --git a/sysdeps/posix/gai_strerror-strs.h b/sysdeps/posix/gai_strerror-strs.h deleted file mode 100644 index 19040a5138..0000000000 --- a/sysdeps/posix/gai_strerror-strs.h +++ /dev/null @@ -1,17 +0,0 @@ -_S(EAI_ADDRFAMILY, N_("Address family for hostname not supported")) -_S(EAI_AGAIN, N_("Temporary failure in name resolution")) -_S(EAI_BADFLAGS, N_("Bad value for ai_flags")) -_S(EAI_FAIL, N_("Non-recoverable failure in name resolution")) -_S(EAI_FAMILY, N_("ai_family not supported")) -_S(EAI_MEMORY, N_("Memory allocation failure")) -_S(EAI_NODATA, N_("No address associated with hostname")) -_S(EAI_NONAME, N_("Name or service not known")) -_S(EAI_SERVICE, N_("Servname not supported for ai_socktype")) -_S(EAI_SOCKTYPE, N_("ai_socktype not supported")) -_S(EAI_SYSTEM, N_("System error")) -_S(EAI_INPROGRESS, N_("Processing request in progress")) -_S(EAI_CANCELED, N_("Request canceled")) -_S(EAI_NOTCANCELED, N_("Request not canceled")) -_S(EAI_ALLDONE, N_("All requests done")) -_S(EAI_INTR, N_("Interrupted by a signal")) -_S(EAI_IDN_ENCODE, N_("Parameter string not correctly encoded")) diff --git a/sysdeps/posix/gai_strerror.c b/sysdeps/posix/gai_strerror.c index cc13dd4dab..e2835a5674 100644 --- a/sysdeps/posix/gai_strerror.c +++ b/sysdeps/posix/gai_strerror.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1997, 2001, 2002, 2004, 2005 Free Software Foundation, Inc. +/* Copyright (C) 1997, 2001, 2002, 2004 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Philip Blundell <pjb27@cam.ac.uk>, 1997. @@ -17,54 +17,44 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -#include <libintl.h> -#include <netdb.h> -#include <stdint.h> #include <stdio.h> +#include <netdb.h> +#include <libintl.h> - -#define MSGSTRFIELD(line) MSGSTRFIELD1 (line) -#define MSGSTRFIELD1(line) str##line -static const union msgstr_t -{ - struct +static struct { -#define _S(n, s) char MSGSTRFIELD(__LINE__)[sizeof (s)]; -#include "gai_strerror-strs.h" -#undef _S - }; - char str[0]; -} msgstr = + int code; + const char *msg; + } +values[] = { - { -#define _S(n, s) s, -#include "gai_strerror-strs.h" -#undef _S - } + { EAI_ADDRFAMILY, N_("Address family for hostname not supported") }, + { EAI_AGAIN, N_("Temporary failure in name resolution") }, + { EAI_BADFLAGS, N_("Bad value for ai_flags") }, + { EAI_FAIL, N_("Non-recoverable failure in name resolution") }, + { EAI_FAMILY, N_("ai_family not supported") }, + { EAI_MEMORY, N_("Memory allocation failure") }, + { EAI_NODATA, N_("No address associated with hostname") }, + { EAI_NONAME, N_("Name or service not known") }, + { EAI_SERVICE, N_("Servname not supported for ai_socktype") }, + { EAI_SOCKTYPE, N_("ai_socktype not supported") }, + { EAI_SYSTEM, N_("System error") }, + { EAI_INPROGRESS, N_("Processing request in progress") }, + { EAI_CANCELED, N_("Request canceled") }, + { EAI_NOTCANCELED, N_("Request not canceled") }, + { EAI_ALLDONE, N_("All requests done") }, + { EAI_INTR, N_("Interrupted by a signal") }, + { EAI_IDN_ENCODE, N_("Parameter string not correctly encoded") } }; -static const struct -{ - int16_t code; - uint16_t idx; -} msgidx[] = - { -#define _S(n, s) { n, offsetof (union msgstr_t, MSGSTRFIELD (__LINE__)) }, -#include "gai_strerror-strs.h" -#undef _S - }; - const char * gai_strerror (int code) { - const char *result = "Unknown error"; - for (size_t i = 0; i < sizeof (msgidx) / sizeof (msgidx[0]); ++i) - if (msgidx[i].code == code) - { - result = msgstr.str + msgidx[i].idx; - break; - } + size_t i; + for (i = 0; i < sizeof (values) / sizeof (values[0]); ++i) + if (values[i].code == code) + return _(values[i].msg); - return _(result); + return _("Unknown error"); } libc_hidden_def (gai_strerror) diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c index a7e1459c9c..c9081345ab 100644 --- a/sysdeps/posix/getaddrinfo.c +++ b/sysdeps/posix/getaddrinfo.c @@ -36,27 +36,23 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. /* This software is Copyright 1996 by Craig Metz, All Rights Reserved. */ #include <assert.h> -#include <ctype.h> #include <errno.h> #include <ifaddrs.h> #include <netdb.h> #include <resolv.h> #include <stdbool.h> #include <stdio.h> -#include <stdio_ext.h> #include <stdlib.h> #include <string.h> +#include <unistd.h> #include <arpa/inet.h> -#include <net/if.h> -#include <netinet/in.h> #include <sys/socket.h> -#include <sys/stat.h> +#include <netinet/in.h> #include <sys/types.h> #include <sys/un.h> #include <sys/utsname.h> -#include <unistd.h> +#include <net/if.h> #include <nsswitch.h> -#include <bits/libc-lock.h> #include <not-cancel.h> #include <nscd/nscd-client.h> #include <nscd/nscd_proto.h> @@ -72,7 +68,7 @@ extern int __idna_to_unicode_lzlz (const char *input, char **output, #define GAIH_EAI ~(GAIH_OKIFUNSPEC) #ifndef UNIX_PATH_MAX -# define UNIX_PATH_MAX 108 +#define UNIX_PATH_MAX 108 #endif struct gaih_service @@ -125,8 +121,7 @@ struct gaih { int family; int (*gaih)(const char *name, const struct gaih_service *service, - const struct addrinfo *req, struct addrinfo **pai, - unsigned int *naddrs); + const struct addrinfo *req, struct addrinfo **pai); }; static const struct addrinfo default_hints = @@ -181,9 +176,9 @@ gaih_local (const char *name, const struct gaih_service *service, if (! tp->name[0]) { if (req->ai_socktype) - return GAIH_OKIFUNSPEC | -EAI_SOCKTYPE; + return (GAIH_OKIFUNSPEC | -EAI_SOCKTYPE); else - return GAIH_OKIFUNSPEC | -EAI_SERVICE; + return (GAIH_OKIFUNSPEC | -EAI_SERVICE); } } @@ -201,10 +196,10 @@ gaih_local (const char *name, const struct gaih_service *service, (*pai)->ai_addrlen = sizeof (struct sockaddr_un); (*pai)->ai_addr = (void *) (*pai) + sizeof (struct addrinfo); -#ifdef _HAVE_SA_LEN +#if SALEN ((struct sockaddr_un *) (*pai)->ai_addr)->sun_len = sizeof (struct sockaddr_un); -#endif /* _HAVE_SA_LEN */ +#endif /* SALEN */ ((struct sockaddr_un *)(*pai)->ai_addr)->sun_family = AF_LOCAL; memset(((struct sockaddr_un *)(*pai)->ai_addr)->sun_path, 0, UNIX_PATH_MAX); @@ -253,10 +248,9 @@ gaih_local (const char *name, const struct gaih_service *service, } #endif /* 0 */ - static int gaih_inet_serv (const char *servicename, const struct gaih_typeproto *tp, - const struct addrinfo *req, struct gaih_servtuple *st) + const struct addrinfo *req, struct gaih_servtuple *st) { struct servent *s; size_t tmpbuflen = 1024; @@ -367,11 +361,9 @@ typedef enum nss_status (*nss_getcanonname_r) int *errnop, int *h_errnop); extern service_user *__nss_hosts_database attribute_hidden; - static int gaih_inet (const char *name, const struct gaih_service *service, - const struct addrinfo *req, struct addrinfo **pai, - unsigned int *naddrs) + const struct addrinfo *req, struct addrinfo **pai) { const struct gaih_typeproto *tp = gaih_inet_typeproto; struct gaih_servtuple *st = (struct gaih_servtuple *) &nullserv; @@ -395,17 +387,16 @@ gaih_inet (const char *name, const struct gaih_service *service, if (! tp->name[0]) { if (req->ai_socktype) - return GAIH_OKIFUNSPEC | -EAI_SOCKTYPE; + return (GAIH_OKIFUNSPEC | -EAI_SOCKTYPE); else - return GAIH_OKIFUNSPEC | -EAI_SERVICE; + return (GAIH_OKIFUNSPEC | -EAI_SERVICE); } } - int port = 0; if (service != NULL) { if ((tp->protoflag & GAI_PROTO_NOSERVICE) != 0) - return GAIH_OKIFUNSPEC | -EAI_SERVICE; + return (GAIH_OKIFUNSPEC | -EAI_SERVICE); if (service->num < 0) { @@ -449,46 +440,68 @@ gaih_inet (const char *name, const struct gaih_service *service, pst = &(newp->next); } if (st == (struct gaih_servtuple *) &nullserv) - return GAIH_OKIFUNSPEC | -EAI_SERVICE; + return (GAIH_OKIFUNSPEC | -EAI_SERVICE); } } else { - port = htons (service->num); - goto got_port; + if (req->ai_socktype || req->ai_protocol) + { + st = __alloca (sizeof (struct gaih_servtuple)); + st->next = NULL; + st->socktype = tp->socktype; + st->protocol = ((tp->protoflag & GAI_PROTO_PROTOANY) + ? req->ai_protocol : tp->protocol); + st->port = htons (service->num); + } + else + { + /* Neither socket type nor protocol is set. Return all + socket types we know about. */ + struct gaih_servtuple **lastp = &st; + for (tp = gaih_inet_typeproto + 1; tp->name[0]; ++tp) + if ((tp->protoflag & GAI_PROTO_NOSERVICE) == 0) + { + struct gaih_servtuple *newp; + + newp = __alloca (sizeof (struct gaih_servtuple)); + newp->next = NULL; + newp->socktype = tp->socktype; + newp->protocol = tp->protocol; + newp->port = htons (service->num); + + *lastp = newp; + lastp = &newp->next; + } + } } } + else if (req->ai_socktype || req->ai_protocol) + { + st = __alloca (sizeof (struct gaih_servtuple)); + st->next = NULL; + st->socktype = tp->socktype; + st->protocol = ((tp->protoflag & GAI_PROTO_PROTOANY) + ? req->ai_protocol : tp->protocol); + st->port = 0; + } else { - got_port: - - if (req->ai_socktype || req->ai_protocol) - { - st = __alloca (sizeof (struct gaih_servtuple)); - st->next = NULL; - st->socktype = tp->socktype; - st->protocol = ((tp->protoflag & GAI_PROTO_PROTOANY) - ? req->ai_protocol : tp->protocol); - st->port = port; - } - else + /* Neither socket type nor protocol is set. Return all socket types + we know about. */ + struct gaih_servtuple **lastp = &st; + for (++tp; tp->name[0]; ++tp) { - /* Neither socket type nor protocol is set. Return all socket types - we know about. */ - struct gaih_servtuple **lastp = &st; - for (++tp; tp->name[0]; ++tp) - { - struct gaih_servtuple *newp; + struct gaih_servtuple *newp; - newp = __alloca (sizeof (struct gaih_servtuple)); - newp->next = NULL; - newp->socktype = tp->socktype; - newp->protocol = tp->protocol; - newp->port = port; + newp = __alloca (sizeof (struct gaih_servtuple)); + newp->next = NULL; + newp->socktype = tp->socktype; + newp->protocol = tp->protocol; + newp->port = 0; - *lastp = newp; - lastp = &newp->next; - } + *lastp = newp; + lastp = &newp->next; } } @@ -533,7 +546,7 @@ gaih_inet (const char *name, const struct gaih_service *service, { if (req->ai_family == AF_UNSPEC || req->ai_family == AF_INET) at->family = AF_INET; - else if (req->ai_family == AF_INET6 && (req->ai_flags & AI_V4MAPPED)) + else if (req->ai_family == AF_INET6 && req->ai_flags & AI_V4MAPPED) { at->addr[3] = at->addr[0]; at->addr[2] = htonl (0xffff); @@ -544,19 +557,23 @@ gaih_inet (const char *name, const struct gaih_service *service, else return -EAI_ADDRFAMILY; + dupname: if (req->ai_flags & AI_CANONNAME) - canon = name; + { + canon = strdup (name); + if (canon == NULL) + return -EAI_MEMORY; + } } - else if (at->family == AF_UNSPEC) + + if (at->family == AF_UNSPEC) { - char *namebuf = (char *) name; - char *scope_delim = strchr (name, SCOPE_DELIMITER); + char *namebuf = strdupa (name); + char *scope_delim; - if (__builtin_expect (scope_delim != NULL, 0)) - { - namebuf = alloca (scope_delim - name + 1); - *((char *) __mempcpy (namebuf, name, scope_delim - name)) = '\0'; - } + scope_delim = strchr (namebuf, SCOPE_DELIMITER); + if (scope_delim != NULL) + *scope_delim = '\0'; if (inet_pton (AF_INET6, namebuf, at->addr) > 0) { @@ -595,8 +612,7 @@ gaih_inet (const char *name, const struct gaih_service *service, } } - if (req->ai_flags & AI_CANONNAME) - canon = name; + goto dupname; } } @@ -613,10 +629,7 @@ gaih_inet (const char *name, const struct gaih_service *service, /* If we do not have to look for IPv4 and IPv6 together, use the simple, old functions. */ - if (req->ai_family == AF_INET - || (req->ai_family == AF_INET6 - && ((req->ai_flags & AI_V4MAPPED) == 0 - || (req->ai_flags & AI_ALL) == 0))) + if (req->ai_family == AF_INET || req->ai_family == AF_INET6) { int family = req->ai_family; size_t tmpbuflen = 512; @@ -667,7 +680,7 @@ gaih_inet (const char *name, const struct gaih_service *service, h->h_length); else { - uint32_t *addr = (uint32_t *) (*pat)->addr; + int32_t *addr = (uint32_t *) (*pat)->addr; addr[3] = *(uint32_t *) h->h_addr_list[i]; addr[2] = htonl (0xffff); addr[1] = 0; @@ -690,7 +703,7 @@ gaih_inet (const char *name, const struct gaih_service *service, } /* We made requests but they turned out no data. The name is known, though. */ - return GAIH_OKIFUNSPEC | -EAI_NODATA; + return (GAIH_OKIFUNSPEC | -EAI_NODATA); } goto process_list; @@ -757,7 +770,7 @@ gaih_inet (const char *name, const struct gaih_service *service, free (air); if (at->family == AF_UNSPEC) - return GAIH_OKIFUNSPEC | -EAI_NONAME; + return (GAIH_OKIFUNSPEC | -EAI_NONAME); goto process_list; } @@ -875,8 +888,8 @@ gaih_inet (const char *name, const struct gaih_service *service, AF_INET6. Try to find a useful one for both. */ if (inet6_status == NSS_STATUS_TRYAGAIN) status = NSS_STATUS_TRYAGAIN; - else if (status == NSS_STATUS_UNAVAIL - && inet6_status != NSS_STATUS_UNAVAIL) + else if (status == NSS_STATUS_UNAVAIL && + inet6_status != NSS_STATUS_UNAVAIL) status = inet6_status; } @@ -899,13 +912,13 @@ gaih_inet (const char *name, const struct gaih_service *service, /* We made requests but they turned out no data. The name is known, though. */ - return GAIH_OKIFUNSPEC | -EAI_NODATA; + return (GAIH_OKIFUNSPEC | -EAI_NODATA); } } process_list: if (at->family == AF_UNSPEC) - return GAIH_OKIFUNSPEC | -EAI_NONAME; + return (GAIH_OKIFUNSPEC | -EAI_NONAME); } else { @@ -1026,9 +1039,9 @@ gaih_inet (const char *name, const struct gaih_service *service, } } - family = at2->family; - if (family == AF_INET6) + if (at2->family == AF_INET6) { + family = AF_INET6; socklen = sizeof (struct sockaddr_in6); /* If we looked up IPv4 mapped address discard them here if @@ -1040,17 +1053,17 @@ gaih_inet (const char *name, const struct gaih_service *service, goto ignore; } else - socklen = sizeof (struct sockaddr_in); + { + family = AF_INET; + socklen = sizeof (struct sockaddr_in); + } for (st2 = st; st2 != NULL; st2 = st2->next) { struct addrinfo *ai; ai = *pai = malloc (sizeof (struct addrinfo) + socklen); if (ai == NULL) - { - free ((char *) canon); - return -EAI_MEMORY; - } + return -EAI_MEMORY; ai->ai_flags = req->ai_flags; ai->ai_family = family; @@ -1063,15 +1076,11 @@ gaih_inet (const char *name, const struct gaih_service *service, ai->ai_canonname = (char *) canon; canon = NULL; -#ifdef _HAVE_SA_LEN +#if SALEN ai->ai_addr->sa_len = socklen; -#endif /* _HAVE_SA_LEN */ +#endif /* SALEN */ ai->ai_addr->sa_family = family; - /* In case of an allocation error the list must be NULL - terminated. */ - ai->ai_next = NULL; - if (family == AF_INET6) { struct sockaddr_in6 *sin6p = @@ -1095,8 +1104,7 @@ gaih_inet (const char *name, const struct gaih_service *service, pai = &(ai->ai_next); } - - ++*naddrs; + *pai = NULL; ignore: at2 = at2->next; @@ -1105,8 +1113,7 @@ gaih_inet (const char *name, const struct gaih_service *service, return 0; } -#if 0 -static const struct gaih gaih[] = +static struct gaih gaih[] = { { PF_INET6, gaih_inet }, { PF_INET, gaih_inet }, @@ -1115,7 +1122,6 @@ static const struct gaih gaih[] = #endif { PF_UNSPEC, NULL } }; -#endif struct sort_result { @@ -1123,7 +1129,6 @@ struct sort_result struct sockaddr_storage source_addr; uint8_t source_addr_len; bool got_source_addr; - uint8_t source_addr_flags; }; @@ -1157,7 +1162,7 @@ get_scope (const struct sockaddr_storage *ss) 169.254/16 and 127/8 are link-local. */ if ((addr[0] == 169 && addr[1] == 254) || addr[0] == 127) scope = 2; - else if (addr[0] == 10 || (addr[0] == 172 && (addr[1] & 0xf0) == 16) + else if (addr[0] == 10 || (addr[0] == 172 && addr[1] == 16) || (addr[0] == 192 && addr[1] == 168)) scope = 5; else @@ -1171,96 +1176,59 @@ get_scope (const struct sockaddr_storage *ss) } -struct prefixentry +/* XXX The system administrator should be able to install other + tables. We need to make this configurable. The problem is that + the kernel is also involved since it needs the same table. */ +static const struct prefixlist { struct in6_addr prefix; unsigned int bits; int val; -}; - - -/* The label table. */ -static const struct prefixentry *labels; - -/* Default labels. */ -static const struct prefixentry default_labels[] = +} default_labels[] = { /* See RFC 3484 for the details. */ - { { .in6_u - = { .u6_addr8 = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 } } }, + { { .in6_u = { .u6_addr16 = { 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0001 } } }, 128, 0 }, - { { .in6_u - = { .u6_addr8 = { 0x20, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } }, + { { .in6_u = { .u6_addr16 = { 0x2002, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000 } } }, 16, 2 }, - { { .in6_u - = { .u6_addr8 = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } }, + { { .in6_u = { .u6_addr16 = { 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000 } } }, 96, 3 }, - { { .in6_u - = { .u6_addr8 = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00 } } }, + { { .in6_u = { .u6_addr16 = { 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0xffff, 0x0000, 0x0000 } } }, 96, 4 }, - /* The next two entries differ from RFC 3484. We need to treat - IPv6 site-local addresses special because they are never NATed, - unlike site-locale IPv4 addresses. If this would not happen, on - machines which have only IPv4 and IPv6 site-local addresses, the - sorting would prefer the IPv6 site-local addresses, causing - unnecessary delays when trying to connect to a global IPv6 address - through a site-local IPv6 address. */ - { { .in6_u - = { .u6_addr8 = { 0xfe, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } }, - 10, 5 }, - { { .in6_u - = { .u6_addr8 = { 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } }, - 7, 6 }, - { { .in6_u - = { .u6_addr8 = { 0x20, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } }, - 32, 7 }, - { { .in6_u - = { .u6_addr8 = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } }, + { { .in6_u = { .u6_addr16 = { 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000 } } }, 0, 1 } }; -/* The precedence table. */ -static const struct prefixentry *precedence; - -/* The default precedences. */ -static const struct prefixentry default_precedence[] = +static const struct prefixlist default_precedence[] = { /* See RFC 3484 for the details. */ - { { .in6_u - = { .u6_addr8 = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 } } }, + { { .in6_u = { .u6_addr16 = { 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0001 } } }, 128, 50 }, - { { .in6_u - = { .u6_addr8 = { 0x20, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } }, + { { .in6_u = { .u6_addr16 = { 0x2002, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000 } } }, 16, 30 }, - { { .in6_u - = { .u6_addr8 = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } }, + { { .in6_u = { .u6_addr16 = { 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000 } } }, 96, 20 }, - { { .in6_u - = { .u6_addr8 = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00 } } }, + { { .in6_u = { .u6_addr16 = { 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0xffff, 0x0000, 0x0000 } } }, 96, 10 }, - { { .in6_u - = { .u6_addr8 = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } }, + { { .in6_u = { .u6_addr16 = { 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000 } } }, 0, 40 } }; static int -match_prefix (const struct sockaddr_storage *ss, - const struct prefixentry *list, int default_val) +match_prefix (const struct sockaddr_storage *ss, const struct prefixlist *list, + int default_val) { int idx; struct sockaddr_in6 in6_mem; @@ -1295,10 +1263,10 @@ match_prefix (const struct sockaddr_storage *ss, for (idx = 0; ; ++idx) { unsigned int bits = list[idx].bits; - const uint8_t *mask = list[idx].prefix.s6_addr; - const uint8_t *val = in6->sin6_addr.s6_addr; + uint8_t *mask = list[idx].prefix.s6_addr; + uint8_t *val = in6->sin6_addr.s6_addr; - while (bits >= 8) + while (bits > 8) { if (*mask != *val) break; @@ -1324,7 +1292,7 @@ static int get_label (const struct sockaddr_storage *ss) { /* XXX What is a good default value? */ - return match_prefix (ss, labels, INT_MAX); + return match_prefix (ss, default_labels, INT_MAX); } @@ -1332,20 +1300,7 @@ static int get_precedence (const struct sockaddr_storage *ss) { /* XXX What is a good default value? */ - return match_prefix (ss, precedence, 0); -} - - -/* Find last bit set in a word. */ -static int -fls (uint32_t a) -{ - uint32_t mask; - int n = 0; - for (n = 0, mask = 1 << 31; n < 32; mask >>= 1, ++n) - if ((a & mask) != 0) - break; - return n; + return match_prefix (ss, default_precedence, 0); } @@ -1383,27 +1338,11 @@ rfc3484_sort (const void *p1, const void *p2) } - /* Rule 3: Avoid deprecated addresses. */ - if (a1->got_source_addr) - { - if (!(a1->source_addr_flags & in6ai_deprecated) - && (a2->source_addr_flags & in6ai_deprecated)) - return -1; - if ((a1->source_addr_flags & in6ai_deprecated) - && !(a2->source_addr_flags & in6ai_deprecated)) - return 1; - } + /* Rule 3: Avoid deprecated addresses. + That's something only the kernel could decide. */ - /* Rule 4: Prefer home addresses. */ - if (a1->got_source_addr) - { - if (!(a1->source_addr_flags & in6ai_homeaddress) - && (a2->source_addr_flags & in6ai_homeaddress)) - return 1; - if ((a1->source_addr_flags & in6ai_homeaddress) - && !(a2->source_addr_flags & in6ai_homeaddress)) - return -1; - } + /* Rule 4: Prefer home addresses. + Another thing only the kernel can decide. */ /* Rule 5: Prefer matching label. */ if (a1->got_source_addr) @@ -1435,18 +1374,8 @@ rfc3484_sort (const void *p1, const void *p2) return 1; - /* Rule 7: Prefer native transport. */ - if (a1->got_source_addr) - { - if (!(a1->source_addr_flags & in6ai_temporary) - && (a2->source_addr_flags & in6ai_temporary)) - return -1; - if ((a1->source_addr_flags & in6ai_temporary) - && !(a2->source_addr_flags & in6ai_temporary)) - return 1; - - /* XXX Do we need to check anything beside temporary addresses? */ - } + /* Rule 7: Prefer native transport. + XXX How to recognize tunnels? */ /* Rule 8: Prefer smaller scope. */ @@ -1478,10 +1407,8 @@ rfc3484_sort (const void *p1, const void *p2) in2_dst = (struct sockaddr_in *) a2->dest_addr->ai_addr; in2_src = (struct sockaddr_in *) &a2->source_addr; - bit1 = fls (ntohl (in1_dst->sin_addr.s_addr - ^ in1_src->sin_addr.s_addr)); - bit2 = fls (ntohl (in2_dst->sin_addr.s_addr - ^ in2_src->sin_addr.s_addr)); + bit1 = ffs (in1_dst->sin_addr.s_addr ^ in1_src->sin_addr.s_addr); + bit2 = ffs (in2_dst->sin_addr.s_addr ^ in2_src->sin_addr.s_addr); } else if (a1->dest_addr->ai_family == PF_INET6) { @@ -1508,10 +1435,10 @@ rfc3484_sort (const void *p1, const void *p2) if (i < 4) { - bit1 = fls (ntohl (in1_dst->sin6_addr.s6_addr32[i] - ^ in1_src->sin6_addr.s6_addr32[i])); - bit2 = fls (ntohl (in2_dst->sin6_addr.s6_addr32[i] - ^ in2_src->sin6_addr.s6_addr32[i])); + bit1 = ffs (in1_dst->sin6_addr.s6_addr32[i] + ^ in1_src->sin6_addr.s6_addr32[i]); + bit2 = ffs (in2_dst->sin6_addr.s6_addr32[i] + ^ in2_src->sin6_addr.s6_addr32[i]); } } @@ -1527,341 +1454,14 @@ rfc3484_sort (const void *p1, const void *p2) } -static int -in6aicmp (const void *p1, const void *p2) -{ - struct in6addrinfo *a1 = (struct in6addrinfo *) p1; - struct in6addrinfo *a2 = (struct in6addrinfo *) p2; - - return memcmp (a1->addr, a2->addr, sizeof (a1->addr)); -} - - -/* Name of the config file for RFC 3484 sorting (for now). */ -#define GAICONF_FNAME "/etc/gai.conf" - - -/* Nozero if we are supposed to reload the config file automatically - whenever it changed. */ -static int gaiconf_reload_flag; - -/* Last modification time. */ -static struct timespec gaiconf_mtime; - - -libc_freeres_fn(fini) -{ - if (labels != default_labels) - { - const struct prefixentry *old = labels; - labels = default_labels; - free ((void *) old); - } - - if (precedence != default_precedence) - { - const struct prefixentry *old = precedence; - precedence = default_precedence; - free ((void *) old); - } -} - - -struct prefixlist -{ - struct prefixentry entry; - struct prefixlist *next; -}; - - -static void -free_prefixlist (struct prefixlist *list) -{ - while (list != NULL) - { - struct prefixlist *oldp = list; - list = list->next; - free (oldp); - } -} - - -static int -prefixcmp (const void *p1, const void *p2) -{ - const struct prefixentry *e1 = (const struct prefixentry *) p1; - const struct prefixentry *e2 = (const struct prefixentry *) p2; - - if (e1->bits < e2->bits) - return 1; - if (e1->bits == e2->bits) - return 0; - return -1; -} - - -static void -gaiconf_init (void) -{ - struct prefixlist *labellist = NULL; - size_t nlabellist = 0; - bool labellist_nullbits = false; - struct prefixlist *precedencelist = NULL; - size_t nprecedencelist = 0; - bool precedencelist_nullbits = false; - - FILE *fp = fopen (GAICONF_FNAME, "rc"); - if (fp != NULL) - { - struct stat64 st; - if (__fxstat64 (_STAT_VER, fileno (fp), &st) != 0) - { - fclose (fp); - goto no_file; - } - - char *line = NULL; - size_t linelen = 0; - - __fsetlocking (fp, FSETLOCKING_BYCALLER); - - while (!feof_unlocked (fp)) - { - ssize_t n = __getline (&line, &linelen, fp); - if (n <= 0) - break; - - /* Handle comments. No escaping possible so this is easy. */ - char *cp = strchr (line, '#'); - if (cp != NULL) - *cp = '\0'; - - cp = line; - while (isspace (*cp)) - ++cp; - - char *cmd = cp; - while (*cp != '\0' && !isspace (*cp)) - ++cp; - size_t cmdlen = cp - cmd; - - if (*cp != '\0') - *cp++ = '\0'; - while (isspace (*cp)) - ++cp; - - char *val1 = cp; - while (*cp != '\0' && !isspace (*cp)) - ++cp; - size_t val1len = cp - cmd; - - /* We always need at least two values. */ - if (val1len == 0) - continue; - - if (*cp != '\0') - *cp++ = '\0'; - while (isspace (*cp)) - ++cp; - - char *val2 = cp; - while (*cp != '\0' && !isspace (*cp)) - ++cp; - - /* Ignore the rest of the line. */ - *cp = '\0'; - - struct prefixlist **listp; - size_t *lenp; - bool *nullbitsp; - switch (cmdlen) - { - case 5: - if (strcmp (cmd, "label") == 0) - { - struct in6_addr prefix; - unsigned long int bits; - unsigned long int val; - char *endp; - - listp = &labellist; - lenp = &nlabellist; - nullbitsp = &labellist_nullbits; - - new_elem: - bits = 128; - __set_errno (0); - cp = strchr (val1, '/'); - if (cp != NULL) - *cp++ = '\0'; - if (inet_pton (AF_INET6, val1, &prefix) - && (cp == NULL - || (bits = strtoul (cp, &endp, 10)) != ULONG_MAX - || errno != ERANGE) - && *endp == '\0' - && bits <= INT_MAX - && ((val = strtoul (val2, &endp, 10)) != ULONG_MAX - || errno != ERANGE) - && *endp == '\0' - && val <= INT_MAX) - { - struct prefixlist *newp = malloc (sizeof (*newp)); - if (newp == NULL) - { - free (line); - fclose (fp); - goto no_file; - } - - memcpy (&newp->entry.prefix, &prefix, sizeof (prefix)); - newp->entry.bits = bits; - newp->entry.val = val; - newp->next = *listp; - *listp = newp; - ++*lenp; - *nullbitsp |= bits == 0; - } - } - break; - - case 6: - if (strcmp (cmd, "reload") == 0) - gaiconf_reload_flag = strcmp (val1, "yes") == 0; - break; - - case 10: - if (strcmp (cmd, "precedence") == 0) - { - listp = &precedencelist; - lenp = &nprecedencelist; - nullbitsp = &precedencelist_nullbits; - goto new_elem; - } - break; - } - } - - free (line); - - fclose (fp); - - /* Create the array for the labels. */ - struct prefixentry *new_labels; - if (nlabellist > 0) - { - if (!labellist_nullbits) - ++nlabellist; - new_labels = malloc (nlabellist * sizeof (*new_labels)); - if (new_labels == NULL) - goto no_file; - - int i = nlabellist; - if (!labellist_nullbits) - { - --i; - memset (&new_labels[i].prefix, '\0', sizeof (struct in6_addr)); - new_labels[i].bits = 0; - new_labels[i].val = 1; - } - - struct prefixlist *l = labellist; - while (i-- > 0) - { - new_labels[i] = l->entry; - l = l->next; - } - free_prefixlist (labellist); - - /* Sort the entries so that the most specific ones are at - the beginning. */ - qsort (new_labels, nlabellist, sizeof (*new_labels), prefixcmp); - } - else - new_labels = (struct prefixentry *) default_labels; - - struct prefixentry *new_precedence; - if (nprecedencelist > 0) - { - if (!precedencelist_nullbits) - ++nprecedencelist; - new_precedence = malloc (nprecedencelist * sizeof (*new_precedence)); - if (new_precedence == NULL) - { - if (new_labels != default_labels) - free (new_labels); - goto no_file; - } - - int i = nprecedencelist; - if (!precedencelist_nullbits) - { - --i; - memset (&new_precedence[i].prefix, '\0', - sizeof (struct in6_addr)); - new_precedence[i].bits = 0; - new_precedence[i].val = 40; - } - - struct prefixlist *l = precedencelist; - while (i-- > 0) - { - new_precedence[i] = l->entry; - l = l->next; - } - free_prefixlist (precedencelist); - - /* Sort the entries so that the most specific ones are at - the beginning. */ - qsort (new_precedence, nprecedencelist, sizeof (*new_labels), - prefixcmp); - } - else - new_precedence = (struct prefixentry *) default_precedence; - - /* Now we are ready to replace the values. */ - const struct prefixentry *old = labels; - labels = new_labels; - if (old != default_labels) - free ((void *) old); - - old = precedence; - precedence = new_precedence; - if (old != default_precedence) - free ((void *) old); - - gaiconf_mtime = st.st_mtim; - } - else - { - no_file: - free_prefixlist (labellist); - free_prefixlist (precedencelist); - - /* If we previously read the file but it is gone now, free the - old data and use the builtin one. Leave the reload flag - alone. */ - fini (); - } -} - - -static void -gaiconf_reload (void) -{ - struct stat64 st; - if (__xstat64 (_STAT_VER, GAICONF_FNAME, &st) != 0 - || memcmp (&st.st_mtim, &gaiconf_mtime, sizeof (gaiconf_mtime)) != 0) - gaiconf_init (); -} - - int getaddrinfo (const char *name, const char *service, const struct addrinfo *hints, struct addrinfo **pai) { - int i = 0, last_i = 0; + int i = 0, j = 0, last_i = 0; int nresults = 0; - struct addrinfo *p = NULL; + struct addrinfo *p = NULL, **end; + struct gaih *g = gaih, *pg = NULL; struct gaih_service gaih_service, *pservice; struct addrinfo local_hints; @@ -1889,23 +1489,15 @@ getaddrinfo (const char *name, const char *service, if ((hints->ai_flags & AI_CANONNAME) && name == NULL) return EAI_BADFLAGS; - struct in6addrinfo *in6ai = NULL; - size_t in6ailen; - bool seen_ipv4 = false; - bool seen_ipv6 = false; - /* We might need information about what kind of interfaces are available. - But even if AI_ADDRCONFIG is not used, if the user requested IPv6 - addresses we have to know whether an address is deprecated or - temporary. */ - if ((hints->ai_flags & AI_ADDRCONFIG) || hints->ai_family == PF_UNSPEC - || hints->ai_family == PF_INET6) - /* Determine whether we have IPv4 or IPv6 interfaces or both. We - cannot cache the results since new interfaces could be added at - any time. */ - __check_pf (&seen_ipv4, &seen_ipv6, &in6ai, &in6ailen); - if (hints->ai_flags & AI_ADDRCONFIG) { + /* Determine whether we have IPv4 or IPv6 interfaces or both. + We cannot cache the results since new interfaces could be + added at any time. */ + bool seen_ipv4; + bool seen_ipv6; + __check_pf (&seen_ipv4, &seen_ipv6); + /* Now make a decision on what we return, if anything. */ if (hints->ai_family == PF_UNSPEC && (seen_ipv4 || seen_ipv6)) { @@ -1920,11 +1512,8 @@ getaddrinfo (const char *name, const char *service, } else if ((hints->ai_family == PF_INET && ! seen_ipv4) || (hints->ai_family == PF_INET6 && ! seen_ipv6)) - { - /* We cannot possibly return a valid answer. */ - free (in6ai); - return EAI_NONAME; - } + /* We cannot possibly return a valid answer. */ + return EAI_NONAME; } if (service && service[0]) @@ -1935,10 +1524,7 @@ getaddrinfo (const char *name, const char *service, if (*c != '\0') { if (hints->ai_flags & AI_NUMERICSERV) - { - free (in6ai); - return EAI_NONAME; - } + return EAI_NONAME; gaih_service.num = -1; } @@ -1948,21 +1534,11 @@ getaddrinfo (const char *name, const char *service, else pservice = NULL; - struct addrinfo **end; if (pai) end = &p; else end = NULL; - unsigned int naddrs = 0; -#if 0 - /* If we would support more protocols than just IPv4 and IPv6 we - would iterate over a table with appropriate callback functions. - Since we currently only handle IPv4 and IPv6 this is not - necessary. */ - const struct gaih *g = gaih; - const struct gaih *pg = NULL; - int j = 0; while (g->gaih) { if (hints->ai_family == g->family || hints->ai_family == AF_UNSPEC) @@ -1971,7 +1547,7 @@ getaddrinfo (const char *name, const char *service, if (pg == NULL || pg->gaih != g->gaih) { pg = g; - i = g->gaih (name, pservice, hints, end, &naddrs); + i = g->gaih (name, pservice, hints, end); if (i != 0) { /* EAI_NODATA is a more specific result as it says that @@ -1986,7 +1562,6 @@ getaddrinfo (const char *name, const char *service, } freeaddrinfo (p); - free (in6ai); return -(i & GAIH_EAI); } @@ -2002,56 +1577,16 @@ getaddrinfo (const char *name, const char *service, } if (j == 0) - { - free (in6ai); - return EAI_FAMILY; - } -#else - if (hints->ai_family == AF_UNSPEC || hints->ai_family == AF_INET - || hints->ai_family == AF_INET6) - { - last_i = gaih_inet (name, pservice, hints, end, &naddrs); - if (last_i != 0) - { - freeaddrinfo (p); - free (in6ai); + return EAI_FAMILY; - return -(last_i & GAIH_EAI); - } - if (end) - while (*end) - { - end = &((*end)->ai_next); - ++nresults; - } - } - else - { - free (in6ai); - return EAI_FAMILY; - } -#endif - - if (naddrs > 1) + if (nresults > 1) { - /* Read the config file. */ - __libc_once_define (static, once); - __typeof (once) old_once = once; - __libc_once (once, gaiconf_init); - if (old_once && gaiconf_reload_flag) - gaiconf_reload (); - /* Sort results according to RFC 3484. */ struct sort_result results[nresults]; struct addrinfo *q; struct addrinfo *last = NULL; char *canonname = NULL; - /* If we have information about deprecated and temporary address - sort the array now. */ - if (in6ai != NULL) - qsort (in6ai, in6ailen, sizeof (*in6ai), in6aicmp); - for (i = 0, q = p; q != NULL; ++i, last = q, q = q->ai_next) { results[i].dest_addr = q; @@ -2066,12 +1601,9 @@ getaddrinfo (const char *name, const char *service, results[i - 1].source_addr_len); results[i].source_addr_len = results[i - 1].source_addr_len; results[i].got_source_addr = results[i - 1].got_source_addr; - results[i].source_addr_flags = results[i - 1].source_addr_flags; } else { - results[i].source_addr_flags = 0; - /* We overwrite the type with SOCK_DGRAM since we do not want connect() to connect to the other side. If we cannot determine the source address remember this @@ -2086,20 +1618,6 @@ getaddrinfo (const char *name, const char *service, { results[i].source_addr_len = sl; results[i].got_source_addr = true; - - if (q->ai_family == PF_INET6 && in6ai != NULL) - { - /* See whether the address is the list of deprecated - or temporary addresses. */ - struct in6addrinfo tmp; - memcpy (tmp.addr, q->ai_addr, IN6ADDRSZ); - - struct in6addrinfo *found - = bsearch (&tmp, in6ai, in6ailen, sizeof (*in6ai), - in6aicmp); - if (found != NULL) - results[i].source_addr_flags = found->flags; - } } else /* Just make sure that if we have to process the same @@ -2133,8 +1651,6 @@ getaddrinfo (const char *name, const char *service, p->ai_canonname = canonname; } - free (in6ai); - if (p) { *pai = p; diff --git a/sysdeps/posix/gettimeofday.c b/sysdeps/posix/gettimeofday.c index bda40f48ec..28f75b0bcc 100644 --- a/sysdeps/posix/gettimeofday.c +++ b/sysdeps/posix/gettimeofday.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991,1992,1994-1997,2002,2005 Free Software Foundation, Inc. +/* Copyright (C) 1991, 92, 94, 95, 96, 97, 2002 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 @@ -20,6 +20,12 @@ #include <time.h> #include <sys/time.h> +#ifndef HAVE_GNU_LD +#define __daylight daylight +#define __timezone timezone +#define __tzname tzname +#endif + #undef __gettimeofday /* Get the current time of day and timezone information, diff --git a/sysdeps/posix/libc_fatal.c b/sysdeps/posix/libc_fatal.c index c611b84363..9dfac68006 100644 --- a/sysdeps/posix/libc_fatal.c +++ b/sysdeps/posix/libc_fatal.c @@ -1,5 +1,4 @@ -/* Copyright (C) 1993,1994,1995,1997,2000,2004,2005 - Free Software Foundation, Inc. +/* Copyright (C) 1993,1994,1995,1997,2000,2004 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 @@ -74,7 +73,7 @@ __libc_message (int do_abort, const char *fmt, ...) while (*cp != '\0') { /* Find the next "%s" or the end of the string. */ - const char *next = cp; + char *next = cp; while (next[0] != '%' || next[1] != 's') { next = __strchrnul (next + 1, '%'); @@ -115,7 +114,7 @@ __libc_message (int do_abort, const char *fmt, ...) for (int cnt = nlist - 1; cnt >= 0; --cnt) { - iov[cnt].iov_base = (char *) list->str; + iov[cnt].iov_base = list->str; iov[cnt].iov_len = list->len; total += list->len; list = list->next; diff --git a/sysdeps/posix/pause.c b/sysdeps/posix/pause.c index 538c186ec0..8639e684f4 100644 --- a/sysdeps/posix/pause.c +++ b/sysdeps/posix/pause.c @@ -1,5 +1,5 @@ /* pause -- suspend the process until a signal arrives. POSIX.1 version. - Copyright (C) 2003, 2006 Free Software Foundation, Inc. + Copyright (C) 2003 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 @@ -23,7 +23,6 @@ /* Suspend the process until a signal arrives. This always returns -1 and sets errno to EINTR. */ - int __libc_pause (void) { @@ -40,18 +39,3 @@ __libc_pause (void) weak_alias (__libc_pause, pause) LIBC_CANCEL_HANDLED (); /* sigsuspend handles our cancellation. */ - -#ifndef NO_CANCELLATION -# include <not-cancel.h> - -int -__pause_nocancel (void) -{ - sigset_t set; - - __sigemptyset (&set); - __sigprocmask (SIG_BLOCK, NULL, &set); - - return sigsuspend_not_cancel (&set); -} -#endif diff --git a/sysdeps/posix/posix_fallocate.c b/sysdeps/posix/posix_fallocate.c index cbaeb49487..838e7a004a 100644 --- a/sysdeps/posix/posix_fallocate.c +++ b/sysdeps/posix/posix_fallocate.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2000, 2003, 2005 Free Software Foundation, Inc. +/* Copyright (C) 2000, 2003 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 @@ -29,8 +29,9 @@ posix_fallocate (int fd, __off_t offset, __off_t len) { struct stat64 st; struct statfs f; + size_t step; - /* `off_t' is a signed type. Therefore we can determine whether + /* `off_tī is a signed type. Therefore we can determine whether OFFSET + LEN is too large if it is a negative value. */ if (offset < 0 || len < 0) return EINVAL; @@ -46,48 +47,24 @@ posix_fallocate (int fd, __off_t offset, __off_t len) if (! S_ISREG (st.st_mode)) return ENODEV; - if (len == 0) - { - if (st.st_size < offset) - { - int ret = __ftruncate (fd, offset); - - if (ret != 0) - ret = errno; - return ret; - } - return 0; - } - /* We have to know the block size of the filesystem to get at least some sort of performance. */ if (__fstatfs (fd, &f) != 0) return errno; - /* Try to play safe. */ - if (f.f_bsize == 0) - f.f_bsize = 512; + /* Align OFFSET to block size and adjust LEN. */ + step = (offset + f.f_bsize - 1) % ~f.f_bsize; + offset += step; /* Write something to every block. */ - for (offset += (len - 1) % f.f_bsize; len > 0; offset += f.f_bsize) + while (len > step) { - len -= f.f_bsize; - - if (offset < st.st_size) - { - unsigned char c; - ssize_t rsize = __pread (fd, &c, 1, offset); - - if (rsize < 0) - return errno; - /* If there is a non-zero byte, the block must have been - allocated already. */ - else if (rsize == 1 && c != 0) - continue; - } + len -= step; if (__pwrite (fd, "", 1, offset) != 1) return errno; + + offset += step; } return 0; diff --git a/sysdeps/posix/posix_fallocate64.c b/sysdeps/posix/posix_fallocate64.c index 64ca9ae83d..0eba4161a5 100644 --- a/sysdeps/posix/posix_fallocate64.c +++ b/sysdeps/posix/posix_fallocate64.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2000, 2003, 2004, 2005 Free Software Foundation, Inc. +/* Copyright (C) 2000, 2003, 2004 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 @@ -29,8 +29,9 @@ __posix_fallocate64_l64 (int fd, __off64_t offset, __off64_t len) { struct stat64 st; struct statfs64 f; + size_t step; - /* `off64_t' is a signed type. Therefore we can determine whether + /* `off64_tī is a signed type. Therefore we can determine whether OFFSET + LEN is too large if it is a negative value. */ if (offset < 0 || len < 0) return EINVAL; @@ -46,48 +47,24 @@ __posix_fallocate64_l64 (int fd, __off64_t offset, __off64_t len) if (! S_ISREG (st.st_mode)) return ENODEV; - if (len == 0) - { - if (st.st_size < offset) - { - int ret = __ftruncate64 (fd, offset); - - if (ret != 0) - ret = errno; - return ret; - } - return 0; - } - /* We have to know the block size of the filesystem to get at least some sort of performance. */ if (__fstatfs64 (fd, &f) != 0) return errno; - /* Try to play safe. */ - if (f.f_bsize == 0) - f.f_bsize = 512; + /* Align OFFSET to block size and adjust LEN. */ + step = (offset + f.f_bsize - 1) % ~f.f_bsize; + offset += step; /* Write something to every block. */ - for (offset += (len - 1) % f.f_bsize; len > 0; offset += f.f_bsize) + while (len > step) { - len -= f.f_bsize; - - if (offset < st.st_size) - { - unsigned char c; - ssize_t rsize = __libc_pread64 (fd, &c, 1, offset); - - if (rsize < 0) - return errno; - /* If there is a non-zero byte, the block must have been - allocated already. */ - else if (rsize == 1 && c != 0) - continue; - } - - if (__libc_pwrite64 (fd, "", 1, offset) != 1) + len -= step; + + if (__pwrite64 (fd, "", 1, offset) != 1) return errno; + + offset += step; } return 0; diff --git a/sysdeps/posix/profil.c b/sysdeps/posix/profil.c index 281b53bf6a..3c2e1dfa07 100644 --- a/sysdeps/posix/profil.c +++ b/sysdeps/posix/profil.c @@ -1,6 +1,5 @@ /* Low-level statistical profiling support function. Mostly POSIX.1 version. - Copyright (C) 1996,1997,1998,2002,2004,2005,2006 - Free Software Foundation, Inc. + Copyright (C) 1996,97,98,2002, 2004 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 @@ -23,11 +22,10 @@ #include <errno.h> #include <signal.h> #include <sys/time.h> -#include <libc-internal.h> #ifndef SIGPROF -#include <gmon/profil.c> +#include <sysdeps/generic/profil.c> #else @@ -112,7 +110,7 @@ __profil (u_short *sample_buffer, size_t size, size_t offset, u_int scale) return -1; timer.it_value.tv_sec = 0; - timer.it_value.tv_usec = 1000000 / __profile_frequency (); + timer.it_value.tv_usec = 1; timer.it_interval = timer.it_value; return __setitimer (ITIMER_PROF, &timer, otimer_ptr); } diff --git a/sysdeps/posix/shm_open.c b/sysdeps/posix/shm_open.c index 0a657fadfa..b773d40db0 100644 --- a/sysdeps/posix/shm_open.c +++ b/sysdeps/posix/shm_open.c @@ -1,5 +1,5 @@ /* shm_open -- open a POSIX shared memory object. Generic POSIX file version. - Copyright (C) 2001,2002,2005 Free Software Foundation, Inc. + Copyright (C) 2001,02 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 @@ -20,7 +20,7 @@ #include <unistd.h> #if ! _POSIX_MAPPED_FILES -#include <rt/shm_open.c> +#include <sysdeps/generic/shm_open.c> #else diff --git a/sysdeps/posix/shm_unlink.c b/sysdeps/posix/shm_unlink.c index 18ca416e16..b67240f838 100644 --- a/sysdeps/posix/shm_unlink.c +++ b/sysdeps/posix/shm_unlink.c @@ -1,5 +1,5 @@ /* shm_unlink -- remove a POSIX shared memory object. Generic POSIX version. - Copyright (C) 2001,2002,2005 Free Software Foundation, Inc. + Copyright (C) 2001,02 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 @@ -20,7 +20,7 @@ #include <unistd.h> #if ! _POSIX_MAPPED_FILES -#include <rt/shm_unlink.c> +#include <sysdeps/generic/shm_unlink.c> #else diff --git a/sysdeps/posix/sigignore.c b/sysdeps/posix/sigignore.c index 9787e8d234..361a19e0dc 100644 --- a/sysdeps/posix/sigignore.c +++ b/sysdeps/posix/sigignore.c @@ -1,5 +1,5 @@ /* Set the disposition of SIG to SIG_IGN. - Copyright (C) 1998, 2005 Free Software Foundation, Inc. + Copyright (C) 1998 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. @@ -22,8 +22,6 @@ #define __need_NULL #include <stddef.h> #include <signal.h> -#include <string.h> /* For the real memset prototype. */ - int sigignore (sig) diff --git a/sysdeps/posix/signal.c b/sysdeps/posix/signal.c index 9fc514c729..9a8efee043 100644 --- a/sysdeps/posix/signal.c +++ b/sysdeps/posix/signal.c @@ -1,6 +1,5 @@ /* BSD-like signal function. - Copyright (C) 1991,1992,1996,1997,2000,2002,2005 - Free Software Foundation, Inc. + Copyright (C) 1991,1992,1996,1997,2000,2002 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 @@ -20,7 +19,6 @@ #include <errno.h> #include <signal.h> -#include <string.h> /* For the real memset prototype. */ sigset_t _sigintr attribute_hidden; /* Set by siginterrupt. */ diff --git a/sysdeps/posix/sigset.c b/sysdeps/posix/sigset.c index 8f96e3d610..873c1cb1e6 100644 --- a/sysdeps/posix/sigset.c +++ b/sysdeps/posix/sigset.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1998, 2000, 2005, 2006 Free Software Foundation, Inc. +/* Copyright (C) 1998, 2000 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 @@ -20,7 +20,6 @@ #define __need_NULL #include <stddef.h> #include <signal.h> -#include <string.h> /* For the real memset prototype. */ /* Set the disposition for SIG. */ @@ -29,10 +28,8 @@ sigset (sig, disp) int sig; __sighandler_t disp; { - struct sigaction act; - struct sigaction oact; + struct sigaction act, oact; sigset_t set; - sigset_t oset; #ifdef SIG_HOLD /* Handle SIG_HOLD first. */ @@ -47,18 +44,10 @@ sigset (sig, disp) return SIG_ERR; /* Add the signal set to the current signal mask. */ - if (__sigprocmask (SIG_BLOCK, &set, &oset) < 0) + if (__sigprocmask (SIG_BLOCK, &set, NULL) < 0) return SIG_ERR; - /* If the signal was already blocked signal this to the caller. */ - if (__sigismember (&oset, sig)) - return SIG_HOLD; - - /* We need to determine whether a specific handler is installed. */ - if (__sigaction (sig, NULL, &oact) < 0) - return SIG_ERR; - - return oact.sa_handler; + return SIG_HOLD; } #endif /* SIG_HOLD */ @@ -85,9 +74,8 @@ sigset (sig, disp) return SIG_ERR; /* Remove the signal set from the current signal mask. */ - if (__sigprocmask (SIG_UNBLOCK, &set, &oset) < 0) + if (__sigprocmask (SIG_UNBLOCK, &set, NULL) < 0) return SIG_ERR; - /* If the signal was already blocked return SIG_HOLD. */ - return __sigismember (&oset, sig) ? SIG_HOLD : oact.sa_handler; + return oact.sa_handler; } diff --git a/sysdeps/posix/spawni.c b/sysdeps/posix/spawni.c index 29803a8461..69106c480e 100644 --- a/sysdeps/posix/spawni.c +++ b/sysdeps/posix/spawni.c @@ -1,5 +1,5 @@ /* Guts of POSIX spawn interface. Generic POSIX.1 version. - Copyright (C) 2000-2005, 2006 Free Software Foundation, Inc. + Copyright (C) 2000, 2001, 2002, 2003, 2004 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 @@ -26,7 +26,6 @@ #include <unistd.h> #include "spawn_int.h" #include <not-cancel.h> -#include <local-setxid.h> /* The Unix standard contains a long explanation of the way to signal @@ -82,15 +81,7 @@ __spawni (pid_t *pid, const char *file, short int flags = attrp == NULL ? 0 : attrp->__flags; /* Generate the new process. */ - if ((flags & POSIX_SPAWN_USEVFORK) != 0 - /* If no major work is done, allow using vfork. Note that we - might perform the path searching. But this would be done by - a call to execvp(), too, and such a call must be OK according - to POSIX. */ - || ((flags & (POSIX_SPAWN_SETSIGMASK | POSIX_SPAWN_SETSIGDEF - | POSIX_SPAWN_SETSCHEDPARAM | POSIX_SPAWN_SETSCHEDULER - | POSIX_SPAWN_SETPGROUP | POSIX_SPAWN_RESETIDS)) == 0 - && file_actions == NULL)) + if (flags & POSIX_SPAWN_USEVFORK) new_pid = __vfork (); else new_pid = __fork (); @@ -156,8 +147,7 @@ __spawni (pid_t *pid, const char *file, /* Set the effective user and group IDs. */ if ((flags & POSIX_SPAWN_RESETIDS) != 0 - && (local_seteuid (__getuid ()) != 0 - || local_setegid (__getgid ()) != 0)) + && (seteuid (__getuid ()) != 0 || setegid (__getgid ()) != 0)) _exit (SPAWN_ERROR); /* Execute the file actions. */ @@ -179,10 +169,9 @@ __spawni (pid_t *pid, const char *file, case spawn_do_open: { - int new_fd = open_not_cancel (action->action.open_action.path, - action->action.open_action.oflag - | O_LARGEFILE, - action->action.open_action.mode); + int new_fd = __open64 (action->action.open_action.path, + action->action.open_action.oflag, + action->action.open_action.mode); if (new_fd == -1) /* The `open' call failed. */ @@ -196,7 +185,7 @@ __spawni (pid_t *pid, const char *file, /* The `dup2' call failed. */ _exit (SPAWN_ERROR); - if (close_not_cancel (new_fd) != 0) + if (__close (new_fd) != 0) /* The `close' call failed. */ _exit (SPAWN_ERROR); } diff --git a/sysdeps/posix/sprofil.c b/sysdeps/posix/sprofil.c index 853038d078..19787fa364 100644 --- a/sysdeps/posix/sprofil.c +++ b/sysdeps/posix/sprofil.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. +/* Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. Contributed by David Mosberger-Tang <davidm@hpl.hp.com>. This file is part of the GNU C Library. @@ -27,7 +27,7 @@ #include <sys/profil.h> #ifndef SIGPROF -# include <gmon/sprofil.c> +# include <sysdeps/generic/sprofil.c> #else #include <libc-internal.h> @@ -181,14 +181,14 @@ profil_count_uint (void *pcp) interrupted code. */ #define profil_counter profil_counter_ushort #define profil_count(pc) profil_count (pc, 0) -#include <profil-counter.h> +#include "profil-counter.h" #undef profil_counter #undef profil_count #define profil_counter profil_counter_uint #define profil_count(pc) profil_count (pc, 1) -#include <profil-counter.h> +#include "profil-counter.h" static int insert (int i, unsigned long int start, unsigned long int end, struct prof *p, diff --git a/sysdeps/posix/sysconf.c b/sysdeps/posix/sysconf.c index 0c0d7d1418..de72e84829 100644 --- a/sysdeps/posix/sysconf.c +++ b/sysdeps/posix/sysconf.c @@ -1,5 +1,5 @@ -/* Copyright (C) 1991,1993,1995-1997,1999-2003,2004,2006 - Free Software Foundation, Inc. +/* Copyright (C) 1991,1993,1995-1997,1999-2003,2004 + 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 @@ -68,7 +68,7 @@ __sysconf (name) #ifdef CHILD_MAX return CHILD_MAX; #else - return __get_child_max (); + return -1; #endif case _SC_CLK_TCK: @@ -95,112 +95,112 @@ __sysconf (name) return MAX (__tzname_max (), _POSIX_TZNAME_MAX); case _SC_JOB_CONTROL: -#if _POSIX_JOB_CONTROL > 0 - return _POSIX_JOB_CONTROL; +#ifdef _POSIX_JOB_CONTROL + return 1; #else return -1; #endif case _SC_SAVED_IDS: -#if _POSIX_SAVED_IDS > 0 +#ifdef _POSIX_SAVED_IDS return 1; #else return -1; #endif case _SC_REALTIME_SIGNALS: -#if _POSIX_REALTIME_SIGNALS > 0 +#ifdef _POSIX_REALTIME_SIGNALS return _POSIX_REALTIME_SIGNALS; #else return -1; #endif case _SC_PRIORITY_SCHEDULING: -#if _POSIX_PRIORITY_SCHEDULING > 0 +#ifdef _POSIX_PRIORITY_SCHEDULING return _POSIX_PRIORITY_SCHEDULING; #else return -1; #endif case _SC_TIMERS: -#if _POSIX_TIMERS > 0 +#ifdef _POSIX_TIMERS return _POSIX_TIMERS; #else return -1; #endif case _SC_ASYNCHRONOUS_IO: -#if _POSIX_ASYNCHRONOUS_IO > 0 +#ifdef _POSIX_ASYNCHRONOUS_IO return _POSIX_ASYNCHRONOUS_IO; #else return -1; #endif case _SC_PRIORITIZED_IO: -#if _POSIX_PRIORITIZED_IO > 0 +#ifdef _POSIX_PRIORITIZED_IO return _POSIX_PRIORITIZED_IO; #else return -1; #endif case _SC_SYNCHRONIZED_IO: -#if _POSIX_SYNCHRONIZED_IO > 0 +#ifdef _POSIX_SYNCHRONIZED_IO return _POSIX_SYNCHRONIZED_IO; #else return -1; #endif case _SC_FSYNC: -#if _POSIX_FSYNC > 0 +#ifdef _POSIX_FSYNC return _POSIX_FSYNC; #else return -1; #endif case _SC_MAPPED_FILES: -#if _POSIX_MAPPED_FILES > 0 +#ifdef _POSIX_MAPPED_FILES return _POSIX_MAPPED_FILES; #else return -1; #endif case _SC_MEMLOCK: -#if _POSIX_MEMLOCK > 0 +#ifdef _POSIX_MEMLOCK return _POSIX_MEMLOCK; #else return -1; #endif case _SC_MEMLOCK_RANGE: -#if _POSIX_MEMLOCK_RANGE > 0 +#ifdef _POSIX_MEMLOCK_RANGE return _POSIX_MEMLOCK_RANGE; #else return -1; #endif case _SC_MEMORY_PROTECTION: -#if _POSIX_MEMORY_PROTECTION > 0 +#ifdef _POSIX_MEMORY_PROTECTION return _POSIX_MEMORY_PROTECTION; #else return -1; #endif case _SC_MESSAGE_PASSING: -#if _POSIX_MESSAGE_PASSING > 0 +#ifdef _POSIX_MESSAGE_PASSING return _POSIX_MESSAGE_PASSING; #else return -1; #endif case _SC_SEMAPHORES: -#if _POSIX_SEMAPHORES > 0 +#ifdef _POSIX_SEMAPHORES return _POSIX_SEMAPHORES; #else return -1; #endif case _SC_SHARED_MEMORY_OBJECTS: -#if _POSIX_SHARED_MEMORY_OBJECTS > 0 +#ifdef _POSIX_SHARED_MEMORY_OBJECTS return _POSIX_SHARED_MEMORY_OBJECTS; #else return -1; @@ -353,49 +353,49 @@ __sysconf (name) #endif case _SC_PII: -#if _POSIX_PII > 0 +#ifdef _POSIX_PII return 1; #else return -1; #endif case _SC_PII_XTI: -#if _POSIX_PII_XTI > 0 +#ifdef _POSIX_PII_XTI return 1; #else return -1; #endif case _SC_PII_SOCKET: -#if _POSIX_PII_SOCKET > 0 +#ifdef _POSIX_PII_SOCKET return 1; #else return -1; #endif case _SC_PII_INTERNET: -#if _POSIX_PII_INTERNET > 0 +#ifdef _POSIX_PII_INTERNET return 1; #else return -1; #endif case _SC_PII_OSI: -#if _POSIX_PII_OSI > 0 +#ifdef _POSIX_PII_OSI return 1; #else return -1; #endif case _SC_POLL: -#if _POSIX_POLL > 0 +#ifdef _POSIX_POLL return 1; #else return -1; #endif case _SC_SELECT: -#if _POSIX_SELECT > 0 +#ifdef _POSIX_SELECT return 1; #else return -1; @@ -410,35 +410,35 @@ __sysconf (name) #endif case _SC_PII_INTERNET_STREAM: -#if _POSIX_PII_INTERNET_STREAM > 0 +#ifdef _POSIX_PII_INTERNET_STREAM return 1; #else return -1; #endif case _SC_PII_INTERNET_DGRAM: -#if _POSIX_PII_INTERNET_DGRAM > 0 +#ifdef _POSIX_PII_INTERNET_DGRAM return 1; #else return -1; #endif case _SC_PII_OSI_COTS: -#if _POSIX_PII_OSI_COTS > 0 +#ifdef _POSIX_PII_OSI_COTS return 1; #else return -1; #endif case _SC_PII_OSI_CLTS: -#if _POSIX_PII_OSI_CLTS > 0 +#ifdef _POSIX_PII_OSI_CLTS return 1; #else return -1; #endif case _SC_PII_OSI_M: -#if _POSIX_PII_OSI_M > 0 +#ifdef _POSIX_PII_OSI_M return 1; #else return -1; @@ -519,14 +519,14 @@ __sysconf (name) /* POSIX 1003.1c (POSIX Threads). */ case _SC_THREADS: -#if _POSIX_THREADS > 0 +#ifdef _POSIX_THREADS return _POSIX_THREADS; #else return -1; #endif case _SC_THREAD_SAFE_FUNCTIONS: -#if _POSIX_THREAD_SAFE_FUNCTIONS > 0 +#ifdef _POSIX_THREAD_SAFE_FUNCTIONS return _POSIX_THREAD_SAFE_FUNCTIONS; #else return -1; @@ -553,7 +553,7 @@ __sysconf (name) #endif case _SC_THREAD_DESTRUCTOR_ITERATIONS: -#if _POSIX_THREAD_DESTRUCTOR_ITERATIONS > 0 +#ifdef _POSIX_THREAD_DESTRUCTOR_ITERATIONS return _POSIX_THREAD_DESTRUCTOR_ITERATIONS; #else return -1; @@ -581,42 +581,42 @@ __sysconf (name) #endif case _SC_THREAD_ATTR_STACKADDR: -#if _POSIX_THREAD_ATTR_STACKADDR > 0 +#ifdef _POSIX_THREAD_ATTR_STACKADDR return _POSIX_THREAD_ATTR_STACKADDR; #else return -1; #endif case _SC_THREAD_ATTR_STACKSIZE: -#if _POSIX_THREAD_ATTR_STACKSIZE > 0 +#ifdef _POSIX_THREAD_ATTR_STACKSIZE return _POSIX_THREAD_ATTR_STACKSIZE; #else return -1; #endif case _SC_THREAD_PRIORITY_SCHEDULING: -#if _POSIX_THREAD_PRIORITY_SCHEDULING > 0 +#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING return _POSIX_THREAD_PRIORITY_SCHEDULING; #else return -1; #endif case _SC_THREAD_PRIO_INHERIT: -#if _POSIX_THREAD_PRIO_INHERIT > 0 +#ifdef _POSIX_THREAD_PRIO_INHERIT return _POSIX_THREAD_PRIO_INHERIT; #else return -1; #endif case _SC_THREAD_PRIO_PROTECT: -#if _POSIX_THREAD_PRIO_PROTECT > 0 +#ifdef _POSIX_THREAD_PRIO_PROTECT return _POSIX_THREAD_PRIO_PROTECT; #else return -1; #endif case _SC_THREAD_PROCESS_SHARED: -#if _POSIX_THREAD_PROCESS_SHARED > 0 +#ifdef _POSIX_THREAD_PROCESS_SHARED return _POSIX_THREAD_PROCESS_SHARED; #else return -1; @@ -857,40 +857,40 @@ __sysconf (name) #endif case _SC_ADVISORY_INFO: -#if _POSIX_ADVISORY_INFO > 0 +#ifdef _POSIX_ADVISORY_INFO return _POSIX_ADVISORY_INFO; #else return -1; #endif case _SC_BARRIERS: -#if _POSIX_BARRIERS > 0 +#ifdef _POSIX_BARRIERS return _POSIX_BARRIERS; #else return -1; #endif case _SC_BASE: -#if _POSIX_BASE > 0 +#ifdef _POSIX_BASE return _POSIX_BASE; #else return -1; #endif case _SC_C_LANG_SUPPORT: -#if _POSIX_C_LANG_SUPPORT > 0 +#ifdef _POSIX_C_LANG_SUPPORT return _POSIX_C_LANG_SUPPORT; #else return -1; #endif case _SC_C_LANG_SUPPORT_R: -#if _POSIX_C_LANG_SUPPORT_R > 0 +#ifdef _POSIX_C_LANG_SUPPORT_R return _POSIX_C_LANG_SUPPORT_R; #else return -1; #endif case _SC_CLOCK_SELECTION: -#if _POSIX_CLOCK_SELECTION > 0 +#ifdef _POSIX_CLOCK_SELECTION return _POSIX_CLOCK_SELECTION; #else return -1; @@ -904,58 +904,58 @@ __sysconf (name) #endif case _SC_DEVICE_IO: -#if _POSIX_DEVICE_IO > 0 +#ifdef _POSIX_DEVICE_IO return _POSIX_DEVICE_IO; #else return -1; #endif case _SC_DEVICE_SPECIFIC: -#if _POSIX_DEVICE_SPCIFIC > 0 +#ifdef _POSIX_DEVICE_SPCIFIC return _POSIX_DEVICE_SPECIFIC; #else return -1; #endif case _SC_DEVICE_SPECIFIC_R: -#if _POSIX_DEVICE_SPCIFIC_R > 0 +#ifdef _POSIX_DEVICE_SPCIFIC_R return _POSIX_DEVICE_SPECIFIC_R; #else return -1; #endif case _SC_FD_MGMT: -#if _POSIX_FD_MGMT > 0 +#ifdef _POSIX_FD_MGMT return _POSIX_FD_MGMT; #else return -1; #endif case _SC_FIFO: -#if _POSIX_FIFO > 0 +#ifdef _POSIX_FIFO return _POSIX_FIFO; #else return -1; #endif case _SC_PIPE: -#if _POSIX_PIPE > 0 +#ifdef _POSIX_PIPE return _POSIX_PIPE; #else return -1; #endif case _SC_FILE_ATTRIBUTES: -#if _POSIX_FILE_ATTRIBUTES > 0 +#ifdef _POSIX_FILE_ATTRIBUTES return _POSIX_FILE_ATTRIBUTES; #else return -1; #endif case _SC_FILE_LOCKING: -#if _POSIX_FILE_LOCKING > 0 +#ifdef _POSIX_FILE_LOCKING return _POSIX_FILE_LOCKING; #else return -1; #endif case _SC_FILE_SYSTEM: -#if _POSIX_FILE_SYSTEM > 0 +#ifdef _POSIX_FILE_SYSTEM return _POSIX_FILE_SYSTEM; #else return -1; @@ -969,53 +969,53 @@ __sysconf (name) #endif case _SC_MULTI_PROCESS: -#if _POSIX_MULTI_PROCESS > 0 +#ifdef _POSIX_MULTI_PROCESS return _POSIX_MULTI_PROCESS; #else return -1; #endif case _SC_SINGLE_PROCESS: -#if _POSIX_SINGLE_PROCESS > 0 +#ifdef _POSIX_SINGLE_PROCESS return _POSIX_SINGLE_PROCESS; #else return -1; #endif case _SC_NETWORKING: -#if _POSIX_NETWORKING > 0 +#ifdef _POSIX_NETWORKING return _POSIX_NETWORKING; #else return -1; #endif case _SC_READER_WRITER_LOCKS: -#if _POSIX_READER_WRITER_LOCKS > 0 +#ifdef _POSIX_READER_WRITER_LOCKS return _POSIX_READER_WRITER_LOCKS; #else return -1; #endif case _SC_SPIN_LOCKS: -#if _POSIX_SPIN_LOCKS > 0 +#ifdef _POSIX_SPIN_LOCKS return _POSIX_SPIN_LOCKS; #else return -1; #endif case _SC_REGEXP: -#if _POSIX_REGEXP > 0 +#ifdef _POSIX_REGEXP return _POSIX_REGEXP; #else return -1; #endif case _SC_REGEX_VERSION: -#if _POSIX_REGEX_VERSION > 0 +#ifdef _POSIX_REGEX_VERSION return _POSIX_REGEX_VERSION; #else return -1; #endif case _SC_SHELL: -#if _POSIX_SHELL > 0 +#ifdef _POSIX_SHELL return _POSIX_SHELL; #else return -1; @@ -1029,33 +1029,33 @@ __sysconf (name) #endif case _SC_SPAWN: -#if _POSIX_SPAWN > 0 +#ifdef _POSIX_SPAWN return _POSIX_SPAWN; #else return -1; #endif case _SC_SPORADIC_SERVER: -#if _POSIX_SPORADIC_SERVER > 0 +#ifdef _POSIX_SPORADIC_SERVER return _POSIX_SPORADIC_SERVER; #else return -1; #endif case _SC_THREAD_SPORADIC_SERVER: -#if _POSIX_THREAD_SPORADIC_SERVER > 0 +#ifdef _POSIX_THREAD_SPORADIC_SERVER return _POSIX_THREAD_SPORADIC_SERVER; #else return -1; #endif case _SC_SYSTEM_DATABASE: -#if _POSIX_SYSTEM_DATABASE > 0 +#ifdef _POSIX_SYSTEM_DATABASE return _POSIX_SYSTEM_DATABASE; #else return -1; #endif case _SC_SYSTEM_DATABASE_R: -#if _POSIX_SYSTEM_DATABASE_R > 0 +#ifdef _POSIX_SYSTEM_DATABASE_R return _POSIX_SYSTEM_DATABASE_R; #else return -1; @@ -1069,27 +1069,27 @@ __sysconf (name) #endif case _SC_TIMEOUTS: -#if _POSIX_TIMEOUTS > 0 +#ifdef _POSIX_TIMEOUTS return _POSIX_TIMEOUTS; #else return -1; #endif case _SC_TYPED_MEMORY_OBJECTS: -#if _POSIX_TYPED_MEMORY_OBJECTS > 0 +#ifdef _POSIX_TYPED_MEMORY_OBJECTS return _POSIX_TYPED_MEMORY_OBJECTS; #else return -1; #endif case _SC_USER_GROUPS: -#if _POSIX_USER_GROUPS > 0 +#ifdef _POSIX_USER_GROUPS return _POSIX_USER_GROUPS; #else return -1; #endif case _SC_USER_GROUPS_R: -#if _POSIX_USER_GROUPS_R > 0 +#ifdef _POSIX_USER_GROUPS_R return _POSIX_USER_GROUPS_R; #else return -1; @@ -1154,25 +1154,25 @@ __sysconf (name) #endif case _SC_TRACE: -#if _POSIX_TRACE > 0 +#ifdef _POSIX_TRACE return _POSIX_TRACE; #else return -1; #endif case _SC_TRACE_EVENT_FILTER: -#if _POSIX_TRACE_EVENT_FILTER > 0 +#ifdef _POSIX_TRACE_EVENT_FILTER return _POSIX_TRACE_EVENT_FILTER; #else return -1; #endif case _SC_TRACE_INHERIT: -#if _POSIX_TRACE_INHERIT > 0 +#ifdef _POSIX_TRACE_INHERIT return _POSIX_TRACE_INHERIT; #else return -1; #endif case _SC_TRACE_LOG: -#if _POSIX_TRACE_LOG > 0 +#ifdef _POSIX_TRACE_LOG return _POSIX_TRACE_LOG; #else return -1; @@ -1198,14 +1198,14 @@ __sysconf (name) return 0; case _SC_IPV6: -#if _POSIX_IPV6 > 0 +#ifdef _POSIX_IPV6 return _POSIX_IPV6; #else return -1; #endif case _SC_RAW_SOCKETS: -#if _POSIX_RAW_SOCKETS > 0 +#ifdef _POSIX_RAW_SOCKETS return _POSIX_RAW_SOCKETS; #else return -1; diff --git a/sysdeps/posix/system.c b/sysdeps/posix/system.c index f63dde4dae..8548313314 100644 --- a/sysdeps/posix/system.c +++ b/sysdeps/posix/system.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991-2000, 2002, 2003, 2005 Free Software Foundation, Inc. +/* Copyright (C) 1991-2000, 2002, 2003 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 @@ -27,6 +27,10 @@ #include <sysdep-cancel.h> +#ifndef HAVE_GNU_LD +#define __environ environ +#endif + #define SHELL_PATH "/bin/sh" /* Path of the shell. */ #define SHELL_NAME "sh" /* Name to give it. */ diff --git a/sysdeps/posix/sysv_signal.c b/sysdeps/posix/sysv_signal.c index 16fcd2c2ab..ca2e84f372 100644 --- a/sysdeps/posix/sysv_signal.c +++ b/sysdeps/posix/sysv_signal.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1992, 1996, 1997, 2005 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1992, 1996, 1997 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 @@ -18,8 +18,6 @@ #include <errno.h> #include <signal.h> -#include <string.h> /* For the real memset prototype. */ - /* Tolerate non-threads versions of Posix */ #ifndef SA_ONESHOT diff --git a/sysdeps/posix/tempname.c b/sysdeps/posix/tempname.c index c8973a0852..0d4bbc418a 100644 --- a/sysdeps/posix/tempname.c +++ b/sysdeps/posix/tempname.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991-1999, 2000, 2001, 2006 Free Software Foundation, Inc. +/* Copyright (C) 1991-1999, 2000, 2001 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 @@ -242,15 +242,11 @@ __gen_tempname (char *tmpl, int kind) necessary to try all these combinations. Instead if a reasonable number of names is tried (we define reasonable as 62**3) fail to give the system administrator the chance to remove the problems. */ -#define ATTEMPTS_MIN (62 * 62 * 62) + unsigned int attempts_min = 62 * 62 * 62; /* The number of times to attempt to generate a temporary file. To conform to POSIX, this must be no smaller than TMP_MAX. */ -#if ATTEMPTS_MIN < TMP_MAX - unsigned int attempts = TMP_MAX; -#else - unsigned int attempts = ATTEMPTS_MIN; -#endif + unsigned int attempts = attempts_min < TMP_MAX ? TMP_MAX : attempts_min; len = strlen (tmpl); if (len < 6 || strcmp (&tmpl[len - 6], "XXXXXX")) |