mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-20 12:00:06 +00:00
dfd2257ad9
1997-10-12 05:09 Ulrich Drepper <drepper@cygnus.com> * libio/Makefile (routines): Remove iofprintf. * stdio-common/fprintf.c [USE_IN_LIBIO]: Define _IO_fprintf. * libio/filedoalloc.c: Use _G_stat64 instead of stat. * libio/fileops.c (_IO_file_open): Change to take extra argument indicating whether 32 or 64 bit mode is wanted. * libio/iofopen.c: Call _IO_file_open with extra argument set to 0. * libio/iofopen64.c: Call _IO_file_open with extra argument set to 0. * libio/iolibio.h (_IO_freopen, _IO_freopen64): Likewise. * libio/iofgetpos.c: Pretty print. * libio/iofgetpos64.c: Use _IO_fpos64_t for local variable `pos'. * manual/conf.texi: Document all the _SC_ and _CS_ constants. * manual/creature.texi: Document _LARGEFILE_SOURCE, _LARGEFILE64_SOURCE and _FILE_OFFSET_BITS. * manual/llio.texi: Document truncate and ftruncate. * manual/stdio.texi: Document positional parameters for printf. * math/Makefile (headers): Add tgmath.h. (libm-support): Remove s_lrint, s_llrint, s_lround, and s_llround and move to ... (libm-calls): ... here. Add scalbln, s_nextafterx and s_fma. * math/libm-test.c (lround_test, llround_test): Test for all FP formats by using FUNC(). * math/libm.map: Add fma, fmaf, fmal, nextafterx, nextafterxf, nextafterxl, scalbln, scalblnf, scalblnl, lrintf, lrintl, llrintf, llrintl, lroundf, lroundl, llroundf, and llroundl. * math/math.h: Document new platform specific macros from mathdef.h. Remove declaration of lrint, llrint, lround, and llround. * math/test-double.c: Define TEST_DOUBLE. * math/test-idouble.c: Likewise. * math/test-float.c: Define TEST_FLOAT. * math/test-ifloat.c: Likewise. * math/tgmath.h: New file. * math/bits/mathcalls.h: Add nextafterx, scalbln, fma, lrint, llrint, lround, and llround. Change second argument of scalbn to `int'. * sysdeps/libm-ieee754/s_fma.S: New file. * sysdeps/libm-ieee754/s_fmaf.S: New file. * sysdeps/libm-ieee754/s_fmal.S: New file. * sysdeps/libm-i387/s_fma.S: New file. * sysdeps/libm-i387/s_fmaf.S: New file. * sysdeps/libm-i387/s_fmal.S: New file. * sysdeps/libm-i387/s_llrint.S: Change to take double argument. * sysdeps/libm-i387/s_lrint.S: Likewise. * sysdeps/libm-i387/s_llrintf.S: New file. * sysdeps/libm-i387/s_llrintl.S: New file. * sysdeps/libm-i387/s_lrintf.S: New file. * sysdeps/libm-i387/s_lrintl.S: New file. * sysdeps/libm-ieee754/s_llrint.c: Remove version which works on 80bit double. * sysdeps/libm-ieee754/s_lrint.c: Likewise. * sysdeps/libm-ieee754/s_llrintf.S: New file. * sysdeps/libm-ieee754/s_llrintl.S: New file. * sysdeps/libm-ieee754/s_lrintf.S: New file. * sysdeps/libm-ieee754/s_lrintl.S: New file. * sysdeps/libm-i387/s_scalbln.c: New file. Empty file. * sysdeps/libm-i387/s_scalblnf.c: New file. Empty file. * sysdeps/libm-i387/s_scalblnl.c: New file. Empty file. * sysdeps/libm-i387/s_scalbn.c: Add scalbln as alias. * sysdeps/libm-i387/s_scalbnf.c: Add scalblnf as alias. * sysdeps/libm-i387/s_scalbnl.c: Add scalblnl as alias. * sysdeps/libm-ieee754/s_llround.c: Remove version which works on 80bit double. * sysdeps/libm-ieee754/s_lround.c: Likewise. * sysdeps/libm-ieee754/s_llroundf.c: Likewise. * sysdeps/libm-ieee754/s_llroundl.c: Likewise. * sysdeps/libm-ieee754/s_lroundf.c: Likewise. * sysdeps/libm-ieee754/s_lroundl.c: Likewise. * sysdeps/libm-ieee754/s_nextafterl.c: Add alias fo nextafterxl. * sysdeps/libm-ieee754/s_nextafterx.c: New file. * sysdeps/libm-ieee754/s_nextafterxf.c: New file. * sysdeps/libm-ieee754/s_nextafterxl.c: New file. * sysdeps/libm-ieee754/s_scalbln.c: New file. * sysdeps/libm-ieee754/s_scalblnf.c: New file. * sysdeps/libm-ieee754/s_scalblnl.c: New file. * sysdeps/libm-ieee754/s_scalbn.c: Change to take `int' as second arg. * sysdeps/libm-ieee754/s_scalbnf.c: Likewise. * sysdeps/libm-ieee754/s_scalbnl.c: Likewise. * stdlib/stdlib.h: Protect declarations of __strto*l_internal functions by #ifdefs since they are duplicated in inttypes.h. * sysdeps/wordsize-32/inttypes.h: Add definition of strtoimax and strtoumax plus needed declarations. * sysdeps/generic/confname.h (_SC_AIO_LISTIO_MAX): Fix typo. 1997-10-09 Andreas Jaeger <aj@arthur.rhein-neckar.de> * locale/programs/locfile.c (locfile_read): Correct while loop. * db2/makedb.c (main): Add missing parameter for error output. (process_input): Likewise. * resolv/gethnamaddr.c (getanswer): Rewrite a bit to avoid warning. 1997-10-12 05:05 Ulrich Drepper <drepper@cygnus.com> * libc-map: Add __bzero, __mempcpy. 1997-10-10 18:51 David S. Miller <davem@tanya.rutgers.edu> * sysdeps/unix/sysv/linux/sparc/bits/ioctls.h: Remove dependencies on kernel_termios.h 1997-10-09 10:24 Thorsten Kukuk <kukuk@vt.uni-paderborn.de> Add the changes from the Solaris 2.6 header files, use the new public defines/functions. * nis/nis_addmember.c: Updated. * nis/nis_checkpoint.c: Updated. * nis/nis_creategroup.c: updated. * nis/nis_destroygroup.c: Updated. * nis/nis_getservlist.c: Updated. * nis/nis_ismember.c: Updated. * nis/nis_lookup.c: Updated. * nis/nis_modify.c: Updated. * nis/nis_ping.c: Updated. * nis/nis_print.c: Updated. * nis/nis_print_group_entry.c: Updated. * nis/nis_remove.c: Updated. * nis/nis_removemember.c: Updated. * nis/nis_xdr.c: Updated. * nis/nss_nisplus/nisplus-alias.c: Updated. * nis/nss_nisplus/nisplus-ethers.c: Updated. * nis/nss_nisplus/nisplus-hosts.c: Updated. * nis/nss_nisplus/nisplus-network.c: Updated. * nis/nss_nisplus/nisplus-parser.c: Updated. * nis/nss_nisplus/nisplus-proto.c: Updated. * nis/nss_nisplus/nisplus-rpc.c: Updated. * nis/nss_nisplus/nisplus-service.c: Updated. * nis/rpcsvc/nis.h: Updated. * nis/rpcsvc/nis.x: Updated. * nis/rpcsvc/nis_object.x: Updated. * nis/rpcsvc/nis_tags.h: Updated. * nis/rpcsvc/nislib.h: Updated. * nis/lckcache.c: Removed, since Sun has dropped the directory signatures. The old cache version is now a security risk and not longer supported by Sun. * nis/nis_cache.c: Likewise. * nis/rpcsvc/nis_cache.h: Likewise. * nis/rpcsvc/nis_cache.x: Likewise. * nis/nis_call.c: Remove calls to the cache functions. * nis/libnsl.map: Remove cache and depending functions. * nis/nis_intern.h: Likewise. * nis/nis_add.c: Remove #include <rpcsvc/nislib.h>. * nis/nis_domain_of.c: Likewise. * nis/nis_domain_of_r.c: Likewise. * nis/nis_error.c: Likewise. * nis/nis_file.c: Likewise. * nis/nis_local_names.c: Likewise. * nis/nis_mkdir.c: Likewise. * nis/nis_rmdir.c: Likewise. * nis/nis_subr.c: Likewise. * nis/nis_verifygroup.c: Likewise. * nis/nis_clone.c: Removed, replaced by ... * nis/nis_clone_dir.c: New. * nis/nis_clone_obj.c: New. * nis/nis_clone_res.c: New. * nis/nis_table.c: Fixed bugs shown through the new clone functions. * nis/nis_defaults.c: Fixed a lot of race conditions. * nis/nis_free.c: Rewritten. * sunrpc/auth_des.c: Fix use of free'ed pointer. * nis/Makefile (libnsl-routines): Remove nis_clone, nis_cache and lckcache. Add nis_clone_dir, nis_clone_obj, and nis_clone_res. 1997-10-09 Andreas Jaeger <aj@arthur.rhein-neckar.de> * wctype/test_wctype.c (TEST): Add parens to avoid ambiguity. 1997-10-08 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * include/features.h: Don't crash if _XOPEN_SOURCE is defined to be empty. 1997-10-09 05:54 Ulrich Drepper <drepper@cygnus.com> * nss/digits_dots.c: Place `result' in resbuf and not in `buffer'. * nss/getXXbyYY_r.c: Make sure digits_dots.c sees `resbuf' as struct and not a pointer. Little optimizations. 1997-10-09 05:00 Ulrich Drepper <drepper@cygnus.com> * sysdeps/stub/getenv.c: Remove unused file. * sysdeps/stub/lxstat.c: Likewise. * sysdeps/stub/morecore.c: Likewise. * sysdeps/stub/putenv.c: Likewise. * sysdeps/stub/sbrk.c: Likewise. * sysdeps/stub/setenv.c: Likewise. * sysdeps/stub/sysd-stdio.c: Likewise. * sysdeps/stub/sysdep.h: Likewise. Reported by Zack Weinberg <zack@rabi.phys.columbia.edu>. 1997-10-09 04:58 Ulrich Drepper <drepper@cygnus.com> * configure.in: Add __bzero definition to DWARF2 unwind test. Reported by David S. Miller <davem@caip.rutgers.edu>. 1997-10-07 Paul Eggert <eggert@twinsun.com> * intl/loadmsgcat.c (_nl_load_domain): Fix &&/|| typo when checking file size. Check for overflow when stuffing off_t into size_t. 1997-10-07 18:11 Ulrich Drepper <drepper@cygnus.com> * time/africa: Update from tzdata1997i. 1997-10-07 Andreas Jaeger <aj@arthur.rhein-neckar.de> * posix/globtest.sh: Add arguments for name of dynamic linker and call dynamic linker to execute globtest. * posix/Makefile (tests): Supply arguments to globtest.sh. 1997-10-07 Andreas Jaeger <aj@arthur.rhein-neckar.de> * nis/rpcsvc/ypupd.h: Add missing __END_DECLS. 1997-10-03 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * libc.map: Add mempcpy, prctl. 1997-09-30 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/generic/memcmp.c: Avoid warnings. * sysdeps/generic/memset.c: Likewise. * sysdeps/generic/strchr.c: Likewise. * sysdeps/generic/strlen.c: Likewise. 1997-09-29 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * malloc/Makefile ($(objpfx)mtrace): Fix typo. 1997-09-29 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/m68k/dl-machine.h (elf_machine_rela): Fix last change. The R_68K_GLOB_DAT and R_68K_JMP_SLOT relocations really ignore the addend, Richard. (elf_machine_fixup_plt): Don't add the addend. (elf_machine_plt_value): New function. * sysdeps/alpha/dl-machine.h (elf_machine_plt_value): New function. * sysdeps/sparc/sparc32/dl-machine.h (elf_machine_plt_value): New function. * sysdeps/sparc/sparc64/dl-machine.h (elf_machine_plt_value): New function. * sysdeps/powerpc/dl-machine.h (elf_machine_plt_value): New function. * sysdeps/i386/dl-machine.h (elf_machine_plt_value): New function. * elf/dl-runtime.c (fixup, profile_fixup): Don't add in the addend, instead let the machine dependent setup decide. 1997-09-20 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/m68k/m68020/bits/string.h: New file. 1997-10-07 04:27 Richard Henderson <rth@cygnus.com> * Makeconfig (+includes): Add -I$(objpfx). * stdlib/longlong.h [__sparc__]: Prototype __udiv_qrnnd. * sysdeps/alpha/setjmp.S: __setjmp is the same as _setjmp. Make the former a strong symbol and the later a weak alias. * sysdeps/sparc/sparc32/setjmp.S: Likewise. * sysdeps/unix/sysv/linux/sparc/sparc64/setjmp.S: Likewise. 1997-10-06 21:01 David S. Miller <davem@tanya.rutgers.edu> * sysdeps/unix/sysv/linux/sparc/sparc64/bits/types.h: Make ino_t 64-bits. * sysdeps/unix/sysv/linux/sparc/sparc64/kernel_stat.h: Make st_ino member 64-bits as well, to match the kernel. 1997-10-06 19:35 Ulrich Drepper <drepper@cygnus.com> * sysdeps/sparc/sparc64/sub_n.S: Fix typo. Patch by Jakub Jelinek <jj@sunsite.ms.mff.cuni.cz>. 1997-10-06 01:09 Zack Weinberg <zack@rabi.phys.columbia.edu> * time/README: Correct list of files from tzcode package. Add contact information for tzcode/tzdata maintainers. Correct spelling of author's name. Compact lists. 1997-10-06 01:48 Ulrich Drepper <drepper@cygnus.com> * malloc/malloc.h: Remove hook definition without caller argument. * malloc/malloc.c: Likewise. * string/tester.c: Correct strsep test. * string/bits/string2.h: Define __string2_1bptr_p and use it. Patch by David S. Miller <davem@tanya.rutgers.edu>. * math/Makefile (routines): Add s_clog10. * math/libm-test.c: Add test for clog10. * math/libm.map: Add clog10{,f,l}. * math/bits/cmathcalls.h [__USE_GNU]: Add clog10. * sysdeps/libm-ieee754/s_clog10.c: New file. * sysdeps/libm-ieee754/s_clog10f.c: New file. * sysdeps/libm-ieee754/s_clog10l.c: New file. * manual/math.texi: Describe clog10. * config.h.in: Add USE_REGPARMS and define internal_function based on this. * configure.in: Define USE_REGPARMS for ix86 machines. * gmon/gmon.c: Mark write_hist, write_call_graph and write_bb_counts as internal functions. * inet/getnameinfo.c: Likewise for nrl_domainname. * inet/getnetgrent_r.c: Likewise for __internal_setnetgrent_reuse. * inet/rcmd.c: Likewise for __icheckhost. * intl/dcgettext.c: Likewise for category_to_name and guess_category_value. * intl/localealias.c: Likewise for read_alias_file. * io/fts.c: Likewise for fts_alloc, fts_build, fts_lfree, fts_maxarglen, fts_padjust, fts_palloc, fts_sort, and fts_stat. * libio/genops.c: Likewise for save_for_backup. * malloc/malloc.c (chunk_free, chunk_alloc, chunk_realloc, chunk_align, main_trim, heap_trim): Likewise. * malloc/mtrace.c (tr_where): Likewise. * misc/fstab.c (mnt2fs): Likewise. * misc/getttyent.c (skip, value): Likewise. * misc/syslog.c (openlog_internal): Likewise. * misc/tsearch.c (trecurse, tdestroy_internal): Likewise. * nss/nsswitch.c (nss_lookup_function, nss_parse_file, nss_getline, nss_parse_service_list, nss_new_service): Likewise. * posix/wordexp.c (parse_dollars, parse_backtick, eval_expr): Likewise. * resolv/inet_ntop.c (inet_ntop4, inet_ntop6): Likewise. * resolv/inet_pton.c (inet_pton4, inet_pton6): Likewise. * resolv/res_init.c (res_setoptions): Likewise. * stdio-common/printf_fp.c (group_number): Likewise. * stdio-common/vfprintf.c (buffered_vfprintf, group_number): Likewise. * stdlib/fmtmsg.c (internal_addseverity): Likewise. * sunrpc/auth_des.c (synchronize): Likewise. * sunrpc/auth_unix.c (marshal_new_auth): Likewise. * sunrpc/clnt_perr.c (auth_errmsg): Likewise. * sunrpc/key_call.c (key_call): Likewise. * sunprc/pmap_rmt.c (getbroadcastnets): Likewise. * sunrpc/svc_tcp.c (makefd_xprt): Likewise. * sunrpc/svcauth_des.c (cache_init, cache_spot, cache_ref, invalidate): Likewise. * sunrpc/xdr_rec.c (fix_buf_size, skip_input_bytes, flush_out, set_input_fragment, get_input_bytes): Likewise. * sysdeps/unix/sysv/linux/getsysstats.c (get_proc_path, phys_pages_info): Likewise. * sysdeps/unix/sysv/linux/if_index.c (opensock): Likewise. * sysdeps/unix/sysv/linux/poll.c (__emulate_poll): Likewise. * sysdeps/unix/sysv/linux/readv.c (__atomic_readv_replacement): Likewise. * sysdeps/unix/sysv/linux/readv.c (__atomic_writev_replacement): Likewise. * time/strptime.c (strptime_internal): Likewise. * time/tzfile.c (find_transition, compute_tzname_max): Likewise. * time/tzset.c (compute_change, tz_compute, tzset_internal): Likewise. * libc.map: Remove _libio_using_thunks, add _fp_hw and _dl_addr. * ctype/ctype.h: Pretty print. * grp/grp.h: Likewise. * include/libc-symbols.h: Likewise. * include/limits.h: Likewise. * include/values.h: Likewise. * io/fcntl.h: Likewise. * io/sys/stat.h: Likewise. * libio/stdio.h: Likewise. * malloc/malloc.h: Likewise. * misc/err.h: Likewise. * misc/regexp.h: Likewise. * misc/sys/cdefs.h: Likewise. * misc/sys/file.h: Likewise. * posix/sys/utsname.h: Likewise. * posix/sys/wait.h: Likewise. * pwd/pwd.h: Likewise. * resolv/netdb.h: Likewise. * signal/signal.h: Likewise. * stdlib/stdlib.h: Likewise. * string/endian.h: Likewise. * string/memory.h: Likewise. * sysdeps/mach/hurd/bits/fcntl.h: Likewise. * sysdeps/mach/hurd/sys/param.h: Likewise. * sysdeps/unix/sysv/linux/sys/param.h: Likewise. * termios/termios.h: Likewise. * wcsmbs/wchar.h: Likewise. * wctype/wctype.h: Likewise. * sysdeps/unix/bsd/bsd4.4/wait3.c: Use __WAIT_STATUS in definition. Implement Large File Support API. * include/features.h: Add suuport for _LARGEFILE_SOURCE, _LARGEFILE64_SOURCE, and _FILE_OFFSET_BITS. * libc.map: Add new functions for LFS. * dirent/Makefile (routines): Add readdir64 and readdir64_r. * dirent/dirent.h: Update readdir prototype for LFS and add new prototypes for above functions. * io/Makefile (routines): Add xstat64, fxstat64, lxstat64, statfs64, fstatfs64, lstat64, open64, lseek64, creat64, and ftw64. * io/creat64.c: New file. * io/fstat64.c: New file. * io/lstat64.c: New file. * io/stat64.c: New file. * io/ftw64.c: New file. * io/ftw.c: Rewrite to allow easy definition of ftw64. * io/ftw.h: Add LFS interface. * io/fcntl.h: Likewise. * io/sys/stat.h: Likewise. * io/sys/statfs.h: Likewise. * libio/Makefile (routines): Add iofgetpos64, iofopen64, iofsetpos64, freopen64, fseeko64, and ftello64. * libcio/fseeko64.c: New file. * libio/ftello64.c: New file. * libio/iofgetpos64.c: New file. * libio/iofopen64.c: New file. * libio/iofsetpos64.c: New file. * libio/fileops.c (_IO_file_fopen): Change to use _IO_off64_t. (_IO_file_attach): Likewise. (_IO_do_write): Likewise. (_IO_file_sync): Likewise. (_IO_file_seek): Likewise. (_IO_file_seekoff): Likewise. Use _G_stat64. (_IO_file_fopen64): New function. (_IO_file_jumps): Initialize showmanyc and imbue. * libio/genops.c (_IO_default_seekpos): Change to use _IO_fpos64_t. (_IO_default_seekoff): Likewise. (_IO_default_seek): Likewise. (_IO_default_showmanyc, _IO_default_imbue): New functions. * libio/iofopncook.c (_IO_cookie_seek): Change to use _IO_off64_t. * libio/iolibio.h: Add prototypes for LFS functions. * libio/ioseekoff.c: Change to use _IO_fpos64_t. * libio/ioseekpos.c: Likewise. * libio/libio.h: Define _IO_fpos64_t and _IO_off64_t. (_IO_FILE): Move _offset field to end and change type to _IO_off64_t. (_IO_seekoff, _IO_seekpos): Change prototype. * libio/libioP.h (_IO_seekoff_t, _IO_seekpos_t, _IO_seek_t): Change to use _IO_off64_t. Change prototypes for function from the *ops.c files. * libio/stdio.h: Add LFS interface definition. * libio/strops.c (_IO_str_seekoff): Change to use _IO_fpos64_t. * posix/Makefile (routines): Add pread64 and pwrite64. * posix/confstr.c: Handle _CS_LFS* requests. * posix/getconf.c: Handle LFS* requests. * sysdeps/generic/confname.h: Add _CS_LFS* constants. * posix/unistd.h: Document _LFS64_LARGEFILE and _LFS64_STDIO. Define off_t and off64_t appropriately. Change prototypes of LFS functions. * posix/sys/types.h: Add LFS types. * resources/Makefile (routines): Add getrlimit64 and setlimit64. * resource/sys/resource.h: Change prototypes of LFS functions. * stdio-common/Makefile (routines): Add tmpfile64. * stdio-common/tmpfile64.c: New file. * sysdeps/generic/_G_config.h: Define _G_fpos64_t and _G_off64_t. Define _G_OPEN64, _G_LSEEK64, _G_FSTAT64. * sysdeps/unix/sysv/linux/_G_config.h: Likewise. * sysdeps/generic/bits/resource.h: Add LFS definitions. * sysdeps/unix/bsd/sun/sunos4/bits/resource.h: Likewise. * sysdeps/unix/sysv/linux/bits/resource.h: Likewise. * sysdeps/generic/statfs.h: Use __fsblkcnt_t for some of the fields. * sysdeps/unix/sysv/linux/bits/statfs.h: Likewise. * sysdeps/unix/sysv/linux/mips/bits/statfs.h: Likewise. * sysdeps/generic/types.h: Define LFS types. * sysdeps/unix/sysv/linux/alpha/bits/types.h: Likewise. * sysdeps/unix/sysv/linux/bits/types.h: Likewise. * sysdeps/unix/sysv/linux/sparc/sparc64/bits/types.h: Likewise. * sysdeps/generic/sys/mman.h: Add LFS definitions. * sysdeps/unix/sysv/linux/sys/mman.h: Likewise. * sysdeps/generic/mach/hurd/bits/fcntl.h: Add flock LFS extensions. * sysdeps/unix/bsd/bits/fcntl.h: Likewise. * sysdeps/unix/sysv/linux/alpha/bits/fcntl.h: Likewise. * sysdeps/unix/sysv/linux/bits/fcntl.h: Likewise. * sysdeps/unix/sysv/linux/mips/bits/fcntl.h: Likewise. * sysdeps/generic/mach/hurd/bits/stat.h: Add stat LFS extensions. * sysdeps/unix/bsd/bits/stat.h: Likewise. * sysdeps/unix/bsd/osf/alpha/bits/stat.h: Likewise. * sysdeps/unix/sysv/linux/alpha/bits/stat.h: Likewise. * sysdeps/unix/sysv/linux/bits/stat.h: Likewise. * sysdeps/unix/sysv/linux/mips/bits/stat.h: Likewise. * sysdeps/unix/sysv/linux/sparc/bits/stat.h: Likewise. * sysdeps/unix/sysv/sysv4/i386/bits/stat.h: Likewise. * sysdeps/unix/sysv/sysv4/solaris2/bits/stat.h: Likewise. * sysdeps/posix/open64.c: New file. * sysdeps/stub/fstatfs64.c: New file. * sysdeps/stub/fxstat64.c: New file. * sysdeps/stub/getrlimit64.c: New file. * sysdeps/stub/lseek64.c: New file. * sysdeps/stub/lxstat64.c: New file. * sysdeps/stub/open64.c: New file. * sysdeps/stub/pread64.c: New file. * sysdeps/stub/pwrite64.c: New file. * sysdeps/stub/readdir64.c: New file. * sysdeps/stub/readdir64_r.c: New file. * sysdeps/stub/setrlimit64.c: New file. * sysdeps/stub/statfs64.c: New file. * sysdeps/stub/xstat64.c: New file. * sysdeps/unix/sysv/linux/llseek.c: Define as __llseek and make llseek and lseek64 weak aliases. * sysdeps/unix/sysv/linux/lseek64.c: New file. Empty. * sysdeps/unix/sysv/linux/alpha/bits/dirent.h: New file. * sysdeps/unix/sysv/linux/bits/dirent.h: Add LFS definitions. * sysdeps/posix/tempname.c: Add extra argument to trigger use of open64. * sysdeps/stub/tempname.c: Likewise. * stdio-common/tempnam.c: Call __stdio_gen_tempname with extra argument. * stdio-common/tmpfile.c: Likewise. * stdio-common/tmpnam.c: Likewise. * stdio-common/tmpnam_r.c: Likewise. * libio/libioP.h: Add definition ofr showmanyc and imbue callbacks. * libio/fileops.c (_IO_file_jumps): Initialize showmanyc and imbue. * libio/iofopncook.c (_IO_cookie_jumps): Likewise. * libio/iopopen.c (_IO_proc_jumps): Likewise. * libio/memstream.c (_IO_mem_jumps): Likewise. * libio/obprintf.c (_IO_obstack_jumps): Likewise. * libio/vsnprintf.c (_IO_strn_jumps): Likewise. * libio/strops.c (_IO_str_jumps): Likewise. * manual/arith.texi: Add a few words why cabs should be used. * manual/llio.texi: Describe sync, fsync, fdatasync. Tell about cleanup handlers & fcntl,lseek,write,read,close,open. * manual/process.texi: Tell about cleanup handlers & system,waitpid, wait. * manual/signal.texi: Likewise for pause. * manual/terminal.texi: Likewise for tcdrain. * manual/time.texi: Document nanosleep. * posix/exevp.c: Don't use nested function. * stdlib/ucontext.h: New file. * sysdeps/i386/sys/ucontext.h: New file. SysV/i386 API definitions. * sunrpc/xcrypt.c (hexval): Make a macro for efficiency. * sysdeps/i386/setjmp.h: Make `here` label local. * sysdeps/i386/elf/start.S: Define _fp_hw "variable". * sysdeps/stub/fstatfs.c: Correct warning. * sysdeps/stub/fxstat.c: Likewise. * sysdeps/stub/lxstat.c: Likewise. * sysdeps/unix/sysv/i386/i686/time.S: New file. 1997-10-03 20:56 Jason Merrill <jason@yorick.cygnus.com> * malloc/obstack.h (obstack_empty_p): New macro. 1997-10-04 17:41 Philip Blundell <Philip.Blundell@pobox.com> * inet/getnameinfo.c (getnameinfo): Remove spurious `#if INET6'. 1997-09-30 Zack Weinberg <zack@rabi.phys.columbia.edu> * maint.texi: Add copyright terms for libdb (Sleepycat, Harvard). Document new --with-binutils switch; delete reference to --with-gnu-as, --with-gnu-ld, --with-gnu-binutils. Add to description of --without-fp: a kernel FPU emulator is adequate (from FAQ) * INSTALL: Regenerated. 1997-09-30 17:29 Richard Henderson <rth@cygnus.com> * sysdeps/sparc/sparc32/dl-machine.h (elf_machine_rela): Move _dl_hwcap declaration to ... (elf_machine_fixup_plt): ... here.
1052 lines
26 KiB
C
1052 lines
26 KiB
C
/* 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. */
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
# include <config.h>
|
|
#endif
|
|
|
|
#include <errno.h>
|
|
#include <fcntl.h>
|
|
#include <locale.h>
|
|
#include <malloc.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
#include <sys/stat.h>
|
|
#include <sys/uio.h>
|
|
|
|
#include "locfile.h"
|
|
#include "linereader.h"
|
|
#include "localeinfo.h"
|
|
#include "locales.h"
|
|
|
|
|
|
/* Uncomment the following line in the production version. */
|
|
/* #define NDEBUG 1 */
|
|
#include <assert.h>
|
|
|
|
/* Define the lookup function. */
|
|
#include "locfile-kw.h"
|
|
|
|
|
|
/* Some useful macros. */
|
|
#define MIN(a, b) (__extension__ ({ typeof (a) _a = (a); \
|
|
typeof (b) _b = (b); \
|
|
_a < _b ? _a : _b; }))
|
|
|
|
|
|
void *xmalloc (size_t __n);
|
|
char *xstrdup (const char *__str);
|
|
|
|
struct localedef_t *
|
|
locfile_read (const char *filename, struct charset_t *charset)
|
|
{
|
|
struct linereader *ldfile;
|
|
struct localedef_t *result;
|
|
int state;
|
|
enum token_t expected_tok = tok_none;
|
|
const char *expected_str = NULL;
|
|
enum token_t ctype_tok_sym = tok_none;
|
|
const char *ctype_tok_str = NULL;
|
|
int copy_category = 0;
|
|
int cnt;
|
|
|
|
/* Allocate space for result. */
|
|
result = (struct localedef_t *) xmalloc (sizeof (struct localedef_t));
|
|
memset (result, '\0', sizeof (struct localedef_t));
|
|
|
|
ldfile = lr_open (filename, locfile_hash);
|
|
if (ldfile == NULL)
|
|
{
|
|
if (filename[0] != '/')
|
|
{
|
|
char *i18npath = __secure_getenv ("I18NPATH");
|
|
if (i18npath != NULL && *i18npath != '\0')
|
|
{
|
|
char path[strlen (filename) + 1 + strlen (i18npath) + 1];
|
|
char *next;
|
|
i18npath = strdupa (i18npath);
|
|
|
|
|
|
while (ldfile == NULL
|
|
&& (next = strsep (&i18npath, ":")) != NULL)
|
|
{
|
|
stpcpy (stpcpy (stpcpy (path, next), "/"), filename);
|
|
|
|
ldfile = lr_open (path, locfile_hash);
|
|
}
|
|
}
|
|
|
|
/* Test in the default directory. */
|
|
if (ldfile == NULL)
|
|
{
|
|
char path[strlen (filename) + 1 + sizeof (LOCSRCDIR)];
|
|
|
|
stpcpy (stpcpy (stpcpy (path, LOCSRCDIR), "/"), filename);
|
|
ldfile = lr_open (path, locfile_hash);
|
|
}
|
|
}
|
|
|
|
if (ldfile == NULL)
|
|
{
|
|
result->failed = 1;
|
|
return result;
|
|
}
|
|
}
|
|
|
|
#define HANDLE_COPY(category, token, string) \
|
|
if (nowtok == tok_copy) \
|
|
{ \
|
|
copy_category = category; \
|
|
expected_tok = token; \
|
|
expected_str = string; \
|
|
state = 8; \
|
|
continue; \
|
|
} \
|
|
++state
|
|
|
|
#define LOCALE_PROLOG(token, string) \
|
|
if (nowtok == tok_eol) \
|
|
/* Ignore empty lines. */ \
|
|
continue; \
|
|
if (nowtok == tok_end) \
|
|
{ \
|
|
expected_tok = token; \
|
|
expected_str = string; \
|
|
state = 4; \
|
|
continue; \
|
|
} \
|
|
if (nowtok == tok_copy) \
|
|
goto only_copy;
|
|
|
|
|
|
#define READ_STRING(fn, errlabel) \
|
|
do \
|
|
{ \
|
|
arg = lr_token (ldfile, charset); \
|
|
if (arg->tok != tok_string) \
|
|
goto errlabel; \
|
|
fn (ldfile, result, nowtok, arg, charset); \
|
|
lr_ignore_rest (ldfile, 1); \
|
|
} \
|
|
while (0)
|
|
|
|
#define READ_STRING_LIST(fn, errlabel) \
|
|
do \
|
|
{ \
|
|
arg = lr_token (ldfile, charset); \
|
|
while (arg->tok == tok_string) \
|
|
{ \
|
|
fn (ldfile, result, nowtok, arg, charset); \
|
|
arg = lr_token (ldfile, charset); \
|
|
if (arg->tok != tok_semicolon) \
|
|
break; \
|
|
arg = lr_token (ldfile, charset); \
|
|
} \
|
|
if (arg->tok != tok_eol) \
|
|
goto errlabel; \
|
|
} \
|
|
while (0)
|
|
|
|
#define READ_NUMBER(fn, errlabel) \
|
|
do \
|
|
{ \
|
|
arg = lr_token (ldfile, charset); \
|
|
if (arg->tok != tok_minus1 && arg->tok != tok_number) \
|
|
goto errlabel; \
|
|
fn (ldfile, result, nowtok, arg, charset); \
|
|
lr_ignore_rest (ldfile, 1); \
|
|
} \
|
|
while (0)
|
|
|
|
#define READ_NUMBER_LIST(fn, errlabel) \
|
|
do \
|
|
{ \
|
|
arg = lr_token (ldfile, charset); \
|
|
while (arg->tok == tok_minus1 || arg->tok == tok_number) \
|
|
{ \
|
|
fn (ldfile, result, nowtok, arg, charset); \
|
|
arg = lr_token (ldfile, charset); \
|
|
if (arg->tok != tok_semicolon) \
|
|
break; \
|
|
arg = lr_token (ldfile, charset); \
|
|
} \
|
|
if (arg->tok != tok_eol) \
|
|
goto errlabel; \
|
|
} \
|
|
while (0)
|
|
|
|
#define SYNTAX_ERROR(string) \
|
|
lr_error (ldfile, string); \
|
|
lr_ignore_rest (ldfile, 0);
|
|
|
|
|
|
/* Parse locale definition file and store result in RESULT. */
|
|
state = 1;
|
|
while (1)
|
|
{
|
|
/* What's on? */
|
|
struct token *now = lr_token (ldfile, charset);
|
|
enum token_t nowtok = now->tok;
|
|
struct token *arg;
|
|
|
|
if (nowtok == tok_eof)
|
|
break;
|
|
|
|
switch (state)
|
|
{
|
|
case 1:
|
|
/* The beginning. We expect the special declarations, EOL or
|
|
the start of any locale. */
|
|
if (nowtok == tok_eol)
|
|
/* Ignore empty lines. */
|
|
continue;
|
|
|
|
switch (nowtok)
|
|
{
|
|
case tok_escape_char:
|
|
case tok_comment_char:
|
|
/* We need an argument. */
|
|
arg = lr_token (ldfile, charset);
|
|
|
|
if (arg->tok != tok_ident)
|
|
{
|
|
SYNTAX_ERROR (_("bad argument"));
|
|
continue;
|
|
}
|
|
|
|
if (arg->val.str.len != 1)
|
|
{
|
|
lr_error (ldfile, _("\
|
|
argument to `%s' must be a single character"),
|
|
nowtok == tok_escape_char ? "escape_char"
|
|
: "comment_char");
|
|
|
|
lr_ignore_rest (ldfile, 0);
|
|
continue;
|
|
}
|
|
|
|
if (nowtok == tok_escape_char)
|
|
ldfile->escape_char = *arg->val.str.start;
|
|
else
|
|
ldfile->comment_char = *arg->val.str.start;
|
|
break;
|
|
|
|
case tok_lc_ctype:
|
|
state = 2;
|
|
break;
|
|
|
|
case tok_lc_collate:
|
|
state = 10;
|
|
break;
|
|
|
|
case tok_lc_monetary:
|
|
state = 20;
|
|
break;
|
|
|
|
case tok_lc_numeric:
|
|
state = 30;
|
|
break;
|
|
|
|
case tok_lc_time:
|
|
state = 40;
|
|
break;
|
|
|
|
case tok_lc_messages:
|
|
state = 50;
|
|
break;
|
|
|
|
default:
|
|
SYNTAX_ERROR (_("\
|
|
syntax error: not inside a locale definition section"));
|
|
continue;
|
|
}
|
|
lr_ignore_rest (ldfile, 1);
|
|
continue;
|
|
|
|
case 2:
|
|
HANDLE_COPY (LC_CTYPE, tok_lc_ctype, "LC_CYTPE");
|
|
|
|
ctype_startup (ldfile, result, charset);
|
|
/* FALLTHROUGH */
|
|
|
|
case 3:
|
|
/* Here we accept all the character classes, tolower/toupper,
|
|
and following ANSI C:1995 self-defined classes. */
|
|
LOCALE_PROLOG (tok_lc_ctype, "LC_CTYPE");
|
|
|
|
if (nowtok == tok_charclass)
|
|
{
|
|
READ_STRING_LIST (ctype_class_new, bad_new_charclass);
|
|
continue;
|
|
bad_new_charclass:
|
|
SYNTAX_ERROR (_("\
|
|
syntax error in definition of new character class"));
|
|
continue;
|
|
}
|
|
|
|
if (nowtok == tok_charconv)
|
|
{
|
|
READ_STRING_LIST (ctype_map_new, bad_new_charconv);
|
|
continue;
|
|
bad_new_charconv:
|
|
SYNTAX_ERROR (_("\
|
|
syntax error in definition of new character map"));
|
|
continue;
|
|
}
|
|
|
|
if (nowtok == tok_upper || nowtok == tok_lower
|
|
|| nowtok == tok_alpha || nowtok == tok_digit
|
|
|| nowtok == tok_alnum || nowtok == tok_space
|
|
|| nowtok == tok_cntrl || nowtok == tok_punct
|
|
|| nowtok == tok_graph || nowtok == tok_print
|
|
|| nowtok == tok_xdigit || nowtok == tok_blank)
|
|
{
|
|
ctype_tok_sym = nowtok;
|
|
ctype_tok_str = NULL;
|
|
state = 5;
|
|
continue;
|
|
}
|
|
|
|
if (nowtok == tok_toupper|| nowtok == tok_tolower)
|
|
{
|
|
ctype_tok_sym = nowtok;
|
|
ctype_tok_str = NULL;
|
|
state = 6;
|
|
continue;
|
|
}
|
|
|
|
if (nowtok != tok_ident)
|
|
goto bad_charclass;
|
|
|
|
/* We possibly have a self-defined character class. */
|
|
if (ctype_is_charclass (ldfile, result, now->val.str.start))
|
|
{
|
|
ctype_tok_sym = nowtok;
|
|
ctype_tok_str = now->val.str.start;
|
|
state = 5;
|
|
continue;
|
|
}
|
|
|
|
/* ...or a self-defined character map. */
|
|
if (ctype_is_charconv (ldfile, result, now->val.str.start))
|
|
{
|
|
ctype_tok_sym = nowtok;
|
|
ctype_tok_str = now->val.str.start;
|
|
state = 6;
|
|
continue;
|
|
}
|
|
|
|
SYNTAX_ERROR (_("syntax error in definition of LC_CTYPE category"));
|
|
continue;
|
|
|
|
case 4:
|
|
/* Handle `END xxx'. */
|
|
if (nowtok != expected_tok)
|
|
lr_error (ldfile, _("\
|
|
`%1$s' definition does not end with `END %1$s'"), expected_str);
|
|
|
|
lr_ignore_rest (ldfile, nowtok == expected_tok);
|
|
state = 1;
|
|
continue;
|
|
|
|
case 5:
|
|
/* Here we expect a semicolon separated list of bsymbols. The
|
|
bit to be set in the word is given in CHARCLASS_BIT. */
|
|
arg = now;
|
|
|
|
ctype_class_start (ldfile, result, ctype_tok_sym, ctype_tok_str,
|
|
charset);
|
|
|
|
while (arg->tok != tok_eol)
|
|
{
|
|
/* Any token other than a bsymbol is an error. */
|
|
if (arg->tok != tok_bsymbol)
|
|
{
|
|
bad_charclass:
|
|
SYNTAX_ERROR (_("\
|
|
syntax error in character class definition"));
|
|
break;
|
|
}
|
|
|
|
/* Lookup value for token and write into array. */
|
|
ctype_class_from (ldfile, result, arg, charset);
|
|
|
|
arg = lr_token (ldfile, charset);
|
|
if (arg->tok == tok_semicolon)
|
|
arg = lr_token (ldfile, charset);
|
|
else if (arg->tok != tok_eol)
|
|
goto bad_charclass;
|
|
|
|
/* Look for ellipsis. */
|
|
if (arg->tok == tok_ellipsis)
|
|
{
|
|
arg = lr_token (ldfile, charset);
|
|
if (arg->tok != tok_semicolon)
|
|
goto bad_charclass;
|
|
|
|
arg = lr_token (ldfile, charset);
|
|
if (arg->tok != tok_bsymbol)
|
|
goto bad_charclass;
|
|
|
|
/* Write range starting at LAST to ARG->VAL. */
|
|
ctype_class_to (ldfile, result, arg, charset);
|
|
|
|
arg = lr_token (ldfile, charset);
|
|
if (arg->tok == tok_semicolon)
|
|
arg = lr_token (ldfile, charset);
|
|
else if (arg->tok != tok_eol)
|
|
goto bad_charclass;
|
|
}
|
|
}
|
|
|
|
/* Mark class as already seen. */
|
|
ctype_class_end (ldfile, result);
|
|
state = 3;
|
|
|
|
continue;
|
|
|
|
case 6:
|
|
/* Here we expect a list of character mappings. Note: the
|
|
first opening brace is already matched. */
|
|
ctype_map_start (ldfile, result, ctype_tok_sym, ctype_tok_str,
|
|
charset);
|
|
|
|
while (1)
|
|
{
|
|
/* Match ( bsymbol , bsymbol ) */
|
|
if (now->tok != tok_open_brace)
|
|
goto bad_charconv;
|
|
|
|
now = lr_token (ldfile, charset);
|
|
if (now->tok != tok_bsymbol)
|
|
{
|
|
bad_charconv:
|
|
SYNTAX_ERROR (_("\
|
|
syntax error in character conversion definition"));
|
|
state = 3;
|
|
break;
|
|
}
|
|
|
|
/* Lookup arg and assign to FROM. */
|
|
ctype_map_from (ldfile, result, now, charset);
|
|
|
|
now = lr_token (ldfile, charset);
|
|
if (now->tok != tok_comma)
|
|
goto bad_charconv;
|
|
|
|
now = lr_token (ldfile, charset);
|
|
if (now->tok != tok_bsymbol)
|
|
goto bad_charconv;
|
|
|
|
/* Lookup arg and assign to TO. */
|
|
ctype_map_to (ldfile, result, now, charset);
|
|
|
|
now = lr_token (ldfile, charset);
|
|
if (now->tok != tok_close_brace)
|
|
goto bad_charconv;
|
|
|
|
now = lr_token (ldfile, charset);
|
|
if (now->tok == tok_eol)
|
|
{
|
|
state = 3;
|
|
break;
|
|
}
|
|
if (now->tok != tok_semicolon)
|
|
goto bad_charconv;
|
|
|
|
now = lr_token (ldfile, charset);
|
|
}
|
|
|
|
ctype_map_end (ldfile, result);
|
|
continue;
|
|
|
|
case 8:
|
|
{
|
|
/* We have seen `copy'. First match the argument. */
|
|
int warned = 0;
|
|
|
|
if (nowtok != tok_string)
|
|
lr_error (ldfile, _("expect string argument for `copy'"));
|
|
else
|
|
def_to_process (now->val.str.start, 1 << copy_category);
|
|
|
|
lr_ignore_rest (ldfile, nowtok == tok_string);
|
|
|
|
/* The rest of the line must be empty
|
|
and the next keyword must be `END xxx'. */
|
|
|
|
while (lr_token (ldfile, charset)->tok != tok_end)
|
|
{
|
|
if (warned == 0)
|
|
{
|
|
only_copy:
|
|
lr_error (ldfile, _("\
|
|
no other keyword shall be specified when `copy' is used"));
|
|
warned = 1;
|
|
}
|
|
|
|
lr_ignore_rest (ldfile, 0);
|
|
}
|
|
|
|
state = 4;
|
|
}
|
|
continue;
|
|
|
|
case 10:
|
|
HANDLE_COPY (LC_COLLATE, tok_lc_collate, "LC_COLLATE");
|
|
|
|
collate_startup (ldfile, result, charset);
|
|
/* FALLTHROUGH */
|
|
|
|
case 11:
|
|
/* Process the LC_COLLATE section. We expect `END LC_COLLATE'
|
|
any of the collation specifications, or any bsymbol. */
|
|
LOCALE_PROLOG (tok_lc_collate, "LC_COLLATE");
|
|
|
|
if (nowtok == tok_order_start)
|
|
{
|
|
state = 12;
|
|
continue;
|
|
}
|
|
|
|
if (nowtok != tok_collating_element
|
|
&& nowtok != tok_collating_symbol)
|
|
{
|
|
bad_collation:
|
|
lr_error (ldfile, _("\
|
|
syntax error in collation definition"));
|
|
lr_ignore_rest (ldfile, 0);
|
|
continue;
|
|
}
|
|
|
|
/* Get argument. */
|
|
arg = lr_token (ldfile, charset);
|
|
if (arg->tok != tok_bsymbol)
|
|
{
|
|
lr_error (ldfile, _("\
|
|
collation symbol expected after `%s'"),
|
|
nowtok == tok_collating_element
|
|
? "collating-element" : "collating-symbol");
|
|
lr_ignore_rest (ldfile, 0);
|
|
continue;
|
|
}
|
|
|
|
if (nowtok == tok_collating_element)
|
|
{
|
|
/* Save to-value as new name. */
|
|
collate_element_to (ldfile, result, arg, charset);
|
|
|
|
arg = lr_token (ldfile, charset);
|
|
if (arg->tok != tok_from)
|
|
{
|
|
lr_error (ldfile, _("\
|
|
`from' expected after first argument to `collating-element'"));
|
|
lr_ignore_rest (ldfile, 0);
|
|
continue;
|
|
}
|
|
|
|
arg = lr_token (ldfile, charset);
|
|
if (arg->tok != tok_string)
|
|
{
|
|
lr_error (ldfile, _("\
|
|
from-value of `collating-element' must be a string"));
|
|
lr_ignore_rest (ldfile, 0);
|
|
continue;
|
|
}
|
|
|
|
/* Enter new collating element. */
|
|
collate_element_from (ldfile, result, arg, charset);
|
|
}
|
|
else
|
|
/* Enter new collating symbol into table. */
|
|
collate_symbol (ldfile, result, arg, charset);
|
|
|
|
lr_ignore_rest (ldfile, 1);
|
|
continue;
|
|
|
|
case 12:
|
|
/* We parse the rest of the line containing `order_start'.
|
|
In any case we continue with parsing the symbols. */
|
|
state = 13;
|
|
|
|
cnt = 0;
|
|
while (now->tok != tok_eol)
|
|
{
|
|
int collation_method = 0;
|
|
|
|
++cnt;
|
|
|
|
do
|
|
{
|
|
if (now->tok == tok_forward)
|
|
collation_method |= sort_forward;
|
|
else if (now->tok == tok_backward)
|
|
collation_method |= sort_backward;
|
|
else if (now->tok == tok_position)
|
|
collation_method |= sort_position;
|
|
else
|
|
{
|
|
lr_error (ldfile, _("unknown collation directive"));
|
|
lr_ignore_rest (ldfile, 0);
|
|
continue;
|
|
}
|
|
|
|
now = lr_token (ldfile, charset);
|
|
}
|
|
while (now->tok == tok_comma
|
|
&& ((now = lr_token (ldfile, charset)) != tok_none));
|
|
|
|
/* Check for consistency: forward and backwards are
|
|
mutually exclusive. */
|
|
if ((collation_method & sort_forward) != 0
|
|
&& (collation_method & sort_backward) != 0)
|
|
{
|
|
lr_error (ldfile, _("\
|
|
sorting order `forward' and `backward' are mutually exclusive"));
|
|
/* The recover clear the backward flag. */
|
|
collation_method &= ~sort_backward;
|
|
}
|
|
|
|
/* ??? I don't know whether this is correct but while
|
|
thinking about the `strcoll' functions I found that I
|
|
need a direction when performing position depended
|
|
collation. So I assume here that implicitly the
|
|
direction `forward' is given when `position' alone is
|
|
written. --drepper */
|
|
if (collation_method == sort_position)
|
|
collation_method |= sort_forward;
|
|
|
|
/* Enter info about next collation order. */
|
|
collate_new_order (ldfile, result, collation_method);
|
|
|
|
if (now->tok != tok_eol && now->tok != tok_semicolon)
|
|
{
|
|
lr_error (ldfile, _("\
|
|
syntax error in `order_start' directive"));
|
|
lr_ignore_rest (ldfile, 0);
|
|
break;
|
|
}
|
|
|
|
if (now->tok == tok_semicolon)
|
|
now = lr_token (ldfile, charset);
|
|
}
|
|
|
|
/* If no argument to `order_start' is given, one `forward'
|
|
argument is implicitly assumed. */
|
|
if (cnt == 0)
|
|
collate_new_order (ldfile, result, sort_forward);
|
|
|
|
|
|
/* We now know about all sorting rules. */
|
|
collate_build_arrays (ldfile, result);
|
|
|
|
continue;
|
|
|
|
case 13:
|
|
/* We read one symbol a line until `order_end' is found. */
|
|
{
|
|
static int last_correct = 1;
|
|
|
|
if (nowtok == tok_order_end)
|
|
{
|
|
state = 14;
|
|
lr_ignore_rest (ldfile, 1);
|
|
continue;
|
|
}
|
|
|
|
/* Ignore empty lines. */
|
|
if (nowtok == tok_eol)
|
|
continue;
|
|
|
|
if (nowtok != tok_bsymbol && nowtok != tok_undefined
|
|
&& nowtok != tok_ellipsis)
|
|
{
|
|
if (last_correct == 1)
|
|
{
|
|
lr_error (ldfile, _("\
|
|
syntax error in collating order definition"));
|
|
last_correct = 0;
|
|
}
|
|
lr_ignore_rest (ldfile, 0);
|
|
continue;
|
|
}
|
|
else
|
|
{
|
|
last_correct = 1;
|
|
|
|
/* Remember current token. */
|
|
if (collate_order_elem (ldfile, result, now, charset) < 0)
|
|
continue;
|
|
}
|
|
|
|
/* Read optional arguments. */
|
|
arg = lr_token (ldfile, charset);
|
|
while (arg->tok != tok_eol)
|
|
{
|
|
if (arg->tok != tok_ignore && arg->tok != tok_ellipsis
|
|
&& arg->tok != tok_bsymbol && arg->tok != tok_string)
|
|
break;
|
|
|
|
if (arg->tok == tok_ignore || arg->tok == tok_ellipsis
|
|
|| arg->tok == tok_string)
|
|
{
|
|
/* Call handler for simple weights. */
|
|
if (collate_simple_weight (ldfile, result, arg, charset)
|
|
< 0)
|
|
goto illegal_weight;
|
|
|
|
arg = lr_token (ldfile, charset);
|
|
}
|
|
else
|
|
do
|
|
{
|
|
/* Collect char. */
|
|
int ok = collate_weight_bsymbol (ldfile, result, arg,
|
|
charset);
|
|
if (ok < 0)
|
|
goto illegal_weight;
|
|
|
|
arg = lr_token (ldfile, charset);
|
|
}
|
|
while (arg->tok == tok_bsymbol);
|
|
|
|
/* Are there more weights? */
|
|
if (arg->tok != tok_semicolon)
|
|
break;
|
|
|
|
/* Yes, prepare next weight. */
|
|
if (collate_next_weight (ldfile, result) < 0)
|
|
goto illegal_weight;
|
|
|
|
arg = lr_token (ldfile, charset);
|
|
}
|
|
|
|
if (arg->tok != tok_eol)
|
|
{
|
|
SYNTAX_ERROR (_("syntax error in order specification"));
|
|
}
|
|
|
|
collate_end_weight (ldfile, result);
|
|
illegal_weight:
|
|
}
|
|
continue;
|
|
|
|
case 14:
|
|
/* Following to the `order_end' keyword we don't expect
|
|
anything but the `END'. */
|
|
if (nowtok == tok_eol)
|
|
continue;
|
|
|
|
if (nowtok != tok_end)
|
|
goto bad_collation;
|
|
|
|
expected_tok = tok_lc_collate;
|
|
expected_str = "LC_COLLATE";
|
|
state = 4;
|
|
|
|
ldfile->translate_strings = 1;
|
|
continue;
|
|
|
|
case 20:
|
|
HANDLE_COPY (LC_MONETARY, tok_lc_monetary, "LC_MONETARY");
|
|
|
|
monetary_startup (ldfile, result, charset);
|
|
/* FALLTHROUGH */
|
|
|
|
case 21:
|
|
LOCALE_PROLOG (tok_lc_monetary, "LC_MONETARY");
|
|
|
|
switch (nowtok)
|
|
{
|
|
case tok_int_curr_symbol:
|
|
case tok_currency_symbol:
|
|
case tok_mon_decimal_point:
|
|
case tok_mon_thousands_sep:
|
|
case tok_positive_sign:
|
|
case tok_negative_sign:
|
|
READ_STRING (monetary_add, bad_monetary);
|
|
break;
|
|
|
|
case tok_int_frac_digits:
|
|
case tok_frac_digits:
|
|
case tok_p_cs_precedes:
|
|
case tok_p_sep_by_space:
|
|
case tok_n_cs_precedes:
|
|
case tok_n_sep_by_space:
|
|
case tok_p_sign_posn:
|
|
case tok_n_sign_posn:
|
|
READ_NUMBER (monetary_add, bad_monetary);
|
|
break;
|
|
|
|
case tok_mon_grouping:
|
|
/* We have a semicolon separated list of integers. */
|
|
READ_NUMBER_LIST (monetary_add, bad_monetary);
|
|
break;
|
|
|
|
default:
|
|
bad_monetary:
|
|
SYNTAX_ERROR (_("syntax error in monetary locale definition"));
|
|
}
|
|
continue;
|
|
|
|
case 30:
|
|
HANDLE_COPY (LC_NUMERIC, tok_lc_numeric, "LC_NUMERIC");
|
|
|
|
numeric_startup (ldfile, result, charset);
|
|
/* FALLTHROUGH */
|
|
|
|
case 31:
|
|
LOCALE_PROLOG (tok_lc_numeric, "LC_NUMERIC");
|
|
|
|
switch (nowtok)
|
|
{
|
|
case tok_decimal_point:
|
|
case tok_thousands_sep:
|
|
READ_STRING (numeric_add, bad_numeric);
|
|
break;
|
|
|
|
case tok_grouping:
|
|
/* We have a semicolon separated list of integers. */
|
|
READ_NUMBER_LIST (numeric_add, bad_numeric);
|
|
break;
|
|
|
|
default:
|
|
bad_numeric:
|
|
SYNTAX_ERROR (_("syntax error in numeric locale definition"));
|
|
}
|
|
continue;
|
|
|
|
case 40:
|
|
HANDLE_COPY (LC_TIME, tok_lc_time, "LC_TIME");
|
|
|
|
time_startup (ldfile, result, charset);
|
|
/* FALLTHROUGH */
|
|
|
|
case 41:
|
|
LOCALE_PROLOG (tok_lc_time, "LC_TIME");
|
|
|
|
switch (nowtok)
|
|
{
|
|
case tok_abday:
|
|
case tok_day:
|
|
case tok_abmon:
|
|
case tok_mon:
|
|
case tok_am_pm:
|
|
case tok_alt_digits:
|
|
case tok_era:
|
|
READ_STRING_LIST (time_add, bad_time);
|
|
continue;
|
|
|
|
case tok_d_t_fmt:
|
|
case tok_d_fmt:
|
|
case tok_t_fmt:
|
|
case tok_t_fmt_ampm:
|
|
case tok_era_year:
|
|
case tok_era_d_t_fmt:
|
|
case tok_era_d_fmt:
|
|
case tok_era_t_fmt:
|
|
READ_STRING (time_add, bad_time);
|
|
break;
|
|
|
|
default:
|
|
bad_time:
|
|
SYNTAX_ERROR (_("syntax error in time locale definition"));
|
|
}
|
|
continue;
|
|
|
|
case 50:
|
|
HANDLE_COPY (LC_MESSAGES, tok_lc_messages, "LC_MESSAGES");
|
|
|
|
messages_startup (ldfile, result, charset);
|
|
/* FALLTHROUGH */
|
|
|
|
case 51:
|
|
LOCALE_PROLOG (tok_lc_messages, "LC_MESSAGES");
|
|
|
|
switch (nowtok)
|
|
{
|
|
case tok_yesexpr:
|
|
case tok_noexpr:
|
|
case tok_yesstr:
|
|
case tok_nostr:
|
|
READ_STRING (messages_add, bad_message);
|
|
break;
|
|
|
|
default:
|
|
bad_message:
|
|
SYNTAX_ERROR (_("syntax error in message locale definition"));
|
|
}
|
|
continue;
|
|
|
|
default:
|
|
error (5, 0, _("%s: error in state machine"), __FILE__);
|
|
/* NOTREACHED */
|
|
}
|
|
|
|
break;
|
|
}
|
|
|
|
/* We read all of the file. */
|
|
lr_close (ldfile);
|
|
|
|
/* Let's see what information is available. */
|
|
for (cnt = LC_CTYPE; cnt <= LC_MESSAGES; ++cnt)
|
|
if (result->categories[cnt].generic != NULL)
|
|
result->avail |= 1 << cnt;
|
|
|
|
return result;
|
|
}
|
|
|
|
|
|
void
|
|
check_all_categories (struct localedef_t *locale, struct charset_t *charset)
|
|
{
|
|
/* Call the finishing functions for all locales. */
|
|
if ((locale->avail & (1 << LC_CTYPE)) != 0
|
|
&& (locale->binary & (1 << LC_CTYPE)) == 0)
|
|
ctype_finish (locale, charset);
|
|
if ((locale->avail & (1 << LC_COLLATE)) != 0
|
|
&& (locale->binary & (1 << LC_COLLATE)) == 0)
|
|
collate_finish (locale, charset);
|
|
if ((locale->avail & (1 << LC_MONETARY)) != 0
|
|
&& (locale->binary & (1 << LC_MONETARY)) == 0)
|
|
monetary_finish (locale);
|
|
if ((locale->avail & (1 << LC_NUMERIC)) != 0
|
|
&& (locale->binary & (1 << LC_NUMERIC)) == 0)
|
|
numeric_finish (locale);
|
|
if ((locale->avail & (1 << LC_TIME)) != 0
|
|
&& (locale->binary & (1 << LC_TIME)) == 0)
|
|
time_finish (locale);
|
|
if ((locale->avail & (1 << LC_MESSAGES)) != 0
|
|
&& (locale->binary & (1 << LC_MESSAGES)) == 0)
|
|
messages_finish (locale);
|
|
}
|
|
|
|
|
|
void
|
|
write_all_categories (struct localedef_t *locale, struct charset_t *charset,
|
|
const char *output_path)
|
|
{
|
|
/* Call all functions to write locale data. */
|
|
if ((locale->avail & (1 << LC_CTYPE)) != 0)
|
|
ctype_output (locale, charset, output_path);
|
|
if ((locale->avail & (1 << LC_COLLATE)) != 0)
|
|
collate_output (locale, charset, output_path);
|
|
if ((locale->avail & (1 << LC_MONETARY)) != 0)
|
|
monetary_output (locale, output_path);
|
|
if ((locale->avail & (1 << LC_NUMERIC)) != 0)
|
|
numeric_output (locale, output_path);
|
|
if ((locale->avail & (1 << LC_TIME)) != 0)
|
|
time_output (locale, output_path);
|
|
if ((locale->avail & (1 << LC_MESSAGES)) != 0)
|
|
messages_output (locale, output_path);
|
|
}
|
|
|
|
|
|
void
|
|
write_locale_data (const char *output_path, const char *category,
|
|
size_t n_elem, struct iovec *vec)
|
|
{
|
|
size_t cnt, step, maxiov;
|
|
int fd;
|
|
char *fname;
|
|
|
|
fname = malloc (strlen (output_path) + 2 * strlen (category) + 6);
|
|
if (fname == NULL)
|
|
error (5, errno, _("memory exhausted"));
|
|
|
|
/* Normally we write to the directory pointed to by the OUTPUT_PATH.
|
|
But for LC_MESSAGES we have to take care for the translation
|
|
data. This means we need to have a directory LC_MESSAGES in
|
|
which we place the file under the name SYS_LC_MESSAGES. */
|
|
sprintf (fname, "%s%s", output_path, category);
|
|
if (strcmp (category, "LC_MESSAGES") == 0)
|
|
{
|
|
struct stat st;
|
|
|
|
if (stat (fname, &st) < 0)
|
|
{
|
|
if (mkdir (fname, 0777) < 0)
|
|
fd = creat (fname, 0666);
|
|
else
|
|
{
|
|
fd = -1;
|
|
errno = EISDIR;
|
|
}
|
|
}
|
|
else if (S_ISREG (st.st_mode))
|
|
fd = creat (fname, 0666);
|
|
else
|
|
{
|
|
fd = -1;
|
|
errno = EISDIR;
|
|
}
|
|
}
|
|
else
|
|
fd = creat (fname, 0666);
|
|
|
|
if (fd == -1)
|
|
{
|
|
int save_err = errno;
|
|
|
|
if (errno == EISDIR)
|
|
{
|
|
sprintf (fname, "%1$s%2$s/SYS_%2$s", output_path, category);
|
|
fd = creat (fname, 0666);
|
|
if (fd == -1)
|
|
save_err = errno;
|
|
}
|
|
|
|
if (fd == -1 && !be_quiet)
|
|
{
|
|
error (0, save_err, _("\
|
|
cannot open output file `%s' for category `%s'"),
|
|
fname, category);
|
|
return;
|
|
}
|
|
}
|
|
free (fname);
|
|
|
|
#ifdef UIO_MAXIOV
|
|
maxiov = UIO_MAXIOV;
|
|
#else
|
|
maxiov = sysconf (_SC_UIO_MAXIOV);
|
|
#endif
|
|
|
|
/* Write the data using writev. But we must take care for the
|
|
limitation of the implementation. */
|
|
for (cnt = 0; cnt < n_elem; cnt += step)
|
|
{
|
|
step = n_elem - cnt;
|
|
if (maxiov > 0)
|
|
step = MIN (maxiov, step);
|
|
|
|
if (writev (fd, &vec[cnt], step) < 0 && !be_quiet)
|
|
{
|
|
error (0, errno, _("failure while writing data for category `%s'"),
|
|
category);
|
|
break;
|
|
}
|
|
}
|
|
|
|
close (fd);
|
|
}
|