Update.

2001-04-25  Ulrich Drepper  <drepper@redhat.com>

	* locale/programs/localedef.c (main): Always set a file name for
	the initial locale.
	* locale/programs/locfile.c (locfile_read): filename is allowed to
	be NULL.

diff --git a/ChangeLog b/ChangeLog
index 12890ec0dd67799bed5ea392c67c1f7a35bebea2..11de345a2a1b04127f7736dc5946a8c9f2a59abc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-04-25  Ulrich Drepper  <drepper@redhat.com>
+
+       * locale/programs/localedef.c (main): Always set a file name for
+       the initial locale.
+       * locale/programs/locfile.c (locfile_read): filename is allowed to
+       be NULL.
+
 2001-04-12  Paul Bame  <paul_bame@hp.com>
 
        * sysdeps/hppa/fpu/fclrexcpt.c: Clear the exception flags, not the

diff --git a/locale/programs/localedef.c b/locale/programs/localedef.c
index f57c46714ca6dab6585e56bf92093e749854299f..4f46d3d98792c7676727135e137d21aab91cbb94 100644 (file)
--- a/locale/programs/localedef.c
+++ b/locale/programs/localedef.c
@@ -194,7 +194,7 @@ main (int argc, char *argv[])
 
   /* Add the first entry in the locale list.  */
   memset (&global, '\0', sizeof (struct localedef_t));
-  global.name = input_file;
+  global.name = input_file ?: "/dev/stdin";
   global.needed = ALL_LOCALES;
   locales = &global;
 

diff --git a/locale/programs/locfile.c b/locale/programs/locfile.c
index 4dafaef19f2087a49e62913e8f6df63487e25197..7c724e292fe3af975ffa8e569ba3c7325ca7bb94 100644 (file)
--- a/locale/programs/locfile.c
+++ b/locale/programs/locfile.c
@@ -51,7 +51,7 @@ locfile_read (struct localedef_t *result, struct charmap_t *charmap)
   ldfile = lr_open (filename, locfile_hash);
   if (ldfile == NULL)
     {
-      if (filename[0] != '/')
+      if (filename != NULL && filename[0] != '/')
        {
          char *i18npath = getenv ("I18NPATH");
          if (i18npath != NULL && *i18npath != '\0')