* locale/programs/xmalloc.c: Test _LIBC as well as STDC_HEADERS.

	* locale/programs/ld-collate.c (collate_finish): Use error_at_line
	instead of error_with_loc.

	* locale/weight.h: Use u_int32_t instead of u32_t.
	* string/strxfrm.c: Likewise.

	* string/strxfrm.c: Find weight.h in ../locale; don't #include
	"localeinfo.h".
	* string/strcoll.c: Likewise.

	* locale/programs/simple-hash.c, locale/programs/simple-hash.h,
 	locale/programs/xmalloc.c, locale/programs/xstrdup.c: Helper functions
 	for locale related programs.
 	locale/programs/charmap.c, locale/programs/charset.c,
 	locale/programs/charset.h, locale/programs/config.h,
 	locale/programs/ctypedump.c, 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/programs/linereader.c,
 	locale/programs/linereader.h, locale/programs/locale.c,
 	locale/programs/localedef.c, locale/programs/locales.h,
 	locale/programs/locfile-kw.gperf, locale/programs/locfile-kw.h,
 	locale/programs/locfile-token.h, locale/programs/locfile.c,
 	locale/programs/locfile.h, locale/programs/stringtrans.c,
 	locale/programs/stringtrans.h: Implementation of locale related
 	programs.

21 files changed, 801 insertions, 147 deletions

diff --git a/ChangeLog b/ChangeLog
index aedd2d0d90..2c683f8aed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
 Thu Mar 28 03:25:10 1996  Roland McGrath  <roland@charlie-brown.gnu.ai.mit.edu>
 
+	* locale/programs/xmalloc.c: Test _LIBC as well as STDC_HEADERS.
+
+	* locale/programs/ld-collate.c (collate_finish): Use error_at_line
+	instead of error_with_loc.
+
+	* locale/weight.h: Use u_int32_t instead of u32_t.
+	* string/strxfrm.c: Likewise.
+
+	* string/strxfrm.c: Find weight.h in ../locale; don't #include
+	"localeinfo.h".
+	* string/strcoll.c: Likewise.
+
 	* intl/Makefile (copysrc): Add missing > in sed cmd.
 
 Sat Mar 23 17:52:49 1996  Ulrich Drepper  <drepper@gnu.ai.mit.edu>
@@ -49,8 +61,9 @@ Sat Mar 23 17:52:49 1996  Ulrich Drepper  <drepper@gnu.ai.mit.edu>
 	_NL_CTYPE_MAP_NAMES, _NL_CTYPE_WIDTH): New internal values for
 	extended LC_CTYPE and LC_COLLATE implementation.
 
-	* locale/simple-hash.c, locale/simple-hash.h, locale/xmalloc.c,
- 	locale/xstrdup.c: Helper functions for locale related programs.
+	* locale/programs/simple-hash.c, locale/programs/simple-hash.h,
+ 	locale/programs/xmalloc.c, locale/programs/xstrdup.c: Helper functions
+ 	for locale related programs.
 
 	* locale/C-collate.c, locale/C-ctype.c,
         locale/C-messages.c, locale/C-monetary.c,
@@ -72,19 +85,19 @@ Sat Mar 23 17:52:49 1996  Ulrich Drepper  <drepper@gnu.ai.mit.edu>
 	for collation tables.
 
 	* locale/programs/charmap-kw.gperf, locale/programs/charmap-kw.h,
-        locale/programs/charmap.c, locale/programs/charset.c,
-        locale/programs/charset.h, locale/programs/config.h,
-        locale/programs/ctypedump.c, 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/programs/linereader.c,
-        locale/programs/linereader.h, locale/programs/locale.c,
-        locale/programs/localedef.c, locale/programs/locales.h,
-        locale/programs/locfile-kw.gperf, locale/programs/locfile-kw.h,
-        locale/programs/locfile-token.h, locale/programs/locfile.c,
-        locale/programs/locfile.h, locale/programs/stringtrans.c,
-        locale/programs/stringtrans.h: Implementation of locale related
-        programs.
+ 	locale/programs/charmap.c, locale/programs/charset.c,
+ 	locale/programs/charset.h, locale/programs/config.h,
+ 	locale/programs/ctypedump.c, 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/programs/linereader.c,
+ 	locale/programs/linereader.h, locale/programs/locale.c,
+ 	locale/programs/localedef.c, locale/programs/locales.h,
+ 	locale/programs/locfile-kw.gperf, locale/programs/locfile-kw.h,
+ 	locale/programs/locfile-token.h, locale/programs/locfile.c,
+ 	locale/programs/locfile.h, locale/programs/stringtrans.c,
+ 	locale/programs/stringtrans.h: Implementation of locale related
+ 	programs.
 
 	* locale/weight.h: Functions to access collation tables.
 
