mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-21 01:12:26 +08:00
37ba7d6663
2002-08-02 Ulrich Drepper <drepper@redhat.com> * configure.in (HAVE_BROKEN_ALIAS_ATTRIBUTE): Add check for broken alias attribute handling. * config.h.in (HAVE_BROKEN_ALIAS_ATTRIBUTE): Add. * assert/assert.c (__assert_fail): Fix typo in comment. * include/rpc/rpc.h: Declare __libc_tsd_RPC_VARS if USE_TLS && HAVE___THREAD. * sunrpc/rpc_thread.c: Don't define __libc_tsd_RPC_VARS as static if USE_TLS && HAVE___THREAD. * sunrpc/Versions [libc] (GLIBC_PRIVATE): Export __libc_tsd_RPC_VARS. 2002-08-02 Jakub Jelinek <jakub@redhat.com> * assert/assert.c (__assert_fail): Remove undef. Replace INTDEF with libc_hidden_def. * assert/__assert.c (__assert): Remove INTUSE. * elf/dl-minimal.c (__assert_fail): Replace INTDEF with libc_hidden_weak. * include/libc-symbols.h (hidden_proto, hidden_def, hidden_weak, hidden_ver, libc_hidden_proto, libc_hidden_def, libc_hidden_weak, libc_hidden_ver, rtld_hidden_proto, rtld_hidden_def, rtld_hidden_weak, rltd_hidden_ver, libm_hidden_proto, libm_hidden_def, libm_hidden_weak, libm_hiden_ver): Define. * include/assert.h (__assert_fail_internal): Remove. (__assert_fail): Add prototype. Add hidden_proto. * include/libc-internal.h (__libc_freeres, __profile_frequency): Add libc_hidden_proto. * include/wchar.h (__mbrtowc_internal, __mbrlen_internal): Remove. (__mbrtowc, __mbrlen): Use libc_hidden_proto. Remove macros. * include/string.h (__mempcpy, __stpncpy, __rawmemchr, __strcasecmp): Add libc_hidden_proto. * include/fcntl.h (__open64, __libc_open, __libc_fcntl, __open, __fcntl): Add libc_hidden_proto. Remove macros. (__open_internal, __fcntl_internal): Remove. * libio/iofdopen.c (_IO_fcntl): Remove INTUSE from __fcntl. * malloc/set-freeres.c (__libc_freeres): Add libc_hidden_def. * nss/nsswitch.h (__nss_database_lookup, __nss_next): Add libc_hiden_proto. * nss/nsswitch.c (__nss_database_lookup, __nss_next): Add libc_hidden_def. * sysdeps/generic/mempcpy.c (__mempcpy): Remove undef. Add libc_hidden_def. * sysdeps/generic/open64.c (__open64): Add libc_hidden_def. * sysdeps/generic/open.c (__open): Remove undef. Add libc_hidden_def. Remove INTDEF. * sysdeps/generic/fcntl.c (__fcntl): Remove undef. Add libc_hidden_def. * sysdeps/mach/hurd/fcntl.c (__fcntl): Likewise. * sysdeps/i386/i586/mempcpy.S (__mempcpy): Add libc_hidden_def. * sysdeps/i386/i686/mempcpy.S (__mempcpy): Likewise. * sysdeps/mach/hurd/fcntl.c (__libc_fcntl, __fcntl): Remove undef. (__fcntl): Remove INTDEF2. Add libc_hidden_weak. (__libc_fcntl): Add libc_hidden_def. * sysdeps/mach/hurd/open.c (__libc_open, __open): Remove undef. (__open): Remove INTDEF2. Add libc_hidden_weak. (__libc_open): Add libc_hidden_def. * sysdeps/posix/open64.c (__open64): Add libc_hidden_weak. * sysdeps/standalone/open.c (__open): Add libc_hidden_def. * sysdeps/unix/sysv/aix/fcntl.c (__libc_fcntl, __fcntl): Remove undef. Add libc_hidden_def. * sysdeps/unix/sysv/aix/open.c (__libc_open, __open): Remove undef. Add libc_hidden_def. * sysdeps/unix/sysv/linux/i386/fcntl.c (__libc_fcntl, __fcntl): Remove undef. (__fcntl): Remove INTDEF2. Add libc_hidden_weak. (__libc_fcntl): Add libc_hidden_def. * sysdeps/unix/sysv/linux/syscalls.list (__fcntl_internal, __getpgid_internal, __chown_internal): Remove. (__GI___fcntl, __GI___libc_fcntl, __GI___getpgid, __GI___pipe, __GI___sched_setscheduler, __GI___select, __GI___setpgid, __GI___chown): Add. * sysdeps/unix/syscalls.list (__close_internal, __dup2_internal, __getpid_internal, __open_internal, __write_internal): Remove. (__GI___fcntl, __GI___libc_fcntl, __GI___open, __GI___libc_open, __GI___chown, __GI___close, __GI___dup2, __GI___getpid, __GI___libc_open, __GI___open, __GI___read, __GI___libc_read, __GI___select, __GI___statfs, __GI___write, __GI___libc_write): Add. * wcsmbs/mbrlen.c (__mbrlen): Remove undef. Replace INTDEF with libc_hidden_def. * wcsmbs/mbrtowc.c (__mbrtowc): Likewise. * catgets/catgetsinfo.h (__open_catalog): Add libc_hidden_proto. * catgets/open_catalog.c (__open_catalog): Add libc_hidden_def. * elf/dl-profile.c (__profile_frequency): Add libc_hidden_proto. * include/rpc/rpc.h (__rpc_thread_svc_fdset, __rpc_thread_createerr): Add libc_hidden_proto. * include/sys/poll.h (__poll): Add libc_hidden_proto. * include/sys/select.h (__select): Likewise. * include/sys/socket.h (__send): Likewise. * include/sys/statfs.h (__statfs): Likewise. * include/unistd.h (__pwrite64, __libc_read, __pipe, __chown, __dup2, __getpid, __getpgid, __setpgid, __close, __read, __write, __getpagesize, __sbrk): Likewise. (__chown_internal, __dup2_internal, __getpid_internal, __getpgid_internal, __close_internal, __write_internal, __getpagesize_internal): Remove. (__close, __dup2, __getpagesize, __getpgid, __getpid, __libc_write): Remove macros. * include/printf.h (__printf_fp): Add libc_hidden_proto. * include/sched.h (__sched_setscheduler): Likewise. * include/resolv.h (__res_ninit, __res_randomid): Likewise. * include/stdlib.h (__secure_getenv): Likewise. * include/signal.h (__sigaction, __sigsuspend): Likewise. * inet/getaliasent_r.c (NSS_attribute_hidden): Remove. * inet/getaliasname_r.c (NSS_attribute_hidden): Remove. * inet/getnetbyad_r.c (NSS_attribute_hidden): Remove. * inet/getnetbynm_r.c (NSS_attribute_hidden): Remove. * inet/getnetent_r.c (NSS_attribute_hidden): Remove. * inet/getproto_r.c (NSS_attribute_hidden): Remove. * inet/getprtent_r.c (NSS_attribute_hidden): Remove. * inet/getprtname_r.c (NSS_attribute_hidden): Remove. * inet/getrpcbyname_r.c (NSS_attribute_hidden): Remove. * inet/getrpcbynumber_r.c (NSS_attribute_hidden): Remove. * inet/getrpcent_r.c (NSS_attribute_hidden): Remove. * inet/getservent_r.c (NSS_attribute_hidden): Remove. * inet/getsrvbynm_r.c (NSS_attribute_hidden): Remove. * inet/getsrvbypt_r.c (NSS_attribute_hidden): Remove. * inet/gethstbyad_r.c (DB_LOOKUP_FCT): Remove INTUSE. * inet/gethstbynm2_r.c (DB_LOOKUP_FCT): Likewise. * inet/gethstbynm_r.c (DB_LOOKUP_FCT): Likewise. * inet/gethstent_r.c (DB_LOOKUP_FCT): Likewise. * libio/genops.c (__overflow): Add libc_hidden_def. * libio/iovdprintf.c: Remove libio.h include. * libio/libioP.h (libc_hidden_proto, libc_hidden_def, libc_hidden_weak): Define to nothing if not defined. (__overflow, __woverflow): Add libc_hidden_proto. * libio/wgenops.c (__woverflow): Add libc_hidden_def. * nss/getXXent_r.c (NSS_attribute_hidden): Remove. (DB_LOOKUP_FCT): Add libc_hidden_proto. * nss/getXXbyYY_r.c (NSS_attribute_hidden): Remove. (DB_LOOKUP_FCT): Add libc_hidden_proto. * nss/XXX-lookup.c (DB_LOOKUP_FCT): Add libc_hidden_proto and libc_hidden_def. * nss/hosts-lookup.c (__nss_hosts_lookup): Remove INTDEF. * posix/bsd-getpgrp.c (__getpgid_internal): Remove. (__getpgid): Add libc_hidden_proto. (__bsd_getpgrp): Remove INTUSE. * resolv/res_init.c (__res_ninit, __res_randomid): Add libc_hidden_def. * shadow/getspent_r.c (NSS_attribute_hidden): Remove. * shadow/getspnam_r.c (NSS_attribute_hidden): Remove. * stdio-common/printf_fp.c (__printf_fp): Add libc_hidden_def. * stdlib/strfmon.c (__printf_fp): Add libc_hidden_proto. * stdlib/secure-getenv.c (__secure_getenv): Add libc_hidden_def. * sunrpc/rpc_thread.c (__rpc_thread_svc_fdset, __rpc_thread_createerr): Add libc_hidden_def. * sysdeps/alpha/alphaev67/rawmemchr.S (__rawmemchr): Add libc_hidden_def. * sysdeps/alpha/alphaev67/stpncpy.S (__stpncpy): Likewise. * sysdeps/alpha/rawmemchr.S (__rawmemchr): Likewise. * sysdeps/alpha/stpncpy.S (__stpncpy): Likewise. * sysdeps/generic/chown.c (__chown): Likewise. * sysdeps/generic/close.c (__close): Likewise. * sysdeps/generic/dup2.c (__dup2): Likewise. * sysdeps/generic/pipe.c (__pipe): Likewise. * sysdeps/generic/prof-freq.c (__profile_frequency): Likewise. * sysdeps/generic/pwrite64.c (__pwrite64): Likewise. * sysdeps/generic/rawmemchr.c (__rawmemchr): Likewise. * sysdeps/generic/read.c (__libc_read): Likewise. (__read): Add libc_hidden_weak. * sysdeps/generic/sbrk.c (__sbrk): Add libc_hidden_def. * sysdeps/generic/sched_sets.c (__sched_setscheduler): Likewise. * sysdeps/generic/select.c (__select): Likewise. * sysdeps/generic/send.c (__send): Likewise. * sysdeps/generic/setpgid.c (__setpgid): Likewise. * sysdeps/generic/sigaction.c (__sigaction): Likewise. * sysdeps/generic/sigsuspend.c (__sigsuspend): Likewise. * sysdeps/generic/statfs.c (__statfs): Likewise. * sysdeps/generic/stpncpy.c (__stpncpy): Likewise. * sysdeps/generic/strcasecmp.c (__strcasecmp): Likewise. * sysdeps/generic/getpagesize.c (__getpagesize): Likewise. Remove undef and INTDEF. * sysdeps/generic/getpgid.c (__getpgid): Likewise. * sysdeps/generic/getpid.c (__getpid): Likewise. * sysdeps/generic/write.c (__libc_write): Likewise. (__write): Add libc_hidden_weak. Remove undef and INTDEF. * sysdeps/i386/rawmemchr.S (__rawmemchr): Add libc_hidden_def. * sysdeps/i386/stpncpy.S (__stpncpy): Likewise. * sysdeps/m68k/rawmemchr.S (__rawmemchr): Likewise. * sysdeps/mach/hurd/chown.c (__chown): Likewise. Remove INTDEF. * sysdeps/mach/hurd/close.c (__close): Add libc_hidden_def. Remove undef and INTDEF. * sysdeps/mach/hurd/dup2.c (__dup2): Likewise. * sysdeps/mach/hurd/getpgid.c (__getpgid): Likewise. * sysdeps/mach/hurd/getpid.c (__getpid): Likewise. * sysdeps/mach/getpagesize.c (__getpagesize): Likewise. * sysdeps/mach/hurd/write.c (__libc_write): Likewise. (__write): Add libc_hidden_weak. Remove undef and INTDEF. * sysdeps/mach/hurd/pipe.c: Include unistd.h. (__pipe): Add libc_hidden_def. * sysdeps/mach/hurd/dl-sysdep.c (__libc_read, __libc_write): Add libc_hidden_weak. * sysdeps/mach/hurd/poll.c (__poll): Add libc_hidden_def. * sysdeps/mach/hurd/profil.c (__profile_frequency): Likewise. * sysdeps/mach/hurd/read.c (__libc_read): Likewise. (__read): Add libc_hidden_weak. * sysdeps/mach/hurd/pwrite64.c (__pwrite64): Likewise. (__libc_pwrite64): Add libc_hidden_def. * sysdeps/mach/hurd/sbrk.c (__sbrk): Likewise. * sysdeps/mach/hurd/select.c (__select): Likewise. * sysdeps/mach/hurd/send.c (__send): Likewise. * sysdeps/mach/hurd/setpgid.c (__setpgid): Likewise. * sysdeps/mach/hurd/sigaction.c (__sigaction): Likewise. * sysdeps/mach/hurd/sigsuspend.c (__sigsuspend): Likewise. * sysdeps/mach/hurd/statfs.c (__statfs): Likewise. * sysdeps/posix/dup2.c: Likewise. Remove undef and INTDEF. * sysdeps/posix/getpagesize.c (__getpagesize): Likewise. * sysdeps/posix/pwrite64.c (__libc_pwrite64): Add libc_hidden_def. (__pwrite64): Add libc_hidden_weak. * sysdeps/posix/sigsuspend.c (__sigsuspend): Add libc_hidden_def. * sysdeps/sparc/sparc64/rawmemchr.S (__rawmemchr): Likewise. * sysdeps/sparc/sparc64/stpncpy.S (__stpncpy): Likewise. * sysdeps/standalone/close.c (__close): Likewise. * sysdeps/standalone/write.c (__libc_write): Likewise. (__write): Add libc_hidden_weak. * sysdeps/standalone/read.c (__read): Likewise. (__libc_read): Add libc_hidden_def. * sysdeps/unix/grantpt.c (grantpt): Remove INTUSE. * sysdeps/unix/bsd/m68k/pipe.S (__pipe): Add libc_hidden_def. * sysdeps/unix/bsd/osf/alpha/pipe.S (__pipe): Likewise. * sysdeps/unix/bsd/vax/pipe.S (__pipe): Likewise. * sysdeps/unix/bsd/syscalls.list (__GI___getpagesize): Likewise. * sysdeps/unix/bsd/poll.c (__poll): Likewise. * sysdeps/unix/bsd/sigaction.c (__sigaction): Likewise. * sysdeps/unix/bsd/sigsuspend.c (__sigsuspend): Likewise. * sysdeps/unix/common/syscalls.list (__GI___getpgid, __GI___setpgid, __GI___sigaction): Add. * sysdeps/unix/i386/pipe.S (__pipe): Add libc_hidden_def. * sysdeps/unix/inet/syscalls.list (__GI___send): Add. * sysdeps/unix/mips/pipe.S (__pipe): Add libc_hidden_def. * sysdeps/unix/sparc/pipe.S (__pipe): Likewise. * sysdeps/unix/sysv/irix4/syscalls.list (__GI___getpgid, __GI___setpgid): Add. * sysdeps/unix/sysv/aix/chown.c (__chown): Add libc_hidden_def. Remove undef and INTDEF. * sysdeps/unix/sysv/aix/getpgid.c (__getpgid): Likewise. * sysdeps/unix/sysv/aix/write.c (__write, __libc_write): Likewise. * sysdeps/unix/sysv/aix/close.c (__close): Add libc_hidden_def. * sysdeps/unix/sysv/aix/getpid.c (__getpid): Likewise. * sysdeps/unix/sysv/aix/pipe.c (__pipe): Likewise. * sysdeps/unix/sysv/aix/read.c (__read, __libc_read): Likewise. * sysdeps/unix/sysv/aix/poll.c (__poll): Likewise. * sysdeps/unix/sysv/aix/sbrk.c (__sbrk): Likewise. * sysdeps/unix/sysv/aix/sigaction.c (__sigaction): Likewise. * sysdeps/unix/sysv/aix/sigsuspend.c (__sigsuspend): Likewise. * sysdeps/unix/sysv/aix/statfs.c (__statfs): Likewise. * sysdeps/unix/sysv/aix/select.c (__select): Likewise. * sysdeps/unix/sysv/aix/setpgid.c (__setpgid): Likewise. * sysdeps/unix/sysv/linux/alpha/pipe.S (__pipe): Likewise. * sysdeps/unix/sysv/linux/alpha/syscalls.list (__GI___pwrite64, __GI___statfs, __GI___send): Add. * sysdeps/unix/sysv/linux/alpha/select.S (__select): Add libc_hidden_ver resp. libc_hidden_def. * sysdeps/unix/sysv/linux/alpha/sigsuspend.S (__sigsuspend): Add libc_hidden_def. * sysdeps/unix/sysv/linux/ia64/getpagesize.c (__getpagesize): Likewise. Remove undef and INTDEF. * sysdeps/unix/sysv/linux/ia64/pipe.S (__pipe): Add libc_hidden_def. * sysdeps/unix/sysv/linux/ia64/syscalls.list (__GI___pwrite64, __GI___statfs, __GI___send): Add. * sysdeps/unix/sysv/linux/ia64/sigaction.c (__sigaction): Add libc_hidden_def. * sysdeps/unix/sysv/linux/ia64/sigsuspend.c (__sigsuspend): Likewise. * sysdeps/unix/sysv/linux/sh/pipe.S (__pipe): Likewise. * sysdeps/unix/sysv/linux/s390/s390-32/chown.c (__chown): Add libc_hidden_ver resp. libc_hidden_def. * sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list (__GI___pwrite64, __GI___send): Add. * sysdeps/unix/sysv/linux/s390/s390-64/sigaction.c (__sigaction): Add libc_hidden_weak. * sysdeps/unix/sysv/linux/s390/s390-64/sigsuspend.c (__sigsuspend): Add libc_hidden_def. * sysdeps/unix/sysv/linux/hppa/syscalls.list (__GI___send): Add. * sysdeps/unix/sysv/linux/arm/sigaction.c (__sigaction): Add libc_hidden_weak. * sysdeps/unix/sysv/linux/i386/chown.c (__chown): Add libc_hidden_ver resp. libc_hidden_def. * sysdeps/unix/sysv/linux/i386/sigaction.c (__sigaction): Add libc_hidden_weak. * sysdeps/unix/sysv/linux/m68k/chown.c (__chown): Likewise. Remove INTDEF. * sysdeps/unix/sysv/linux/m68k/getpagesize.c (__getpagesize): Likewise. Remove undef. * sysdeps/unix/sysv/linux/mips/pwrite64.c (__pwrite64): Add libc_hidden_weak. * sysdeps/unix/sysv/linux/mips/syscalls.list (__GI___send): Add. * sysdeps/unix/sysv/linux/mips/sigaction.c (__sigaction): Add libc_hidden_weak. * sysdeps/unix/sysv/linux/powerpc/chown.c (__chown): Add libc_hidden_def. * sysdeps/unix/sysv/linux/powerpc/pwrite64.c (__pwrite64): Likewise. * sysdeps/unix/sysv/linux/sparc/sparc32/getpagesize.c (__getpagesize): Likewise. Remove undef and INTDEF. * sysdeps/unix/sysv/linux/sparc/sparc32/pipe.S (__pipe): Add libc_hidden_def. * sysdeps/unix/sysv/linux/sparc/sparc32/sigaction.c (__sigaction): Add libc_hidden_weak. * sysdeps/unix/sysv/linux/sparc/sparc64/pipe.S (__pipe): Add libc_hidden_def. * sysdeps/unix/sysv/linux/sparc/sparc64/syscalls.list (__GI___pwrite64, __GI___statfs, __GI___select, __GI___send): Add. * sysdeps/unix/sysv/linux/sparc/sparc64/sigaction.c (__sigaction): Add libc_hidden_weak. * sysdeps/unix/sysv/linux/sparc/sparc64/sigsuspend.c (__sigsuspend): Add libc_hidden_def. * sysdeps/unix/sysv/linux/x86_64/syscalls.list (__GI___pwrite64, __GI___statfs): Add. * sysdeps/unix/sysv/linux/x86_64/send.c (__send): Add libc_hidden_weak. * sysdeps/unix/sysv/linux/x86_64/sigaction.c (__sigaction): Likewise. * sysdeps/unix/sysv/linux/getpagesize.c: Add libc_hidden_def. Remove undef and INTDEF. * sysdeps/unix/sysv/linux/poll.c (__poll): Add libc_hidden_def. * sysdeps/unix/sysv/linux/pwrite64.c (__pwrite64): Add libc_hidden_def. * sysdeps/unix/sysv/linux/send.S (__send): Likewise. * sysdeps/unix/sysv/linux/sigaction.c (__sigaction): Add libc_hidden_weak. * sysdeps/unix/sysv/linux/sigsuspend.c (__sigsuspend): Add libc_hidden_def. * sysdeps/unix/sysv/sco3.2.4/__setpgid.c (__setpgid): Likewise. * sysdeps/unix/sysv/sco3.2.4/sigaction.S (__sigaction): Likewise. * sysdeps/unix/sysv/sysv4/solaris2/syscalls.list (__GI___sigaction): Add. * sysdeps/unix/sysv/sysv4/__getpgid.c (__getpgid): Add libc_hidden_def. Remove undef and INTDEF. * sysdeps/unix/sysv/sysv4/getpgid.c (__getpgid): Likewise. * sysdeps/unix/sysv/sysv4/__setpgid.c (__setpgid): Add libc_hidden_def. * sysdeps/unix/sysv/sysv4/setpgid.c (__setpgid): Likewise. * sysdeps/unix/sysv/sysv4/sigaction.c (__sigaction): Likewise. * sysdeps/unix/sysv/sigaction.c (__sigaction): Likewise. * sysdeps/unix/getpagesize.c (__getpagesize): Add libc_hidden_def. Remove undef and INTDEF. * configure.in (HAVE_BROKEN_VISIBILITY_ATTRIBUTE): Add check for broken visibility attribute handling. * config.h.in (HAVE_BROKEN_VISIBILITY_ATTRIBUTE): Add. 2002-08-02 Ulrich Drepper <drepper@redhat.com>
559 lines
17 KiB
C
559 lines
17 KiB
C
/*
|
|
* Copyright (c) 1985, 1989, 1993
|
|
* The Regents of the University of California. All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
* 4. Neither the name of the University nor the names of its contributors
|
|
* may be used to endorse or promote products derived from this software
|
|
* without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
* SUCH DAMAGE.
|
|
*/
|
|
|
|
/*
|
|
* Portions Copyright (c) 1993 by Digital Equipment Corporation.
|
|
*
|
|
* Permission to use, copy, modify, and distribute this software for any
|
|
* purpose with or without fee is hereby granted, provided that the above
|
|
* copyright notice and this permission notice appear in all copies, and that
|
|
* the name of Digital Equipment Corporation not be used in advertising or
|
|
* publicity pertaining to distribution of the document or software without
|
|
* specific, written prior permission.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
|
|
* WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
|
|
* OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL DIGITAL EQUIPMENT
|
|
* CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
|
|
* DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
|
|
* PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
|
|
* ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
|
|
* SOFTWARE.
|
|
*/
|
|
|
|
/*
|
|
* Portions Copyright (c) 1996-1999 by Internet Software Consortium.
|
|
*
|
|
* Permission to use, copy, modify, and distribute this software for any
|
|
* purpose with or without fee is hereby granted, provided that the above
|
|
* copyright notice and this permission notice appear in all copies.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
|
|
* ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
|
|
* OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
|
|
* CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
|
|
* DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
|
|
* PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
|
|
* ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
|
|
* SOFTWARE.
|
|
*/
|
|
|
|
#if defined(LIBC_SCCS) && !defined(lint)
|
|
static const char sccsid[] = "@(#)res_init.c 8.1 (Berkeley) 6/7/93";
|
|
static const char rcsid[] = "$BINDId: res_init.c,v 8.16 2000/05/09 07:10:12 vixie Exp $";
|
|
#endif /* LIBC_SCCS and not lint */
|
|
|
|
#include <sys/types.h>
|
|
#include <sys/param.h>
|
|
#include <sys/socket.h>
|
|
#include <sys/time.h>
|
|
|
|
#include <netinet/in.h>
|
|
#include <arpa/inet.h>
|
|
#include <arpa/nameser.h>
|
|
|
|
#include <ctype.h>
|
|
#include <resolv.h>
|
|
#include <stdio.h>
|
|
#include <stdio_ext.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
|
|
/* Options. Should all be left alone. */
|
|
#define RESOLVSORT
|
|
#define RFC1535
|
|
/* #undef DEBUG */
|
|
|
|
static void res_setoptions (res_state, const char *, const char *)
|
|
internal_function;
|
|
|
|
#ifdef RESOLVSORT
|
|
static const char sort_mask[] = "/&";
|
|
#define ISSORTMASK(ch) (strchr(sort_mask, ch) != NULL)
|
|
static u_int32_t net_mask __P((struct in_addr));
|
|
#endif
|
|
|
|
#if !defined(isascii) /* XXX - could be a function */
|
|
# define isascii(c) (!(c & 0200))
|
|
#endif
|
|
|
|
/*
|
|
* Resolver state default settings.
|
|
*/
|
|
|
|
/*
|
|
* Set up default settings. If the configuration file exist, the values
|
|
* there will have precedence. Otherwise, the server address is set to
|
|
* INADDR_ANY and the default domain name comes from the gethostname().
|
|
*
|
|
* An interrim version of this code (BIND 4.9, pre-4.4BSD) used 127.0.0.1
|
|
* rather than INADDR_ANY ("0.0.0.0") as the default name server address
|
|
* since it was noted that INADDR_ANY actually meant ``the first interface
|
|
* you "ifconfig"'d at boot time'' and if this was a SLIP or PPP interface,
|
|
* it had to be "up" in order for you to reach your own name server. It
|
|
* was later decided that since the recommended practice is to always
|
|
* install local static routes through 127.0.0.1 for all your network
|
|
* interfaces, that we could solve this problem without a code change.
|
|
*
|
|
* The configuration file should always be used, since it is the only way
|
|
* to specify a default domain. If you are running a server on your local
|
|
* machine, you should say "nameserver 0.0.0.0" or "nameserver 127.0.0.1"
|
|
* in the configuration file.
|
|
*
|
|
* Return 0 if completes successfully, -1 on error
|
|
*/
|
|
int
|
|
res_ninit(res_state statp) {
|
|
extern int __res_vinit(res_state, int);
|
|
|
|
return (__res_vinit(statp, 0));
|
|
}
|
|
#ifdef _LIBC
|
|
libc_hidden_def (__res_ninit)
|
|
#endif
|
|
|
|
/* This function has to be reachable by res_data.c but not publically. */
|
|
int
|
|
__res_vinit(res_state statp, int preinit) {
|
|
register FILE *fp;
|
|
register char *cp, **pp;
|
|
register int n;
|
|
char buf[BUFSIZ];
|
|
int nserv = 0; /* number of nameserver records read from file */
|
|
#ifdef _LIBC
|
|
int nservall = 0; /* number of NS records read, nserv IPv4 only */
|
|
#endif
|
|
int haveenv = 0;
|
|
int havesearch = 0;
|
|
#ifdef RESOLVSORT
|
|
int nsort = 0;
|
|
char *net;
|
|
#endif
|
|
#ifndef RFC1535
|
|
int dots;
|
|
#endif
|
|
|
|
if (!preinit) {
|
|
statp->retrans = RES_TIMEOUT;
|
|
statp->retry = RES_DFLRETRY;
|
|
statp->options = RES_DEFAULT;
|
|
statp->id = res_randomid();
|
|
}
|
|
|
|
#ifdef USELOOPBACK
|
|
statp->nsaddr.sin_addr = inet_makeaddr(IN_LOOPBACKNET, 1);
|
|
#else
|
|
statp->nsaddr.sin_addr.s_addr = INADDR_ANY;
|
|
#endif
|
|
statp->nsaddr.sin_family = AF_INET;
|
|
statp->nsaddr.sin_port = htons(NAMESERVER_PORT);
|
|
statp->nscount = 1;
|
|
statp->ndots = 1;
|
|
statp->pfcode = 0;
|
|
statp->_vcsock = -1;
|
|
statp->_flags = 0;
|
|
statp->qhook = NULL;
|
|
statp->rhook = NULL;
|
|
statp->_u._ext.nsinit = 0;
|
|
statp->_u._ext.nscount = 0;
|
|
#ifdef _LIBC
|
|
statp->_u._ext.nscount6 = 0;
|
|
for (n = 0; n < MAXNS; n++) {
|
|
statp->_u._ext.nsaddrs[n] = NULL;
|
|
statp->_u._ext.nsmap[n] = MAXNS;
|
|
}
|
|
#endif
|
|
|
|
/* Allow user to override the local domain definition */
|
|
if ((cp = getenv("LOCALDOMAIN")) != NULL) {
|
|
(void)strncpy(statp->defdname, cp, sizeof(statp->defdname) - 1);
|
|
statp->defdname[sizeof(statp->defdname) - 1] = '\0';
|
|
haveenv++;
|
|
|
|
/*
|
|
* Set search list to be blank-separated strings
|
|
* from rest of env value. Permits users of LOCALDOMAIN
|
|
* to still have a search list, and anyone to set the
|
|
* one that they want to use as an individual (even more
|
|
* important now that the rfc1535 stuff restricts searches)
|
|
*/
|
|
cp = statp->defdname;
|
|
pp = statp->dnsrch;
|
|
*pp++ = cp;
|
|
for (n = 0; *cp && pp < statp->dnsrch + MAXDNSRCH; cp++) {
|
|
if (*cp == '\n') /* silly backwards compat */
|
|
break;
|
|
else if (*cp == ' ' || *cp == '\t') {
|
|
*cp = 0;
|
|
n = 1;
|
|
} else if (n) {
|
|
*pp++ = cp;
|
|
n = 0;
|
|
havesearch = 1;
|
|
}
|
|
}
|
|
/* null terminate last domain if there are excess */
|
|
while (*cp != '\0' && *cp != ' ' && *cp != '\t' && *cp != '\n')
|
|
cp++;
|
|
*cp = '\0';
|
|
*pp++ = 0;
|
|
}
|
|
|
|
#define MATCH(line, name) \
|
|
(!strncmp(line, name, sizeof(name) - 1) && \
|
|
(line[sizeof(name) - 1] == ' ' || \
|
|
line[sizeof(name) - 1] == '\t'))
|
|
|
|
if ((fp = fopen(_PATH_RESCONF, "r")) != NULL) {
|
|
/* No threads use this stream. */
|
|
__fsetlocking (fp, FSETLOCKING_BYCALLER);
|
|
/* read the config file */
|
|
while (fgets_unlocked(buf, sizeof(buf), fp) != NULL) {
|
|
/* skip comments */
|
|
if (*buf == ';' || *buf == '#')
|
|
continue;
|
|
/* read default domain name */
|
|
if (MATCH(buf, "domain")) {
|
|
if (haveenv) /* skip if have from environ */
|
|
continue;
|
|
cp = buf + sizeof("domain") - 1;
|
|
while (*cp == ' ' || *cp == '\t')
|
|
cp++;
|
|
if ((*cp == '\0') || (*cp == '\n'))
|
|
continue;
|
|
strncpy(statp->defdname, cp, sizeof(statp->defdname) - 1);
|
|
statp->defdname[sizeof(statp->defdname) - 1] = '\0';
|
|
if ((cp = strpbrk(statp->defdname, " \t\n")) != NULL)
|
|
*cp = '\0';
|
|
havesearch = 0;
|
|
continue;
|
|
}
|
|
/* set search list */
|
|
if (MATCH(buf, "search")) {
|
|
if (haveenv) /* skip if have from environ */
|
|
continue;
|
|
cp = buf + sizeof("search") - 1;
|
|
while (*cp == ' ' || *cp == '\t')
|
|
cp++;
|
|
if ((*cp == '\0') || (*cp == '\n'))
|
|
continue;
|
|
strncpy(statp->defdname, cp, sizeof(statp->defdname) - 1);
|
|
statp->defdname[sizeof(statp->defdname) - 1] = '\0';
|
|
if ((cp = strchr(statp->defdname, '\n')) != NULL)
|
|
*cp = '\0';
|
|
/*
|
|
* Set search list to be blank-separated strings
|
|
* on rest of line.
|
|
*/
|
|
cp = statp->defdname;
|
|
pp = statp->dnsrch;
|
|
*pp++ = cp;
|
|
for (n = 0; *cp && pp < statp->dnsrch + MAXDNSRCH; cp++) {
|
|
if (*cp == ' ' || *cp == '\t') {
|
|
*cp = 0;
|
|
n = 1;
|
|
} else if (n) {
|
|
*pp++ = cp;
|
|
n = 0;
|
|
}
|
|
}
|
|
/* null terminate last domain if there are excess */
|
|
while (*cp != '\0' && *cp != ' ' && *cp != '\t')
|
|
cp++;
|
|
*cp = '\0';
|
|
*pp++ = 0;
|
|
havesearch = 1;
|
|
continue;
|
|
}
|
|
/* read nameservers to query */
|
|
#ifdef _LIBC
|
|
if (MATCH(buf, "nameserver") && nservall < MAXNS) {
|
|
#else
|
|
if (MATCH(buf, "nameserver") && nserv < MAXNS) {
|
|
#endif
|
|
struct in_addr a;
|
|
|
|
cp = buf + sizeof("nameserver") - 1;
|
|
while (*cp == ' ' || *cp == '\t')
|
|
cp++;
|
|
if ((*cp != '\0') && (*cp != '\n')
|
|
&& __inet_aton(cp, &a)) {
|
|
statp->nsaddr_list[nserv].sin_addr = a;
|
|
statp->nsaddr_list[nserv].sin_family = AF_INET;
|
|
statp->nsaddr_list[nserv].sin_port =
|
|
htons(NAMESERVER_PORT);
|
|
nserv++;
|
|
#ifdef _LIBC
|
|
nservall++;
|
|
} else {
|
|
struct in6_addr a6;
|
|
char *el;
|
|
|
|
if ((el = strchr(cp, '\n')) != NULL)
|
|
*el = '\0';
|
|
if ((*cp != '\0') &&
|
|
(inet_pton(AF_INET6, cp, &a6) > 0)) {
|
|
struct sockaddr_in6 *sa6;
|
|
|
|
sa6 = malloc(sizeof(*sa6));
|
|
if (sa6 != NULL) {
|
|
sa6->sin6_addr = a6;
|
|
sa6->sin6_family = AF_INET6;
|
|
sa6->sin6_port = htons(NAMESERVER_PORT);
|
|
statp->_u._ext.nsaddrs[nservall] = sa6;
|
|
statp->_u._ext.nssocks[nservall] = -1;
|
|
statp->_u._ext.nsmap[nservall] = MAXNS + 1;
|
|
nservall++;
|
|
}
|
|
}
|
|
#endif
|
|
}
|
|
continue;
|
|
}
|
|
#ifdef RESOLVSORT
|
|
if (MATCH(buf, "sortlist")) {
|
|
struct in_addr a;
|
|
|
|
cp = buf + sizeof("sortlist") - 1;
|
|
while (nsort < MAXRESOLVSORT) {
|
|
while (*cp == ' ' || *cp == '\t')
|
|
cp++;
|
|
if (*cp == '\0' || *cp == '\n' || *cp == ';')
|
|
break;
|
|
net = cp;
|
|
while (*cp && !ISSORTMASK(*cp) && *cp != ';' &&
|
|
isascii(*cp) && !isspace(*cp))
|
|
cp++;
|
|
n = *cp;
|
|
*cp = 0;
|
|
if (__inet_aton(net, &a)) {
|
|
statp->sort_list[nsort].addr = a;
|
|
if (ISSORTMASK(n)) {
|
|
*cp++ = n;
|
|
net = cp;
|
|
while (*cp && *cp != ';' &&
|
|
isascii(*cp) && !isspace(*cp))
|
|
cp++;
|
|
n = *cp;
|
|
*cp = 0;
|
|
if (__inet_aton(net, &a)) {
|
|
statp->sort_list[nsort].mask = a.s_addr;
|
|
} else {
|
|
statp->sort_list[nsort].mask =
|
|
net_mask(statp->sort_list[nsort].addr);
|
|
}
|
|
} else {
|
|
statp->sort_list[nsort].mask =
|
|
net_mask(statp->sort_list[nsort].addr);
|
|
}
|
|
nsort++;
|
|
}
|
|
*cp = n;
|
|
}
|
|
continue;
|
|
}
|
|
#endif
|
|
if (MATCH(buf, "options")) {
|
|
res_setoptions(statp, buf + sizeof("options") - 1, "conf");
|
|
continue;
|
|
}
|
|
}
|
|
if (nserv > 1)
|
|
statp->nscount = nserv;
|
|
#ifdef _LIBC
|
|
if (nservall - nserv > 0)
|
|
statp->_u._ext.nscount6 = nservall - nserv;
|
|
#endif
|
|
#ifdef RESOLVSORT
|
|
statp->nsort = nsort;
|
|
#endif
|
|
(void) fclose(fp);
|
|
}
|
|
if (statp->defdname[0] == 0 &&
|
|
__gethostname(buf, sizeof(statp->defdname) - 1) == 0 &&
|
|
(cp = strchr(buf, '.')) != NULL)
|
|
strcpy(statp->defdname, cp + 1);
|
|
|
|
/* find components of local domain that might be searched */
|
|
if (havesearch == 0) {
|
|
pp = statp->dnsrch;
|
|
*pp++ = statp->defdname;
|
|
*pp = NULL;
|
|
|
|
#ifndef RFC1535
|
|
dots = 0;
|
|
for (cp = statp->defdname; *cp; cp++)
|
|
dots += (*cp == '.');
|
|
|
|
cp = statp->defdname;
|
|
while (pp < statp->dnsrch + MAXDFLSRCH) {
|
|
if (dots < LOCALDOMAINPARTS)
|
|
break;
|
|
cp = __rawmemchr(cp, '.') + 1; /* we know there is one */
|
|
*pp++ = cp;
|
|
dots--;
|
|
}
|
|
*pp = NULL;
|
|
#ifdef DEBUG
|
|
if (statp->options & RES_DEBUG) {
|
|
printf(";; res_init()... default dnsrch list:\n");
|
|
for (pp = statp->dnsrch; *pp; pp++)
|
|
printf(";;\t%s\n", *pp);
|
|
printf(";;\t..END..\n");
|
|
}
|
|
#endif
|
|
#endif /* !RFC1535 */
|
|
}
|
|
|
|
if ((cp = getenv("RES_OPTIONS")) != NULL)
|
|
res_setoptions(statp, cp, "env");
|
|
statp->options |= RES_INIT;
|
|
return (0);
|
|
}
|
|
|
|
static void
|
|
internal_function
|
|
res_setoptions(res_state statp, const char *options, const char *source) {
|
|
const char *cp = options;
|
|
int i;
|
|
|
|
#ifdef DEBUG
|
|
if (statp->options & RES_DEBUG)
|
|
printf(";; res_setoptions(\"%s\", \"%s\")...\n",
|
|
options, source);
|
|
#endif
|
|
while (*cp) {
|
|
/* skip leading and inner runs of spaces */
|
|
while (*cp == ' ' || *cp == '\t')
|
|
cp++;
|
|
/* search for and process individual options */
|
|
if (!strncmp(cp, "ndots:", sizeof("ndots:") - 1)) {
|
|
i = atoi(cp + sizeof("ndots:") - 1);
|
|
if (i <= RES_MAXNDOTS)
|
|
statp->ndots = i;
|
|
else
|
|
statp->ndots = RES_MAXNDOTS;
|
|
#ifdef DEBUG
|
|
if (statp->options & RES_DEBUG)
|
|
printf(";;\tndots=%d\n", statp->ndots);
|
|
#endif
|
|
} else if (!strncmp(cp, "timeout:", sizeof("timeout:") - 1)) {
|
|
i = atoi(cp + sizeof("timeout:") - 1);
|
|
if (i <= RES_MAXRETRANS)
|
|
statp->retrans = i;
|
|
else
|
|
statp->retrans = RES_MAXRETRANS;
|
|
} else if (!strncmp(cp, "attempts:", sizeof("attempts:") - 1)){
|
|
i = atoi(cp + sizeof("attempts:") - 1);
|
|
if (i <= RES_MAXRETRY)
|
|
statp->retry = i;
|
|
else
|
|
statp->retry = RES_MAXRETRY;
|
|
} else if (!strncmp(cp, "debug", sizeof("debug") - 1)) {
|
|
#ifdef DEBUG
|
|
if (!(statp->options & RES_DEBUG)) {
|
|
printf(";; res_setoptions(\"%s\", \"%s\")..\n",
|
|
options, source);
|
|
statp->options |= RES_DEBUG;
|
|
}
|
|
printf(";;\tdebug\n");
|
|
#endif
|
|
} else if (!strncmp(cp, "inet6", sizeof("inet6") - 1)) {
|
|
statp->options |= RES_USE_INET6;
|
|
} else if (!strncmp(cp, "rotate", sizeof("rotate") - 1)) {
|
|
statp->options |= RES_ROTATE;
|
|
} else if (!strncmp(cp, "no-check-names",
|
|
sizeof("no-check-names") - 1)) {
|
|
statp->options |= RES_NOCHECKNAME;
|
|
} else {
|
|
/* XXX - print a warning here? */
|
|
}
|
|
/* skip to next run of spaces */
|
|
while (*cp && *cp != ' ' && *cp != '\t')
|
|
cp++;
|
|
}
|
|
}
|
|
|
|
#ifdef RESOLVSORT
|
|
/* XXX - should really support CIDR which means explicit masks always. */
|
|
static u_int32_t
|
|
net_mask(in) /* XXX - should really use system's version of this */
|
|
struct in_addr in;
|
|
{
|
|
register u_int32_t i = ntohl(in.s_addr);
|
|
|
|
if (IN_CLASSA(i))
|
|
return (htonl(IN_CLASSA_NET));
|
|
else if (IN_CLASSB(i))
|
|
return (htonl(IN_CLASSB_NET));
|
|
return (htonl(IN_CLASSC_NET));
|
|
}
|
|
#endif
|
|
|
|
u_int
|
|
res_randomid(void) {
|
|
struct timeval now;
|
|
|
|
__gettimeofday(&now, NULL);
|
|
return (0xffff & (now.tv_sec ^ now.tv_usec ^ __getpid()));
|
|
}
|
|
#ifdef _LIBC
|
|
libc_hidden_def (__res_randomid)
|
|
#endif
|
|
|
|
/*
|
|
* This routine is for closing the socket if a virtual circuit is used and
|
|
* the program wants to close it. This provides support for endhostent()
|
|
* which expects to close the socket.
|
|
*
|
|
* This routine is not expected to be user visible.
|
|
*/
|
|
void
|
|
res_nclose(res_state statp) {
|
|
int ns;
|
|
|
|
if (statp->_vcsock >= 0) {
|
|
(void) __close(statp->_vcsock);
|
|
statp->_vcsock = -1;
|
|
statp->_flags &= ~(RES_F_VC | RES_F_CONN);
|
|
}
|
|
#ifdef _LIBC
|
|
for (ns = 0; ns < MAXNS; ns++)
|
|
#else
|
|
for (ns = 0; ns < statp->_u._ext.nscount; ns++)
|
|
#endif
|
|
if (statp->_u._ext.nsaddrs[ns]
|
|
&& statp->_u._ext.nssocks[ns] != -1) {
|
|
(void) __close(statp->_u._ext.nssocks[ns]);
|
|
statp->_u._ext.nssocks[ns] = -1;
|
|
}
|
|
statp->_u._ext.nsinit = 0;
|
|
}
|