mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-14 17:11:06 +00:00
c40298232a
Mon Sep 23 15:31:04 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu> * hurd/Makefile ($(includedir)/rpc/netdb.h): There is no make variable `top_srcdir' in libc; use $(..) instead. * sysdeps/mach/hurd/Makefile (rtld-installed-name): Delete special definition. It was a *Mistake*. (With a capital M.) * sysdeps/mach/getsysstats.c (__get_nprocs): Renamed from __get_nproc. (__get_nprocs_conf): Renamed from __get_nproc_conf. Fri Sep 27 03:49:56 1996 Ulrich Drepper <drepper@cygnus.com> Add support for cancelable system calls. * csu/initfini.c: Make in crti.o reference to symbol __libc_force_cancel_wrapper when compiling reentrant version. * misc/Makefile (routines): Add force-wrapper. * misc/force-wrapper.c: New file. * posix/system.c: Rename function to __libc_system and make system a weak alias. * sysdeps/stub/system.c: Likewise. * posix/wait.c: Rename function to __libc_wait and make __wait a weak alias. De-ANSI-fy. * sysdeps/standalone/read.c: Rename function to __libc_read and make __read a weak alias. * sysdeps/stub/read.c: Likewise. * sysdeps/standalone/write.c: Rename function to __libc_write and make __write a weak alias. * sysdeps/stub/write.c: Likewise. * sysdeps/stub/tcdrain.c: Rename function to __libc_tcdrain and make tcdrain a weak alias. * sysdeps/unix/bsd/tcdrain.c: Likewise. * sysdeps/unix/bsd/bsd4.4/tcdrain.c: Likewise. * sysdeps/unix/sysv/tcdrain.c: Likewise. * sysdeps/unix/sysv/linux/tcdrain.c: Likewise. * sysdeps/unix/bsd/bsd4.4/wait.c: Rename function to __libc_wait and make __wait a weak alias. * sysdeps/stub/waitpid.c: Rename function to __libc_waitpid and make __waitpid a weak alias. * sysdeps/unix/bsd/bsd4.4/waitpid.c: Likewise. * sysdeps/unix/sysv/linux/waitpid.c: Likewise. * sysdeps/unix/sysv/sysv4/waitpid.c: Likewise. * sysdeps/unix/common/pause.c: Rename function to __libc_pause and make pause a weak alias. De-ANSI-fy. * sysdeps/unix/syscalls.list: Change name for close, fcntl, fsync, lseek, open, read, and write to have __libc_ prefix and make old names a weak alias. * sysdeps/unix/mman/syscalls.list: Likewise for msync. * sysdeps/unix/sysv/linux/syscalls.list: Likewise for nanosleep. * io/creat.c: De-ANSI-fy. * sysdeps/unix/sysv/linux/syscalls.list: Add pause. Thu Sep 26 19:15:55 1996 Ulrich Drepper <drepper@cygnus.com> * misc/mntent.h: Add MNTTYPE_* and MNTOPT_* macros. Reported by Hans Grobler <grobh@nolian.ee.sun.ac.za>. Thu Sep 26 14:40:10 1996 Ulrich Drepper <drepper@cygnus.com> * sysdeps/posix/pathconf.c: Pass descriptor for just opened file to fpathconf. Reported by Martin von Loewis <martin@mira.isdn.cs.tu-berlin.de>. Thu Sep 26 04:02:43 1996 Ulrich Drepper <drepper@cygnus.com> * locale/programs/locfile.c (write_locale_data): Allocate room even for file name for LC_MESSAGES locale. (locafile_read): `tok_era' must be handled as a string list. * locale/programs/ld-time.c: Finish correction of handling `era'. * locale/C-time.c (_nl_C_LC_TIME): Add initializer for new fields. * locale/categories.def: Add postload function for LC_TIME. * locale/setlocale.c: Make lock global and rename to __libc_setlocale_lock. * locale/localeinfo.h (struct era_entry): New type. Used in strftime. Add prototypes for _nl_get_era_entry and _nl_get_alt_digit. * locale/lc-time.c (_nl_postload_time): New function. Initialize lazy intialization. (_nl_get_era_entry): New function. Return era entry which corresponds to given year. (_nl_get_alt_digit): New function. Return string with alternate digit representation for given number. * time/strftime.c (strftime): Use _nl_get_alt_digit to get string representing alternate digit notation. Wed Sep 25 17:31:55 1996 Ulrich Drepper <drepper@cygnus.com> * sysdeps/generic/waitstatus.h (union wait): Add w_status field. Reported by Hans Grobler <grobh@nolian.ee.sun.ac.za>. * elf/rtld.c (dl_main): Process LD_PRELOAD before loading ld.so.preload. Suggested by David Engel <david@elo.ods.com>. Wed Sep 25 13:10:57 1996 Ulrich Drepper <drepper@cygnus.com> * catgets/gencat.c (main): Change --version again because RMS wants the package name in parentheses. * db/makedb.c: Likewise. * locale/programs/locale.c: Likewise. * locale/programs/localedef.c: Likewise. Tue Sep 24 01:28:05 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * Makefile ($(objpfx)sysd-dirs): Depend on Subdirs files, command rewritten. ($(objpfx)version-info.h): Depend on Banner files, command rewritten. Wed Sep 25 02:44:41 1996 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/linux/sleep.c: New file. Based on nanosleep. Tue Sep 24 21:46:02 1996 Ulrich Drepper <drepper@cygnus.com> * shadow/lckpwdf.c (PWD_LOCKFILE): Change to /etc/lock.pwd to be on the same device as the password file. * shadow/shadow.h (struct spwd): Change type of numeric fields to `long int' since there value are days, not seconds. * shadow/putspent.c: Change casts from time_t to `long int'. * shadow/sgetspent_r.c (LINE_READER): Likewise. Mon Sep 23 23:05:24 1996 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/linux/errnos.h: Define __set_errno to make sure the thread specific variable is set as well as the global variable. * sysdeps/mach/hurd/errnos.awk: Define macro for source code compatibility. * sysdeps/stub/errnos.h: Likewise. * sysdeps/unix/bsd/bsd4.4/errnos.h: Likewise. * shadow/putspent.c: Don't include <errno.h>. * dirent/scandir.c (scandir): Use __set_errno to set errno variable. * elf/dl-load.c (open_path): Likewise. * inet/rcmd.c (rcmd): Likewise. (rresvport): Likewise. * intl/dcgettext.c [!__set_errno]: Define __set_errno. (DCGETTEXT): Use __set_errno to set errno variable. * io/fts.c (fts_open): Likewise. (fts_close): Likewise. (fts_read): Likewise. (fts_set): Likewise. (fts_children): Likewise. (fts_build): Likewise. (fts_stat): Likewise. * io/ftw.c (ftw_dir): Likewise. (ftw): Likewise. * io/getwd.c (getwd): Likewise. * io/lockf.c (lockf): Likewise. * libio/libioP.h [EINVAL]: Use __set_errno to define MAYBE_SET_EINVAL. * libio/iofdopen.c (_IO_fdopen): Use MAYBE_SET_EINVAL to errno. * libio/iogetdelim.c (_IO_getdelim): Likewise. * libio/fileops.c (_IO_file_open): Use __set_errno to set errno variable. * libio/iofgetpos.c (_IO_fgetpos): Likewise. * libio/iofsetpos.c (_IO_fsetpos): Likewise. * libio/ioftell.c (_IO_ftell): Likewise. * locale/loadlocale.c (_nl_load_locale): Likewise. * locale/nl_langinfo.c (nl_langinfo): Likewise. * locale/setlocale.c (ERROR_RETURN): Likewise. * login/getutid_r (__getutid_r): Likewise. * login/getutline_r (__getutline_r): Likewise. * login/login.c (tty_name): Likewise. * login/oututline_r.c (__pututline_r): Likewise. * malloc/malloc.c (morecore): Likewise. * misc/efgcvt_r.c (fcvt_r): Likewise. * misc/hsearch_r.c (hcreate_r): Likewise. (hdestroy_r): Likewise. (hsearch_r): Likewise. * nss/nsswitch.c (__nss_configure_lookup): Likewise. * nss/nss_dns/dns-host.c (_nss_dns_gethostbyname2_r): Likewise. (_nss_dns_gethostbyaddr_r): Likewise. * nss/nss_files/files-XXX.c (internal_getent): Likewise. * nss/nss_files/files-parse.c (parse_list): Likewise. * posix/confstr.c (confstr): Likewise. De-ANSI-fy. * posix/execvp.c (execvp): Likewise. * posix/glob.c: Define __set_errno. (glob): Use __set_errno to set errno variable. (glob_in_dir): Likewise. * pwd/getpw.c: Likewise. De-ANSI-fy. * pwd/putpwent.c: Likewise. * resolv/inet_net_ntop.c: Likewise. * resolv/inet_net_pton.c: Likewise. * resolv/inet_neta.c: Likewise. * resolv/inet_ntop.c: Likewise. * resolv/inet_pton.c: Likewise. * resolv/res_query.c (res_search): Likewise. * resolv/res_send.c (Aerror): Likewise. (Perror): Likewise. (res_send): Likewise. * signal/sigaddset.c: Likewise. De-ANSI-fy. * signal/sigdelset.c: Likewise. * signal/sigempty.c: Likewise. * signal/sigfillset.c: Likewise. * signal/sigismem.c: Likewise. * stdio/fclose.c: Likewise. * stdio/feof.c: Likewise. * stdio/ferror.c: Likewise. * stdio/fflush.c: Likewise. * stdio/fgetc.c: Likewise. * stdio/fgetpos.c: Likewise. * stdio/fgets.c: Likewise. * stdio/fileno.c: Likewise. * stdio/fmemopen.c: Likewise. * stdio/fopen.c: Likewise. * stdio/fputc.c: Likewise. * stdio/fread.c: Likewise. * stdio/freopen.c: Likewise. * stdio/fseek.c: Likewise. * stdio/fsetpos.c: Likewise. * stdio/ftell.c: Likewise. * stdio/fwrite.c: Likewise. * stdio/getdelim.c: Likewise. * stdio/gets.c: Likewise. * stdio/glue.c: Likewise. * stdio/internals.c: Likewise. * stdio/memstream.c: Likewise. * stdio/setvbuf.c: Likewise. * stdio/ungetc.c: Likewise. * stdio/vsscanf.c: Likewise. * stdio-common/reg-printf.c: Likewise. * stdio-common/vfprintf.c: Likewise. * stdio-common/vfscanf.c: Likewise. * stdlib/canonicalize.c: Likewise. * stdlib/msort.c: Likewise. * stdlib/random_r.c: Likewise. * stdlib/strfmon.c: Likewise. * stdlib/strtod.c: Likewise. * stdlib/strtol.c: Likewise. * sunrpc/bindrsvprt.c: Likewise. * time/asctime.c: Likewise. * time/localtime.c: Likewise. * wcsmbs/mbrtowc.c: Likewise. * wcsmbs/mbsnrtowcs.c: Likewise. * wcsmbs/mbsrtowcs.c: Likewise. * wcsmbs/wcrtomb.c: Likewise. * wcsmbs/wcsnrtombs.c: Likewise. * wcsmbs/wcsrtombs.c: Likewise. * wcsmbs/wcstok.c: Likewise. * sysdeps/generic/ftime.c: Likewise. * sysdeps/generic/pty.c: Likewise. * sysdeps/generic/setenv.c: Likewise. * sysdeps/generic/speed.c: Likewise. * sysdeps/generic/sysd-stdio.c: Likewise. * sysdeps/generic/uname.c: Likewise. * sysdeps/generic/vlimit.c: Likewise. * sysdeps/libm-ieee754/k_standard.c: Likewise. * sysdeps/libm-ieee754/s_ldexp.c: Likewise. * sysdeps/libm-ieee754/s_ldexpf.c: Likewise. * sysdeps/libm-ieee754/s_ldexpl.c: Likewise. * sysdeps/libm-ieee754/w_scalb.c: Likewise. * sysdeps/libm-ieee754/w_scalbf.c: Likewise. * sysdeps/libm-ieee754/w_scalbl.c: Likewise. * sysdeps/posix/dup2.c: Likewise. * sysdeps/posix/euidaccess.c: Likewise. * sysdeps/posix/fdopen.c: Likewise. * sysdeps/posix/flock.c: Likewise. * sysdeps/posix/fpathconf.c: Likewise. * sysdeps/posix/getcwd.c: Likewise. * sysdeps/posix/gettimeofday.c: Likewise. * sysdeps/posix/isatty.c: Likewise. * sysdeps/posix/isfdtype.c: Likewise. * sysdeps/posix/killpg.c: Likewise. * sysdeps/posix/mkstemp.c: Likewise. * sysdeps/posix/mktemp.c: Likewise. * sysdeps/posix/pathconf.c: Likewise. * sysdeps/posix/pipestream.c: Likewise. * sysdeps/posix/remove.c: Likewise. * sysdeps/posix/rename.c: Likewise. * sysdeps/posix/sigintr.c: Likewise. * sysdeps/posix/signal.c: Likewise. * sysdeps/posix/sigsuspend.c: Likewise. * sysdeps/posix/sigvec.c: Likewise. * sysdeps/posix/sleep.c: Likewise. * sysdeps/posix/sysconf.c: Likewise. * sysdeps/posix/system.c: Likewise. * sysdeps/posix/tempname.c: Likewise. * sysdeps/posix/truncate.c: Likewise. * sysdeps/posix/ttyname.c: Likewise. * sysdeps/posix/ttyname_r.c: Likewise. * sysdeps/posix/wait3.c: Likewise. * sysdeps/standalone/close.c: Likewise. * sysdeps/standalone/open.c: Likewise. * sysdeps/standalone/read.c: Likewise. * sysdeps/standalone/write.c: Likewise. * sysdeps/stub/__longjmp.c: Likewise. * sysdeps/stub/accept.c: Likewise. * sysdeps/stub/access.c: Likewise. * sysdeps/stub/acct.c: Likewise. * sysdeps/stub/adjtime.c: Likewise. * sysdeps/stub/alarm.c: Likewise. * sysdeps/stub/bind.c: Likewise. * sysdeps/stub/brk.c: Likewise. * sysdeps/stub/chdir.c: Likewise. * sysdeps/stub/chflags.c: Likewise. * sysdeps/stub/chmod.c: Likewise. * sysdeps/stub/chown.c: Likewise. * sysdeps/stub/chroot.c: Likewise. * sysdeps/stub/clock.c: Likewise. * sysdeps/stub/close.c: Likewise. * sysdeps/stub/closedir.c: Likewise. * sysdeps/stub/connect.c: Likewise. * sysdeps/stub/ctermid.c: Likewise. * sysdeps/stub/cuserid.c: Likewise. * sysdeps/stub/dirfd.c: Likewise. * sysdeps/stub/dup.c: Likewise. * sysdeps/stub/dup2.c: Likewise. * sysdeps/stub/euidaccess.c: Likewise. * sysdeps/stub/execve.c: Likewise. * sysdeps/stub/fchdir.c: Likewise. * sysdeps/stub/fchflags.c: Likewise. * sysdeps/stub/fchmod.c: Likewise. * sysdeps/stub/fchown.c: Likewise. * sysdeps/stub/fcntl.c: Likewise. * sysdeps/stub/fdopen.c: Likewise. * sysdeps/stub/fexecve.c: Likewise. * sysdeps/stub/flock.c: Likewise. * sysdeps/stub/fork.c: Likewise. * sysdeps/stub/fpathconf.c: Likewise. * sysdeps/stub/fstatfs.c: Likewise. * sysdeps/stub/fsync.c: Likewise. * sysdeps/stub/ftruncate.c: Likewise. * sysdeps/stub/fxstat.c: Likewise. * sysdeps/stub/getcwd.c: Likewise. * sysdeps/stub/getdents.c: Likewise. * sysdeps/stub/getdomain.c: Likewise. * sysdeps/stub/getdtsz.c: Likewise. * sysdeps/stub/getegid.c: Likewise. * sysdeps/stub/getenv.c: Likewise. * sysdeps/stub/geteuid.c: Likewise. * sysdeps/stub/getgid.c: Likewise. * sysdeps/stub/getgroups.c: Likewise. * sysdeps/stub/gethostid.c: Likewise. * sysdeps/stub/gethostname.c: Likewise. * sysdeps/stub/getitimer.c: Likewise. * sysdeps/stub/getlogin.c: Likewise. * sysdeps/stub/getlogin_r.c: Likewise. * sysdeps/stub/getpagesize.c: Likewise. * sysdeps/stub/getpeername.c: Likewise. * sysdeps/stub/getpid.c: Likewise. * sysdeps/stub/getppid.c: Likewise. * sysdeps/stub/getpriority.c: Likewise. * sysdeps/stub/getrlimit.c: Likewise. * sysdeps/stub/getrusage.c: Likewise. * sysdeps/stub/getsid.c: Likewise. * sysdeps/stub/getsockname.c: Likewise. * sysdeps/stub/getsockopt.c: Likewise. * sysdeps/stub/getsysstats.c: Likewise. * sysdeps/stub/gettimeofday.c: Likewise. * sysdeps/stub/getuid.c: Likewise. * sysdeps/stub/gtty.c: Likewise. * sysdeps/stub/ioctl.c: Likewise. * sysdeps/stub/isatty.c: Likewise. * sysdeps/stub/isfdtype.c: Likewise. * sysdeps/stub/kill.c: Likewise. * sysdeps/stub/killpg.c: Likewise. * sysdeps/stub/link.c: Likewise. * sysdeps/stub/listen.c: Likewise. * sysdeps/stub/lseek.c: Likewise. * sysdeps/stub/lxstat.c: Likewise. * sysdeps/stub/madvice.c: Likewise. * sysdeps/stub/mkdir.c: Likewise. * sysdeps/stub/mkfifo.c: Likewise. * sysdeps/stub/mkstemp.c: Likewise. * sysdeps/stub/mktemp.c: Likewise. * sysdeps/stub/mmap.c: Likewise. * sysdeps/stub/morecore.c: Likewise. * sysdeps/stub/mprotect.c: Likewise. * sysdeps/stub/msgctl.c: Likewise. * sysdeps/stub/msgget.c: Likewise. * sysdeps/stub/msgrcv.c: Likewise. * sysdeps/stub/msgsnd.c: Likewise. * sysdeps/stub/msync.c: Likewise. * sysdeps/stub/munmap.c: Likewise. * sysdeps/stub/nanosleep.c: Likewise. * sysdeps/stub/nice.c: Likewise. * sysdeps/stub/nlist.c: Likewise. * sysdeps/stub/open.c: Likewise. * sysdeps/stub/opendir.c: Likewise. * sysdeps/stub/pathconf.c: Likewise. * sysdeps/stub/pause.c: Likewise. * sysdeps/stub/pipe.c: Likewise. * sysdeps/stub/pipestream.c: Likewise. * sysdeps/stub/poll.c: Likewise. * sysdeps/stub/profil.c: Likewise. * sysdeps/stub/ptrace.c: Likewise. * sysdeps/stub/putenv.c: Likewise. * sysdeps/stub/raise.c: Likewise. * sysdeps/stub/read.c: Likewise. * sysdeps/stub/readdir.c: Likewise. * sysdeps/stub/readlink.c: Likewise. * sysdeps/stub/readv.c: Likewise. * sysdeps/stub/reboot.c: Likewise. * sysdeps/stub/recv.c: Likewise. * sysdeps/stub/recvfrom.c: Likewise. * sysdeps/stub/recvmsg.c: Likewise. * sysdeps/stub/remove.c: Likewise. * sysdeps/stub/rename.c: Likewise. * sysdeps/stub/revoke.c: Likewise. * sysdeps/stub/rewinddir.c: Likewise. * sysdeps/stub/rmdir.c: Likewise. * sysdeps/stub/sbrk.c: Likewise. * sysdeps/stub/sched_getp.c: Likewise. * sysdeps/stub/sched_gets.c: Likewise. * sysdeps/stub/sched_primax.c: Likewise. * sysdeps/stub/sched_primin.c: Likewise. * sysdeps/stub/sched_rr_gi.c: Likewise. * sysdeps/stub/sched_setp.c: Likewise. * sysdeps/stub/sched_sets.c: Likewise. * sysdeps/stub/sched_yield.c: Likewise. * sysdeps/stub/seekdir.c: Likewise. * sysdeps/stub/select.c: Likewise. * sysdeps/stub/semctl.c: Likewise. * sysdeps/stub/semget.c: Likewise. * sysdeps/stub/semop.c: Likewise. * sysdeps/stub/send.c: Likewise. * sysdeps/stub/sendmsg.c: Likewise. * sysdeps/stub/sendto.c: Likewise. * sysdeps/stub/setdomain.c: Likewise. * sysdeps/stub/setegid.c: Likewise. * sysdeps/stub/setenv.c: Likewise. * sysdeps/stub/seteuid.c: Likewise. * sysdeps/stub/setgid.c: Likewise. * sysdeps/stub/setgroups.c: Likewise. * sysdeps/stub/sethostid.c: Likewise. * sysdeps/stub/sethostname.c: Likewise. * sysdeps/stub/setitimer.c: Likewise. * sysdeps/stub/setjmp.c: Likewise. * sysdeps/stub/setlogin.c: Likewise. * sysdeps/stub/setpgid.c: Likewise. * sysdeps/stub/setpriority.c: Likewise. * sysdeps/stub/setregid.c: Likewise. * sysdeps/stub/setreuid.c: Likewise. * sysdeps/stub/setrlimit.c: Likewise. * sysdeps/stub/setsid.c: Likewise. * sysdeps/stub/setsockopt.c: Likewise. * sysdeps/stub/settimeofday.c: Likewise. * sysdeps/stub/setuid.c: Likewise. * sysdeps/stub/shmat.c: Likewise. * sysdeps/stub/shmctl.c: Likewise. * sysdeps/stub/shmdt.c: Likewise. * sysdeps/stub/shmget.c: Likewise. * sysdeps/stub/shutdown.c: Likewise. * sysdeps/stub/sigaction.c: Likewise. * sysdeps/stub/sigaltstack.c: Likewise. * sysdeps/stub/sigblock.c: Likewise. * sysdeps/stub/sigintr.c: Likewise. * sysdeps/stub/signal.c: Likewise. * sysdeps/stub/sigpause.c: Likewise. * sysdeps/stub/sigpending.c: Likewise. * sysdeps/stub/sigprocmask.c: Likewise. * sysdeps/stub/sigreturn.c: Likewise. * sysdeps/stub/sigsetmask.c: Likewise. * sysdeps/stub/sigstack.c: Likewise. * sysdeps/stub/sigsuspend.c: Likewise. * sysdeps/stub/sigvec.c: Likewise. * sysdeps/stub/sleep.c: Likewise. * sysdeps/stub/socket.c: Likewise. * sysdeps/stub/socketpair.c: Likewise. * sysdeps/stub/sstk.c: Likewise. * sysdeps/stub/statfs.c: Likewise. * sysdeps/stub/stime.c: Likewise. * sysdeps/stub/stty.c: Likewise. * sysdeps/stub/swapoff.c: Likewise. * sysdeps/stub/swapon.c: Likewise. * sysdeps/stub/symlink.c: Likewise. * sysdeps/stub/sync.c: Likewise. * sysdeps/stub/syscall.c: Likewise. * sysdeps/stub/sysconf.c: Likewise. * sysdeps/stub/sysd-stdio.c: Likewise. * sysdeps/stub/system.c: Likewise. * sysdeps/stub/tcdrain.c: Likewise. * sysdeps/stub/tcflow.c: Likewise. * sysdeps/stub/tcflush.c: Likewise. * sysdeps/stub/tcgetattr.c: Likewise. * sysdeps/stub/tcgetpgrp.c: Likewise. * sysdeps/stub/tcsendbrk.c: Likewise. * sysdeps/stub/tcsetattr.c: Likewise. * sysdeps/stub/tcsetpgrp.c: Likewise. * sysdeps/stub/telldir.c: Likewise. * sysdeps/stub/tempname.c: Likewise. * sysdeps/stub/time.c: Likewise. * sysdeps/stub/times.c: Likewise. * sysdeps/stub/truncate.c: Likewise. * sysdeps/stub/ttyname.c: Likewise. * sysdeps/stub/ttyname_r.c: Likewise. * sysdeps/stub/ualarm.c: Likewise. * sysdeps/stub/ulimit.c: Likewise. * sysdeps/stub/umask.c: Likewise. * sysdeps/stub/unlink.c: Likewise. * sysdeps/stub/usleep.c: Likewise. * sysdeps/stub/ustat.c: Likewise. * sysdeps/stub/utime.c: Likewise. * sysdeps/stub/utimes.c: Likewise. * sysdeps/stub/vhangup.c: Likewise. * sysdeps/stub/wait.c: Likewise. * sysdeps/stub/wait3.c: Likewise. * sysdeps/stub/wait4.c: Likewise. * sysdeps/stub/waitpid.c: Likewise. * sysdeps/stub/write.c: Likewise. * sysdeps/stub/writev.c: Likewise. * sysdeps/stub/xmknod.c: Likewise. * sysdeps/stub/xstat.c: Likewise. * sysdeps/unix/closedir.c: Likewise. * sysdeps/unix/fxstat.c: Likewise. * sysdeps/unix/getlogin.c: Likewise. * sysdeps/unix/getlogin_r.c: Likewise. * sysdeps/unix/mkdir.c: Likewise. * sysdeps/unix/nice.c: Likewise. * sysdeps/unix/nlist.c: Likewise. * sysdeps/unix/opendir.c: Likewise. * sysdeps/unix/readdir.c: Likewise. * sysdeps/unix/rmdir.c: Likewise. * sysdeps/unix/stime.c: Likewise. * sysdeps/unix/xmknod.c: Likewise. * sysdeps/unix/xstat.c: Likewise. * sysdeps/unix/bsd/isatty.c: Likewise. * sysdeps/unix/bsd/setegid.c: Likewise. * sysdeps/unix/bsd/seteuid.c: Likewise. * sysdeps/unix/bsd/setsid.c: Likewise. * sysdeps/unix/bsd/sigaction.c: Likewise. * sysdeps/unix/bsd/sigprocmask.c: Likewise. * sysdeps/unix/bsd/sigsuspend.c: Likewise. * sysdeps/unix/bsd/tcflow.c: Likewise. * sysdeps/unix/bsd/tcflush.c: Likewise. * sysdeps/unix/bsd/tcgetattr.c: Likewise. * sysdeps/unix/bsd/tcsetattr.c: Likewise. * sysdeps/unix/bsd/times.c: Likewise. * sysdeps/unix/bsd/ulimit.c: Likewise. * sysdeps/unix/common/lxstat.c: Likewise. * sysdeps/unix/common/tcsendbrk.c: Likewise. * sysdeps/unix/sysv/setrlimit.c: Likewise. * sysdeps/unix/sysv/settimeofday.c: Likewise. * sysdeps/unix/sysv/sigaction.c: Likewise. * sysdeps/unix/sysv/tcflow.c: Likewise. * sysdeps/unix/sysv/tcflush.c: Likewise. * sysdeps/unix/sysv/tcgetattr.c: Likewise. * sysdeps/unix/sysv/tcsendbrk.c: Likewise. * sysdeps/unix/sysv/tcsetattr.c: Likewise. * sysdeps/unix/bsd/ultrix4/sysconf.c: Likewise. * sysdeps/unix/sysv/irix4/getpriority.c: Likewise. * sysdeps/unix/sysv/irix4/setpriority.c: Likewise. * sysdeps/unix/sysv/linux/adjtime.c: Likewise. * sysdeps/unix/sysv/linux/gethostid.c: Likewise. * sysdeps/unix/sysv/linux/gethostname.c: Likewise. * sysdeps/unix/sysv/linux/getsysstats.c: Likewise. * sysdeps/unix/sysv/linux/ptrace.c: Likewise. * sysdeps/unix/sysv/linux/speed.c: Likewise. * sysdeps/unix/sysv/linux/ulimit.c: Likewise. * sysdeps/unix/sysv/sysv4/sigaction.c: Likewise. * sysdeps/unix/sysv/sysv4/sysconf.c: Likewise. * sysdeps/unix/bsd/sun/m68k/sigtramp.c: Likewise. * sysdeps/unix/bsd/sun/sparc/sigtramp.c: Likewise. * sysdeps/unix/bsd/sun/sunos4/speed.c: Likewise. * sysdeps/unix/bsd/sun/sunos4/tcsetattr.c: Likewise. * sysdeps/unix/sysv/linux/alpha/ioperm.c: Likewise. * sysdeps/unix/sysv/linux/i386/brk.c: Likewise. * sysdeps/unix/sysv/linux/i386/sigaction.c: Likewise. * sysdeps/unix/sysv/linux/m68k/brk.c: Likewise. * sunrpc/clnt_tcp.c: Protect declaration of errno by #ifndef. * sunrpc/clnt_udp.c: Likewise. * sunrpc/bindrsvprt.c: Likewise. * sunrpc/pm_getmaps.c: Likewise. * sunrpc/pmap_rmt.c: Likewise. * sunrpc/svc.c: Likewise. * sunrpc/svc_run.c: Likewise. * sunrpc/svc_tcp.c: Likewise. * sunrpc/svc_udp.c: Likewise. * sysdeps/generic/strtok.c: Don't check argument, just crash. * sysdeps/generic/strtok_r.c: Likewise. * sysdeps/stub/start.c: Make __errno a strong alias of errno. * sysdeps/unix/start.c: Likewise. De-ANSI-fy. * sysdeps/unix/sparc/start.c: Likewise. * sysdeps/standalone/m68k/m68020/start.S: Likewise. * sysdeps/unix/sysv/irix4/start.c: Likewise. * sysdeps/unix/bsd/ultrix4/mips/start.S: Likewise. * sysdeps/unix/sysv/linux/i386/sysdep.S: Likewise. * sysdeps/unix/sysv/linux/m68k/sysdep.S: Likewise. Mon Sep 23 17:54:57 1996 Ulrich Drepper <drepper@cygnus.com> * catgets/gencat.c (main): Put package name in --version message in parantheses. Reported by Jim Meyering. * db/makedb.c: Likewise. * locale/programs/locale.c: Likewise. * locale/programs/localedef.c: Likewise. * sysdeps/i386/fpu/__math.h (tan): Make sure gcc knows we use two registers. Patch by John Bowman. Sat Sep 21 15:08:25 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/mach/libc-lock.h: Fix comment. * sysdeps/stubs/libc-lock.h: Likewise. Sat Sep 21 13:50:40 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * libio/genops.c (_IO_init) [_IO_MTSAFE_IO]: Dereference pointer to lock when passing it to __libc_lock_init macro. (_IO_default_finish) [_IO_MTSAFE_IO]: Dereference pointer to lock when passing it to __libc_lock_fini macro. Sat Sep 21 14:35:40 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/unix/sysv/linux/m68k/sysdep.h (SYSCALL_ERROR_HANDLER) [_LIBC_REENTRANT]: Add missing semicolon. * sysdeps/unix/sysv/linux/m68k/sysdep.S: Move inclusion of sysdep.h to the top outside of #ifndef PIC. Don't include errnos.h. Use the ENTRY macro. Sat Sep 21 14:33:41 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * libio/Makefile: Make `all' the default target. * po/Makefile: Likewise. Mon Sep 23 15:49:47 1996 Ulrich Drepper <drepper@cygnus.com> * stdlib/test-canon.c: Correct patch from Thu Sep 12 23:01:16 1996. I applied it incorrectly. * sysdeps/m68k/fpu/s_scalbn.c: Likewise. * sysdeps/m68k/fpu/s_scalbnf.c: Likewise. * sysdeps/m68k/fpu/s_scalbnl.c: Likewise. Mon Sep 23 03:00:10 1996 Ulrich Drepper <drepper@cygnus.com> * shadow/sgetspent_r.c (LINE_PARSER): Accept empty 9th field. Patch by NIIBE Yutaka <gniibe@mri.co.jp>. * shadow/sgetspent_r.c (LINE_PARSER): Don't accept any chars after 9th field. * sysdeps/unix/sysv/linux/Makefile [$(subdir)==misc] (sysdep_headers): Add sys/debugreg.h, sys/kd.h, sys/soundcard.h, and sys/vt.h. * sysdeps/unix/sysv/linux/sys/debugreg.h: New file. * sysdeps/unix/sysv/linux/sys/kd.h: New file. * sysdeps/unix/sysv/linux/sys/soundcard.h: New file. * sysdeps/unix/sysv/linux/sys/vt.h: New file. Reported by NIIBE Yutaka <gniibe@mri.co.jp>.
1018 lines
25 KiB
C
1018 lines
25 KiB
C
/* Copyright (C) 1996 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Ulrich Drepper, <drepper@gnu.ai.mit.edu>.
|
|
|
|
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 <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 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 implicitely 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->binary & (1 << LC_CTYPE)) == 0)
|
|
ctype_finish (locale, charset);
|
|
if ((locale->binary & (1 << LC_COLLATE)) == 0)
|
|
collate_finish (locale, charset);
|
|
if ((locale->binary & (1 << LC_MONETARY)) == 0)
|
|
monetary_finish (locale);
|
|
if ((locale->binary & (1 << LC_NUMERIC)) == 0)
|
|
numeric_finish (locale);
|
|
if ((locale->binary & (1 << LC_TIME)) == 0)
|
|
time_finish (locale);
|
|
if ((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. */
|
|
ctype_output (locale, charset, output_path);
|
|
collate_output (locale, charset, output_path);
|
|
monetary_output (locale, output_path);
|
|
numeric_output (locale, output_path);
|
|
time_output (locale, output_path);
|
|
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)
|
|
{
|
|
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)
|
|
{
|
|
error (0, errno, _("failure while writing data for category `%s'"),
|
|
category);
|
|
break;
|
|
}
|
|
}
|
|
|
|
close (fd);
|
|
}
|