second update 960907 from main archive

[kopensolaris-gnu/glibc.git] / locale / loadlocale.c

diff --git a/locale/loadlocale.c b/locale/loadlocale.c
index 24959a5..d465ed1 100644 (file)
--- a/locale/loadlocale.c
+++ b/locale/loadlocale.c
@@ -1,6 +1,7 @@
 /* Functions to read locale data files.
 /* Functions to read locale data files.

-Copyright (C) 1995 Free Software Foundation, Inc.
+Copyright (C) 1996 Free Software Foundation, Inc.

 This file is part of the GNU C Library.
 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
 
 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,31 +15,50 @@ 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
 
 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 <errno.h>
 #include <fcntl.h>

-#include <unistd.h>

 #include <stdlib.h>
 #include <string.h>
 #include <stdlib.h>
 #include <string.h>

-#include <stdio.h>
-#include <sys/stat.h>
+#include <unistd.h>

 #include <sys/mman.h>
 #include <sys/mman.h>

+#include <sys/stat.h>
+

 #include "localeinfo.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) \
 #define DEFINE_CATEGORY(category, category_name, items, a, b, c, d) \

-    [category] = _NL_NUM_##category,
+  [category] = _NL_ITEM_INDEX (_NL_NUM_##category),

 #include "categories.def"
 #undef DEFINE_CATEGORY
 #include "categories.def"
 #undef DEFINE_CATEGORY

-  };
+};
+
+
+#define NO_PAREN(arg, rest...) arg, ##rest
+
+#define DEFINE_CATEGORY(category, category_name, items, a, b, c, d) \
+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, b, c, d) \
+  [category] = _nl_value_type_##category,
+#include "categories.def"
+#undef DEFINE_CATEGORY
+};
+

 
 

-struct locale_data *
-_nl_load_locale (int category, char **name)
+void
+_nl_load_locale (struct loaded_l10nfile *file, int category)

 {
 {

-  char *file;

   int fd;
   struct
     {
   int fd;
   struct
     {


@@ -48,7 +68,9 @@ _nl_load_locale (int category, char **name)
     } *filedata;
   struct stat st;
   struct locale_data *newdata;
     } *filedata;
   struct stat st;
   struct locale_data *newdata;

+  int save_err;

   int swap = 0;
   int swap = 0;

+  size_t cnt;

   inline unsigned int SWAP (const unsigned int *inw)
     {
       const unsigned char *inc = (const unsigned char *) inw;
   inline unsigned int SWAP (const unsigned int *inw)
     {
       const unsigned char *inc = (const unsigned char *) inw;


@@ -56,68 +78,86 @@ _nl_load_locale (int category, char **name)
        return *inw;
       return (inc[3] << 24) | (inc[2] << 16) | (inc[1] << 8) | inc[0];
     }
        return *inw;
       return (inc[3] << 24) | (inc[2] << 16) | (inc[1] << 8) | inc[0];
     }

-  unsigned int i;

 
 

-  if ((*name)[0] == '\0')
-    {
-      *name = getenv (_nl_category_names[category]);
-      if (! *name || (*name) == '\0')
-       *name = getenv ("LANG");
-      if (! *name || (*name) == '\0')
-       *name = (char *) "local";
-    }
+  file->decided = 1;
+  file->data = NULL;

 
 

-/* 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);
+  fd = __open (file->filename, O_RDONLY);

   if (fd < 0)
   if (fd < 0)

-    return NULL;
+    /* Cannot open the file.  */
+    return;
+

   if (__fstat (fd, &st) < 0)
     goto puntfd;
   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.  */
+      char *newp;
+
+      __close (fd);

 
 

-  {
-    /* Map in the file's data.  */
-    int save = errno;
-    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;
-      }
-  }
+      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;
+    }
+
+  /* Map in the file's data.  */
+  save_err = errno;
+#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 (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.  */
 
   if (filedata->magic == LIMAGIC (category))
     /* Good data file in our byte order.  */


@@ -133,7 +173,7 @@ _nl_load_locale (int category, char **name)
          __munmap ((caddr_t) filedata, st.st_size);
        puntfd:
          __close (fd);
          __munmap ((caddr_t) filedata, st.st_size);
        puntfd:
          __close (fd);

-         return NULL;
+         return;

        }
     }
 
        }
     }
 


@@ -141,7 +181,7 @@ _nl_load_locale (int category, char **name)
 
   if (W (filedata->nstrings) < _nl_category_num_items[category] ||
       (sizeof *filedata + W (filedata->nstrings) * sizeof (unsigned int)
 
   if (W (filedata->nstrings) < _nl_category_num_items[category] ||
       (sizeof *filedata + W (filedata->nstrings) * sizeof (unsigned int)

-       >= st.st_size))
+       >= (size_t) st.st_size))

     {
       /* Insufficient data.  */
       errno = EINVAL;
     {
       /* Insufficient data.  */
       errno = EINVAL;


@@ -149,38 +189,49 @@ _nl_load_locale (int category, char **name)
     }
 
   newdata = malloc (sizeof *newdata +
     }
 
   newdata = malloc (sizeof *newdata +

-                   W (filedata->nstrings) * sizeof (char *));
+                   (_nl_category_num_items[category]
+                    * sizeof (union locale_data_value)));

   if (! newdata)
     goto puntmap;
 
   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->filedata = (void *) filedata;
   newdata->filesize = st.st_size;

-  newdata->nstrings = W (filedata->nstrings);
-  for (i = 0; i < newdata->nstrings; ++i)
+  newdata->nstrings = _nl_category_num_items[category];
+  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 (idx >= newdata->filesize)
        {
          free (newdata);
          errno = EINVAL;
          goto puntmap;
        }

-      newdata->strings[i] = newdata->filedata + idx;
+      if (_nl_value_types[category][cnt] == word)
+       newdata->values[cnt].word = W (*((u_int32_t *) (newdata->filedata
+                                                       + idx)));
+      else
+       newdata->values[cnt].string = newdata->filedata + idx;

     }
 
     }
 

-  return newdata;
+  __close (fd);
+  file->data = newdata;

 }
 \f
 void
 }
 \f
 void

-_nl_free_locale (struct locale_data *data)
+_nl_free_locale (const struct locale_data *data)

 {
   int save = errno;
 {
   int save = errno;

+  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;
     }
   if (__munmap ((caddr_t) data->filedata, data->filesize) < 0)
     {
       if (errno == ENOSYS)
        free ((void *) data->filedata);
       errno = save;
     }

-  free (data);
+  free ((void *) data);

 }
 }

-