From b2386e4ed44e075f69ac9e768f266ee404ca6713 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Thu, 17 Feb 2000 07:36:53 +0000 Subject: [PATCH] Update. * locale/programs/charmap.c (charmap_read): Find charmap also in the standard directory. --- ChangeLog | 3 +++ locale/programs/charmap.c | 9 +++++++++ 2 files changed, 12 insertions(+) diff --git a/ChangeLog b/ChangeLog index e654e14..06133d7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2000-02-16 Ulrich Drepper + * locale/programs/charmap.c (charmap_read): Find charmap also in + the standard directory. + * sysdeps/unix/sysv/linux/powerpc/mmap64.c: Correct prototype for __syscall_mmap2. diff --git a/locale/programs/charmap.c b/locale/programs/charmap.c index b4bce4f..0c54c78 100644 --- a/locale/programs/charmap.c +++ b/locale/programs/charmap.c @@ -99,6 +99,15 @@ charmap_read (const char *filename) } } } + + if (cmfile == NULL) + { + /* Try the default directory. */ + char path[sizeof (CHARMAP_PATH) + strlen (filename) + 1]; + + stpcpy (stpcpy (stpcpy (path, CHARMAP_PATH), "/"), filename); + cmfile = lr_open (path, charmap_hash); + } } } -- 2.7.4