mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-01 01:00:10 +00:00
b6aa34eb72
* locale/loadlocale.c (_nl_load_locale): Optimize a bit. Pretty print. Add checks for _POSIX_MMAPPED_FILES where necessary. (_nl_unload_locale): If locale data was mmapped use munmap. 2000-01-29 Andreas Jaeger <aj@suse.de> * sysdeps/unix/sysv/linux/i386/sys/io.h: Add missing ints, use _EXTERN_INLINE, compile inline assembler functions only with gcc. 2000-01-29 Ulrich Drepper <drepper@redhat.com> * catgets/catgets.c (catopen): Handle NL_CAT_LOCALE correctly. * catgets/gencat.c (read_input_file): Remove messages correctly. * catgets/open_catalog.c (__open_catalog): Handle trailing colons and adjacent colons correctly. Correct loops to read territory and and codeset part. Patches by Geoff Clare <gwc@unisoft.com> (PR libc/1559). * rt/aio_misc.c (get_elem): Assign pointer to new row to correct pool entry. Patch by Jens Moeller <jens.moeller@waii.com> (PR libc/1558). 2000-01-28 Jakub Jelinek <jakub@redhat.com> * sysdeps/unix/sysv/linux/arm/Versions: Export the new *rlimit interface with symbol version GLIBC_2.2. * sysdeps/unix/sysv/linux/i386/Versions: Likewise. * sysdeps/unix/sysv/linux/i386/getrlimit.c: Likewise. * sysdeps/unix/sysv/linux/i386/getrlimit64.c: Likewise. * sysdeps/unix/sysv/linux/i386/setrlimit.c: Likewise. 2000-01-27 Scott Bambrough <scottb@netwinder.org> * sysdeps/unix/sysv/linux/arm/Makefile: Backout rlimit changes for resource directory. * sysdeps/unix/sysv/linux/arm/syscalls.list: Backout changes for versioning setrlimit and getrlimit. 2000-01-27 Andreas Jaeger <aj@suse.de> * sysdeps/powerpc/fpu/libm-ulps: Renamed to ... * sysdeps/powerpc/fpu/libm-test-ulps: ...this. 2000-01-27 Ruediger Oertel <ro@suse.de> * sysdeps/unix/sysv/linux/i386/sys/io.h: Change "::" to ": :" for g++. 2000-01-29 Ulrich Drepper <drepper@redhat.com>
165 lines
4.2 KiB
C
165 lines
4.2 KiB
C
/* Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Ulrich Drepper, <drepper@gnu.org>.
|
|
|
|
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 <locale.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 = NULL;
|
|
const char *nlspath = NULL;
|
|
size_t cat_name_len = strlen (cat_name) + 1;
|
|
size_t env_var_len = 0;
|
|
size_t nlspath_len = 0;
|
|
char *endp;
|
|
|
|
if (strchr (cat_name, '/') == NULL)
|
|
{
|
|
if (flag == NL_CAT_LOCALE)
|
|
/* Use the current locale setting for LC_MESSAGES. */
|
|
env_var = setlocale (LC_MESSAGES, NULL);
|
|
else
|
|
/* Use the LANG environment variable. */
|
|
env_var = getenv ("LANG");
|
|
|
|
if (env_var == NULL)
|
|
env_var = "C";
|
|
|
|
env_var_len = strlen (env_var) + 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;
|
|
|
|
nlspath_len = len;
|
|
}
|
|
else
|
|
{
|
|
nlspath = NLSPATH;
|
|
|
|
nlspath_len = sizeof NLSPATH;
|
|
}
|
|
}
|
|
|
|
result = (__nl_catd) malloc (sizeof (*result) + cat_name_len
|
|
+ env_var_len + nlspath_len);
|
|
if (result == NULL)
|
|
/* We cannot get enough memory. */
|
|
return (nl_catd) -1;
|
|
|
|
result->status = closed;
|
|
result->cat_name = endp = (char *) (result + 1);
|
|
endp = __mempcpy (endp, cat_name, cat_name_len);
|
|
|
|
result->env_var = cat_name_len != 0 ? endp : NULL;
|
|
endp = __mempcpy (endp, env_var, env_var_len);
|
|
|
|
result->nlspath = nlspath_len != 0 ? endp : NULL;
|
|
memcpy (endp, nlspath, nlspath_len);
|
|
|
|
__libc_lock_init (result->lock);
|
|
|
|
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);
|
|
|
|
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;
|
|
|
|
#ifdef _POSIX_MAPPED_FILES
|
|
if (catalog->status == mmapped)
|
|
__munmap ((void *) catalog->file_ptr, catalog->file_size);
|
|
else
|
|
#endif /* _POSIX_MAPPED_FILES */
|
|
if (catalog->status == malloced)
|
|
free ((void *) catalog->file_ptr);
|
|
else if (catalog->status != closed && catalog->status != nonexisting)
|
|
{
|
|
__set_errno (EBADF);
|
|
return -1;
|
|
}
|
|
|
|
free ((void *) catalog);
|
|
|
|
return 0;
|
|
}
|