mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-20 17:51:16 +00:00
e4cf507069
Mon Dec 2 03:59:38 1996 Ulrich Drepper <drepper@cygnus.com> * grp/initgroups.c: Update and reformat copyright. Use __getgrent_r instead of getgrent. * inet/rcmd.c: Update and reformat copyright. Use __gethostbyname_r instead of gethostbyname. * inet/rexec.c: Likewise. * intl/finddomain.c: Correct comment about CEN sponsor and revision. * locale/findlocale.c: Likewise. * intl/l10nflist.c: Correct handling of CEN sponsor and revision. * locale/Makefile (CPPFLAGS): Add definition of LOCALEDIR. * locale/setlocale.c (setlocale): Correctly split value of LOCALE_PATH. * locale/programs/localedef.c: Use LOCALEDIR not LOCALE_PATH to find output directory. * nss/getXXbyYY.c [NEED_H_ERRNO]: Before enlarging buffer test h_errno_tmp variable. Save error value from being changed during `free' call. * nss/getXXent.c: Likewise. * nss/nss_files/files-XXX.c: Set h_errno variable to NETDB_INTERNAL before returning ERANGE error. * posix/glob.c: Use getlogin_r and getpwnam_r function when available or in GNU libc. * pwd/getpw.c: Use getpwuid_r instead of getpwuid. * sunrpc/clnt_gen.c: Use gethostbyname_r and getprotobyname_r. * sunrpc/clnt_simp.c: Likewise. * sunrpc/getrpcport.c: Likewise. * sysdeps/unix/sysv/linux/gethostid.c: Likewise. * posix/getconf.c: Treat _SC_UNIT_MAX and _SC_ULONG_MAX separately since the value might be outsode the range of the `long int'. Print string `undefined' when a value is undefined. * stdlib/l64a.c: Return correct pointer. Patch by NIIBE Yutaka <gniibe@mri.co.jp>. * string/Makefile (routines): Add argz-addsep. * string/argz-addsep.c: New file. * string/argz.h: Add prototypes for argz_add_sep. * string/argz-ctsep.c: Prevent memory leak. * string/strcoll.c: Correct typo in comment. Sat Nov 30 02:53:59 1996 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/linux/sys/serial.h: Removed again. The file is not general enough to be part of the libc. * sysdeps/unix/sysv/linux/Dist: Remove sys/serial.h. * sysdeps/unix/sysv/linux/Makefile: Don't install sys/serial.h. Thu Nov 28 20:04:41 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * login/Makefile: Fix typo. * nss/Makefile (generated): Filter out db-alias.c. Thu Nov 28 14:44:01 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * time/Makefile (echo-zonenames): Don't depend on non-existing target `zonenames'. Thu Nov 28 12:34:05 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * link.h: New file. * nss/nsswitch.c: Use it. * printf.h: Fix file name. * stdlib/strfmon.c: Use it.
113 lines
3.3 KiB
C
113 lines
3.3 KiB
C
/* Copyright (C) 1996 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Library General Public License as
|
|
published by the Free Software Foundation; either version 2 of the
|
|
License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Library General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Library General Public
|
|
License along with the GNU C Library; see the file COPYING.LIB. If not,
|
|
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
Boston, MA 02111-1307, USA. */
|
|
|
|
#include <errno.h>
|
|
#include <libc-lock.h>
|
|
#include <stdlib.h>
|
|
|
|
#include "nsswitch.h"
|
|
|
|
/*******************************************************************\
|
|
|* Here we assume several symbols to be defined: *|
|
|
|* *|
|
|
|* LOOKUP_TYPE - the return type of the function *|
|
|
|* *|
|
|
|* GETFUNC_NAME - name of the non-reentrant getXXXent function *|
|
|
|* *|
|
|
|* BUFLEN - size of static buffer *|
|
|
|* *|
|
|
|* Optionally the following vars can be defined: *|
|
|
|* *|
|
|
|* 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 INTERNAL(name) INTERNAL1 (name)
|
|
#define INTERNAL1(name) __##name
|
|
|
|
/* 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
|
|
|
|
/* Prototype of the reentrant version. */
|
|
extern int INTERNAL (REENTRANT_GETNAME) (LOOKUP_TYPE *resbuf, char *buffer,
|
|
size_t buflen, LOOKUP_TYPE **result
|
|
H_ERRNO_PARM);
|
|
|
|
/* We need to protect the dynamic buffer handling. */
|
|
__libc_lock_define_initialized (static, lock);
|
|
|
|
|
|
LOOKUP_TYPE *
|
|
GETFUNC_NAME (void)
|
|
{
|
|
static char *buffer;
|
|
static size_t buffer_size;
|
|
static LOOKUP_TYPE resbuf;
|
|
LOOKUP_TYPE *result = NULL;
|
|
int save;
|
|
|
|
/* Get lock. */
|
|
__libc_lock_lock (lock);
|
|
|
|
if (buffer == NULL)
|
|
{
|
|
buffer_size = BUFLEN;
|
|
buffer = malloc (buffer_size);
|
|
}
|
|
|
|
while (buffer != NULL
|
|
&& INTERNAL (REENTRANT_GETNAME) (&resbuf, buffer, buffer_size, &result
|
|
H_ERRNO_VAR) != 0
|
|
#ifdef NEED_H_ERRNO
|
|
&& h_errno == NETDB_INTERNAL
|
|
#endif
|
|
&& errno == ERANGE)
|
|
{
|
|
char *new_buf;
|
|
buffer_size += BUFLEN;
|
|
new_buf = realloc (buffer, buffer_size);
|
|
if (new_buf == NULL)
|
|
{
|
|
/* We are out of memory. Free the current buffer so that the
|
|
process gets a chance for a normal termination. */
|
|
save = errno;
|
|
free (buffer);
|
|
__set_errno (save);
|
|
}
|
|
buffer = new_buf;
|
|
}
|
|
|
|
/* Release lock. Preserve error value. */
|
|
save = errno;
|
|
__libc_lock_unlock (lock);
|
|
__set_errno (save);
|
|
|
|
return result;
|
|
}
|