mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-22 04:50:07 +00:00
6dbe283756
* nss/Makefile (databases): New variable. (routines, libnss_files-routines): Use it. (subdir-dirs): Compute from $(services). * sysdeps/unix/sysv/linux/syscalls.list (create_module, delete_module, init_module, klogctl): Use EXTRA in the "caller" column so these get added to unix-extra-syscalls and thus compiled in misc. * string/Makefile (routines): Add strndup. * string/strndup.c: New file. * string/string.h: Declare strndup. (strndupa): New macro. * string/string.h: Declare __strdup. * string/strdup.c: Deansideclized. Define __ name and weak alias. * string/string.h: Don't define memccpy as macro for [__OPTIMIZE__]. Thu Jun 27 23:43:22 1996 Richard Henderson <rth@tamu.edu> * sysdeps/alpha/dl-machine.h (elf_machine_rela): The Alpha's address-of operation and plt format conspire to require all dynamic relocs to be resolved to actual symbols not plt entries. Thu Jun 27 02:49:28 1996 Ulrich Drepper <drepper@cygnus.com> * catgets/gencat.c: Add casts to avoid signed<->unsigned warnings. * grp/initgroups.c (initgroups): De-ansi-fy. Move declaration of NGROUPS and GROUPS outside #if so that the code compiles for NGROUPS_MAX != 0. * inet/Makefile (headers): Add netinet/ether.h and netinet/if_ether.h. (routines): Add ether_aton, ether_aton_r, ether_hton, ether_line, ether_ntoa, ether_ntoa_r, and ether_ntoh. * inet/ether_aton.c, inet/ether_aton_r.c, inet/ether_hton.c, inet/ether_line.c, inet/ether_ntoa.c, inet/ether_ntoa_r.c, inet/ether_ntoh.c: New files. Implementation of functions to handle Ethernet address to host mapping. * inet/netinet/ether.h: New file. Declare ether_* functions. * netinet/ether.h: Wrapper around inet/netinet/ether.h for glibc compilation. * nss/ethers-lookup.c: New file. Lookup function for ethers database. * nss/Makefile (routines): Add ethers-lookup. (libnss_files-routines): Add files-ethers. * nss/getXXent_r.c: Don't define set*ent and end*ent function with _r suffix. * nss/nss_files/files-XXX.c (internal_endent): Don't reset KEEP_STREAM every time called. (_nss_files_end): Reset KEEP_STREAM here instead. (internal_getent): If STREAM == NULL try to open instead of signalling error. Use cast to prevent warning. Terminate read line in case the buffer is too small. * nss/nss_files/files-ethers.c: New file. Implementation of Ethernet adress<->hostname lookup through files interface. * stdlib/mbstowcs.c: Define based on mbsrtowcs(). * stdlib/mbtowc.c: Define based on mbrtowc(). * stdlib/wcstombs.c: Define based on wcsrtombs(). * stdlib/wctomb.c: Define based on wcrtomb(). * sunrpc/xdr.c (xdr_u_int): Avoid bogus call to unexpected_sizes_in_xdr_u_int. * sysdeps/generic/netinet/if_ether.h: New file. Generic declaration of `struct ether_addr'. * sysdeps/unix/sysv/linux/netinet/if_ether.h: New file. Linux specific declaration of `struct ether_addr'. * wcsmbs/mbrtowc.c: Handle case where argument PS is NULL. * wcsmbs/mbsrtowcs.c: Ditto. * wcsmbs/wcrtomb.c: Ditto. * wcsmbs/wcsrtombs.c: Ditto. * wcsmbs/mbsinit.c: Prepare for PS being NULL.
223 lines
6.2 KiB
C
223 lines
6.2 KiB
C
/* Copyright (C) 1996 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 Library General Public License as
|
|
published by the Free Software Foundation; either version 2 of the
|
|
License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Library General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Library General Public
|
|
License along with the GNU C Library; see the file COPYING.LIB. If
|
|
not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
Boston, MA 02111-1307, USA. */
|
|
|
|
#include <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) APPEND_R1 (name)
|
|
#define APPEND_R1(name) name##_r
|
|
|
|
#define SETFUNC_NAME_STRING STRINGIZE (SETFUNC_NAME)
|
|
#define GETFUNC_NAME_STRING STRINGIZE (GETFUNC_NAME)
|
|
#define ENDFUNC_NAME_STRING STRINGIZE (ENDFUNC_NAME)
|
|
#define DATABASE_NAME_STRING STRINGIZE (DATABASE_NAME)
|
|
#define STRINGIZE(name) STRINGIZE1 (name)
|
|
#define STRINGIZE1(name) #name
|
|
|
|
#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
|
|
|
|
/* 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
|
|
#else
|
|
# define H_ERRNO_PARM
|
|
# define H_ERRNO_VAR
|
|
#endif
|
|
|
|
/* Some databases take the `stayopen' flag. */
|
|
#ifndef STAYOPEN
|
|
#define STAYOPEN void
|
|
#define STAYOPEN_VAR
|
|
#endif
|
|
|
|
/* Prototype for the setXXXent functions we use here. */
|
|
typedef int (*set_function) (STAYOPEN);
|
|
|
|
/* Prototype for the endXXXent functions we use here. */
|
|
typedef int (*end_function) (void);
|
|
|
|
/* Prototype for the setXXXent functions we use here. */
|
|
typedef int (*get_function) (LOOKUP_TYPE *, char *, int H_ERRNO_PARM);
|
|
|
|
|
|
/* This handle for the NSS data base is shared between all
|
|
set/get/endXXXent functions. */
|
|
static service_user *nip;
|
|
/* Remember the first service_entry, it's always the same. */
|
|
static service_user *startp;
|
|
|
|
/* 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);
|
|
|
|
|
|
void
|
|
SETFUNC_NAME (STAYOPEN)
|
|
{
|
|
set_function fct;
|
|
int no_more;
|
|
|
|
#ifdef NEED__RES
|
|
if ((_res.options & RES_INIT) == 0 && res_init () == -1)
|
|
{
|
|
h_errno = NETDB_INTERNAL;
|
|
return NULL;
|
|
}
|
|
#endif /* need _res */
|
|
|
|
__libc_lock_lock (lock);
|
|
|
|
if (startp == NULL)
|
|
{
|
|
no_more = DB_LOOKUP_FCT (&nip, SETFUNC_NAME_STRING, (void **) &fct);
|
|
startp = no_more == 0 ? (service_user *) -1 : nip;
|
|
}
|
|
else
|
|
no_more = (nip = startp) != (service_user *) -1;
|
|
|
|
/* Cycle through all the services and run their setXXent functions. */
|
|
while (! no_more)
|
|
{
|
|
/* Ignore status, we force check in __NSS_NEXT. */
|
|
(void) (*fct) (STAYOPEN_VAR);
|
|
|
|
no_more = __nss_next (&nip, SETFUNC_NAME_STRING, (void **) &fct, 0, 1);
|
|
}
|
|
|
|
__libc_lock_unlock (lock);
|
|
}
|
|
|
|
|
|
void
|
|
ENDFUNC_NAME (void)
|
|
{
|
|
end_function fct;
|
|
int no_more;
|
|
|
|
#ifdef NEED__RES
|
|
if ((_res.options & RES_INIT) == 0 && res_init () == -1)
|
|
{
|
|
h_errno = NETDB_INTERNAL;
|
|
return NULL;
|
|
}
|
|
#endif /* need _res */
|
|
|
|
__libc_lock_lock (lock);
|
|
|
|
if (startp == NULL)
|
|
{
|
|
no_more = DB_LOOKUP_FCT (&nip, SETFUNC_NAME_STRING, (void **) &fct);
|
|
startp = no_more == 0 ? (service_user *) -1 : nip;
|
|
}
|
|
else
|
|
no_more = (nip = startp) != (service_user *) -1;
|
|
|
|
/* Cycle through all the services and run their endXXent functions. */
|
|
while (no_more == 0)
|
|
{
|
|
/* Ignore status, we force check in __NSS_NEXT. */
|
|
(void) (*fct) ();
|
|
|
|
no_more = __nss_next (&nip, ENDFUNC_NAME_STRING, (void **) &fct, 0, 1);
|
|
}
|
|
|
|
__libc_lock_unlock (lock);
|
|
}
|
|
|
|
|
|
LOOKUP_TYPE *
|
|
REENTRANT_GETNAME (LOOKUP_TYPE *result, char *buffer, int buflen H_ERRNO_PARM)
|
|
{
|
|
get_function fct;
|
|
int no_more;
|
|
enum nss_status status = NSS_STATUS_NOTFOUND;
|
|
|
|
#ifdef NEED__RES
|
|
if ((_res.options & RES_INIT) == 0 && res_init () == -1)
|
|
{
|
|
h_errno = NETDB_INTERNAL;
|
|
return NULL;
|
|
}
|
|
#endif /* need _res */
|
|
|
|
__libc_lock_lock (lock);
|
|
|
|
if (nip)
|
|
/* Continuing a walk-through started before. */
|
|
no_more = 0;
|
|
else
|
|
{
|
|
if (startp == NULL)
|
|
{
|
|
no_more = DB_LOOKUP_FCT (&nip, SETFUNC_NAME_STRING, (void **) &fct);
|
|
startp = no_more == 0 ? (service_user *) -1 : nip;
|
|
}
|
|
else
|
|
no_more = (nip = startp) != (service_user *) -1;
|
|
|
|
if (no_more != 0)
|
|
status = NSS_STATUS_UNAVAIL;
|
|
}
|
|
|
|
while (no_more == 0)
|
|
{
|
|
status = (*fct) (result, buffer, buflen H_ERRNO_VAR);
|
|
|
|
no_more = __nss_next (&nip, GETFUNC_NAME_STRING, (void **) &fct,
|
|
status, 0);
|
|
}
|
|
|
|
__libc_lock_unlock (lock);
|
|
|
|
return status == NSS_STATUS_SUCCESS ? result : NULL;
|
|
}
|