mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-17 02:20:10 +00:00
09bf6406b1
2000-09-26 Jakub Jelinek <jakub@redhat.com> * sysdeps/sparc/sparc32/bits/endian.h: Remove. * sysdeps/sparc/sparc32/ieee754.h: New. * sysdeps/sparc/sparc64/bits/endian.h: Move... * sysdeps/sparc/bits/endian.h: ...here. * sysdeps/unix/sysv/linux/sparc/sparc32/clone.S (__clone): Optimize. * sysdeps/unix/sysv/linux/sparc/sparc64/clone.S (__clone): Check %o1, not %o0 to see if we're parent or child. Optimize. 2000-09-26 Jes Sorensen <jes@linuxcare.com> * sysdeps/unix/sysv/linux/ia64/fork.S: New file (based on code by Hans Boehm). * sysdeps/unix/sysv/linux/ia64/vfork.S: New file (based on code by Hans Boehm). * sysdeps/unix/sysv/linux/ia64/fork.c: Deleted (obsoleted by fork.S). 2000-09-20 H.J. Lu <hjl@gnu.org> * sysdeps/ia64/fpu/printf_fphex.c: New file. * sysdeps/ia64/fpu/libm-test-ulps: New file. 2000-09-17 H.J. Lu <hjl@gnu.org> * sysdeps/ia64/Makefile (long-double-fcts): New. Defined as yes. * sysdeps/ia64/fpu/s_isinfl.c: New file. Include sysdeps/i386/fpu/s_isinfl.c. * sysdeps/ia64/fpu/s_isnanl.c: New file. Include sysdeps/i386/fpu/s_isnanl.c. * sysdeps/ia64/fpu/s_nextafterl.c: New file. Include sysdeps/i386/fpu/s_nextafterl.c. * sysdeps/ia64/fpu/bits/mathdef.h: New file. Copied from sysdeps/i386/fpu/bits/mathdef.h. 2000-09-16 H.J. Lu <hjl@gnu.org> * sysdeps/generic/ldsodefs.h (DL_UNMAP): New. Defined if DL_UNMAP_IS_SPECIAL is not defined. * sysdeps/ia64/dl-lookupcfg.h (DL_UNMAP_IS_SPECIAL): Defined. (_dl_unmap): New prototype. (DL_UNMAP): New. Defined as _dl_unmap. * sysdeps/ia64/Versions [ld] (GLIBC_2.2): Add _dl_unmap. * elf/dl-close.c (_dl_close): Replace __munmap with DL_UNMAP. 2000-09-16 H.J. Lu <hjl@gnu.org> * sysdeps/generic/ldsodefs.h (DL_LOOKUP_ADDRESS): New. Defined if ELF_FUNCTION_PTR_IS_SPECIAL is not defined. * sysdeps/ia64/dl-lookupcfg.h (_dl_lookup_address): New prototype. (DL_LOOKUP_ADDRESS): New. Defined as _dl_lookup_address. * sysdeps/ia64/dl-fptr.c (_dl_lookup_address): New. Lookup the memory location of a function from a function descriptor. * sysdeps/ia64/Versions [ld] (GLIBC_2.2): Add _dl_lookup_address. * elf/dl-addr.c (_dl_addr): Use DL_LOOKUP_ADDRESS to get the memory location. 2000-09-14 Jes Sorensen <jes@linuxcare.com> * sysdeps/ia64/bits/byteswap.h (__bswap_16): Don't mark output variable as input argument. (__bswap_32): Likewise. * sysdeps/ia64/dl-machine.h: Add missing stop bit in RTLD_START() - found by Jim Wilson <wilson@cygnus.com> 2000-09-26 Ulrich Drepper <drepper@redhat.com> * string/strxfrm.c: Only require alignment on __alignof__ (int32_t) instead of 4. 2000-09-26 Andreas Schwab <schwab@suse.de> * locale/programs/ld-collate.c (collate_output): Only require alignment on __alignof__ (int32_t) instead of 4. * locale/loadlocale.c (_nl_load_locale): Likewise. * string/strcoll.c: Likewise. 2000-09-26 Jes Sorensen <jes@linuxcare.com> * sysdeps/ieee754/ldbl-96/e_atan2l.c (__ieee754_atan2l): Add parentheses around arithmetic used in | statement to kill compiler warning. * math/math_private.h: Add prototype for __finitel. (__ilogbl): Likewise. (__isinfl): Likewise. (__isnanl): Likewise. (__atanl): Likewise. (__copysignl): Likewise. (__expm1l): Likewise. (__floorl): Likewise. (__frexpl): Likewise. (__ldexpl): Likewise. (__log1pl): Likewise. (__nanl): Likewise. (__rintl): Likewise. (__scalbnl): Likewise. (__sqrtl): Likewise. (fabsl): Likewise. (__sincosl): Likewise. (si_isr) [USE_GNU]: Likewise. (ILL_BREAK) [USE_GNU]: Likewise. (FPE_DECOVF) [USE_GNU]: Likewise. (FPE_DECDIV) [USE_GNU]: Likewise. (FPE_DECERR) [USE_GNU]: Likewise. (FPE_INVASC) [USE_GNU]: Likewise. (FPE_INVDEC) [USE_GNU]: Likewise. (TRAP_BRANCH) [USE_GNU]: Likewise. (TRAP_HWBKPT) [USE_GNU]: Likewise. * sysdeps/ieee754/flt-32/s_exp2f.c: Likewise.
246 lines
6.5 KiB
C
246 lines
6.5 KiB
C
/* Functions to read locale data files.
|
|
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@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 <assert.h>
|
|
#include <errno.h>
|
|
#include <fcntl.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
#ifdef _POSIX_MAPPED_FILES
|
|
# include <sys/mman.h>
|
|
#endif
|
|
#include <sys/stat.h>
|
|
|
|
#include "localeinfo.h"
|
|
|
|
|
|
static const size_t _nl_category_num_items[] =
|
|
{
|
|
#define DEFINE_CATEGORY(category, category_name, items, a) \
|
|
[category] = _NL_ITEM_INDEX (_NL_NUM_##category),
|
|
#include "categories.def"
|
|
#undef DEFINE_CATEGORY
|
|
};
|
|
|
|
|
|
#define NO_PAREN(arg, rest...) arg, ##rest
|
|
|
|
#define DEFINE_CATEGORY(category, category_name, items, a) \
|
|
static const enum value_type _nl_value_type_##category[] = { NO_PAREN items };
|
|
#define DEFINE_ELEMENT(element, element_name, optstd, type, rest...) \
|
|
[_NL_ITEM_INDEX (element)] = type,
|
|
#include "categories.def"
|
|
#undef DEFINE_CATEGORY
|
|
|
|
static const enum value_type *_nl_value_types[] =
|
|
{
|
|
#define DEFINE_CATEGORY(category, category_name, items, a) \
|
|
[category] = _nl_value_type_##category,
|
|
#include "categories.def"
|
|
#undef DEFINE_CATEGORY
|
|
};
|
|
|
|
|
|
void
|
|
_nl_load_locale (struct loaded_l10nfile *file, int category)
|
|
{
|
|
int fd;
|
|
struct
|
|
{
|
|
unsigned int magic;
|
|
unsigned int nstrings;
|
|
unsigned int strindex[0];
|
|
} *filedata;
|
|
struct stat64 st;
|
|
struct locale_data *newdata;
|
|
int save_err;
|
|
int mmaped = 1;
|
|
size_t cnt;
|
|
|
|
file->decided = 1;
|
|
file->data = NULL;
|
|
|
|
fd = __open (file->filename, O_RDONLY);
|
|
if (__builtin_expect (fd, 0) < 0)
|
|
/* Cannot open the file. */
|
|
return;
|
|
|
|
if (__builtin_expect (__fxstat64 (_STAT_VER, fd, &st), 0) < 0)
|
|
goto puntfd;
|
|
if (__builtin_expect (S_ISDIR (st.st_mode), 0))
|
|
{
|
|
/* LOCALE/LC_foo is a directory; open LOCALE/LC_foo/SYS_LC_foo
|
|
instead. */
|
|
char *newp;
|
|
size_t filenamelen;
|
|
|
|
__close (fd);
|
|
|
|
filenamelen = strlen (file->filename);
|
|
newp = (char *) alloca (filenamelen
|
|
+ 5 + _nl_category_name_sizes[category] + 1);
|
|
__mempcpy (__mempcpy (__mempcpy (newp, file->filename, filenamelen),
|
|
"/SYS_", 5),
|
|
_nl_category_names[category],
|
|
_nl_category_name_sizes[category] + 1);
|
|
|
|
fd = __open (newp, O_RDONLY);
|
|
if (__builtin_expect (fd, 0) < 0)
|
|
return;
|
|
|
|
if (__builtin_expect (__fxstat64 (_STAT_VER, fd, &st), 0) < 0)
|
|
goto puntfd;
|
|
}
|
|
|
|
/* Map in the file's data. */
|
|
save_err = errno;
|
|
#ifdef _POSIX_MAPPED_FILES
|
|
# ifndef MAP_COPY
|
|
/* Linux seems to lack read-only copy-on-write. */
|
|
# define MAP_COPY MAP_PRIVATE
|
|
# endif
|
|
# ifndef MAP_FILE
|
|
/* Some systems do not have this flag; it is superfluous. */
|
|
# define MAP_FILE 0
|
|
# endif
|
|
# ifndef MAP_INHERIT
|
|
/* Some systems might lack this; they lose. */
|
|
# define MAP_INHERIT 0
|
|
# endif
|
|
filedata = (void *) __mmap ((caddr_t) 0, st.st_size, PROT_READ,
|
|
MAP_FILE|MAP_COPY|MAP_INHERIT, fd, 0);
|
|
if (__builtin_expect ((void *) filedata != MAP_FAILED, 1))
|
|
{
|
|
if (__builtin_expect (st.st_size < sizeof (*filedata), 0))
|
|
/* This cannot be a locale data file since it's too small. */
|
|
goto puntfd;
|
|
}
|
|
else
|
|
{
|
|
if (__builtin_expect (errno, ENOSYS) == ENOSYS)
|
|
{
|
|
#endif /* _POSIX_MAPPED_FILES */
|
|
/* No mmap; allocate a buffer and read from the file. */
|
|
mmaped = 0;
|
|
filedata = malloc (st.st_size);
|
|
if (filedata != NULL)
|
|
{
|
|
off_t to_read = st.st_size;
|
|
ssize_t nread;
|
|
char *p = (char *) filedata;
|
|
while (to_read > 0)
|
|
{
|
|
nread = __read (fd, p, to_read);
|
|
if (__builtin_expect (nread, 1) <= 0)
|
|
{
|
|
free (filedata);
|
|
if (nread == 0)
|
|
__set_errno (EINVAL); /* Bizarreness going on. */
|
|
goto puntfd;
|
|
}
|
|
p += nread;
|
|
to_read -= nread;
|
|
}
|
|
}
|
|
else
|
|
goto puntfd;
|
|
__set_errno (save_err);
|
|
#ifdef _POSIX_MAPPED_FILES
|
|
}
|
|
else
|
|
goto puntfd;
|
|
}
|
|
#endif /* _POSIX_MAPPED_FILES */
|
|
|
|
if (__builtin_expect (filedata->magic != LIMAGIC (category), 0))
|
|
/* Bad data file in either byte order. */
|
|
{
|
|
puntmap:
|
|
#ifdef _POSIX_MAPPED_FILES
|
|
__munmap ((caddr_t) filedata, st.st_size);
|
|
#endif
|
|
puntfd:
|
|
__close (fd);
|
|
return;
|
|
}
|
|
|
|
if (__builtin_expect (filedata->nstrings < _nl_category_num_items[category],
|
|
0)
|
|
|| (__builtin_expect (sizeof *filedata
|
|
+ filedata->nstrings * sizeof (unsigned int)
|
|
>= (size_t) st.st_size, 0)))
|
|
{
|
|
/* Insufficient data. */
|
|
__set_errno (EINVAL);
|
|
goto puntmap;
|
|
}
|
|
|
|
newdata = malloc (sizeof *newdata
|
|
+ filedata->nstrings * sizeof (union locale_data_value));
|
|
if (newdata == NULL)
|
|
goto puntmap;
|
|
|
|
newdata->name = NULL; /* This will be filled if necessary in findlocale.c. */
|
|
newdata->filedata = (void *) filedata;
|
|
newdata->filesize = st.st_size;
|
|
newdata->mmaped = mmaped;
|
|
newdata->usage_count = 0;
|
|
newdata->use_translit = 0;
|
|
newdata->options = NULL;
|
|
newdata->nstrings = filedata->nstrings;
|
|
for (cnt = 0; cnt < newdata->nstrings; ++cnt)
|
|
{
|
|
off_t idx = filedata->strindex[cnt];
|
|
if (__builtin_expect (idx > newdata->filesize, 0))
|
|
{
|
|
free (newdata);
|
|
__set_errno (EINVAL);
|
|
goto puntmap;
|
|
}
|
|
if (__builtin_expect (_nl_value_types[category][cnt] == word, 0))
|
|
{
|
|
assert (idx % __alignof__ (u_int32_t) == 0);
|
|
newdata->values[cnt].word =
|
|
*((u_int32_t *) (newdata->filedata + idx));
|
|
}
|
|
else
|
|
newdata->values[cnt].string = newdata->filedata + idx;
|
|
}
|
|
|
|
__close (fd);
|
|
file->data = newdata;
|
|
}
|
|
|
|
void
|
|
_nl_unload_locale (struct locale_data *locale)
|
|
{
|
|
#ifdef _POSIX_MAPPED_FILES
|
|
if (__builtin_expect (locale->mmaped, 1))
|
|
__munmap ((caddr_t) locale->filedata, locale->filesize);
|
|
else
|
|
#endif
|
|
free ((void *) locale->filedata);
|
|
|
|
free ((char *) locale->options);
|
|
free ((char *) locale->name);
|
|
free (locale);
|
|
}
|