mirror of
https://sourceware.org/git/glibc.git
synced 2025-01-11 20:00:07 +00:00
40a55d2054
1997-08-20 05:30 Ulrich Drepper <drepper@cygnus.com> * catgets/catgets.c (catclose): Use __munmap instead of munmap. * catgets/gencat.c (read_input_file): Fix typo. * dirent/dirent.h: Make seekdir and telldir available for __USE_XOPEN. * elf/dl-load.c: Fix case of missing DT_RPATH in object which gets executed (e.g., when it is a static binary). * intl/bindtextdomain.c: Use strdup in glibc. Correct comment. * intl/dcgettext.c: Likewise. * intl/dgettext.c: Likewise. * intl/explodename.c: Likewise. * intl/finddomain.c: Likewise. * intl/gettext.c: Likewise. * intl/gettext.h: Likewise. * intl/hash-string.h: Likewise. * intl/l10nflist.c: Likewise. * intl/libintl.h: Likewise. * intl/loadinfo.h: Likewise. * intl/loadmsgcat.c: Likewise. * intl/localealias.c: Likewise. * intl/textdomain.c: Likewise. Unify libio sources with code in libg++. * libio/fcloseall.c: Update and reformat copyright. Protect use of weak_alias. Use _IO_* thread macros instead of __libc_*. * libio/feof.c: Likewise. * libio/feof_u.c: Likewise. * libio/ferror.c: Likewise. * libio/ferror_u.c: Likewise. * libio/fgetc.c: Likewise. * libio/filedoalloc.c: Likewise. * libio/fileno.c: Likewise. * libio/fileops.c: Likewise. * libio/fputc.c: Likewise. * libio/fputc_u.c: Likewise. * libio/freopen.c: Likewise. * libio/fseek.c: Likewise. * libio/genops.c: Likewise. * libio/getc.c: Likewise. * libio/getc_u.c: Likewise. * libio/getchar.c: Likewise. * libio/getchar_u.c: Likewise. * libio/iofclose.c: Likewise. * libio/iofdopen.c: Likewise. * libio/iofflush.c: Likewise. * libio/iofflush_u.c: Likewise. * libio/iofgetpos.c: Likewise. * libio/iofgets.c: Likewise. * libio/iofopen.c: Likewise. * libio/iofopncook.c: Likewise. * libio/iofprintf.c: Likewise. * libio/iofputs.c: Likewise. * libio/iofread.c: Likewise. * libio/iofsetpos.c: Likewise. * libio/ioftell.c: Likewise. * libio/iofwrite.c: Likewise. * libio/iogetdelim.c: Likewise. * libio/iogetline.c: Likewise. * libio/iogets.c: Likewise. * libio/iopadn.c: Likewise. * libio/iopopen.c: Likewise. * libio/ioputs.c: Likewise. * libio/ioseekoff.c: Likewise. * libio/ioseekpos.c: Likewise. * libio/iosetbuffer.c: Likewise. * libio/iosetvbuf.c: Likewise. * libio/iosprintf.c: Likewise. * libio/ioungetc.c: Likewise. * libio/iovdprintf.c: Likewise. * libio/iovsprintf.c: Likewise. * libio/iovsscanf.c: Likewise. * libio/libio.h: Likewise. * libio/libioP.h: Likewise. * libio/obprintf.c: Likewise. * libio/pclose.c: Likewise. * libio/peekc.c: Likewise. * libio/putc.c: Likewise. * libio/putchar.c: Likewise. * libio/rewind.c: Likewise. * libio/setbuf.c: Likewise. * libio/setlinebuf.c: Likewise. * libio/stdfiles.c: Likewise. * libio/stdio.c: Likewise. * libio/strfile.h: Likewise. * libio/strops.c: Likewise. * libio/vasprintf.c: Likewise. * libio/vscanf.c: Likewise. * libio/vsnprintf.c: Likewise. * manual/libc.texinfo: Add menu entries for chapter on message translation. * manual/locale.texi: Correct next entry in @node for new chapter. * manual/search.texi: Likewise for previous link. * manual/message.texi: New file. * manual/startup.texi: Document LC_ALL, LC_MESSAGES, NLSPATH, setenv, unsetenv, and clearenv. * manual/string.texi: Fix typos. Patch by Jim Meyering. * math/Makefile (test-longdouble-yes): Enable. We want long double tests now. Crusade against strcat. * nis/nss_nisplus/nisplus-publickey.c: Remove uses of strcat. * stdlib/canonicalize.c: Likewise. * posix/glob.h: Define __const if necessary. Use __const in all prototypes. * sysdeps/generic/stpcpy.c: Use K&R form to allow use in other GNU packages. * posix/wordexp.c: Completely reworked buffer handling for much better performance. Patch by Tim Waugh. * socket/sys/sochet.h (getpeername): Fix type of LEN parameter, it must be socklen_t. * sysdeps/libm-i387/e_remainder.S: Pretty print. * sysdeps/libm-i387/e_remainderf.S: Likewise. * sysdeps/libm-i387/e_remainderl.S: Pop extra value for FPU stack. * sysdeps/libm-i387/s_cexp.S: Little optimization. * sysdeps/libm-i387/s_cexpl.S: Likewise. * sysdep/libm-ieee754/s_csinhl.c: Include <fenv.h>. 1997-08-18 15:21 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/linux/if_index.c (if_nameindex): Fix memory leak in cleanup code. 1997-08-17 Paul Eggert <eggert@twinsun.com> * tzset.c (__tzset_internal): Fix memory leak when the user specifies a TZ value that uses a default rule file. Do not assume US DST rules when the user specifies that there is no DST. 1997-08-10 19:17 Philip Blundell <Philip.Blundell@pobox.com> * inet/getnameinfo.c: Tidy up. * sysdeps/posix/getaddrinfo.c: Likewise. * sysdeps/unix/sysv/linux/if_index.c (if_nametoindex): Return 0 if using stub code. (if_indextoname): Use SIOGIFNAME ioctl if the kernel supports it. (if_nameindex): Use alloca() rather than malloc(); use SIOCGIFCOUNT ioctl if the kernel supports it. 1997-08-16 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/unix/sysv/linux/sys/mount.h: Remove the IS_* macros, they operate on internal kernel structures and have no place in a user header. 1997-08-16 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * Makerules (lib%.so): Depend on $(+preinit) and $(+postinit). (build-shlib): Filter them out of $^. 1997-08-15 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * elf/dl-error.c (_dl_signal_error): Fix error message. 1997-08-16 04:06 Ulrich Drepper <drepper@cygnus.com> * assert/assert.h [__USE_GNU]: Undefine assert_perror. Reported by Theodore C. Belding <Ted.Belding@umich.edu>. 1997-08-13 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * Makeconfig: Change object suffixes from *.[spgb]o to *.o[spgb] to avoid conflict with PO files. * Makerules: Likewise. * Rules: Likewise. * elf/Makefile: Likewise. * extra-lib.mk: Likewise. * gmon/Makefile: Likewise. * nis/Makefile: Likewise. * nss/Makefile: Likewise. * resolv/Makefile: Likewise. * rpm/Makefile: Likewise. * sunrpc/Makefile: Likewise. * sysdeps/sparc/elf/Makefile: Likewise. * sysdeps/sparc64/elf/Makefile: Likewise. * sysdeps/unix/sysv/linux/sparc/Makefile: Likewise. (ASFLAGS-.os): Renamed from as-FLAGS.os.
184 lines
4.4 KiB
C
184 lines
4.4 KiB
C
/* Copyright (C) 1996, 1997 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Ulrich Drepper, <drepper@gnu.ai.mit.edu>.
|
|
|
|
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 <alloca.h>
|
|
#include <errno.h>
|
|
#include <nl_types.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
#include <sys/mman.h>
|
|
|
|
#include "catgetsinfo.h"
|
|
|
|
|
|
/* Open the catalog and return a descriptor for the catalog. */
|
|
nl_catd
|
|
catopen (const char *cat_name, int flag)
|
|
{
|
|
__nl_catd result;
|
|
const char *env_var;
|
|
const char *nlspath;
|
|
|
|
result = (__nl_catd) malloc (sizeof (*result));
|
|
if (result == NULL)
|
|
/* We cannot get enough memory. */
|
|
return (nl_catd) -1;
|
|
|
|
result->status = closed;
|
|
|
|
result->cat_name = __strdup (cat_name);
|
|
if (result->cat_name == NULL)
|
|
{
|
|
free (result);
|
|
__set_errno (ENOMEM);
|
|
return (nl_catd) -1;
|
|
}
|
|
|
|
if (strchr (cat_name, '/') == NULL)
|
|
{
|
|
if (flag == NL_CAT_LOCALE)
|
|
{
|
|
env_var = getenv ("LC_ALL");
|
|
if (env_var == NULL)
|
|
{
|
|
env_var = getenv ("LC_MESSAGES");
|
|
if (env_var == NULL)
|
|
{
|
|
env_var = getenv ("LANG");
|
|
if (env_var == NULL)
|
|
env_var = "C";
|
|
}
|
|
}
|
|
}
|
|
else
|
|
{
|
|
env_var = getenv ("LANG");
|
|
if (env_var == NULL)
|
|
env_var = "C";
|
|
}
|
|
|
|
result->env_var = __strdup (env_var);
|
|
if (result->env_var == NULL)
|
|
{
|
|
free ((void *) result->cat_name);
|
|
free ((void *) result);
|
|
__set_errno (ENOMEM);
|
|
return (nl_catd) -1;
|
|
}
|
|
|
|
nlspath = __secure_getenv ("NLSPATH");
|
|
if (nlspath != NULL && *nlspath != '\0')
|
|
{
|
|
/* Append the system dependent directory. */
|
|
size_t len = strlen (nlspath + 1 + sizeof NLSPATH);
|
|
char *tmp = alloca (len);
|
|
|
|
__stpcpy (__stpcpy (__stpcpy (tmp, nlspath), ":"), NLSPATH);
|
|
nlspath = tmp;
|
|
}
|
|
else
|
|
result->nlspath = __strdup (NLSPATH);
|
|
|
|
if (result->nlspath == NULL)
|
|
{
|
|
free ((void *) result->cat_name);
|
|
free ((void *) result->env_var);
|
|
free ((void *) result);
|
|
__set_errno (ENOMEM);
|
|
return (nl_catd) -1;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
result->env_var = NULL;
|
|
result->nlspath = NULL;
|
|
}
|
|
|
|
return (nl_catd) result;
|
|
}
|
|
|
|
|
|
/* Return message from message catalog. */
|
|
char *
|
|
catgets (nl_catd catalog_desc, int set, int message, const char *string)
|
|
{
|
|
__nl_catd catalog;
|
|
size_t idx;
|
|
size_t cnt;
|
|
|
|
/* Be generous if catalog which failed to be open is used. */
|
|
if (catalog_desc == (nl_catd) -1 || ++set <= 0 || message < 0)
|
|
return (char *) string;
|
|
|
|
catalog = (__nl_catd) catalog_desc;
|
|
|
|
if (catalog->status == closed)
|
|
__open_catalog (catalog, 1);
|
|
|
|
if (catalog->status == nonexisting)
|
|
{
|
|
__set_errno (EBADF);
|
|
return (char *) string;
|
|
}
|
|
|
|
idx = ((set * message) % catalog->plane_size) * 3;
|
|
cnt = 0;
|
|
do
|
|
{
|
|
if (catalog->name_ptr[idx + 0] == (u_int32_t) set
|
|
&& catalog->name_ptr[idx + 1] == (u_int32_t) message)
|
|
return (char *) &catalog->strings[catalog->name_ptr[idx + 2]];
|
|
|
|
idx += catalog->plane_size * 3;
|
|
}
|
|
while (++cnt < catalog->plane_depth);
|
|
|
|
__set_errno (ENOMSG);
|
|
return (char *) string;
|
|
}
|
|
|
|
|
|
/* Return resources used for loaded message catalog. */
|
|
int
|
|
catclose (nl_catd catalog_desc)
|
|
{
|
|
__nl_catd catalog;
|
|
|
|
catalog = (__nl_catd) catalog_desc;
|
|
|
|
if (catalog->status == mmapped)
|
|
__munmap ((void *) catalog->file_ptr, catalog->file_size);
|
|
else if (catalog->status == malloced)
|
|
free ((void *) catalog->file_ptr);
|
|
else if (catalog->status != closed && catalog->status != nonexisting)
|
|
{
|
|
__set_errno (EBADF);
|
|
return -1;
|
|
}
|
|
|
|
if (catalog->nlspath)
|
|
free ((void *) catalog->nlspath);
|
|
if (catalog->env_var)
|
|
free ((void *) catalog->env_var);
|
|
free ((void *) catalog);
|
|
|
|
return 0;
|
|
}
|