diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2002-04-04 05:10:14 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2002-04-04 05:10:14 +0000 |
| commit | 4a10c7fec7babe4b74d070c1d5ff575ca8abe31b (patch) | |
| tree | 34675dfc790492933ec70351e75438fbdd6279a8 /locale/programs | |
| parent | 87c9379402f3d91373438919f77f693f59ceafe1 (diff) | |
| download | glibc-4a10c7fec7babe4b74d070c1d5ff575ca8abe31b.tar.gz glibc-4a10c7fec7babe4b74d070c1d5ff575ca8abe31b.tar.xz glibc-4a10c7fec7babe4b74d070c1d5ff575ca8abe31b.zip | |
Update.
2002-04-03 Ulrich Drepper <drepper@redhat.com> * locale/programs/charmap.c (charmap_read): If the charmap doesn't define a code_set_name provide one based on the filename. * malloc/hooks.c: Define weak_variable correctly for _LIBC. 2001-12-28 Andreas Jaeger <aj@suse.de> * time/mktime.c (__mktime_internal): Check for year < 70 [PR libc/2738]. * sysdeps/generic/w_lgamma.c: Initialized local_signgam. * sysdeps/generic/w_lgammaf.c: Likewise. * sysdeps/generic/w_lgammal.c: Likewise [PR libc/2854]. * debug/catchsegv.sh (exval): Quote [ in pattern [PR libc/2902]. Adjust for new output format of the backtrace functions. * misc/syslog.c (vsyslog): Only use cleanup handler if _LIBC_REENTRANT is defined [PR libc/2924]. * sysdeps/s390/s390-64/bits/byteswap.h: Likewise [PR libc/2757].
Diffstat (limited to 'locale/programs')
| -rw-r--r-- | locale/programs/charmap.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/locale/programs/charmap.c b/locale/programs/charmap.c index ee755ba50a..82d5fb349f 100644 --- a/locale/programs/charmap.c +++ b/locale/programs/charmap.c @@ -194,6 +194,11 @@ character map file `%s' not found"), filename)); default character map file `%s' not found"), DEFAULT_CHARMAP)); } + if (result->code_set_name == NULL) + /* The input file does not specify a code set name. This + shouldn't happen but we should cope with it. */ + result->code_set_name = basename (filename); + /* Test of ASCII compatibility of locale encoding. Verify that the encoding to be used in a locale is ASCII compatible, |