Skip to content

Commit

Permalink
Update.
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
Ulrich Drepper committed Apr 25, 2001
1 parent 69d8605 commit dcf56f4
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 2 deletions.
7 changes: 7 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion locale/programs/localedef.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion locale/programs/locfile.c
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down

0 comments on commit dcf56f4

Please sign in to comment.