mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-02 01:40:07 +00:00
a5a0310d8e
1997-09-30 18:03 Ulrich Drepper <drepper@cygnus.com> * Makerules: Undo last change. * csu/Makefile: Define before-compile at the right place. * aclocal.m4: Remove a.out file created by assembler test. * set-init.c: Find set-hooks.h using <...>. Update to db 2.3.10. * db2/Makefile: Update. * db2/db.h: Likewise. * db2/db_185.h: Likewise. * db2/db_int.h: Likewise. * db2/btree/bt_close.c: Likewise. * db2/btree/bt_conv.c: Likewise. * db2/btree/bt_cursor.c: Likewise. * db2/btree/bt_put.c: Likewise. * db2/btree/bt_rec.c: Likewise. * db2/btree/bt_recno.c: Likewise. * db2/btree/btree.src: Likewise. * db2/btree/btree_auto.c: Likewise. * db2/clib/getlong.c: Likewise. * db2/db/db.c: Likewise. * db2/db/db_auto.c: Likewise. * db2/db/db_conv.c: Likewise. * db2/db/db_pr.c: Likewise. * db2/db/db_ret.c: Likewise. * db2/db/db_thread.c: Likewise. * db2/hash/hash.c: Likewise. * db2/hash/hash_auto.c: Likewise. * db2/hash/hash_conv.c: Likewise. * db2/hash/hash_dup.c: Likewise. * db2/hash/hash_func.c: Likewise. * db2/hash/hash_page.c: Likewise. * db2/hash/hash_rec.c: Likewise. * db2/include/btree.h: Likewise. * db2/include/btree_ext.h: Likewise. * db2/include/db.h.src: Likewise. * db2/include/db_185.h.src: Likewise. * db2/include/db_cxx.h: Likewise. * db2/include/db_ext.h: Likewise. * db2/include/db_int.h.src: Likewise. * db2/include/db_page.h: Likewise. * db2/include/db_shash.h: Likewise. * db2/include/lock.h: Likewise. * db2/include/log.h: Likewise. * db2/include/log_ext.h: Likewise. * db2/include/mp.h: Likewise. * db2/include/shqueue.h: Likewise. * db2/include/txn.h: Likewise. * db2/lock/lock.c: Likewise. * db2/lock/lock_deadlock.c: Likewise. * db2/log/log.c: Likewise. * db2/log/log_archive.c: Likewise. * db2/log/log_auto.c: Likewise. * db2/log/log_get.c: Likewise. * db2/log/log_put.c: Likewise. * db2/log/log_register.c: Likewise. * db2/mp/mp_bh.c: Likewise. * db2/mp/mp_fget.c: Likewise. * db2/mp/mp_fopen.c: Likewise. * db2/mp/mp_fput.c: Likewise. * db2/mp/mp_fset.c: Likewise. * db2/mp/mp_open.c: Likewise. * db2/mutex/mutex.c: Likewise. * db2/os/db_os_dir.c: Likewise. * db2/progs/db_checkpoint/db_checkpoint.c: Likewise. * db2/progs/db_deadlock/db_deadlock.c: Likewise. * db2/progs/db_dump185/db_dump185.c: Likewise. * db2/progs/db_load/db_load.c: Likewise. * db2/progs/db_recover/db_recover.c: Likewise. * db2/txn/txn.c: Likewise. * db2/txn/txn_auto.c: Likewise. * elf/link.h: Define struct libname_list outside struct link_map to not confuse C++ compilers. * include/features.h: Recognize _XOPEN_SOURCE == 500 and set __USE_UNIX98. * manual/creature.texi: Explain this. * libc.map: Add new functions. * libio/Makefile (routines): Add fseeko and ftello. * libio/ftello.c: New file. * libio/fseeko.c: New file. * libio/stdio.h: Add prototypes for new functions. * manual/stdio.texi: Document fseeko and ftello. * posix/Makefile (routines): Add pread and pwrite. * sysdeps/posix/pread.c: New file. * sysdeps/posix/pwrite.c: New file. * sysdeps/stub/pread.c: New file. * sysdeps/stub/pwrite.c: New file. * posix/unistd.h: Add prototypes for pread and pwrite. Pretty print header. Define gid_t, uid_t, off_t, pid_t if __USE_UNIX98. Declare ctermid and cuserid if __USE_UNIX98. (swab): Change to take void * arguments. * string/swab.c: Change parameter to void *. * posix/sys/types: Define gid_t, uid_t, off_t, pid_t only if not already happened. * manual/llio.texi: Document pread and pwrite. * string/strings.h: Don't simply include string.h. Define BSD functions according to Unix98. * stdlib/tst-strtol.c: Include <string.h> not <strings.h>. * sunrpc/clnt_simp.c: Likewise. * malloc/Makefile (aux): Add set-freeres. * malloc/mtrace.c: Define function release_libc_mem which calls the __libc_subfreeres handler. (mtrace): Register release_libc_mem. * malloc/set-freeres.c: New file. * intl/dcgettext.c: Define free_mem function and add to __libc_subfreeres list. * intl/finddomain.c: Likewise. * intl/gettextP.h (struct loaded_domain): Add new fields use_mmap and mmap_size. Add prototype for _nl_unloaded_domain. * intl/loadmsgcat.c: Define new function _nl_unload_domain. (_nl_load_domain): Store informaiton about mmap use and file size. * intl/localealias.c (read_alias_file): Optimize locale alias file reading by avoid frequen mallocs. Define free_mem function and add to __libc_subfreeres list. * locale/localeinfo.h: Make a difference between MAX_USAGE_COUNT and undeletable. Add prototype for _nl_unload_locale. * locale/C-collate: Mark data as undeletable by using UNDELETABLE. * locale/C-ctype: Likewise. * locale/C-messages: Likewise. * locale/C-monetary: Likewise. * locale/C-numeric: Likewise. * locale/C-time: Likewise. * locale/findlocale.c (_nl_find_locale, _nl_remove_locale): Handle MAX_USAGE_COUNT and UNDELETABLE. (free_mem): New function. Add it to __libc_subfreeres list. * locale/loadlocale.c: Define _nl_unload_locale function. * misc/hsearch.c: Register hdestroy in __libc_subfreeres list. * stdlib/fmtmsg.c (addseverity): Handle illegal severity arguments correctly Define free_mem function and add to __libc_subfreeres list. * locale/programs/localedef.c (options): short form os verbose is v. Reported by Andreas Jaeger. * misc/sys/select.h: Define pselect only is __USE_POSIX since this header is used in some others as well for historical reasons. * resolv/resolv.h: Include <netinet/in.h> to make self-contained. * string/bits/string2.h: Add missing braces and optimize strcmp a bit more. * sysdeps/i386/i486/bits/string.h: Likewise. * sunrpc/rpc/auth_des.h: Include rpc/auth.h to be self-contained. Pretty print. * sysdeps/mach/hurd/cthreads.c: Add copyright text. * sysdeps/unix/sysv/linux/syscalls.list: Correct prctl entry. * sysdeps/unix/sysv/linux/sys/mman.h: Get definition of size_t. * time/time.h: Pretty print. 1997-09-29 Paul Eggert <eggert@twinsun.com> * time/strftime.c: Synchronize with GNU Emacs strftime.c. (HAVE_MEMCPY): Define if emacs is defined and HAVE_BCOPY isn't. (gmtime_r, localtime_r): Undef before defining. (iso_week_days): Use __inline__, not inline. 1997-09-27 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/m68k/fpu/bits/mathinline.h: Rename exp2{,l,f} to __ieee754_exp2{,l,f}. * sysdeps/m68k/fpu/s_exp2.c: Likewise. * sysdeps/m68k/fpu/s_exp2l.c: Likewise. * sysdeps/m68k/fpu/s_exp2f.c: Likewise. 1997-09-27 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * elf/soinit.c (__EH_FRAME_BEGIN__): Don't make the .eh_frame section read-only, it contains relocations. * elf/sofini.c (__FRAME_END__): Likewise. 1997-09-29 03:08 Ulrich Drepper <drepper@cygnus.com> * sysdeps/i386/i486/bits/string.h [__PIC__] (__strspn_cg, __strcspn_cg, __strpbrk_cg, __strstr_cg): Optimize even more. No spill register needed. Patch by NIIBE Yutaka <gniibe@mri.co.jp>. 1997-09-28 08:27 Thorsten Kukuk <kukuk@vt.uni-paderborn.de> * nis/nis_call.c (__do_niscall2): Fix return code, add missing break in switch case. * nis/nis_mkdir.c: Fix return codes to match Solaris version. * nis/nis_rmdir.c: Likewise. * nis/rpcsvc/yp_prot.h: Rename struct keydat to struct keydat_t for C++. 1997-09-28 04:32 Ulrich Drepper <drepper@cygnus.com> * configure.in: Fix typo. Patch by Zack Weinberg <zack@rabi.phys.columbia.edu>. 1997-09-25 20:14 Philip Blundell <Philip.Blundell@pobox.com> * sysdeps/unix/sysv/linux/scsi/sg.h: New file. * sysdeps/unix/sysv/linux/Makefile: Install <scsi/sg.h>.
235 lines
6.0 KiB
C
235 lines
6.0 KiB
C
/* Functions to read locale data files.
|
|
Copyright (C) 1996, 1997 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1996.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Library General Public License as
|
|
published by the Free Software Foundation; either version 2 of the
|
|
License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Library General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Library General Public
|
|
License along with the GNU C Library; see the file COPYING.LIB. If not,
|
|
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
Boston, MA 02111-1307, USA. */
|
|
|
|
#include <errno.h>
|
|
#include <fcntl.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
#include <sys/mman.h>
|
|
#include <sys/stat.h>
|
|
|
|
#include "localeinfo.h"
|
|
|
|
|
|
static const size_t _nl_category_num_items[] =
|
|
{
|
|
#define DEFINE_CATEGORY(category, category_name, items, a, b, c, d) \
|
|
[category] = _NL_ITEM_INDEX (_NL_NUM_##category),
|
|
#include "categories.def"
|
|
#undef DEFINE_CATEGORY
|
|
};
|
|
|
|
|
|
#define NO_PAREN(arg, rest...) arg, ##rest
|
|
|
|
#define DEFINE_CATEGORY(category, category_name, items, a, b, c, d) \
|
|
static const enum value_type _nl_value_type_##category[] = { NO_PAREN items };
|
|
#define DEFINE_ELEMENT(element, element_name, optstd, type, rest...) \
|
|
[_NL_ITEM_INDEX (element)] = type,
|
|
#include "categories.def"
|
|
#undef DEFINE_CATEGORY
|
|
|
|
static const enum value_type *_nl_value_types[] =
|
|
{
|
|
#define DEFINE_CATEGORY(category, category_name, items, a, b, c, d) \
|
|
[category] = _nl_value_type_##category,
|
|
#include "categories.def"
|
|
#undef DEFINE_CATEGORY
|
|
};
|
|
|
|
|
|
void
|
|
_nl_load_locale (struct loaded_l10nfile *file, int category)
|
|
{
|
|
int fd;
|
|
struct
|
|
{
|
|
unsigned int magic;
|
|
unsigned int nstrings;
|
|
unsigned int strindex[0];
|
|
} *filedata;
|
|
struct stat st;
|
|
struct locale_data *newdata;
|
|
int save_err;
|
|
int swap = 0;
|
|
int mmaped = 1;
|
|
size_t cnt;
|
|
inline unsigned int SWAP (const unsigned int *inw)
|
|
{
|
|
const unsigned char *inc = (const unsigned char *) inw;
|
|
if (!swap)
|
|
return *inw;
|
|
return (inc[3] << 24) | (inc[2] << 16) | (inc[1] << 8) | inc[0];
|
|
}
|
|
|
|
file->decided = 1;
|
|
file->data = NULL;
|
|
|
|
fd = __open (file->filename, O_RDONLY);
|
|
if (fd < 0)
|
|
/* Cannot open the file. */
|
|
return;
|
|
|
|
if (__fstat (fd, &st) < 0)
|
|
goto puntfd;
|
|
if (S_ISDIR (st.st_mode))
|
|
{
|
|
/* LOCALE/LC_foo is a directory; open LOCALE/LC_foo/SYS_LC_foo
|
|
instead. */
|
|
char *newp;
|
|
|
|
__close (fd);
|
|
|
|
newp = (char *) alloca (strlen (file->filename)
|
|
+ 5 + _nl_category_name_sizes[category] + 1);
|
|
__stpcpy (__stpcpy (__stpcpy (newp, file->filename), "/SYS_"),
|
|
_nl_category_names[category]);
|
|
|
|
fd = __open (newp, O_RDONLY);
|
|
if (fd < 0)
|
|
return;
|
|
|
|
if (__fstat (fd, &st) < 0)
|
|
goto puntfd;
|
|
}
|
|
|
|
/* Map in the file's data. */
|
|
save_err = errno;
|
|
#ifndef MAP_COPY
|
|
/* Linux seems to lack read-only copy-on-write. */
|
|
#define MAP_COPY MAP_PRIVATE
|
|
#endif
|
|
#ifndef MAP_FILE
|
|
/* Some systems do not have this flag; it is superfluous. */
|
|
#define MAP_FILE 0
|
|
#endif
|
|
#ifndef MAP_INHERIT
|
|
/* Some systems might lack this; they lose. */
|
|
#define MAP_INHERIT 0
|
|
#endif
|
|
filedata = (void *) __mmap ((caddr_t) 0, st.st_size, PROT_READ,
|
|
MAP_FILE|MAP_COPY|MAP_INHERIT, fd, 0);
|
|
if ((void *) filedata == MAP_FAILED)
|
|
{
|
|
if (errno == ENOSYS)
|
|
{
|
|
/* No mmap; allocate a buffer and read from the file. */
|
|
mmaped = 0;
|
|
filedata = malloc (st.st_size);
|
|
if (filedata != NULL)
|
|
{
|
|
off_t to_read = st.st_size;
|
|
ssize_t nread;
|
|
char *p = (char *) filedata;
|
|
while (to_read > 0)
|
|
{
|
|
nread = __read (fd, p, to_read);
|
|
if (nread <= 0)
|
|
{
|
|
free (filedata);
|
|
if (nread == 0)
|
|
__set_errno (EINVAL); /* Bizarreness going on. */
|
|
goto puntfd;
|
|
}
|
|
p += nread;
|
|
to_read -= nread;
|
|
}
|
|
}
|
|
else
|
|
goto puntfd;
|
|
__set_errno (save_err);
|
|
}
|
|
else
|
|
goto puntfd;
|
|
}
|
|
|
|
if (filedata->magic == LIMAGIC (category))
|
|
/* Good data file in our byte order. */
|
|
swap = 0;
|
|
else
|
|
{
|
|
/* Try the other byte order. */
|
|
swap = 1;
|
|
if (SWAP (&filedata->magic) != LIMAGIC (category))
|
|
/* Bad data file in either byte order. */
|
|
{
|
|
puntmap:
|
|
__munmap ((caddr_t) filedata, st.st_size);
|
|
puntfd:
|
|
__close (fd);
|
|
return;
|
|
}
|
|
}
|
|
|
|
#define W(word) SWAP (&(word))
|
|
|
|
if (W (filedata->nstrings) < _nl_category_num_items[category] ||
|
|
(sizeof *filedata + W (filedata->nstrings) * sizeof (unsigned int)
|
|
>= (size_t) st.st_size))
|
|
{
|
|
/* Insufficient data. */
|
|
__set_errno (EINVAL);
|
|
goto puntmap;
|
|
}
|
|
|
|
newdata = malloc (sizeof *newdata +
|
|
(_nl_category_num_items[category]
|
|
* sizeof (union locale_data_value)));
|
|
if (! newdata)
|
|
goto puntmap;
|
|
|
|
newdata->name = NULL; /* This will be filled if necessary in findlocale.c. */
|
|
newdata->filedata = (void *) filedata;
|
|
newdata->filesize = st.st_size;
|
|
newdata->mmaped = mmaped;
|
|
newdata->usage_count = 0;
|
|
newdata->nstrings = _nl_category_num_items[category];
|
|
for (cnt = 0; cnt < newdata->nstrings; ++cnt)
|
|
{
|
|
off_t idx = W (filedata->strindex[cnt]);
|
|
if (idx >= newdata->filesize)
|
|
{
|
|
free (newdata);
|
|
__set_errno (EINVAL);
|
|
goto puntmap;
|
|
}
|
|
if (_nl_value_types[category][cnt] == word)
|
|
newdata->values[cnt].word = W (*((u_int32_t *) (newdata->filedata
|
|
+ idx)));
|
|
else
|
|
newdata->values[cnt].string = newdata->filedata + idx;
|
|
}
|
|
|
|
__close (fd);
|
|
file->data = newdata;
|
|
}
|
|
|
|
void
|
|
_nl_unload_locale (struct locale_data *locale)
|
|
{
|
|
if (locale->mmaped)
|
|
__munmap ((caddr_t) locale->filedata, locale->filesize);
|
|
else
|
|
free ((void *) locale->filedata);
|
|
|
|
free (locale);
|
|
}
|