Sun Mar 5 19:40:13 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu>

	* locale/localeinfo.h: Rewritten for new locale system, using
	locale data files and with <langinfo.h> interface.
	* locale/setlocale.c: Rewritten to use locale data files.
	* langinfo.h: New file.
        * locale/langinfo.h: New file.
        * locale/nl_langinfo.c: New file.
        * locale/loadlocale.c: New file.
        * locale/lc-ctype.c: New file.
        * locale/lc-messages.c: New file.
        * locale/lc-monetary.c: New file.
        * locale/lc-numeric.c: New file.
        * locale/lc-time.c: New file.
        * locale/categories.def: New file.
	* locale/Makefile (headers): Remove localeinfo.h.
	(distribute): New variable; put localeinfo.h here, and categories.def.
	(routines): Add loadlocale.
	(categories): New variable.
	(aux): Use that to get C-category and lc-category.
	* ctype/ctype.h (_IS*): Use independent bits for all but _ISalnum.
	* locale/C-ctype.c, locale/C-messages.c: New files.
 	* locale/C-monetary.c, locale/C-numeric.c, locale/C-time.c:
	Default "C" locale data updated for new locale system.
	* locale/C-collate.c: File removed.
        * locale/C-ctype_ct.c: File removed.
        * locale/C-ctype_mb.c: File removed.
        * locale/C-response.c: File removed.
	* locale/localeconv.c: Use _NL_CURRENT macro to access locale data.
	* stdio/printf_fp.c, stdio/vfprintf.c, stdio/vfscanf.c,
	  stdlib/strtod.c, time/asctime.c, time/strftime.c:
	Include ../locale/localeinfo.h and use _NL_CURRENT macro to access
	locale data.
	* time/localtime.c: Don't include <localeinfo.h>.
	* time/tzset.c: Don't use locale items for default TZ value or
	"GMT" string (use "UTC").

	* stdio/vfprintf.c [USE_IN_LIBIO] (PAD): Only call the function if
 	WIDTH>0; update DONE.

	* malloc/malloc.c (morecore): Fix last change to calculate by
 	blocks instead of bytes.

1 files changed, 186 insertions, 0 deletions

diff --git a/locale/loadlocale.c b/locale/loadlocale.c
new file mode 100644
index 0000000..24959a5
--- /dev/null
+++ b/locale/loadlocale.c
@@ -0,0 +1,186 @@
+/* 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_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 (_nl_category_names[category]);
+      if (! *name || (*name) == '\0')
+	*name = getenv ("LANG");
+      if (! *name || (*name) == '\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;
+    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;
+    }
+
+  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);
+}
+