diff --git a/intl/bindtextdom.c b/intl/bindtextdom.c
index bd9f422654..7d62aa80f8 100644
--- a/intl/bindtextdom.c
+++ b/intl/bindtextdom.c
@@ -1,19 +1,23 @@
 /* bindtextdom.c -- implementation of the bindtextdomain(3) function
    Copyright (C) 1995 Free Software Foundation, Inc.
 
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
+This file is part of the GNU C Library.  Its master source is NOT part of
+the C library, however.  The master source lives in /gd/gnu/lib.
 
-This program is distributed in the hope that it will be useful,
+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 General Public License for more details.
+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 General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+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.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/intl/dcgettext.c b/intl/dcgettext.c
index 7562f69ab4..7d739d32c3 100644
--- a/intl/dcgettext.c
+++ b/intl/dcgettext.c
@@ -1,19 +1,23 @@
 /* dcgettext.c -- implementation of the dcgettext(3) function
    Copyright (C) 1995 Free Software Foundation, Inc.
 
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
+This file is part of the GNU C Library.  Its master source is NOT part of
+the C library, however.  The master source lives in /gd/gnu/lib.
 
-This program is distributed in the hope that it will be useful,
+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 General Public License for more details.
+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 General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+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.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/intl/dgettext.c b/intl/dgettext.c
index 2fde6770f7..ef214d0f03 100644
--- a/intl/dgettext.c
+++ b/intl/dgettext.c
@@ -1,19 +1,23 @@
 /* dgettext.c -- implementation of the dgettext(3) function
    Copyright (C) 1995 Software Foundation, Inc.
 
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
+This file is part of the GNU C Library.  Its master source is NOT part of
+the C library, however.  The master source lives in /gd/gnu/lib.
 
-This program is distributed in the hope that it will be useful,
+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 General Public License for more details.
+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 General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+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.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/intl/finddomain.c b/intl/finddomain.c
index 45773ee306..3ced26fa4b 100644
--- a/intl/finddomain.c
+++ b/intl/finddomain.c
@@ -2,24 +2,29 @@
    Copyright (C) 1995, 1996 Free Software Foundation, Inc.
    Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
 
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
+This file is part of the GNU C Library.  Its master source is NOT part of
+the C library, however.  The master source lives in /gd/gnu/lib.
 
-This program is distributed in the hope that it will be useful,
+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 General Public License for more details.
+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 General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+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.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 
+#include <ctype.h>
 #include <errno.h>
 #include <stdio.h>
 #include <sys/types.h>
diff --git a/intl/gettext.c b/intl/gettext.c
index 7bed6369b4..c789e227e6 100644
--- a/intl/gettext.c
+++ b/intl/gettext.c
@@ -1,19 +1,23 @@
 /* gettext.c -- implementation of gettext(3) function
    Copyright (C) 1995 Software Foundation, Inc.
 
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
+This file is part of the GNU C Library.  Its master source is NOT part of
+the C library, however.  The master source lives in /gd/gnu/lib.
 
-This program is distributed in the hope that it will be useful,
+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 General Public License for more details.
+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 General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+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.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/intl/gettext.h b/intl/gettext.h
index 5190f09447..6c6cfcd2d5 100644
--- a/intl/gettext.h
+++ b/intl/gettext.h
@@ -1,20 +1,23 @@
 /* gettext.h - internal header for GNU gettext internationalization functions
    Copyright (C) 1995 Software Foundation, Inc.
 
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
+This file is part of the GNU C Library.  Its master source is NOT part of
+the C library, however.  The master source lives in /gd/gnu/lib.
 
-This program is distributed in the hope that it will be useful,
+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 General Public License for more details.
+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., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+not, write to the Free Software Foundation, Inc., 675 Mass Ave,
+Cambridge, MA 02139, USA.  */
 
 #ifndef _GETTEXT_H
 #define _GETTEXT_H 1
diff --git a/intl/gettextP.h b/intl/gettextP.h
index 7c74f6c9ab..34196a0859 100644
--- a/intl/gettextP.h
+++ b/intl/gettextP.h
@@ -1,19 +1,23 @@
 /* gettextP.h -- header describing internals of gettext library
-   Copyright (C) 1995 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1996 Free Software Foundation, Inc.
 
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
+This file is part of the GNU C Library.  Its master source is NOT part of
+the C library, however.  The master source lives in /gd/gnu/lib.
 
-This program is distributed in the hope that it will be useful,
+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 General Public License for more details.
+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 General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+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.  */
 
 #ifndef _GETTEXTP_H
 #define _GETTEXTP_H
@@ -46,7 +50,7 @@ SWAP (i)
 struct loaded_domain
 {
   struct loaded_domain *next;
-  struct loaded_domain *successor[31];
+  struct loaded_domain *successor[63];
 
   const char *filename;
   int decided;
diff --git a/intl/hash-string.h b/intl/hash-string.h
index ef1f448d86..c0c5915767 100644
--- a/intl/hash-string.h
+++ b/intl/hash-string.h
@@ -1,19 +1,23 @@
 /* hash-string - Implements a string hashing function.
    Copyright (C) 1995 Free Software Foundation, Inc.
 
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
+This file is part of the GNU C Library.  Its master source is NOT part of
+the C library, however.  The master source lives in /gd/gnu/lib.
 
-This program is distributed in the hope that it will be useful,
+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 General Public License for more details.
+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 General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+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.  */
 
 #ifdef HAVE_VALUES_H
 # include <values.h>
diff --git a/intl/libintl.h b/intl/libintl.h
index 8e5b8f9e69..effb7c2e81 100644
--- a/intl/libintl.h
+++ b/intl/libintl.h
@@ -1,9 +1,11 @@
 /* libgettext.h -- Message catalogs for internationalization.
 Copyright (C) 1995 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
 Contributed by Ulrich Drepper.
 This file is derived from the file libgettext.h in the GNU gettext package.
 
+This file is part of the GNU C Library.  Its master source is NOT part of
+the C library, however.  The master source lives in /gd/gnu/lib.
+
 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
@@ -16,8 +18,8 @@ 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., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+not, write to the Free Software Foundation, Inc., 675 Mass Ave,
+Cambridge, MA 02139, USA.  */
 
 #ifndef _LIBINTL_H
 #define _LIBINTL_H	1
diff --git a/intl/loadmsgcat.c b/intl/loadmsgcat.c
index d98f365bf9..0f5bfd5b9d 100644
--- a/intl/loadmsgcat.c
+++ b/intl/loadmsgcat.c
@@ -1,19 +1,23 @@
 /* loadmsgcat.c -- load needed message catalogs
    Copyright (C) 1995 Software Foundation, Inc.
 
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (a