mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-23 11:20:07 +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>.
604 lines
16 KiB
C
604 lines
16 KiB
C
/* dcgettext.c -- implementation of the dcgettext(3) function
|
|
Copyright (C) 1995, 1996 Free Software Foundation, Inc.
|
|
|
|
This file is part of the GNU C Library. Its master source is NOT part of
|
|
the C library, however. The master source lives in /gd/gnu/lib.
|
|
|
|
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., 675 Mass Ave,
|
|
Cambridge, MA 02139, USA. */
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
# include <config.h>
|
|
#endif
|
|
|
|
#include <sys/types.h>
|
|
|
|
#ifdef __GNUC__
|
|
# define alloca __builtin_alloca
|
|
# define HAVE_ALLOCA 1
|
|
#else
|
|
# if defined HAVE_ALLOCA_H || defined _LIBC
|
|
# include <alloca.h>
|
|
# else
|
|
# ifdef _AIX
|
|
#pragma alloca
|
|
# else
|
|
# ifndef alloca
|
|
char *alloca ();
|
|
# endif
|
|
# endif
|
|
# endif
|
|
#endif
|
|
|
|
#include <errno.h>
|
|
#ifndef errno
|
|
extern int errno;
|
|
#endif
|
|
#ifndef __set_errno
|
|
# define __set_errno(val) errno = (val)
|
|
#endif
|
|
|
|
#if defined STDC_HEADERS || defined _LIBC
|
|
# include <stdlib.h>
|
|
#else
|
|
char *getenv ();
|
|
# ifdef HAVE_MALLOC_H
|
|
# include <malloc.h>
|
|
# else
|
|
void free ();
|
|
# endif
|
|
#endif
|
|
|
|
#if defined HAVE_STRING_H || defined _LIBC
|
|
# ifndef _GNU_SOURCE
|
|
# define _GNU_SOURCE 1
|
|
# endif
|
|
# include <string.h>
|
|
#else
|
|
# include <strings.h>
|
|
#endif
|
|
#if !HAVE_STRCHR && !defined _LIBC
|
|
# ifndef strchr
|
|
# define strchr index
|
|
# endif
|
|
#endif
|
|
|
|
#if defined HAVE_UNISTD_H || defined _LIBC
|
|
# include <unistd.h>
|
|
#endif
|
|
|
|
#include "gettext.h"
|
|
#include "gettextP.h"
|
|
#ifdef _LIBC
|
|
# include <libintl.h>
|
|
#else
|
|
# include "libgettext.h"
|
|
#endif
|
|
#include "hash-string.h"
|
|
|
|
/* @@ end of prolog @@ */
|
|
|
|
#ifdef _LIBC
|
|
/* Rename the non ANSI C functions. This is required by the standard
|
|
because some ANSI C functions will require linking with this object
|
|
file and the name space must not be polluted. */
|
|
# define getcwd __getcwd
|
|
# define stpcpy __stpcpy
|
|
#else
|
|
# if !defined HAVE_GETCWD
|
|
char *getwd ();
|
|
# define getcwd(buf, max) getwd (buf)
|
|
# else
|
|
char *getcwd ();
|
|
# endif
|
|
# ifndef HAVE_STPCPY
|
|
static char *stpcpy PARAMS ((char *dest, const char *src));
|
|
# endif
|
|
#endif
|
|
|
|
/* Amount to increase buffer size by in each try. */
|
|
#define PATH_INCR 32
|
|
|
|
/* The following is from pathmax.h. */
|
|
/* Non-POSIX BSD systems might have gcc's limits.h, which doesn't define
|
|
PATH_MAX but might cause redefinition warnings when sys/param.h is
|
|
later included (as on MORE/BSD 4.3). */
|
|
#if defined(_POSIX_VERSION) || (defined(HAVE_LIMITS_H) && !defined(__GNUC__))
|
|
# include <limits.h>
|
|
#endif
|
|
|
|
#ifndef _POSIX_PATH_MAX
|
|
# define _POSIX_PATH_MAX 255
|
|
#endif
|
|
|
|
#if !defined(PATH_MAX) && defined(_PC_PATH_MAX)
|
|
# define PATH_MAX (pathconf ("/", _PC_PATH_MAX) < 1 ? 1024 : pathconf ("/", _PC_PATH_MAX))
|
|
#endif
|
|
|
|
/* Don't include sys/param.h if it already has been. */
|
|
#if defined(HAVE_SYS_PARAM_H) && !defined(PATH_MAX) && !defined(MAXPATHLEN)
|
|
# include <sys/param.h>
|
|
#endif
|
|
|
|
#if !defined(PATH_MAX) && defined(MAXPATHLEN)
|
|
# define PATH_MAX MAXPATHLEN
|
|
#endif
|
|
|
|
#ifndef PATH_MAX
|
|
# define PATH_MAX _POSIX_PATH_MAX
|
|
#endif
|
|
|
|
/* XPG3 defines the result of `setlocale (category, NULL)' as:
|
|
``Directs `setlocale()' to query `category' and return the current
|
|
setting of `local'.''
|
|
However it does not specify the exact format. And even worse: POSIX
|
|
defines this not at all. So we can use this feature only on selected
|
|
system (e.g. those using GNU C Library). */
|
|
#ifdef _LIBC
|
|
# define HAVE_LOCALE_NULL
|
|
#endif
|
|
|
|
/* Name of the default domain used for gettext(3) prior any call to
|
|
textdomain(3). The default value for this is "messages". */
|
|
const char _nl_default_default_domain[] = "messages";
|
|
|
|
/* Value used as the default domain for gettext(3). */
|
|
const char *_nl_current_default_domain = _nl_default_default_domain;
|
|
|
|
/* Contains the default location of the message catalogs. */
|
|
const char _nl_default_dirname[] = GNULOCALEDIR;
|
|
|
|
/* List with bindings of specific domains created by bindtextdomain()
|
|
calls. */
|
|
struct binding *_nl_domain_bindings;
|
|
|
|
/* Prototypes for local functions. */
|
|
static char *find_msg PARAMS ((struct loaded_l10nfile *domain_file,
|
|
const char *msgid));
|
|
static const char *category_to_name PARAMS ((int category));
|
|
static const char *guess_category_value PARAMS ((int category,
|
|
const char *categoryname));
|
|
|
|
|
|
/* For those loosing systems which don't have `alloca' we have to add
|
|
some additional code emulating it. */
|
|
#ifdef HAVE_ALLOCA
|
|
/* Nothing has to be done. */
|
|
# define ADD_BLOCK(list, address) /* nothing */
|
|
# define FREE_BLOCKS(list) /* nothing */
|
|
#else
|
|
struct block_list
|
|
{
|
|
void *address;
|
|
struct block_list *next;
|
|
};
|
|
# define ADD_BLOCK(list, addr) \
|
|
do { \
|
|
struct block_list *newp = (struct block_list *) malloc (sizeof (*newp)); \
|
|
/* If we cannot get a free block we cannot add the new element to \
|
|
the list. */ \
|
|
if (newp != NULL) { \
|
|
newp->address = (addr); \
|
|
newp->next = (list); \
|
|
(list) = newp; \
|
|
} \
|
|
} while (0)
|
|
# define FREE_BLOCKS(list) \
|
|
do { \
|
|
while (list != NULL) { \
|
|
struct block_list *old = list; \
|
|
list = list->next; \
|
|
free (old); \
|
|
} \
|
|
} while (0)
|
|
# undef alloca
|
|
# define alloca(size) (malloc (size))
|
|
#endif /* have alloca */
|
|
|
|
|
|
/* Names for the libintl functions are a problem. They must not clash
|
|
with existing names and they should follow ANSI C. But this source
|
|
code is also used in GNU C Library where the names have a __
|
|
prefix. So we have to make a difference here. */
|
|
#ifdef _LIBC
|
|
# define DCGETTEXT __dcgettext
|
|
#else
|
|
# define DCGETTEXT dcgettext__
|
|
#endif
|
|
|
|
/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY
|
|
locale. */
|
|
char *
|
|
DCGETTEXT (domainname, msgid, category)
|
|
const char *domainname;
|
|
const char *msgid;
|
|
int category;
|
|
{
|
|
#ifndef HAVE_ALLOCA
|
|
struct block_list *block_list = NULL;
|
|
#endif
|
|
struct loaded_l10nfile *domain;
|
|
struct binding *binding;
|
|
const char *categoryname;
|
|
const char *categoryvalue;
|
|
char *dirname, *xdomainname;
|
|
char *single_locale;
|
|
char *retval;
|
|
int saved_errno = errno;
|
|
|
|
/* If no real MSGID is given return NULL. */
|
|
if (msgid == NULL)
|
|
return NULL;
|
|
|
|
/* If DOMAINNAME is NULL, we are interested in the default domain. If
|
|
CATEGORY is not LC_MESSAGES this might not make much sense but the
|
|
defintion left this undefined. */
|
|
if (domainname == NULL)
|
|
domainname = _nl_current_default_domain;
|
|
|
|
/* First find matching binding. */
|
|
for (binding = _nl_domain_bindings; binding != NULL; binding = binding->next)
|
|
{
|
|
int compare = strcmp (domainname, binding->domainname);
|
|
if (compare == 0)
|
|
/* We found it! */
|
|
break;
|
|
if (compare < 0)
|
|
{
|
|
/* It is not in the list. */
|
|
binding = NULL;
|
|
break;
|
|
}
|
|
}
|
|
|
|
if (binding == NULL)
|
|
dirname = (char *) _nl_default_dirname;
|
|
else if (binding->dirname[0] == '/')
|
|
dirname = binding->dirname;
|
|
else
|
|
{
|
|
/* We have a relative path. Make it absolute now. */
|
|
size_t dirname_len = strlen (binding->dirname) + 1;
|
|
size_t path_max;
|
|
char *ret;
|
|
|
|
path_max = (unsigned) PATH_MAX;
|
|
path_max += 2; /* The getcwd docs say to do this. */
|
|
|
|
dirname = (char *) alloca (path_max + dirname_len);
|
|
ADD_BLOCK (block_list, dirname);
|
|
|
|
__set_errno (0);
|
|
while ((ret = getcwd (dirname, path_max)) == NULL && errno == ERANGE)
|
|
{
|
|
path_max += PATH_INCR;
|
|
dirname = (char *) alloca (path_max + dirname_len);
|
|
ADD_BLOCK (block_list, dirname);
|
|
__set_errno (0);
|
|
}
|
|
|
|
if (ret == NULL)
|
|
{
|
|
/* We cannot get the current working directory. Don't signal an
|
|
error but simply return the default string. */
|
|
FREE_BLOCKS (block_list);
|
|
__set_errno (saved_errno);
|
|
return (char *) msgid;
|
|
}
|
|
|
|
/* We don't want libintl.a to depend on any other library. So
|
|
we avoid the non-standard function stpcpy. In GNU C Library
|
|
this function is available, though. Also allow the symbol
|
|
HAVE_STPCPY to be defined. */
|
|
stpcpy (stpcpy (strchr (dirname, '\0'), "/"), binding->dirname);
|
|
}
|
|
|
|
/* Now determine the symbolic name of CATEGORY and its value. */
|
|
categoryname = category_to_name (category);
|
|
categoryvalue = guess_category_value (category, categoryname);
|
|
|
|
xdomainname = (char *) alloca (strlen (categoryname)
|
|
+ strlen (domainname) + 5);
|
|
ADD_BLOCK (block_list, xdomainname);
|
|
/* We don't want libintl.a to depend on any other library. So we
|
|
avoid the non-standard function stpcpy. In GNU C Library this
|
|
function is available, though. Also allow the symbol HAVE_STPCPY
|
|
to be defined. */
|
|
stpcpy (stpcpy (stpcpy (stpcpy (xdomainname, categoryname), "/"),
|
|
domainname),
|
|
".mo");
|
|
|
|
/* Creating working area. */
|
|
single_locale = (char *) alloca (strlen (categoryvalue) + 1);
|
|
ADD_BLOCK (block_list, single_locale);
|
|
|
|
|
|
/* Search for the given string. This is a loop because we perhaps
|
|
got an ordered list of languages to consider for th translation. */
|
|
while (1)
|
|
{
|
|
/* Make CATEGORYVALUE point to the next element of the list. */
|
|
while (categoryvalue[0] != '\0' && categoryvalue[0] == ':')
|
|
++categoryvalue;
|
|
if (categoryvalue[0] == '\0')
|
|
{
|
|
/* The whole contents of CATEGORYVALUE has been searched but
|
|
no valid entry has been found. We solve this situation
|
|
by implicitely appending a "C" entry, i.e. no translation
|
|
will take place. */
|
|
single_locale[0] = 'C';
|
|
single_locale[1] = '\0';
|
|
}
|
|
else
|
|
{
|
|
char *cp = single_locale;
|
|
while (categoryvalue[0] != '\0' && categoryvalue[0] != ':')
|
|
*cp++ = *categoryvalue++;
|
|
*cp = '\0';
|
|
}
|
|
|
|
/* If the current locale value is C (or POSIX) we don't load a
|
|
domain. Return the MSGID. */
|
|
if (strcmp (single_locale, "C") == 0
|
|
|| strcmp (single_locale, "POSIX") == 0)
|
|
{
|
|
FREE_BLOCKS (block_list);
|
|
__set_errno (saved_errno);
|
|
return (char *) msgid;
|
|
}
|
|
|
|
|
|
/* Find structure describing the message catalog matching the
|
|
DOMAINNAME and CATEGORY. */
|
|
domain = _nl_find_domain (dirname, single_locale, xdomainname);
|
|
|
|
if (domain != NULL)
|
|
{
|
|
retval = find_msg (domain, msgid);
|
|
|
|
if (retval == NULL)
|
|
{
|
|
int cnt;
|
|
|
|
for (cnt = 0; domain->successor[cnt] != NULL; ++cnt)
|
|
{
|
|
retval = find_msg (domain->successor[cnt], msgid);
|
|
|
|
if (retval != NULL)
|
|
break;
|
|
}
|
|
}
|
|
|
|
if (retval != NULL)
|
|
{
|
|
FREE_BLOCKS (block_list);
|
|
__set_errno (saved_errno);
|
|
return retval;
|
|
}
|
|
}
|
|
}
|
|
/* NOTREACHED */
|
|
}
|
|
|
|
#ifdef _LIBC
|
|
/* Alias for function name in GNU C Library. */
|
|
weak_alias (__dcgettext, dcgettext);
|
|
#endif
|
|
|
|
|
|
static char *
|
|
find_msg (domain_file, msgid)
|
|
struct loaded_l10nfile *domain_file;
|
|
const char *msgid;
|
|
{
|
|
size_t top, act, bottom;
|
|
struct loaded_domain *domain;
|
|
|
|
if (domain_file->decided == 0)
|
|
_nl_load_domain (domain_file);
|
|
|
|
if (domain_file->data == NULL)
|
|
return NULL;
|
|
|
|
domain = (struct loaded_domain *) domain_file->data;
|
|
|
|
/* Locate the MSGID and its translation. */
|
|
if (domain->hash_size > 2 && domain->hash_tab != NULL)
|
|
{
|
|
/* Use the hashing table. */
|
|
nls_uint32 len = strlen (msgid);
|
|
nls_uint32 hash_val = hash_string (msgid);
|
|
nls_uint32 idx = hash_val % domain->hash_size;
|
|
nls_uint32 incr = 1 + (hash_val % (domain->hash_size - 2));
|
|
nls_uint32 nstr = W (domain->must_swap, domain->hash_tab[idx]);
|
|
|
|
if (nstr == 0)
|
|
/* Hash table entry is empty. */
|
|
return NULL;
|
|
|
|
if (W (domain->must_swap, domain->orig_tab[nstr - 1].length) == len
|
|
&& strcmp (msgid,
|
|
domain->data + W (domain->must_swap,
|
|
domain->orig_tab[nstr - 1].offset)) == 0)
|
|
return (char *) domain->data + W (domain->must_swap,
|
|
domain->trans_tab[nstr - 1].offset);
|
|
|
|
while (1)
|
|
{
|
|
if (idx >= domain->hash_size - incr)
|
|
idx -= domain->hash_size - incr;
|
|
else
|
|
idx += incr;
|
|
|
|
nstr = W (domain->must_swap, domain->hash_tab[idx]);
|
|
if (nstr == 0)
|
|
/* Hash table entry is empty. */
|
|
return NULL;
|
|
|
|
if (W (domain->must_swap, domain->orig_tab[nstr - 1].length) == len
|
|
&& strcmp (msgid,
|
|
domain->data + W (domain->must_swap,
|
|
domain->orig_tab[nstr - 1].offset))
|
|
== 0)
|
|
return (char *) domain->data
|
|
+ W (domain->must_swap, domain->trans_tab[nstr - 1].offset);
|
|
}
|
|
/* NOTREACHED */
|
|
}
|
|
|
|
/* Now we try the default method: binary search in the sorted
|
|
array of messages. */
|
|
bottom = 0;
|
|
top = domain->nstrings;
|
|
while (bottom < top)
|
|
{
|
|
int cmp_val;
|
|
|
|
act = (bottom + top) / 2;
|
|
cmp_val = strcmp (msgid, domain->data
|
|
+ W (domain->must_swap,
|
|
domain->orig_tab[act].offset));
|
|
if (cmp_val < 0)
|
|
top = act;
|
|
else if (cmp_val > 0)
|
|
bottom = act + 1;
|
|
else
|
|
break;
|
|
}
|
|
|
|
/* If an translation is found return this. */
|
|
return bottom >= top ? NULL : (char *) domain->data
|
|
+ W (domain->must_swap,
|
|
domain->trans_tab[act].offset);
|
|
}
|
|
|
|
|
|
/* Return string representation of locale CATEGORY. */
|
|
static const char *
|
|
category_to_name (category)
|
|
int category;
|
|
{
|
|
const char *retval;
|
|
|
|
switch (category)
|
|
{
|
|
#ifdef LC_COLLATE
|
|
case LC_COLLATE:
|
|
retval = "LC_COLLATE";
|
|
break;
|
|
#endif
|
|
#ifdef LC_CTYPE
|
|
case LC_CTYPE:
|
|
retval = "LC_CTYPE";
|
|
break;
|
|
#endif
|
|
#ifdef LC_MONETARY
|
|
case LC_MONETARY:
|
|
retval = "LC_MONETARY";
|
|
break;
|
|
#endif
|
|
#ifdef LC_NUMERIC
|
|
case LC_NUMERIC:
|
|
retval = "LC_NUMERIC";
|
|
break;
|
|
#endif
|
|
#ifdef LC_TIME
|
|
case LC_TIME:
|
|
retval = "LC_TIME";
|
|
break;
|
|
#endif
|
|
#ifdef LC_MESSAGES
|
|
case LC_MESSAGES:
|
|
retval = "LC_MESSAGES";
|
|
break;
|
|
#endif
|
|
#ifdef LC_RESPONSE
|
|
case LC_RESPONSE:
|
|
retval = "LC_RESPONSE";
|
|
break;
|
|
#endif
|
|
#ifdef LC_ALL
|
|
case LC_ALL:
|
|
/* This might not make sense but is perhaps better than any other
|
|
value. */
|
|
retval = "LC_ALL";
|
|
break;
|
|
#endif
|
|
default:
|
|
/* If you have a better idea for a default value let me know. */
|
|
retval = "LC_XXX";
|
|
}
|
|
|
|
return retval;
|
|
}
|
|
|
|
/* Guess value of current locale from value of the environment variables. */
|
|
static const char *guess_category_value (category, categoryname)
|
|
int category;
|
|
const char *categoryname;
|
|
{
|
|
const char *retval;
|
|
|
|
/* The highest priority value is the `LANGUAGE' environment
|
|
variable. This is a GNU extension. */
|
|
retval = getenv ("LANGUAGE");
|
|
if (retval != NULL && retval[0] != '\0')
|
|
return retval;
|
|
|
|
/* `LANGUAGE' is not set. So we have to proceed with the POSIX
|
|
methods of looking to `LC_ALL', `LC_xxx', and `LANG'. On some
|
|
systems this can be done by the `setlocale' function itself. */
|
|
#if defined HAVE_SETLOCALE && defined HAVE_LC_MESSAGES && defined HAVE_LOCALE_NULL
|
|
return setlocale (category, NULL);
|
|
#else
|
|
/* Setting of LC_ALL overwrites all other. */
|
|
retval = getenv ("LC_ALL");
|
|
if (retval != NULL && retval[0] != '\0')
|
|
return retval;
|
|
|
|
/* Next comes the name of the desired category. */
|
|
retval = getenv (categoryname);
|
|
if (retval != NULL && retval[0] != '\0')
|
|
return retval;
|
|
|
|
/* Last possibility is the LANG environment variable. */
|
|
retval = getenv ("LANG");
|
|
if (retval != NULL && retval[0] != '\0')
|
|
return retval;
|
|
|
|
/* We use C as the default domain. POSIX says this is implementation
|
|
defined. */
|
|
return "C";
|
|
#endif
|
|
}
|
|
|
|
/* @@ begin of epilog @@ */
|
|
|
|
/* We don't want libintl.a to depend on any other library. So we
|
|
avoid the non-standard function stpcpy. In GNU C Library this
|
|
function is available, though. Also allow the symbol HAVE_STPCPY
|
|
to be defined. */
|
|
#if !_LIBC && !HAVE_STPCPY
|
|
static char *
|
|
stpcpy (dest, src)
|
|
char *dest;
|
|
const char *src;
|
|
{
|
|
while ((*dest++ = *src++) != '\0')
|
|
/* Do nothing. */ ;
|
|
return dest - 1;
|
|
}
|
|
#endif
|