diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2001-04-25 19:18:43 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2001-04-25 19:18:43 +0000 |
| commit | dcf56f424621f87405a5b1fcf46d5863fd7e9adc (patch) | |
| tree | 1f56b0c60695be17fb919068b4aeb8353eb9b8e2 | |
| parent | 69d8605e847999157ed38fdecc49dffb826cdd2a (diff) | |
| download | glibc-dcf56f424621f87405a5b1fcf46d5863fd7e9adc.tar.gz | |
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.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | locale/programs/localedef.c | 2 | ||||
| -rw-r--r-- | locale/programs/locfile.c | 2 |
3 files changed, 9 insertions, 2 deletions
@@ -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 f57c46714c..4f46d3d987 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 4dafaef19f..7c724e292f 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') |