qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update. 

* locale/programs/charmap.c (charmap_read): Find charmap also in
	the standard directory.
This commit is contained in:
Ulrich Drepper 2000-02-17 07:36:53 +00:00
parent f065a05b69
commit b2386e4ed4
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,8 @@
2000-02-16 Ulrich Drepper <drepper@redhat.com> 2000-02-16 Ulrich Drepper <drepper@redhat.com>
* locale/programs/charmap.c (charmap_read): Find charmap also in
the standard directory.
* sysdeps/unix/sysv/linux/powerpc/mmap64.c: Correct prototype for * sysdeps/unix/sysv/linux/powerpc/mmap64.c: Correct prototype for
__syscall_mmap2. __syscall_mmap2.

9
locale/programs/charmap.c
View File

@ -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);
}
} }
} }