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.

3 files changed, 20 insertions, 18 deletions

diff --git a/stdio/printf_fp.c b/stdio/printf_fp.c
index ddf0257..10018f0 100644
--- a/stdio/printf_fp.c
+++ b/stdio/printf_fp.c
@@ -32,7 +32,8 @@ Cambridge, MA 02139, USA.  */
 #include <gmp.h>
 #include <gmp-impl.h>
 #include <longlong.h>
-#include <localeinfo.h>
+#include "../locale/localeinfo.h"
+#include <limits.h>
 #include <math.h>
 #include <printf.h>
 #include <stdarg.h>
@@ -227,22 +228,22 @@ __printf_fp (fp, info, args)
 
 
   /* Figure out the decimal point character.  */
-  if (mbtowc (&decimal, _numeric_info->decimal_point,
-	      strlen (_numeric_info->decimal_point)) <= 0)
-    decimal = (wchar_t) *_numeric_info->decimal_point;
+  if (mbtowc (&decimal, _NL_CURRENT (LC_NUMERIC, DECIMAL_POINT),
+	      strlen (_NL_CURRENT (LC_NUMERIC, DECIMAL_POINT))) <= 0)
+    decimal = (wchar_t) *_NL_CURRENT (LC_NUMERIC, DECIMAL_POINT);
 
 
   if (info->group)
     {
-      grouping = _numeric_info->grouping; /* Cache the grouping info array.  */
+      grouping = _NL_CURRENT (LC_NUMERIC, GROUPING);
       if (*grouping <= 0 || *grouping == CHAR_MAX)
 	grouping = NULL;
       else
 	{
 	  /* Figure out the thousands seperator character.  */
-	  if (mbtowc (&thousands_sep, _numeric_info->thousands_sep,
-		      strlen (_numeric_info->thousands_sep)) <= 0)
-	    thousands_sep = (wchar_t) *_numeric_info->thousands_sep;
+	  if (mbtowc (&thousands_sep, _NL_CURRENT (LC_NUMERIC, THOUSANDS_SEP),
+		      strlen (_NL_CURRENT (LC_NUMERIC, THOUSANDS_SEP))) <= 0)
+	    thousands_sep = (wchar_t) *_NL_CURRENT (LC_NUMERIC, THOUSANDS_SEP);
 	  if (thousands_sep == L'\0')
 	    grouping = NULL;
 	}
diff --git a/stdio/vfprintf.c b/stdio/vfprintf.c
index 1b773e7..125e179 100644
--- a/stdio/vfprintf.c
+++ b/stdio/vfprintf.c
@@ -17,7 +17,7 @@ not, write to the Free Software Foundation, Inc., 675 Mass Ave,
 Cambridge, MA 02139, USA.  */
 
 #include <ansidecl.h>
-#include <localeinfo.h>
+#include "../locale/localeinfo.h"
 #include <ctype.h>
 #include <errno.h>
 #include <float.h>
@@ -38,7 +38,8 @@ Cambridge, MA 02139, USA.  */
 /* This code is for use in libio.  */
 #include <libioP.h>
 #define PUT(f, s, n)	_IO_sputn (f, s, n)
-#define PAD(padchar)	_IO_padn (s, padchar, width)
+#define PAD(padchar)	\
+  (width > 0 ? (_IO_padn (s, padchar, width), done += width) : 0)
 #define PUTC(c, f)	_IO_putc(c, f)
 #define vfprintf	_IO_vfprintf
 #define size_t		_IO_size_t
@@ -159,10 +160,10 @@ DEFUN(vfprintf, (s, format, args),
   (void) mblen ((char *) NULL, 0);
 
   /* Figure out the thousands seperator character.  */
-  if (mbtowc (&thousands_sep, _numeric_info->thousands_sep,
-	      strlen (_numeric_info->thousands_sep)) <= 0)
-    thousands_sep = (wchar_t) *_numeric_info->thousands_sep;
-  grouping = _numeric_info->grouping; /* Cache the grouping info array.  */
+  if (mbtowc (&thousands_sep, _NL_CURRENT (LC_NUMERIC, THOUSANDS_SEP),
+	      strlen (_NL_CURRENT (LC_NUMERIC, THOUSANDS_SEP))) <= 0)
+    thousands_sep = (wchar_t) *_NL_CURRENT (LC_NUMERIC, THOUSANDS_SEP);
+  grouping = _NL_CURRENT (LC_NUMERIC, GROUPING);
   if (*grouping == '\0' || thousands_sep == L'\0')
     grouping = NULL;
 
diff --git a/stdio/vfscanf.c b/stdio/vfscanf.c
index 10baa94..47781ed 100644
--- a/stdio/vfscanf.c
+++ b/stdio/vfscanf.c
@@ -17,7 +17,7 @@ not, write to the Free Software Foundation, Inc., 675 Mass Ave,
 Cambridge, MA 02139, USA.  */
 
 #include <ansidecl.h>
-#include <localeinfo.h>
+#include "../locale/localeinfo.h"
 #include <errno.h>
 #include <limits.h>
 #include <ctype.h>
@@ -93,9 +93,9 @@ DEFUN(__vfscanf, (s, format, arg),
     }
 
   /* Figure out the decimal point character.  */
-  if (mbtowc(&decimal, _numeric_info->decimal_point,
-	     strlen(_numeric_info->decimal_point)) <= 0)
-    decimal = (wchar_t) *_numeric_info->decimal_point;
+  if (mbtowc(&decimal, _NL_CURRENT (LC_NUMERIC, DECIMAL_POINT),
+	     strlen (_NL_CURRENT (LC_NUMERIC, DECIMAL_POINT))) <= 0)
+    decimal = (wchar_t) *_NL_CURRENT (LC_NUMERIC, DECIMAL_POINT);
 
   c = inchar();