From: Ulrich Drepper <drepper@redhat.com>
Date: Wed, 25 Apr 2001 19:18:43 +0000 (+0000)
Subject: Update.
X-Git-Tag: cvs/glibc-2_2_3~13
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dcf56f424621f87405a5b1fcf46d5863fd7e9adc;p=thirdparty%2Fglibc.git

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 12890ec0dd6..11de345a2a1 100644
--- 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 f57c46714ca..4f46d3d9879 100644
--- 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 4dafaef19f2..7c724e292fe 100644
--- 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')