aboutsummaryrefslogtreecommitdiff
path: root/locale/loadlocale.c
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>1996-05-03 17:44:31 +0000
committerRoland McGrath <roland@gnu.org>1996-05-03 17:44:31 +0000
commit7a12c6bba750ca500009854db3a0fcdfb1ad61a7 (patch)
tree52654097781ee98deb03b41dd4f5a805bb9c9e30 /locale/loadlocale.c
parent9e720468715080bd95edadf10fd45a2c8be5e678 (diff)
downloadglibc-7a12c6bba750ca500009854db3a0fcdfb1ad61a7.zip
glibc-7a12c6bba750ca500009854db3a0fcdfb1ad61a7.tar.gz
glibc-7a12c6bba750ca500009854db3a0fcdfb1ad61a7.tar.bz2
Fri May 3 13:32:08 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>cvs/libc-960504
* intl/Makefile (CPPFLAGS): Change $(nlsdir) to $(i18ndir) in LOCALE_ALIAS_PATH. Fri May 3 03:14:02 1996 Ulrich Drepper <drepper@cygnus.com> * intl/Makefile (routines): Add l10nflist and explodename. (distribute): Add loadinfo.h and locale.alias. (install-others): New variable to install locale.alias. * intl/dcgettext.c, intl/finddomain.c, intl/gettextP.h, intl/loadmsgcat.c: Adapt for upcoming gettext-0.10.13. Some code is now shared with the locale implementation. * intl/explodename.c, intl/l10nflist.c, intl/loadinfo.h: New file. Extracted from finddomain.c. This is also used in the locale implementation. * intl/locale.alias: New file. Locale alias database compatible with X Window System's locale alias file. Can now be used in locale and gettext code. * libio/stdio.h: Add prototypes for asprint and vasprintf. * locale/C-collate.c, locale/C-ctype.c, locale/C-messages.c, locale/C-monetary.c, locale/C-numeric.c, locale/C-time.c: Add new field in structure with name of locale ("C" in this case). * locale/Makefile (routines): Add findlocale. * locale/findlocale.c: New file. Instead of trying to load the directly described file we now try to be much smarter when this fails. Use the same code as gettext does. * locale/loadlocale.c, locale/setlocale.c: Rewrite to know about new loading scheme. * locale/localeinfo.h: Adapt prototypes and declarations for new setlocale implementation. Remove definition of u32_t type. We now use u_int32_t from <sys/types.h>. * locale/programs/charset.h (ILLEGAL_CHAR_VALUE): Provide type with constant. * locale/programs/config.h, locale/lc-collate.c, locale/localeinfo.h, locale/programs/ld-collate.c, locale/programs/ld-ctype.c, locale/programs/ld-messages.c, locale/programs/ld-monetary.c, locale/programs/ld-numeric.c, locale/programs/ld-time.c, locale/weight.h, string/strcoll.c: Change to use u_int32_t and u_int16_t. * locale/programs/localedef.c (construct_output_path): Change name of output locale to contain normalized form of the character set portion. * string/Makefile (routines): Add agrz-ctsep and argz-next. (tests): Add tst-strlen. * string/argz-ctsep.c: New file. Implement reverse operation from argz-stringify. * string/argz-next.c: Non-inline version of function from argz.h. * string/argz.h, string/envz.h: Make usable as global header file. * string/envz.c: Fix declarations to use size_t where prototypes say so. * string/tst-strlen.c: New file. Another test for critical situation in strlen implementations. * sysdeps/i386/i586/strlen.S: Fix bug with highest byte in word being zero. * wctype/test_wctype.c: Fix controlling comparison after change to 32 bit character class array. Fri May 3 12:53:12 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu> * sysdeps/unix/sysv/linux/sys/socket.h: Remove spurious doubled line. Thu May 2 22:50:52 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/unix/sysv/linux/getpriority.c: New file. * sysdeps/unix/sysv/linux/syscalls.list: Add s_getpriority. Thu May 2 22:41:31 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/unix/sysv/linux/m68k/fpu_control.h (_FPU_DEFAULT): Disable all exceptions. Thu May 2 22:33:14 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/m68k/fpu/e_acos.c, sysdeps/m68k/fpu/e_acosf.c, sysdeps/m68k/fpu/e_fmod.c, sysdeps/m68k/fpu/e_fmodf.c, sysdeps/m68k/fpu/isinfl.c, sysdeps/m68k/fpu/isnanl.c, sysdeps/m68k/fpu/s_atan.c, sysdeps/m68k/fpu/s_atanf.c, sysdeps/m68k/fpu/s_frexp.c, sysdeps/m68k/fpu/s_frexpf.c, sysdeps/m68k/fpu/s_ilogb.c, sysdeps/m68k/fpu/s_ilogbf.c, sysdeps/m68k/fpu/s_isinf.c, sysdeps/m68k/fpu/s_isinff.c, sysdeps/m68k/fpu/s_ldexp.c, sysdeps/m68k/fpu/s_ldexpf.c, sysdeps/m68k/fpu/s_modf.c, sysdeps/m68k/fpu/s_modff.c: Don't define __NO_MATH_INLINES, which is already defined on command line. Thu May 2 22:18:28 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/libm-ieee754/e_j0f.c (__ieee754_j0f, __ieee754_y0f): Replace 0x80000000 by 0x48000000. * sysdeps/libm-ieee754/e_j1f.c (__ieee754_j1f): Likewise. Thu May 2 21:30:33 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sunrpc/svc_simple.c: Make global variable pl local to registerrpc. Thu May 2 00:24:04 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * time/Makefile (tz-cflags): New variable. (CFLAGS-tzfile.c): New variable. (CFLAGS-zic.c): Add $(tz-cflags). (tz-cc): Remove variable. ($(objpfx)tzfile.o, $(objpfx)zic.o): Remove targets. * sysdeps/mach/hurd/getcwd.c: Jump out of both loops when we find a name, instead of checking for reaching end of buffer, which happens when the match is the last entry in the buffer.
Diffstat (limited to 'locale/loadlocale.c')
-rw-r--r--locale/loadlocale.c194
1 files changed, 95 insertions, 99 deletions
diff --git a/locale/loadlocale.c b/locale/loadlocale.c
index 68f9c7a..93b9e95 100644
--- a/locale/loadlocale.c
+++ b/locale/loadlocale.c
@@ -1,6 +1,6 @@
-/* Functions to read locale data files.
-Copyright (C) 1995, 1996 Free Software Foundation, Inc.
+/* Copyright (C) 1996 Free Software Foundation, Inc.
This file is part of the GNU C Library.
+Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 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
@@ -14,20 +14,21 @@ 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. */
+not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA. */
#include <errno.h>
#include <fcntl.h>
-#include <unistd.h>
#include <stdlib.h>
#include <string.h>
-#include <stdio.h>
-#include <sys/stat.h>
+#include <unistd.h>
#include <sys/mman.h>
+#include <sys/stat.h>
+
#include "localeinfo.h"
-const size_t _nl_category_num_items[] =
+
+static 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),
@@ -54,8 +55,8 @@ static const enum value_type *_nl_value_types[] =
};
-struct locale_data *
-_nl_load_locale (int category, char **name)
+void
+_nl_load_locale (struct loaded_l10nfile *file, int category)
{
int fd;
struct
@@ -66,7 +67,9 @@ _nl_load_locale (int category, char **name)
} *filedata;
struct stat st;
struct locale_data *newdata;
+ int save_err;
int swap = 0;
+ size_t cnt;
inline unsigned int SWAP (const unsigned int *inw)
{
const unsigned char *inc = (const unsigned char *) inw;
@@ -74,98 +77,86 @@ _nl_load_locale (int category, char **name)
return *inw;
return (inc[3] << 24) | (inc[2] << 16) | (inc[1] << 8) | inc[0];
}
- unsigned int i;
- if ((*name)[0] == '\0')
+ file->decided = 1;
+ file->data = NULL;
+
+ fd = __open (file->filename, O_RDONLY);
+ if (fd < 0)
+ /* Cannot open the file. */
+ return;
+
+ if (__fstat (fd, &st) < 0)
+ goto puntfd;
+ if (S_ISDIR (st.st_mode))
{
- *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";
+ /* LOCALE/LC_foo is a directory; open LOCALE/LC_foo/SYS_LC_foo
+ instead. */
+ char *newp;
+
+ __close (fd);
+
+ newp = (char *) alloca (strlen (file->filename)
+ + 5 + _nl_category_name_sizes[category] + 1);
+ __stpcpy (__stpcpy (__stpcpy (newp, file->filename), "/SYS_"),
+ _nl_category_names[category]);
+
+ fd = __open (newp, O_RDONLY);
+ if (fd < 0)
+ return;
+
+ if (__fstat (fd, &st) < 0)
+ goto puntfd;
}
- {
- const char *catname = _nl_category_names[category];
- size_t namelen = strlen (*name);
- size_t catlen = strlen (catname);
- char file[sizeof LOCALE_PATH + 1 + namelen + catlen * 2 + 4];
- if (strchr (*name, '/') != NULL)
- sprintf (file, "%s/%s", *name, catname);
- else
- sprintf (file, "%s/%s/%s", LOCALE_PATH, *name, catname);
- fd = __open (file, O_RDONLY);
- if (fd < 0)
- return NULL;
- if (__fstat (fd, &st) < 0)
- goto puntfd;
- if (S_ISDIR (st.st_mode))
- {
- /* LOCALE/LC_foo is a directory; open LOCALE/LC_foo/SYS_LC_foo
- instead. */
- __close (fd);
- memcpy (stpcpy (strchr (file, '\0'), "SYS_"), catname, catlen);
- fd = __open (file, O_RDONLY);
- if (fd < 0)
- return NULL;
- if (__fstat (fd, &st) < 0)
- goto puntfd;
- }
- }
-
- {
- /* Map in the file's data. */
- int save = errno;
+ /* Map in the file's data. */
+ save_err = errno;
#ifndef MAP_COPY
- /* Linux seems to lack read-only copy-on-write. */
+ /* 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. */
+ /* 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. */
+ /* 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 (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;
- }
- }
+ filedata = (void *) __mmap ((caddr_t) 0, st.st_size, PROT_READ,
+ MAP_FILE|MAP_COPY|MAP_INHERIT, 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 != 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 (nread <= 0)
+ {
+ free (filedata);
+ if (nread == 0)
+ errno = EINVAL; /* Bizarreness going on. */
+ goto puntfd;
+ }
+ p += nread;
+ to_read -= nread;
+ }
+ }
+ else
+ goto puntfd;
+ errno = save_err;
+ }
+ else
+ goto puntfd;
+ }
if (filedata->magic == LIMAGIC (category))
/* Good data file in our byte order. */
@@ -181,7 +172,7 @@ _nl_load_locale (int category, char **name)
__munmap ((caddr_t) filedata, st.st_size);
puntfd:
__close (fd);
- return NULL;
+ return;
}
}
@@ -201,41 +192,46 @@ _nl_load_locale (int category, char **name)
if (! newdata)
goto puntmap;
+ newdata->name = NULL; /* This will be filled if necessary in findlocale.c. */
newdata->filedata = (void *) filedata;
newdata->filesize = st.st_size;
newdata->nstrings = W (filedata->nstrings);
- for (i = 0; i < newdata->nstrings; ++i)
+ for (cnt = 0; cnt < newdata->nstrings; ++cnt)
{
- unsigned int idx = W (filedata->strindex[i]);
+ off_t idx = W (filedata->strindex[cnt]);
if (idx >= newdata->filesize)
{
free (newdata);
errno = EINVAL;
goto puntmap;
}
- if (_nl_value_types[category][i] == word)
- newdata->values[i].word = W (*((u32_t *) (newdata->filedata + idx)));
+ if (_nl_value_types[category][cnt] == word)
+ newdata->values[cnt].word = W (*((u_int32_t *) (newdata->filedata
+ + idx)));
else
- newdata->values[i].string = newdata->filedata + idx;
+ newdata->values[cnt].string = newdata->filedata + idx;
}
__close (fd);
- return newdata;
+ file->data = newdata;
}
void
-_nl_free_locale (struct locale_data *data)
+_nl_free_locale (const struct locale_data *data)
{
int save = errno;
- if (! data)
+ if (data == NULL)
/* Ignore a null pointer, like free does. */
return;
+ if (data->name != NULL)
+ free ((void *) data->name);
if (__munmap ((caddr_t) data->filedata, data->filesize) < 0)
{
if (errno == ENOSYS)
free ((void *) data->filedata);
errno = save;
}
- free (data);
+ free ((void *) data);
}
+