mirror of
git://sourceware.org/git/newlib-cygwin.git
synced 2025-01-17 12:01:53 +08:00
3c77dcff9e
* libc/include/sys/reent.h: Add _h_errno field. * libc/sys/linux/libc-symbols.h: Add default stubs for new libc macros now used in net directory. * libc/sys/linux/bits/libc-lock.h: Always define _IO_MTSAFE_IO. * libc/sys/linux/include/hesiod.h: Add needed macros for new code in net directory. * libc/sys/linux/include/netdb.h: Ditto. * libc/sys/linux/include/resolv.h: Ditto. * libc/sys/linux/include/stdint.h: Ditto. * libc/sys/linux/include/arpa/nameser.h: Ditto. * libc/sys/linux/include/net/ethernet.h: Ditto. * libc/sys/linux/include/net/if_ppp.h: Ditto. * libc/sys/linux/include/netinet/if_ether.h: Ditto. * libc/sys/linux/machine/i386/get_clockfreq.c: Remove static memmem. * libc/sys/linux/machine/i386/include/endian.h: Protect macros with flags to avoid duplicate definition. * libc/sys/linux/machine/i386/include/param.h: Ditto. * libc/sys/linux/net/Makefile.am: Modified to account for removed and added files. * libc/sys/linux/net/Makefile.in: Regenerated. * libc/sys/linux/net/base64.c: Replaced with glibc version of code. * libc/sys/linux/net/getaddrinfo.c: Ditto. * libc/sys/linux/net/getnameinfo.c: Ditto. * libc/sys/linux/net/getproto.c: Ditto. * libc/sys/linux/net/getservent.c: Ditto. * libc/sys/linux/net/inet_netof.c: Ditto. * libc/sys/linux/net/inet_lnaof.c: Ditto. * libc/sys/linux/net/ns_name.c: Ditto. * libc/sys/linux/net/ns_netint.c: Ditto. * libc/sys/linux/net/inet_ntoa.c: Ditto. * libc/sys/linux/net/ns_parse.c: Ditto. * libc/sys/linux/net/ns_print.c: Ditto. * libc/sys/linux/net/ns_ttl.c: Ditto. * libc/sys/linux/net/nsap_addr.c: Ditto. * libc/sys/linux/net/rcmd.c: Ditto. * libc/sys/linux/net/res_comp.c: Ditto. * libc/sys/linux/net/res_data.c: Ditto. * libc/sys/linux/net/res_debug.c: Ditto. * libc/sys/linux/net/res_init.c: Ditto. * libc/sys/linux/net/res_mkquery.c: Ditto. * libc/sys/linux/net/res_query.c: Ditto. * libc/sys/linux/net/res_send.c: Ditto. * libc/sys/linux/net/send.c: Ditto. * libc/sys/linux/stdlib/collate.c: Ditto. * libc/sys/linux/sys/ioctl.h: Ditto. * libc/sys/linux/sys/socket.h: Ditto. * libc/sys/linux/sys/unistd.h: Ditto. * libc/sys/linux/iconv/iconvconfig.c: Removed either because no longer used or because licensing includes advertising clause that cannot be ignored. * libc/sys/linux/iconv/strtab.c: Ditto. * libc/sys/linux/include/libc_private.h: Ditto. * libc/sys/linux/include/nsswitch.h: Ditto. * libc/sys/linux/include/net/if_atm.h: Ditto. * libc/sys/linux/include/net/if_media.h: Ditto. * libc/sys/linux/include/net/if_pppvar.h: Ditto. * libc/sys/linux/include/netinet/if_atm.h: Ditto. * libc/sys/linux/include/netinet/ip_flow.h: Ditto. * libc/sys/linux/intl/locale.alias: Ditto. * libc/sys/linux/net/addr2ascii.3: Ditto. * libc/sys/linux/net/bindresvport.c: Ditto. * libc/sys/linux/net/byteorder.3: Ditto. * libc/sys/linux/net/res_config.h: Ditto. * libc/sys/linux/net/ether_addr.c: Ditto. * libc/sys/linux/net/ethers.3: Ditto. * libc/sys/linux/net/getaddrinfo.3: Ditto. * libc/sys/linux/net/gethostbydns.c: Ditto. * libc/sys/linux/net/gethostbyht.c: Ditto. * libc/sys/linux/net/gethostbyname.3: Ditto. * libc/sys/linux/net/gethostbynis.c: Ditto. * libc/sys/linux/net/gethostnamadr.c: Ditto. * libc/sys/linux/net/getifaddrs.3: Ditto. * libc/sys/linux/net/getifaddrs.c: Ditto. * libc/sys/linux/net/getipnodebyname.3: Ditto. * libc/sys/linux/net/getnameinfo.3: Ditto. * libc/sys/linux/net/getnetbydns.c: Ditto. * libc/sys/linux/net/getnetbyht.c: Ditto. * libc/sys/linux/net/getnetbynis.c: Ditto. * libc/sys/linux/net/getnetent.3: Ditto. * libc/sys/linux/net/getnetnamadr.c: Ditto. * libc/sys/linux/net/getprotoent.3: Ditto. * libc/sys/linux/net/getprotoent.c: Ditto. * libc/sys/linux/net/getprotoname.c: Ditto. * libc/sys/linux/net/getservbyname.c: Ditto. * libc/sys/linux/net/getservbyport.c: Ditto. * libc/sys/linux/net/getservent.3: Ditto. * libc/sys/linux/net/herror.c: Ditto. * libc/sys/linux/net/hesiod.3: Ditto. * libc/sys/linux/net/hesiod.c: Ditto. * libc/sys/linux/net/if_indextoname.3: Ditto. * libc/sys/linux/net/inet.3: Ditto. * libc/sys/linux/net/inet6_option_space.3: Ditto. * libc/sys/linux/net/inet6_rthdr_space.3: Ditto. * libc/sys/linux/net/inet_makeaddr.c: Ditto. * libc/sys/linux/net/inet_net.3: Ditto. * libc/sys/linux/net/inet_network.c: Ditto. * libc/sys/linux/net/innetgr-stub.c: Ditto. * libc/sys/linux/net/ip6opt.c: Ditto. * libc/sys/linux/net/iso_addr.3: Ditto. * libc/sys/linux/net/iso_addr.c: Ditto. * libc/sys/linux/net/linkaddr.3: Ditto. * libc/sys/linux/net/linkaddr.c: Ditto. * libc/sys/linux/net/map_v4v6.c: Ditto. * libc/sys/linux/net/name6.c: Ditto. * libc/sys/linux/net/namespace.h: Ditto. * libc/sys/linux/net/ns.3: Ditto. * libc/sys/linux/net/ns_addr.c: Ditto. * libc/sys/linux/net/ns_ntoa.c: Ditto. * libc/sys/linux/net/nsdispatch.3: Ditto. * libc/sys/linux/net/nsdispatch.c: Ditto. * libc/sys/linux/net/nslexer.c: Ditto. * libc/sys/linux/net/nslexer.l: Ditto. * libc/sys/linux/net/nsparser.c: Ditto. * libc/sys/linux/net/nsparser.h: Ditto. * libc/sys/linux/net/nsparser.y: Ditto. * libc/sys/linux/net/rcmd.3: Ditto. * libc/sys/linux/net/rcmdsh.3: Ditto. * libc/sys/linux/net/res_mkupdate.c: Ditto. * libc/sys/linux/net/res_update.c: Ditto. * libc/sys/linux/net/resolver.3: Ditto. * libc/sys/linux/net/rthdr.c: Ditto. * libc/sys/linux/net/vars.c: Ditto. * libc/sys/linux/shlib-compat.h: New file. * libc/sys/linux/machine/i386/atomic.h: Ditto. * libc/sys/linux/net/XXX-lookup.c: Ditto. * libc/sys/linux/net/alias-lookup.c: Ditto. * libc/sys/linux/net/res_libc.c: Ditto. * libc/sys/linux/net/aliases.h: Ditto. * libc/sys/linux/net/check_pf.c: Ditto. * libc/sys/linux/net/databases.def: Ditto. * libc/sys/linux/net/digits_dots.c: Ditto. * libc/sys/linux/net/ether_aton.c: Ditto. * libc/sys/linux/net/ether_aton_r.c: Ditto. * libc/sys/linux/net/ether_hton.c: Ditto. * libc/sys/linux/net/ether_line.c: Ditto. * libc/sys/linux/net/ether_ntoa.c: Ditto. * libc/sys/linux/net/ether_ntoa_r.c: Ditto. * libc/sys/linux/net/ether_ntoh.c: Ditto. * libc/sys/linux/net/etherent.h: Ditto. * libc/sys/linux/net/ethers-lookup.c: Ditto. * libc/sys/linux/net/function.def: Ditto. * libc/sys/linux/net/getXXbyYY.c: Ditto. * libc/sys/linux/net/getXXbyYY_r.c: Ditto. * libc/sys/linux/net/getXXent.c: Ditto. * libc/sys/linux/net/getXXent_r.c: Ditto. * libc/sys/linux/net/getaliasent.c: Ditto. * libc/sys/linux/net/getaliasent_r.c: Ditto. * libc/sys/linux/net/getaliasname.c: Ditto. * libc/sys/linux/net/getaliasname_r.c: Ditto. * libc/sys/linux/net/gethstbyad.c: Ditto. * libc/sys/linux/net/gethstbyad_r.c: Ditto. * libc/sys/linux/net/gethstbynm.c: Ditto. * libc/sys/linux/net/gethstbynm2.c: Ditto. * libc/sys/linux/net/gethstbynm2_r.c: Ditto. * libc/sys/linux/net/gethstbynm_r.c: Ditto. * libc/sys/linux/net/gethstent.c: Ditto. * libc/sys/linux/net/gethstent_r.c: Ditto. * libc/sys/linux/net/getnetbyad.c: Ditto. * libc/sys/linux/net/getnetbyad_r.c: Ditto. * libc/sys/linux/net/getnetbynm.c: Ditto. * libc/sys/linux/net/getnetbynm_r.c: Ditto. * libc/sys/linux/net/getnetent.c: Ditto. * libc/sys/linux/net/getnetent_r.c: Ditto. * libc/sys/linux/net/getnetgrent.c: Ditto. * libc/sys/linux/net/getnetgrent_r.c: Ditto. * libc/sys/linux/net/getnssent.c: Ditto. * libc/sys/linux/net/getnssent_r.c: Ditto. * libc/sys/linux/net/getproto_r.c: Ditto. * libc/sys/linux/net/getprtent.c: Ditto. * libc/sys/linux/net/getprtent_r.c: Ditto. * libc/sys/linux/net/getprtname.c: Ditto. * libc/sys/linux/net/getprtname_r.c: Ditto. * libc/sys/linux/net/getrpcbyname.c: Ditto. * libc/sys/linux/net/getrpcbyname_r.c: Ditto. * libc/sys/linux/net/getrpcbynumber.c: Ditto. * libc/sys/linux/net/getrpcbynumber_r.c: Ditto. * libc/sys/linux/net/getrpcent.c: Ditto. * libc/sys/linux/net/getrpcent_r.c: Ditto. * libc/sys/linux/net/getservent_r.c: Ditto. * libc/sys/linux/net/getsrvbynm.c: Ditto. * libc/sys/linux/net/getsrvbynm_r.c: Ditto. * libc/sys/linux/net/getsrvbypt.c: Ditto. * libc/sys/linux/net/getsrvbypt_r.c: Ditto. * libc/sys/linux/net/grp-lookup.c: Ditto. * libc/sys/linux/net/herrno.c: Ditto. * libc/sys/linux/net/hosts-lookup.c: Ditto. * libc/sys/linux/net/ifaddrs.h: Ditto. * libc/sys/linux/net/ifreq.c: Ditto. * libc/sys/linux/net/ifreq.h: Ditto. * libc/sys/linux/net/in6_addr.c: Ditto. * libc/sys/linux/net/inet6_option.c: Ditto. * libc/sys/linux/net/inet_mkadr.c: Ditto. * libc/sys/linux/net/inet_net.c: Ditto. * libc/sys/linux/net/key-lookup.c: Ditto. * libc/sys/linux/net/local.h: Ditto. * libc/sys/linux/net/netgroup.h: Ditto. * libc/sys/linux/net/netgrp-lookup.c: Ditto. * libc/sys/linux/net/network-lookup.c: Ditto. * libc/sys/linux/net/not-cancel.h: Ditto. * libc/sys/linux/net/ns_samedomain.c: Ditto. * libc/sys/linux/net/nscd-types.h: Ditto. * libc/sys/linux/net/nss.h: Ditto. * libc/sys/linux/net/nsswitch.c: Ditto. * libc/sys/linux/net/nsswitch.h: Ditto. * libc/sys/linux/net/opensock.c: Ditto. * libc/sys/linux/net/proto-lookup.c: Ditto. * libc/sys/linux/net/pwd-lookup.c: Ditto. * libc/sys/linux/net/res_debug.h: Ditto. * libc/sys/linux/net/res_hconf.c: Ditto. * libc/sys/linux/net/res_hconf.h: Ditto. * libc/sys/linux/net/rexec.c: Ditto. * libc/sys/linux/net/rpc-lookup.c: Ditto. * libc/sys/linux/net/ruserpass.c: Ditto. * libc/sys/linux/net/service-lookup.c: Ditto. * libc/sys/linux/net/spwd-lookup.c: Ditto. * libc/sys/linux/net/nscd/nscd-client.h: Ditto. * libc/sys/linux/net/nscd/nscd_proto.h: Ditto.
210 lines
6.4 KiB
C
210 lines
6.4 KiB
C
/* Copyright (C) 1996,97,98,99,2000,2002,2004 Free Software Foundation, Inc.
|
||
This file is part of the GNU C Library.
|
||
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
|
||
|
||
The GNU C Library is free software; you can redistribute it and/or
|
||
modify it under the terms of the GNU Lesser General Public
|
||
License as published by the Free Software Foundation; either
|
||
version 2.1 of the License, or (at your option) any later version.
|
||
|
||
The GNU C Library is distributed in the hope that it will be useful,
|
||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||
Lesser General Public License for more details.
|
||
|
||
You should have received a copy of the GNU Lesser General Public
|
||
License along with the GNU C Library; if not, write to the Free
|
||
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
||
02111-1307 USA. */
|
||
|
||
#include <errno.h>
|
||
#define _IO_MTSAFE_IO
|
||
#include <bits/libc-lock.h>
|
||
|
||
#include "nsswitch.h"
|
||
|
||
/*******************************************************************\
|
||
|* Here we assume several symbols to be defined: *|
|
||
|* *|
|
||
|* LOOKUP_TYPE - the return type of the function *|
|
||
|* *|
|
||
|* SETFUNC_NAME - name of the non-reentrant setXXXent function *|
|
||
|* *|
|
||
|* GETFUNC_NAME - name of the non-reentrant getXXXent function *|
|
||
|* *|
|
||
|* ENDFUNC_NAME - name of the non-reentrant endXXXent function *|
|
||
|* *|
|
||
|* DATABASE_NAME - name of the database the function accesses *|
|
||
|* (e.g., host, services, ...) *|
|
||
|* *|
|
||
|* Optionally the following vars can be defined: *|
|
||
|* *|
|
||
|* STAYOPEN - variable declaration for setXXXent function *|
|
||
|* *|
|
||
|* STAYOPEN_VAR - variable name for setXXXent function *|
|
||
|* *|
|
||
|* NEED_H_ERRNO - an extra parameter will be passed to point to *|
|
||
|* the global `h_errno' variable. *|
|
||
|* *|
|
||
\*******************************************************************/
|
||
|
||
/* To make the real sources a bit prettier. */
|
||
#define REENTRANT_GETNAME APPEND_R (GETFUNC_NAME)
|
||
#define APPEND_R(Name) CONCAT2_2 (Name, _r)
|
||
#define INTERNAL(Name) CONCAT2_2 (__, Name)
|
||
#define CONCAT2_1(Pre, Post) CONCAT2_2 (Pre, Post)
|
||
#define CONCAT2_2(Pre, Post) Pre##Post
|
||
#define NEW(name) NEW1 (name)
|
||
#define NEW1(name) __new_##name
|
||
|
||
#define SETFUNC_NAME_STRING STRINGIZE (SETFUNC_NAME)
|
||
#define GETFUNC_NAME_STRING STRINGIZE (REENTRANT_GETNAME)
|
||
#define ENDFUNC_NAME_STRING STRINGIZE (ENDFUNC_NAME)
|
||
#define DATABASE_NAME_STRING STRINGIZE (DATABASE_NAME)
|
||
#define STRINGIZE(Name) STRINGIZE1 (Name)
|
||
#define STRINGIZE1(Name) #Name
|
||
|
||
#ifndef DB_LOOKUP_FCT
|
||
# define DB_LOOKUP_FCT CONCAT3_1 (__nss_, DATABASE_NAME, _lookup)
|
||
# define CONCAT3_1(Pre, Name, Post) CONCAT3_2 (Pre, Name, Post)
|
||
# define CONCAT3_2(Pre, Name, Post) Pre##Name##Post
|
||
#endif
|
||
|
||
/* Sometimes we need to store error codes in the `h_errno' variable. */
|
||
#ifdef NEED_H_ERRNO
|
||
# define H_ERRNO_PARM , int *h_errnop
|
||
# define H_ERRNO_VAR , &h_errno
|
||
# define H_ERRNO_VAR_P &h_errno
|
||
#else
|
||
# define H_ERRNO_PARM
|
||
# define H_ERRNO_VAR
|
||
# define H_ERRNO_VAR_P NULL
|
||
#endif
|
||
|
||
/* Some databases take the `stayopen' flag. */
|
||
#ifdef STAYOPEN
|
||
# define STAYOPEN_TMP CONCAT2_1 (STAYOPEN, _tmp)
|
||
# define STAYOPEN_TMPVAR &CONCAT2_1 (STAYOPEN_VAR, _tmp)
|
||
#else
|
||
# define STAYOPEN void
|
||
# define STAYOPEN_VAR 0
|
||
# define STAYOPEN_TMPVAR NULL
|
||
#endif
|
||
|
||
#ifndef NEED__RES
|
||
# define NEED__RES 0
|
||
#endif
|
||
|
||
/* This handle for the NSS data base is shared between all
|
||
set/get/endXXXent functions. */
|
||
static service_user *nip;
|
||
/* Remember the last service used since the last call to `endXXent'. */
|
||
static service_user *last_nip;
|
||
/* Remember the first service_entry, it's always the same. */
|
||
static service_user *startp;
|
||
|
||
#ifdef STAYOPEN_TMP
|
||
/* We need to remember the last `stayopen' flag given by the user
|
||
since the `setent' function is only called for the first available
|
||
service. */
|
||
static STAYOPEN_TMP;
|
||
#endif
|
||
|
||
/* Protect above variable against multiple uses at the same time. */
|
||
__libc_lock_define_initialized (static, lock)
|
||
|
||
/* The lookup function for the first entry of this service. */
|
||
extern int DB_LOOKUP_FCT (service_user **nip, const char *name, void **fctp)
|
||
internal_function;
|
||
libc_hidden_proto (DB_LOOKUP_FCT)
|
||
|
||
void
|
||
SETFUNC_NAME (STAYOPEN)
|
||
{
|
||
int save;
|
||
|
||
__libc_lock_lock (lock);
|
||
__nss_setent (SETFUNC_NAME_STRING, DB_LOOKUP_FCT, &nip, &startp,
|
||
&last_nip, STAYOPEN_VAR, STAYOPEN_TMPVAR, NEED__RES);
|
||
|
||
save = errno;
|
||
__libc_lock_unlock (lock);
|
||
__set_errno (save);
|
||
}
|
||
|
||
|
||
void
|
||
ENDFUNC_NAME (void)
|
||
{
|
||
int save;
|
||
|
||
/* If the service has not been used before do not do anything. */
|
||
if (startp != NULL)
|
||
{
|
||
__libc_lock_lock (lock);
|
||
__nss_endent (ENDFUNC_NAME_STRING, DB_LOOKUP_FCT, &nip, &startp,
|
||
&last_nip, NEED__RES);
|
||
save = errno;
|
||
__libc_lock_unlock (lock);
|
||
__set_errno (save);
|
||
}
|
||
}
|
||
|
||
|
||
int
|
||
INTERNAL (REENTRANT_GETNAME) (LOOKUP_TYPE *resbuf, char *buffer, size_t buflen,
|
||
LOOKUP_TYPE **result H_ERRNO_PARM)
|
||
{
|
||
int status;
|
||
int save;
|
||
|
||
__libc_lock_lock (lock);
|
||
status = __nss_getent_r (GETFUNC_NAME_STRING, SETFUNC_NAME_STRING,
|
||
DB_LOOKUP_FCT, &nip, &startp, &last_nip,
|
||
STAYOPEN_TMPVAR, NEED__RES, resbuf, buffer,
|
||
buflen, (void **) result, H_ERRNO_VAR_P);
|
||
save = errno;
|
||
__libc_lock_unlock (lock);
|
||
__set_errno (save);
|
||
return status;
|
||
}
|
||
|
||
|
||
#include <shlib-compat.h>
|
||
#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1_2)
|
||
#define OLD(name) OLD1 (name)
|
||
#define OLD1(name) __old_##name
|
||
|
||
int
|
||
attribute_compat_text_section
|
||
OLD (REENTRANT_GETNAME) (LOOKUP_TYPE *resbuf, char *buffer, size_t buflen,
|
||
LOOKUP_TYPE **result H_ERRNO_PARM)
|
||
{
|
||
int ret = INTERNAL (REENTRANT_GETNAME) (resbuf, buffer, buflen,
|
||
result H_ERRNO_VAR);
|
||
|
||
if (ret != 0)
|
||
ret = -1;
|
||
|
||
return ret;
|
||
}
|
||
|
||
#define do_symbol_version(real, name, version) \
|
||
compat_symbol (libc, real, name, version)
|
||
do_symbol_version (OLD (REENTRANT_GETNAME), REENTRANT_GETNAME, GLIBC_2_0);
|
||
#endif
|
||
|
||
/* As INTERNAL (REENTRANT_GETNAME) may be hidden, we need an alias
|
||
in between so that the REENTRANT_GETNAME@@GLIBC_2.1.2 is not
|
||
hidden too. */
|
||
strong_alias (INTERNAL (REENTRANT_GETNAME), NEW (REENTRANT_GETNAME));
|
||
|
||
#define do_default_symbol_version(real, name, version) \
|
||
versioned_symbol (libc, real, name, version)
|
||
do_default_symbol_version (NEW (REENTRANT_GETNAME),
|
||
REENTRANT_GETNAME, GLIBC_2_1_2);
|
||
|
||
static_link_warning (SETFUNC_NAME)
|
||
static_link_warning (ENDFUNC_NAME)
|
||
static_link_warning (REENTRANT_GETNAME)
|