mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-22 10:50:07 +00:00
f0bf9cb92c
* locale/C-ctype.c: New correct data generated by drepper. * Rules: Don't use $(libc.a). Parsing of grouped numbers contributed by Ulrich Drepper. * stdlib/strtol.c (__strtol_internal): Renamed from strtol. Take new flag arg; if nonzero, parse locale-dependent thousands grouping and interpret only the prefix that is correctly grouped. (strtol): Define this to call _strtol_internal with zero for the flag. Use a weak symbol for the definition. * stdlib/strtod.c (strtod, __strtod_internal): Likewise. Check for the exponent of the number overflowing the float format. * stdlib/stdlib.h (__strtof, __strtold): Declarations removed. (__strto{f,d,ld,l,ul,q,uq}_internal): Declare these functions. [__OPTIMIZE__]: Define inline functions calling those. * stdlib/grouping.h: New file, written by drepper. * stdlib/Makefile (distribute): Add grouping.h. * stdio/vfscanf.c: Grok %' modifier to numeric conversions. Call __strtoX_internal with the grouping flag set iff the modifier is present. Wed Mar 15 00:40:54 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu> * sysdeps/generic/memchr.c: Fix typos: limit.h -> limits.h. * mach/Machrules: Produce static deps for all object flavors. [interface-library]: Remove all these variables and rules. ($(interface-library)-routines): Define this variable. (extra-libs): Append $(interface-library) to this. * mach/Makefile (interface-library): Omit .a suffix. * hurd/Makefile: Likewise. Tue Mar 14 23:40:31 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu> * stdio/internals.c (flushbuf): If !FLUSH_ONLY, don't skip out early if no new data in buffer after priming. * Makerules (object-suffixes, libtypes): Move all these variables to Makeconfig. * Makeconfig (object-suffixes, libtypes): Moved here from Makerules. * Makerules (build-extra-lib): New canned sequence. * sysdeps/mach/hurd/euidaccess.c: Include fcntl.h. Declare ERR; fix uses of FILE and PORT. Remove bogus weak alias for `access'. * sysdeps/mach/hurd/dirfd.c: Include hurd/fd.h and errno.h. Add missing semicolon. * sysdeps/mach/hurd/opendir.c: Include hurd/fd.h. Use a `struct hurd_fd *' temp var, since DIRP->__fd is a `void *'. * sysdeps/mach/hurd/readdir.c: Include hurd/fd.h. * stdlib/wcstombs.c: #if 0 out code for non-ASCII chars until the locale data format is implemented. * sysdeps/mach/hurd/i386/trampoline.c (_hurd_setup_sighandler): Pass &__sigreturn on the stack to the trampoline code, so it is not position-dependent. * stdio/printf_fp.c (NDEBUG): Define this to disable assert. Don't include <stdarg.h>. (__printf_fp): Last arg ARGS is now `const void **const'; dereference ARGS[0] instead of using va_arg. * locale/setlocale.c: In LC_ALL case, initialize CATEGORY before loop to install data. * locale/loadlocale.c (_nl_category_num_items): Use _NL_ITEM_INDEX to extract number from item code. (_nl_load_locale): Close the descriptor when finished. * malloc/realloc.c (_realloc_internal): Call _malloc_internal in place of malloc. * time/tzfile.c (__tzfile_default): Initialize RULE_STDOFF to zero.
194 lines
4.7 KiB
C
194 lines
4.7 KiB
C
/* Functions to read locale data files.
|
||
Copyright (C) 1995 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., 675 Mass Ave,
|
||
Cambridge, MA 02139, USA. */
|
||
|
||
#include <errno.h>
|
||
#include <fcntl.h>
|
||
#include <unistd.h>
|
||
#include <stdlib.h>
|
||
#include <string.h>
|
||
#include <stdio.h>
|
||
#include <sys/stat.h>
|
||
#include <sys/mman.h>
|
||
#include "localeinfo.h"
|
||
|
||
const size_t _nl_category_num_items[] =
|
||
{
|
||
#define DEFINE_CATEGORY(category, category_name, items, a, b, c, d) \
|
||
[category] = _NL_ITEM_INDEX (_NL_NUM_##category),
|
||
#include "categories.def"
|
||
#undef DEFINE_CATEGORY
|
||
};
|
||
|
||
struct locale_data *
|
||
_nl_load_locale (int category, char **name)
|
||
{
|
||
char *file;
|
||
int fd;
|
||
struct
|
||
{
|
||
unsigned int magic;
|
||
unsigned int nstrings;
|
||
unsigned int strindex[0];
|
||
} *filedata;
|
||
struct stat st;
|
||
struct locale_data *newdata;
|
||
int swap = 0;
|
||
inline unsigned int SWAP (const unsigned int *inw)
|
||
{
|
||
const unsigned char *inc = (const unsigned char *) inw;
|
||
if (!swap)
|
||
return *inw;
|
||
return (inc[3] << 24) | (inc[2] << 16) | (inc[1] << 8) | inc[0];
|
||
}
|
||
unsigned int i;
|
||
|
||
if ((*name)[0] == '\0')
|
||
{
|
||
*name = getenv ("LC_ALL");
|
||
if (! *name || (*name)[0] == '\0')
|
||
*name = getenv (_nl_category_names[category]);
|
||
if (! *name || (*name)[0] == '\0')
|
||
*name = getenv ("LANG");
|
||
if (! *name || (*name)[0] == '\0')
|
||
*name = (char *) "local";
|
||
}
|
||
|
||
/* XXX can't use asprintf here */
|
||
if (asprintf (&file, "%s%s/%s",
|
||
strchr (*name, '/') != NULL ? "" : "/share/locale/", /* XXX */
|
||
*name, _nl_category_names[category]) == -1)
|
||
return NULL;
|
||
|
||
fd = __open (file, O_RDONLY);
|
||
free (file);
|
||
if (fd < 0)
|
||
return NULL;
|
||
if (__fstat (fd, &st) < 0)
|
||
goto puntfd;
|
||
|
||
{
|
||
/* Map in the file's data. */
|
||
int save = errno;
|
||
#ifndef MAP_COPY
|
||
/* Linux seems to lack read-only copy-on-write. */
|
||
#define MAP_COPY MAP_PRIVATE
|
||
#endif
|
||
filedata = (void *) __mmap ((caddr_t) 0, st.st_size,
|
||
PROT_READ, MAP_FILE|MAP_COPY, fd, 0);
|
||
if (filedata == (void *) -1)
|
||
{
|
||
if (errno == ENOSYS)
|
||
{
|
||
/* No mmap; allocate a buffer and read from the file. */
|
||
filedata = malloc (st.st_size);
|
||
if (filedata)
|
||
{
|
||
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 (nread <= 0)
|
||
{
|
||
free (filedata);
|
||
if (nread == 0)
|
||
errno = EINVAL; /* Bizarreness going on. */
|
||
goto puntfd;
|
||
}
|
||
p += nread;
|
||
to_read -= nread;
|
||
}
|
||
}
|
||
else
|
||
goto puntfd;
|
||
errno = save;
|
||
}
|
||
else
|
||
goto puntfd;
|
||
}
|
||
}
|
||
|
||
if (filedata->magic == LIMAGIC (category))
|
||
/* Good data file in our byte order. */
|
||
swap = 0;
|
||
else
|
||
{
|
||
/* Try the other byte order. */
|
||
swap = 1;
|
||
if (SWAP (&filedata->magic) != LIMAGIC (category))
|
||
/* Bad data file in either byte order. */
|
||
{
|
||
puntmap:
|
||
__munmap ((caddr_t) filedata, st.st_size);
|
||
puntfd:
|
||
__close (fd);
|
||
return NULL;
|
||
}
|
||
}
|
||
|
||
#define W(word) SWAP (&(word))
|
||
|
||
if (W (filedata->nstrings) < _nl_category_num_items[category] ||
|
||
(sizeof *filedata + W (filedata->nstrings) * sizeof (unsigned int)
|
||
>= st.st_size))
|
||
{
|
||
/* Insufficient data. */
|
||
errno = EINVAL;
|
||
goto puntmap;
|
||
}
|
||
|
||
newdata = malloc (sizeof *newdata +
|
||
W (filedata->nstrings) * sizeof (char *));
|
||
if (! newdata)
|
||
goto puntmap;
|
||
|
||
newdata->filedata = (void *) filedata;
|
||
newdata->filesize = st.st_size;
|
||
newdata->nstrings = W (filedata->nstrings);
|
||
for (i = 0; i < newdata->nstrings; ++i)
|
||
{
|
||
unsigned int idx = W (filedata->strindex[i]);
|
||
if (idx >= newdata->filesize)
|
||
{
|
||
free (newdata);
|
||
errno = EINVAL;
|
||
goto puntmap;
|
||
}
|
||
newdata->strings[i] = newdata->filedata + idx;
|
||
}
|
||
|
||
__close (fd);
|
||
return newdata;
|
||
}
|
||
|
||
void
|
||
_nl_free_locale (struct locale_data *data)
|
||
{
|
||
int save = errno;
|
||
if (__munmap ((caddr_t) data->filedata, data->filesize) < 0)
|
||
{
|
||
if (errno == ENOSYS)
|
||
free ((void *) data->filedata);
|
||
errno = save;
|
||
}
|
||
free (data);
|
||
}
|
||
|