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>.
801 lines
20 KiB
C
801 lines
20 KiB
C
/*
|
|
* ++Copyright++ 1985, 1989, 1993
|
|
* -
|
|
* Copyright (c) 1985, 1989, 1993
|
|
* The Regents of the University of California. All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
* 3. All advertising materials mentioning features or use of this software
|
|
* must display the following acknowledgement:
|
|
* This product includes software developed by the University of
|
|
* California, Berkeley and its contributors.
|
|
* 4. Neither the name of the University nor the names of its contributors
|
|
* may be used to endorse or promote products derived from this software
|
|
* without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
* SUCH DAMAGE.
|
|
* -
|
|
* Portions Copyright (c) 1993 by Digital Equipment Corporation.
|
|
*
|
|
* Permission to use, copy, modify, and distribute this software for any
|
|
* purpose with or without fee is hereby granted, provided that the above
|
|
* copyright notice and this permission notice appear in all copies, and that
|
|
* the name of Digital Equipment Corporation not be used in advertising or
|
|
* publicity pertaining to distribution of the document or software without
|
|
* specific, written prior permission.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
|
|
* WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
|
|
* OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL DIGITAL EQUIPMENT
|
|
* CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
|
|
* DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
|
|
* PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
|
|
* ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
|
|
* SOFTWARE.
|
|
* -
|
|
* --Copyright--
|
|
*/
|
|
|
|
#if defined(LIBC_SCCS) && !defined(lint)
|
|
static char sccsid[] = "@(#)res_send.c 8.1 (Berkeley) 6/4/93";
|
|
static char rcsid[] = "$Id$";
|
|
#endif /* LIBC_SCCS and not lint */
|
|
|
|
/* change this to "0"
|
|
* if you talk to a lot
|
|
* of multi-homed SunOS
|
|
* ("broken") name servers.
|
|
*/
|
|
#define CHECK_SRVR_ADDR 1 /* XXX - should be in options.h */
|
|
|
|
/*
|
|
* Send query to name server and wait for reply.
|
|
*/
|
|
|
|
#include <sys/types.h>
|
|
#include <sys/param.h>
|
|
#include <sys/time.h>
|
|
#include <sys/socket.h>
|
|
#include <sys/uio.h>
|
|
#include <netinet/in.h>
|
|
#include <arpa/nameser.h>
|
|
#include <arpa/inet.h>
|
|
|
|
#include <stdio.h>
|
|
#include <netdb.h>
|
|
#include <errno.h>
|
|
#include <resolv.h>
|
|
#if defined(BSD) && (BSD >= 199306)
|
|
# include <stdlib.h>
|
|
# include <string.h>
|
|
# include <unistd.h>
|
|
#else
|
|
# include "../conf/portability.h"
|
|
#endif
|
|
|
|
#if defined(USE_OPTIONS_H)
|
|
# include <../conf/options.h>
|
|
#endif
|
|
|
|
void _res_close __P((void));
|
|
|
|
static int s = -1; /* socket used for communications */
|
|
static int connected = 0; /* is the socket connected */
|
|
static int vc = 0; /* is the socket a virtual ciruit? */
|
|
|
|
#ifndef FD_SET
|
|
/* XXX - should be in portability.h */
|
|
#define NFDBITS 32
|
|
#define FD_SETSIZE 32
|
|
#define FD_SET(n, p) ((p)->fds_bits[(n)/NFDBITS] |= (1 << ((n) % NFDBITS)))
|
|
#define FD_CLR(n, p) ((p)->fds_bits[(n)/NFDBITS] &= ~(1 << ((n) % NFDBITS)))
|
|
#define FD_ISSET(n, p) ((p)->fds_bits[(n)/NFDBITS] & (1 << ((n) % NFDBITS)))
|
|
#define FD_ZERO(p) bzero((char *)(p), sizeof(*(p)))
|
|
#endif
|
|
|
|
/* XXX - this should be done in portability.h */
|
|
#if (defined(BSD) && (BSD >= 199103)) || defined(linux)
|
|
# define CAN_RECONNECT 1
|
|
#else
|
|
# define CAN_RECONNECT 0
|
|
#endif
|
|
|
|
#ifndef DEBUG
|
|
# define Dprint(cond, args) /*empty*/
|
|
# define DprintQ(cond, args, query, size) /*empty*/
|
|
# define Aerror(file, string, error, address) /*empty*/
|
|
# define Perror(file, string, error) /*empty*/
|
|
#else
|
|
# define Dprint(cond, args) if (cond) {fprintf args;} else {}
|
|
# define DprintQ(cond, args, query, size) if (cond) {\
|
|
fprintf args;\
|
|
__fp_nquery(query, size, stdout);\
|
|
} else {}
|
|
static void
|
|
Aerror(file, string, error, address)
|
|
FILE *file;
|
|
char *string;
|
|
int error;
|
|
struct sockaddr_in address;
|
|
{
|
|
int save = errno;
|
|
|
|
if (_res.options & RES_DEBUG) {
|
|
fprintf(file, "res_send: %s ([%s].%u): %s\n",
|
|
string,
|
|
inet_ntoa(address.sin_addr),
|
|
ntohs(address.sin_port),
|
|
strerror(error));
|
|
}
|
|
__set_errno (save);
|
|
}
|
|
static void
|
|
Perror(file, string, error)
|
|
FILE *file;
|
|
char *string;
|
|
int error;
|
|
{
|
|
int save = errno;
|
|
|
|
if (_res.options & RES_DEBUG) {
|
|
fprintf(file, "res_send: %s: %s\n",
|
|
string, strerror(error));
|
|
}
|
|
__set_errno (save);
|
|
}
|
|
#endif
|
|
|
|
static res_send_qhook Qhook = NULL;
|
|
static res_send_rhook Rhook = NULL;
|
|
|
|
void
|
|
res_send_setqhook(hook)
|
|
res_send_qhook hook;
|
|
{
|
|
|
|
Qhook = hook;
|
|
}
|
|
|
|
void
|
|
res_send_setrhook(hook)
|
|
res_send_rhook hook;
|
|
{
|
|
|
|
Rhook = hook;
|
|
}
|
|
|
|
/* int
|
|
* res_isourserver(ina)
|
|
* looks up "ina" in _res.ns_addr_list[]
|
|
* returns:
|
|
* 0 : not found
|
|
* >0 : found
|
|
* author:
|
|
* paul vixie, 29may94
|
|
*/
|
|
int
|
|
res_isourserver(inp)
|
|
const struct sockaddr_in *inp;
|
|
{
|
|
struct sockaddr_in ina;
|
|
register int ns, ret;
|
|
|
|
ina = *inp;
|
|
ret = 0;
|
|
for (ns = 0; ns < _res.nscount; ns++) {
|
|
register const struct sockaddr_in *srv = &_res.nsaddr_list[ns];
|
|
|
|
if (srv->sin_family == ina.sin_family &&
|
|
srv->sin_port == ina.sin_port &&
|
|
(srv->sin_addr.s_addr == INADDR_ANY ||
|
|
srv->sin_addr.s_addr == ina.sin_addr.s_addr)) {
|
|
ret++;
|
|
break;
|
|
}
|
|
}
|
|
return (ret);
|
|
}
|
|
|
|
/* int
|
|
* res_nameinquery(name, type, class, buf, eom)
|
|
* look for (name,type,class) in the query section of packet (buf,eom)
|
|
* returns:
|
|
* -1 : format error
|
|
* 0 : not found
|
|
* >0 : found
|
|
* author:
|
|
* paul vixie, 29may94
|
|
*/
|
|
int
|
|
res_nameinquery(name, type, class, buf, eom)
|
|
const char *name;
|
|
register int type, class;
|
|
const u_char *buf, *eom;
|
|
{
|
|
register const u_char *cp = buf + HFIXEDSZ;
|
|
int qdcount = ntohs(((HEADER*)buf)->qdcount);
|
|
|
|
while (qdcount-- > 0) {
|
|
char tname[MAXDNAME+1];
|
|
register int n, ttype, tclass;
|
|
|
|
n = dn_expand(buf, eom, cp, tname, sizeof tname);
|
|
if (n < 0)
|
|
return (-1);
|
|
cp += n;
|
|
ttype = _getshort(cp); cp += INT16SZ;
|
|
tclass = _getshort(cp); cp += INT16SZ;
|
|
if (ttype == type &&
|
|
tclass == class &&
|
|
strcasecmp(tname, name) == 0)
|
|
return (1);
|
|
}
|
|
return (0);
|
|
}
|
|
|
|
/* int
|
|
* res_queriesmatch(buf1, eom1, buf2, eom2)
|
|
* is there a 1:1 mapping of (name,type,class)
|
|
* in (buf1,eom1) and (buf2,eom2)?
|
|
* returns:
|
|
* -1 : format error
|
|
* 0 : not a 1:1 mapping
|
|
* >0 : is a 1:1 mapping
|
|
* author:
|
|
* paul vixie, 29may94
|
|
*/
|
|
int
|
|
res_queriesmatch(buf1, eom1, buf2, eom2)
|
|
const u_char *buf1, *eom1;
|
|
const u_char *buf2, *eom2;
|
|
{
|
|
register const u_char *cp = buf1 + HFIXEDSZ;
|
|
int qdcount = ntohs(((HEADER*)buf1)->qdcount);
|
|
|
|
if (qdcount != ntohs(((HEADER*)buf2)->qdcount))
|
|
return (0);
|
|
while (qdcount-- > 0) {
|
|
char tname[MAXDNAME+1];
|
|
register int n, ttype, tclass;
|
|
|
|
n = dn_expand(buf1, eom1, cp, tname, sizeof tname);
|
|
if (n < 0)
|
|
return (-1);
|
|
cp += n;
|
|
ttype = _getshort(cp); cp += INT16SZ;
|
|
tclass = _getshort(cp); cp += INT16SZ;
|
|
if (!res_nameinquery(tname, ttype, tclass, buf2, eom2))
|
|
return (0);
|
|
}
|
|
return (1);
|
|
}
|
|
|
|
int
|
|
res_send(buf, buflen, ans, anssiz)
|
|
const u_char *buf;
|
|
int buflen;
|
|
u_char *ans;
|
|
int anssiz;
|
|
{
|
|
HEADER *hp = (HEADER *) buf;
|
|
HEADER *anhp = (HEADER *) ans;
|
|
int gotsomewhere, connreset, terrno, try, v_circuit, resplen, ns;
|
|
register int n;
|
|
u_int badns; /* XXX NSMAX can't exceed #/bits in this var */
|
|
|
|
if ((_res.options & RES_INIT) == 0 && res_init() == -1) {
|
|
/* errno should have been set by res_init() in this case. */
|
|
return (-1);
|
|
}
|
|
DprintQ((_res.options & RES_DEBUG) || (_res.pfcode & RES_PRF_QUERY),
|
|
(stdout, ";; res_send()\n"), buf, buflen);
|
|
v_circuit = (_res.options & RES_USEVC) || buflen > PACKETSZ;
|
|
gotsomewhere = 0;
|
|
connreset = 0;
|
|
terrno = ETIMEDOUT;
|
|
badns = 0;
|
|
|
|
/*
|
|
* Send request, RETRY times, or until successful
|
|
*/
|
|
for (try = 0; try < _res.retry; try++) {
|
|
for (ns = 0; ns < _res.nscount; ns++) {
|
|
struct sockaddr_in *nsap = &_res.nsaddr_list[ns];
|
|
same_ns:
|
|
if (badns & (1 << ns)) {
|
|
_res_close();
|
|
goto next_ns;
|
|
}
|
|
|
|
if (Qhook) {
|
|
int done = 0, loops = 0;
|
|
|
|
do {
|
|
res_sendhookact act;
|
|
|
|
act = (*Qhook)(&nsap, &buf, &buflen,
|
|
ans, anssiz, &resplen);
|
|
switch (act) {
|
|
case res_goahead:
|
|
done = 1;
|
|
break;
|
|
case res_nextns:
|
|
_res_close();
|
|
goto next_ns;
|
|
case res_done:
|
|
return (resplen);
|
|
case res_modified:
|
|
/* give the hook another try */
|
|
if (++loops < 42) /*doug adams*/
|
|
break;
|
|
/*FALLTHROUGH*/
|
|
case res_error:
|
|
/*FALLTHROUGH*/
|
|
default:
|
|
return (-1);
|
|
}
|
|
} while (!done);
|
|
}
|
|
|
|
Dprint(_res.options & RES_DEBUG,
|
|
(stdout, ";; Querying server (# %d) address = %s\n",
|
|
ns + 1, inet_ntoa(nsap->sin_addr)));
|
|
|
|
if (v_circuit) {
|
|
int truncated;
|
|
struct iovec iov[2];
|
|
u_short len;
|
|
u_char *cp;
|
|
|
|
/*
|
|
* Use virtual circuit;
|
|
* at most one attempt per server.
|
|
*/
|
|
try = _res.retry;
|
|
truncated = 0;
|
|
if ((s < 0) || (!vc)) {
|
|
if (s >= 0)
|
|
_res_close();
|
|
|
|
s = socket(PF_INET, SOCK_STREAM, 0);
|
|
if (s < 0) {
|
|
terrno = errno;
|
|
Perror(stderr, "socket(vc)", errno);
|
|
return (-1);
|
|
}
|
|
__set_errno (0);
|
|
if (connect(s, (struct sockaddr *)nsap,
|
|
sizeof(struct sockaddr)) < 0) {
|
|
terrno = errno;
|
|
Aerror(stderr, "connect/vc",
|
|
errno, *nsap);
|
|
badns |= (1 << ns);
|
|
_res_close();
|
|
goto next_ns;
|
|
}
|
|
vc = 1;
|
|
}
|
|
/*
|
|
* Send length & message
|
|
*/
|
|
putshort((u_short)buflen, (u_char*)&len);
|
|
iov[0].iov_base = (caddr_t)&len;
|
|
iov[0].iov_len = INT16SZ;
|
|
iov[1].iov_base = (caddr_t)buf;
|
|
iov[1].iov_len = buflen;
|
|
if (writev(s, iov, 2) != (INT16SZ + buflen)) {
|
|
terrno = errno;
|
|
Perror(stderr, "write failed", errno);
|
|
badns |= (1 << ns);
|
|
_res_close();
|
|
goto next_ns;
|
|
}
|
|
/*
|
|
* Receive length & response
|
|
*/
|
|
read_len:
|
|
cp = ans;
|
|
len = INT16SZ;
|
|
while ((n = read(s, (char *)cp, (int)len)) > 0) {
|
|
cp += n;
|
|
if ((len -= n) <= 0)
|
|
break;
|
|
}
|
|
if (n <= 0) {
|
|
terrno = errno;
|
|
Perror(stderr, "read failed", errno);
|
|
_res_close();
|
|
/*
|
|
* A long running process might get its TCP
|
|
* connection reset if the remote server was
|
|
* restarted. Requery the server instead of
|
|
* trying a new one. When there is only one
|
|
* server, this means that a query might work
|
|
* instead of failing. We only allow one reset
|
|
* per query to prevent looping.
|
|
*/
|
|
if (terrno == ECONNRESET && !connreset) {
|
|
connreset = 1;
|
|
_res_close();
|
|
goto same_ns;
|
|
}
|
|
_res_close();
|
|
goto next_ns;
|
|
}
|
|
resplen = _getshort(ans);
|
|
if (resplen > anssiz) {
|
|
Dprint(_res.options & RES_DEBUG,
|
|
(stdout, ";; response truncated\n")
|
|
);
|
|
truncated = 1;
|
|
len = anssiz;
|
|
} else
|
|
len = resplen;
|
|
cp = ans;
|
|
while (len != 0 &&
|
|
(n = read(s, (char *)cp, (int)len)) > 0) {
|
|
cp += n;
|
|
len -= n;
|
|
}
|
|
if (n <= 0) {
|
|
terrno = errno;
|
|
Perror(stderr, "read(vc)", errno);
|
|
_res_close();
|
|
goto next_ns;
|
|
}
|
|
if (truncated) {
|
|
/*
|
|
* Flush rest of answer
|
|
* so connection stays in synch.
|
|
*/
|
|
anhp->tc = 1;
|
|
len = resplen - anssiz;
|
|
while (len != 0) {
|
|
char junk[PACKETSZ];
|
|
|
|
n = (len > sizeof(junk)
|
|
? sizeof(junk)
|
|
: len);
|
|
if ((n = read(s, junk, n)) > 0)
|
|
len -= n;
|
|
else
|
|
break;
|
|
}
|
|
}
|
|
/*
|
|
* The calling applicating has bailed out of
|
|
* a previous call and failed to arrange to have
|
|
* the circuit closed or the server has got
|
|
* itself confused. Anyway drop the packet and
|
|
* wait for the correct one.
|
|
*/
|
|
if (hp->id != anhp->id) {
|
|
DprintQ((_res.options & RES_DEBUG) ||
|
|
(_res.pfcode & RES_PRF_REPLY),
|
|
(stdout, ";; old answer (unexpected):\n"),
|
|
ans, (resplen>anssiz)?anssiz:resplen);
|
|
goto read_len;
|
|
}
|
|
} else {
|
|
/*
|
|
* Use datagrams.
|
|
*/
|
|
struct timeval timeout;
|
|
fd_set dsmask;
|
|
struct sockaddr_in from;
|
|
size_t fromlen;
|
|
|
|
if ((s < 0) || vc) {
|
|
if (vc)
|
|
_res_close();
|
|
s = socket(PF_INET, SOCK_DGRAM, 0);
|
|
if (s < 0) {
|
|
#if !CAN_RECONNECT
|
|
bad_dg_sock:
|
|
#endif
|
|
terrno = errno;
|
|
Perror(stderr, "socket(dg)", errno);
|
|
return (-1);
|
|
}
|
|
connected = 0;
|
|
}
|
|
/*
|
|
* On a 4.3BSD+ machine (client and server,
|
|
* actually), sending to a nameserver datagram
|
|
* port with no nameserver will cause an
|
|
* ICMP port unreachable message to be returned.
|
|
* If our datagram socket is "connected" to the
|
|
* server, we get an ECONNREFUSED error on the next
|
|
* socket operation, and select returns if the
|
|
* error message is received. We can thus detect
|
|
* the absence of a nameserver without timing out.
|
|
* If we have sent queries to at least two servers,
|
|
* however, we don't want to remain connected,
|
|
* as we wish to receive answers from the first
|
|
* server to respond.
|
|
*/
|
|
if (_res.nscount == 1 || (try == 0 && ns == 0)) {
|
|
/*
|
|
* Connect only if we are sure we won't
|
|
* receive a response from another server.
|
|
*/
|
|
if (!connected) {
|
|
if (connect(s, (struct sockaddr *)nsap,
|
|
sizeof(struct sockaddr)
|
|
) < 0) {
|
|
Aerror(stderr,
|
|
"connect(dg)",
|
|
errno, *nsap);
|
|
badns |= (1 << ns);
|
|
_res_close();
|
|
goto next_ns;
|
|
}
|
|
connected = 1;
|
|
}
|
|
if (send(s, (char*)buf, buflen, 0) != buflen) {
|
|
Perror(stderr, "send", errno);
|
|
badns |= (1 << ns);
|
|
_res_close();
|
|
goto next_ns;
|
|
}
|
|
} else {
|
|
/*
|
|
* Disconnect if we want to listen
|
|
* for responses from more than one server.
|
|
*/
|
|
if (connected) {
|
|
#if CAN_RECONNECT
|
|
struct sockaddr_in no_addr;
|
|
|
|
no_addr.sin_family = AF_INET;
|
|
no_addr.sin_addr.s_addr = INADDR_ANY;
|
|
no_addr.sin_port = 0;
|
|
(void) connect(s,
|
|
(struct sockaddr *)
|
|
&no_addr,
|
|
sizeof(no_addr));
|
|
#else
|
|
int s1 = socket(PF_INET, SOCK_DGRAM,0);
|
|
if (s1 < 0)
|
|
goto bad_dg_sock;
|
|
(void) dup2(s1, s);
|
|
(void) close(s1);
|
|
Dprint(_res.options & RES_DEBUG,
|
|
(stdout, ";; new DG socket\n"))
|
|
#endif
|
|
connected = 0;
|
|
__set_errno (0);
|
|
}
|
|
if (sendto(s, (char*)buf, buflen, 0,
|
|
(struct sockaddr *)nsap,
|
|
sizeof(struct sockaddr))
|
|
!= buflen) {
|
|
Aerror(stderr, "sendto", errno, *nsap);
|
|
badns |= (1 << ns);
|
|
_res_close();
|
|
goto next_ns;
|
|
}
|
|
}
|
|
|
|
/*
|
|
* Wait for reply
|
|
*/
|
|
timeout.tv_sec = (_res.retrans << try);
|
|
if (try > 0)
|
|
timeout.tv_sec /= _res.nscount;
|
|
if ((long) timeout.tv_sec <= 0)
|
|
timeout.tv_sec = 1;
|
|
timeout.tv_usec = 0;
|
|
wait:
|
|
FD_ZERO(&dsmask);
|
|
FD_SET(s, &dsmask);
|
|
n = select(s+1, &dsmask, (fd_set *)NULL,
|
|
(fd_set *)NULL, &timeout);
|
|
if (n < 0) {
|
|
if (errno == EINTR)
|
|
goto wait;
|
|
Perror(stderr, "select", errno);
|
|
_res_close();
|
|
goto next_ns;
|
|
}
|
|
if (n == 0) {
|
|
/*
|
|
* timeout
|
|
*/
|
|
Dprint(_res.options & RES_DEBUG,
|
|
(stdout, ";; timeout\n"));
|
|
gotsomewhere = 1;
|
|
_res_close();
|
|
goto next_ns;
|
|
}
|
|
__set_errno (0);
|
|
fromlen = sizeof(struct sockaddr_in);
|
|
resplen = recvfrom(s, (char*)ans, anssiz, 0,
|
|
(struct sockaddr *)&from, &fromlen);
|
|
if (resplen <= 0) {
|
|
Perror(stderr, "recvfrom", errno);
|
|
_res_close();
|
|
goto next_ns;
|
|
}
|
|
gotsomewhere = 1;
|
|
if (hp->id != anhp->id) {
|
|
/*
|
|
* response from old query, ignore it.
|
|
* XXX - potential security hazard could
|
|
* be detected here.
|
|
*/
|
|
DprintQ((_res.options & RES_DEBUG) ||
|
|
(_res.pfcode & RES_PRF_REPLY),
|
|
(stdout, ";; old answer:\n"),
|
|
ans, (resplen>anssiz)?anssiz:resplen);
|
|
goto wait;
|
|
}
|
|
#if CHECK_SRVR_ADDR
|
|
if (!(_res.options & RES_INSECURE1) &&
|
|
!res_isourserver(&from)) {
|
|
/*
|
|
* response from wrong server? ignore it.
|
|
* XXX - potential security hazard could
|
|
* be detected here.
|
|
*/
|
|
DprintQ((_res.options & RES_DEBUG) ||
|
|
(_res.pfcode & RES_PRF_REPLY),
|
|
(stdout, ";; not our server:\n"),
|
|
ans, (resplen>anssiz)?anssiz:resplen);
|
|
goto wait;
|
|
}
|
|
#endif
|
|
if (!(_res.options & RES_INSECURE2) &&
|
|
!res_queriesmatch(buf, buf + buflen,
|
|
ans, ans + anssiz)) {
|
|
/*
|
|
* response contains wrong query? ignore it.
|
|
* XXX - potential security hazard could
|
|
* be detected here.
|
|
*/
|
|
DprintQ((_res.options & RES_DEBUG) ||
|
|
(_res.pfcode & RES_PRF_REPLY),
|
|
(stdout, ";; wrong query name:\n"),
|
|
ans, (resplen>anssiz)?anssiz:resplen);
|
|
goto wait;
|
|
}
|
|
if (anhp->rcode == SERVFAIL ||
|
|
anhp->rcode == NOTIMP ||
|
|
anhp->rcode == REFUSED) {
|
|
DprintQ(_res.options & RES_DEBUG,
|
|
(stdout, "server rejected query:\n"),
|
|
ans, (resplen>anssiz)?anssiz:resplen);
|
|
badns |= (1 << ns);
|
|
_res_close();
|
|
/* don't retry if called from dig */
|
|
if (!_res.pfcode)
|
|
goto next_ns;
|
|
}
|
|
if (!(_res.options & RES_IGNTC) && anhp->tc) {
|
|
/*
|
|
* get rest of answer;
|
|
* use TCP with same server.
|
|
*/
|
|
Dprint(_res.options & RES_DEBUG,
|
|
(stdout, ";; truncated answer\n"));
|
|
v_circuit = 1;
|
|
_res_close();
|
|
goto same_ns;
|
|
}
|
|
} /*if vc/dg*/
|
|
Dprint((_res.options & RES_DEBUG) ||
|
|
((_res.pfcode & RES_PRF_REPLY) &&
|
|
(_res.pfcode & RES_PRF_HEAD1)),
|
|
(stdout, ";; got answer:\n"));
|
|
DprintQ((_res.options & RES_DEBUG) ||
|
|
(_res.pfcode & RES_PRF_REPLY),
|
|
(stdout, ""),
|
|
ans, (resplen>anssiz)?anssiz:resplen);
|
|
/*
|
|
* If using virtual circuits, we assume that the first server
|
|
* is preferred over the rest (i.e. it is on the local
|
|
* machine) and only keep that one open.
|
|
* If we have temporarily opened a virtual circuit,
|
|
* or if we haven't been asked to keep a socket open,
|
|
* close the socket.
|
|
*/
|
|
if ((v_circuit && (!(_res.options & RES_USEVC) || ns != 0)) ||
|
|
!(_res.options & RES_STAYOPEN)) {
|
|
_res_close();
|
|
}
|
|
if (Rhook) {
|
|
int done = 0, loops = 0;
|
|
|
|
do {
|
|
res_sendhookact act;
|
|
|
|
act = (*Rhook)(nsap, buf, buflen,
|
|
ans, anssiz, &resplen);
|
|
switch (act) {
|
|
case res_goahead:
|
|
case res_done:
|
|
done = 1;
|
|
break;
|
|
case res_nextns:
|
|
_res_close();
|
|
goto next_ns;
|
|
case res_modified:
|
|
/* give the hook another try */
|
|
if (++loops < 42) /*doug adams*/
|
|
break;
|
|
/*FALLTHROUGH*/
|
|
case res_error:
|
|
/*FALLTHROUGH*/
|
|
default:
|
|
return (-1);
|
|
}
|
|
} while (!done);
|
|
|
|
}
|
|
return (resplen);
|
|
next_ns: ;
|
|
} /*foreach ns*/
|
|
} /*foreach retry*/
|
|
_res_close();
|
|
if (!v_circuit)
|
|
if (!gotsomewhere)
|
|
__set_errno (ECONNREFUSED); /* no nameservers found */
|
|
else
|
|
__set_errno (ETIMEDOUT); /* no answer obtained */
|
|
else
|
|
__set_errno (terrno);
|
|
return (-1);
|
|
}
|
|
|
|
/*
|
|
* This routine is for closing the socket if a virtual circuit is used and
|
|
* the program wants to close it. This provides support for endhostent()
|
|
* which expects to close the socket.
|
|
*
|
|
* This routine is not expected to be user visible.
|
|
*/
|
|
void
|
|
_res_close()
|
|
{
|
|
if (s >= 0) {
|
|
(void) close(s);
|
|
s = -1;
|
|
connected = 0;
|
|
vc = 0;
|
|
}
|
|
}
|
|
|
|
#ifdef ultrix
|
|
/* ultrix 4.0 had some icky packaging in its libc.a. alias for it here.
|
|
* there is more gunk of this kind over in res_debug.c.
|
|
*/
|
|
|
|
#undef res_send
|
|
int
|
|
res_send(buf, buflen, ans, anssiz)
|
|
const u_char *buf;
|
|
int buflen;
|
|
u_char *ans;
|
|
int anssiz;
|
|
{
|
|
return (__res_send(buf, buflen, ans, anssiz));
|
|
}
|
|
#endif /* Ultrix 4.0 hackery */
|