mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-27 03:41:23 +08:00
dfd2257ad9
1997-10-12 05:09 Ulrich Drepper <drepper@cygnus.com> * libio/Makefile (routines): Remove iofprintf. * stdio-common/fprintf.c [USE_IN_LIBIO]: Define _IO_fprintf. * libio/filedoalloc.c: Use _G_stat64 instead of stat. * libio/fileops.c (_IO_file_open): Change to take extra argument indicating whether 32 or 64 bit mode is wanted. * libio/iofopen.c: Call _IO_file_open with extra argument set to 0. * libio/iofopen64.c: Call _IO_file_open with extra argument set to 0. * libio/iolibio.h (_IO_freopen, _IO_freopen64): Likewise. * libio/iofgetpos.c: Pretty print. * libio/iofgetpos64.c: Use _IO_fpos64_t for local variable `pos'. * manual/conf.texi: Document all the _SC_ and _CS_ constants. * manual/creature.texi: Document _LARGEFILE_SOURCE, _LARGEFILE64_SOURCE and _FILE_OFFSET_BITS. * manual/llio.texi: Document truncate and ftruncate. * manual/stdio.texi: Document positional parameters for printf. * math/Makefile (headers): Add tgmath.h. (libm-support): Remove s_lrint, s_llrint, s_lround, and s_llround and move to ... (libm-calls): ... here. Add scalbln, s_nextafterx and s_fma. * math/libm-test.c (lround_test, llround_test): Test for all FP formats by using FUNC(). * math/libm.map: Add fma, fmaf, fmal, nextafterx, nextafterxf, nextafterxl, scalbln, scalblnf, scalblnl, lrintf, lrintl, llrintf, llrintl, lroundf, lroundl, llroundf, and llroundl. * math/math.h: Document new platform specific macros from mathdef.h. Remove declaration of lrint, llrint, lround, and llround. * math/test-double.c: Define TEST_DOUBLE. * math/test-idouble.c: Likewise. * math/test-float.c: Define TEST_FLOAT. * math/test-ifloat.c: Likewise. * math/tgmath.h: New file. * math/bits/mathcalls.h: Add nextafterx, scalbln, fma, lrint, llrint, lround, and llround. Change second argument of scalbn to `int'. * sysdeps/libm-ieee754/s_fma.S: New file. * sysdeps/libm-ieee754/s_fmaf.S: New file. * sysdeps/libm-ieee754/s_fmal.S: New file. * sysdeps/libm-i387/s_fma.S: New file. * sysdeps/libm-i387/s_fmaf.S: New file. * sysdeps/libm-i387/s_fmal.S: New file. * sysdeps/libm-i387/s_llrint.S: Change to take double argument. * sysdeps/libm-i387/s_lrint.S: Likewise. * sysdeps/libm-i387/s_llrintf.S: New file. * sysdeps/libm-i387/s_llrintl.S: New file. * sysdeps/libm-i387/s_lrintf.S: New file. * sysdeps/libm-i387/s_lrintl.S: New file. * sysdeps/libm-ieee754/s_llrint.c: Remove version which works on 80bit double. * sysdeps/libm-ieee754/s_lrint.c: Likewise. * sysdeps/libm-ieee754/s_llrintf.S: New file. * sysdeps/libm-ieee754/s_llrintl.S: New file. * sysdeps/libm-ieee754/s_lrintf.S: New file. * sysdeps/libm-ieee754/s_lrintl.S: New file. * sysdeps/libm-i387/s_scalbln.c: New file. Empty file. * sysdeps/libm-i387/s_scalblnf.c: New file. Empty file. * sysdeps/libm-i387/s_scalblnl.c: New file. Empty file. * sysdeps/libm-i387/s_scalbn.c: Add scalbln as alias. * sysdeps/libm-i387/s_scalbnf.c: Add scalblnf as alias. * sysdeps/libm-i387/s_scalbnl.c: Add scalblnl as alias. * sysdeps/libm-ieee754/s_llround.c: Remove version which works on 80bit double. * sysdeps/libm-ieee754/s_lround.c: Likewise. * sysdeps/libm-ieee754/s_llroundf.c: Likewise. * sysdeps/libm-ieee754/s_llroundl.c: Likewise. * sysdeps/libm-ieee754/s_lroundf.c: Likewise. * sysdeps/libm-ieee754/s_lroundl.c: Likewise. * sysdeps/libm-ieee754/s_nextafterl.c: Add alias fo nextafterxl. * sysdeps/libm-ieee754/s_nextafterx.c: New file. * sysdeps/libm-ieee754/s_nextafterxf.c: New file. * sysdeps/libm-ieee754/s_nextafterxl.c: New file. * sysdeps/libm-ieee754/s_scalbln.c: New file. * sysdeps/libm-ieee754/s_scalblnf.c: New file. * sysdeps/libm-ieee754/s_scalblnl.c: New file. * sysdeps/libm-ieee754/s_scalbn.c: Change to take `int' as second arg. * sysdeps/libm-ieee754/s_scalbnf.c: Likewise. * sysdeps/libm-ieee754/s_scalbnl.c: Likewise. * stdlib/stdlib.h: Protect declarations of __strto*l_internal functions by #ifdefs since they are duplicated in inttypes.h. * sysdeps/wordsize-32/inttypes.h: Add definition of strtoimax and strtoumax plus needed declarations. * sysdeps/generic/confname.h (_SC_AIO_LISTIO_MAX): Fix typo. 1997-10-09 Andreas Jaeger <aj@arthur.rhein-neckar.de> * locale/programs/locfile.c (locfile_read): Correct while loop. * db2/makedb.c (main): Add missing parameter for error output. (process_input): Likewise. * resolv/gethnamaddr.c (getanswer): Rewrite a bit to avoid warning. 1997-10-12 05:05 Ulrich Drepper <drepper@cygnus.com> * libc-map: Add __bzero, __mempcpy. 1997-10-10 18:51 David S. Miller <davem@tanya.rutgers.edu> * sysdeps/unix/sysv/linux/sparc/bits/ioctls.h: Remove dependencies on kernel_termios.h 1997-10-09 10:24 Thorsten Kukuk <kukuk@vt.uni-paderborn.de> Add the changes from the Solaris 2.6 header files, use the new public defines/functions. * nis/nis_addmember.c: Updated. * nis/nis_checkpoint.c: Updated. * nis/nis_creategroup.c: updated. * nis/nis_destroygroup.c: Updated. * nis/nis_getservlist.c: Updated. * nis/nis_ismember.c: Updated. * nis/nis_lookup.c: Updated. * nis/nis_modify.c: Updated. * nis/nis_ping.c: Updated. * nis/nis_print.c: Updated. * nis/nis_print_group_entry.c: Updated. * nis/nis_remove.c: Updated. * nis/nis_removemember.c: Updated. * nis/nis_xdr.c: Updated. * nis/nss_nisplus/nisplus-alias.c: Updated. * nis/nss_nisplus/nisplus-ethers.c: Updated. * nis/nss_nisplus/nisplus-hosts.c: Updated. * nis/nss_nisplus/nisplus-network.c: Updated. * nis/nss_nisplus/nisplus-parser.c: Updated. * nis/nss_nisplus/nisplus-proto.c: Updated. * nis/nss_nisplus/nisplus-rpc.c: Updated. * nis/nss_nisplus/nisplus-service.c: Updated. * nis/rpcsvc/nis.h: Updated. * nis/rpcsvc/nis.x: Updated. * nis/rpcsvc/nis_object.x: Updated. * nis/rpcsvc/nis_tags.h: Updated. * nis/rpcsvc/nislib.h: Updated. * nis/lckcache.c: Removed, since Sun has dropped the directory signatures. The old cache version is now a security risk and not longer supported by Sun. * nis/nis_cache.c: Likewise. * nis/rpcsvc/nis_cache.h: Likewise. * nis/rpcsvc/nis_cache.x: Likewise. * nis/nis_call.c: Remove calls to the cache functions. * nis/libnsl.map: Remove cache and depending functions. * nis/nis_intern.h: Likewise. * nis/nis_add.c: Remove #include <rpcsvc/nislib.h>. * nis/nis_domain_of.c: Likewise. * nis/nis_domain_of_r.c: Likewise. * nis/nis_error.c: Likewise. * nis/nis_file.c: Likewise. * nis/nis_local_names.c: Likewise. * nis/nis_mkdir.c: Likewise. * nis/nis_rmdir.c: Likewise. * nis/nis_subr.c: Likewise. * nis/nis_verifygroup.c: Likewise. * nis/nis_clone.c: Removed, replaced by ... * nis/nis_clone_dir.c: New. * nis/nis_clone_obj.c: New. * nis/nis_clone_res.c: New. * nis/nis_table.c: Fixed bugs shown through the new clone functions. * nis/nis_defaults.c: Fixed a lot of race conditions. * nis/nis_free.c: Rewritten. * sunrpc/auth_des.c: Fix use of free'ed pointer. * nis/Makefile (libnsl-routines): Remove nis_clone, nis_cache and lckcache. Add nis_clone_dir, nis_clone_obj, and nis_clone_res. 1997-10-09 Andreas Jaeger <aj@arthur.rhein-neckar.de> * wctype/test_wctype.c (TEST): Add parens to avoid ambiguity. 1997-10-08 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * include/features.h: Don't crash if _XOPEN_SOURCE is defined to be empty. 1997-10-09 05:54 Ulrich Drepper <drepper@cygnus.com> * nss/digits_dots.c: Place `result' in resbuf and not in `buffer'. * nss/getXXbyYY_r.c: Make sure digits_dots.c sees `resbuf' as struct and not a pointer. Little optimizations. 1997-10-09 05:00 Ulrich Drepper <drepper@cygnus.com> * sysdeps/stub/getenv.c: Remove unused file. * sysdeps/stub/lxstat.c: Likewise. * sysdeps/stub/morecore.c: Likewise. * sysdeps/stub/putenv.c: Likewise. * sysdeps/stub/sbrk.c: Likewise. * sysdeps/stub/setenv.c: Likewise. * sysdeps/stub/sysd-stdio.c: Likewise. * sysdeps/stub/sysdep.h: Likewise. Reported by Zack Weinberg <zack@rabi.phys.columbia.edu>. 1997-10-09 04:58 Ulrich Drepper <drepper@cygnus.com> * configure.in: Add __bzero definition to DWARF2 unwind test. Reported by David S. Miller <davem@caip.rutgers.edu>. 1997-10-07 Paul Eggert <eggert@twinsun.com> * intl/loadmsgcat.c (_nl_load_domain): Fix &&/|| typo when checking file size. Check for overflow when stuffing off_t into size_t. 1997-10-07 18:11 Ulrich Drepper <drepper@cygnus.com> * time/africa: Update from tzdata1997i. 1997-10-07 Andreas Jaeger <aj@arthur.rhein-neckar.de> * posix/globtest.sh: Add arguments for name of dynamic linker and call dynamic linker to execute globtest. * posix/Makefile (tests): Supply arguments to globtest.sh. 1997-10-07 Andreas Jaeger <aj@arthur.rhein-neckar.de> * nis/rpcsvc/ypupd.h: Add missing __END_DECLS. 1997-10-03 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * libc.map: Add mempcpy, prctl. 1997-09-30 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/generic/memcmp.c: Avoid warnings. * sysdeps/generic/memset.c: Likewise. * sysdeps/generic/strchr.c: Likewise. * sysdeps/generic/strlen.c: Likewise. 1997-09-29 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * malloc/Makefile ($(objpfx)mtrace): Fix typo. 1997-09-29 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/m68k/dl-machine.h (elf_machine_rela): Fix last change. The R_68K_GLOB_DAT and R_68K_JMP_SLOT relocations really ignore the addend, Richard. (elf_machine_fixup_plt): Don't add the addend. (elf_machine_plt_value): New function. * sysdeps/alpha/dl-machine.h (elf_machine_plt_value): New function. * sysdeps/sparc/sparc32/dl-machine.h (elf_machine_plt_value): New function. * sysdeps/sparc/sparc64/dl-machine.h (elf_machine_plt_value): New function. * sysdeps/powerpc/dl-machine.h (elf_machine_plt_value): New function. * sysdeps/i386/dl-machine.h (elf_machine_plt_value): New function. * elf/dl-runtime.c (fixup, profile_fixup): Don't add in the addend, instead let the machine dependent setup decide. 1997-09-20 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/m68k/m68020/bits/string.h: New file. 1997-10-07 04:27 Richard Henderson <rth@cygnus.com> * Makeconfig (+includes): Add -I$(objpfx). * stdlib/longlong.h [__sparc__]: Prototype __udiv_qrnnd. * sysdeps/alpha/setjmp.S: __setjmp is the same as _setjmp. Make the former a strong symbol and the later a weak alias. * sysdeps/sparc/sparc32/setjmp.S: Likewise. * sysdeps/unix/sysv/linux/sparc/sparc64/setjmp.S: Likewise. 1997-10-06 21:01 David S. Miller <davem@tanya.rutgers.edu> * sysdeps/unix/sysv/linux/sparc/sparc64/bits/types.h: Make ino_t 64-bits. * sysdeps/unix/sysv/linux/sparc/sparc64/kernel_stat.h: Make st_ino member 64-bits as well, to match the kernel. 1997-10-06 19:35 Ulrich Drepper <drepper@cygnus.com> * sysdeps/sparc/sparc64/sub_n.S: Fix typo. Patch by Jakub Jelinek <jj@sunsite.ms.mff.cuni.cz>. 1997-10-06 01:09 Zack Weinberg <zack@rabi.phys.columbia.edu> * time/README: Correct list of files from tzcode package. Add contact information for tzcode/tzdata maintainers. Correct spelling of author's name. Compact lists. 1997-10-06 01:48 Ulrich Drepper <drepper@cygnus.com> * malloc/malloc.h: Remove hook definition without caller argument. * malloc/malloc.c: Likewise. * string/tester.c: Correct strsep test. * string/bits/string2.h: Define __string2_1bptr_p and use it. Patch by David S. Miller <davem@tanya.rutgers.edu>. * math/Makefile (routines): Add s_clog10. * math/libm-test.c: Add test for clog10. * math/libm.map: Add clog10{,f,l}. * math/bits/cmathcalls.h [__USE_GNU]: Add clog10. * sysdeps/libm-ieee754/s_clog10.c: New file. * sysdeps/libm-ieee754/s_clog10f.c: New file. * sysdeps/libm-ieee754/s_clog10l.c: New file. * manual/math.texi: Describe clog10. * config.h.in: Add USE_REGPARMS and define internal_function based on this. * configure.in: Define USE_REGPARMS for ix86 machines. * gmon/gmon.c: Mark write_hist, write_call_graph and write_bb_counts as internal functions. * inet/getnameinfo.c: Likewise for nrl_domainname. * inet/getnetgrent_r.c: Likewise for __internal_setnetgrent_reuse. * inet/rcmd.c: Likewise for __icheckhost. * intl/dcgettext.c: Likewise for category_to_name and guess_category_value. * intl/localealias.c: Likewise for read_alias_file. * io/fts.c: Likewise for fts_alloc, fts_build, fts_lfree, fts_maxarglen, fts_padjust, fts_palloc, fts_sort, and fts_stat. * libio/genops.c: Likewise for save_for_backup. * malloc/malloc.c (chunk_free, chunk_alloc, chunk_realloc, chunk_align, main_trim, heap_trim): Likewise. * malloc/mtrace.c (tr_where): Likewise. * misc/fstab.c (mnt2fs): Likewise. * misc/getttyent.c (skip, value): Likewise. * misc/syslog.c (openlog_internal): Likewise. * misc/tsearch.c (trecurse, tdestroy_internal): Likewise. * nss/nsswitch.c (nss_lookup_function, nss_parse_file, nss_getline, nss_parse_service_list, nss_new_service): Likewise. * posix/wordexp.c (parse_dollars, parse_backtick, eval_expr): Likewise. * resolv/inet_ntop.c (inet_ntop4, inet_ntop6): Likewise. * resolv/inet_pton.c (inet_pton4, inet_pton6): Likewise. * resolv/res_init.c (res_setoptions): Likewise. * stdio-common/printf_fp.c (group_number): Likewise. * stdio-common/vfprintf.c (buffered_vfprintf, group_number): Likewise. * stdlib/fmtmsg.c (internal_addseverity): Likewise. * sunrpc/auth_des.c (synchronize): Likewise. * sunrpc/auth_unix.c (marshal_new_auth): Likewise. * sunrpc/clnt_perr.c (auth_errmsg): Likewise. * sunrpc/key_call.c (key_call): Likewise. * sunprc/pmap_rmt.c (getbroadcastnets): Likewise. * sunrpc/svc_tcp.c (makefd_xprt): Likewise. * sunrpc/svcauth_des.c (cache_init, cache_spot, cache_ref, invalidate): Likewise. * sunrpc/xdr_rec.c (fix_buf_size, skip_input_bytes, flush_out, set_input_fragment, get_input_bytes): Likewise. * sysdeps/unix/sysv/linux/getsysstats.c (get_proc_path, phys_pages_info): Likewise. * sysdeps/unix/sysv/linux/if_index.c (opensock): Likewise. * sysdeps/unix/sysv/linux/poll.c (__emulate_poll): Likewise. * sysdeps/unix/sysv/linux/readv.c (__atomic_readv_replacement): Likewise. * sysdeps/unix/sysv/linux/readv.c (__atomic_writev_replacement): Likewise. * time/strptime.c (strptime_internal): Likewise. * time/tzfile.c (find_transition, compute_tzname_max): Likewise. * time/tzset.c (compute_change, tz_compute, tzset_internal): Likewise. * libc.map: Remove _libio_using_thunks, add _fp_hw and _dl_addr. * ctype/ctype.h: Pretty print. * grp/grp.h: Likewise. * include/libc-symbols.h: Likewise. * include/limits.h: Likewise. * include/values.h: Likewise. * io/fcntl.h: Likewise. * io/sys/stat.h: Likewise. * libio/stdio.h: Likewise. * malloc/malloc.h: Likewise. * misc/err.h: Likewise. * misc/regexp.h: Likewise. * misc/sys/cdefs.h: Likewise. * misc/sys/file.h: Likewise. * posix/sys/utsname.h: Likewise. * posix/sys/wait.h: Likewise. * pwd/pwd.h: Likewise. * resolv/netdb.h: Likewise. * signal/signal.h: Likewise. * stdlib/stdlib.h: Likewise. * string/endian.h: Likewise. * string/memory.h: Likewise. * sysdeps/mach/hurd/bits/fcntl.h: Likewise. * sysdeps/mach/hurd/sys/param.h: Likewise. * sysdeps/unix/sysv/linux/sys/param.h: Likewise. * termios/termios.h: Likewise. * wcsmbs/wchar.h: Likewise. * wctype/wctype.h: Likewise. * sysdeps/unix/bsd/bsd4.4/wait3.c: Use __WAIT_STATUS in definition. Implement Large File Support API. * include/features.h: Add suuport for _LARGEFILE_SOURCE, _LARGEFILE64_SOURCE, and _FILE_OFFSET_BITS. * libc.map: Add new functions for LFS. * dirent/Makefile (routines): Add readdir64 and readdir64_r. * dirent/dirent.h: Update readdir prototype for LFS and add new prototypes for above functions. * io/Makefile (routines): Add xstat64, fxstat64, lxstat64, statfs64, fstatfs64, lstat64, open64, lseek64, creat64, and ftw64. * io/creat64.c: New file. * io/fstat64.c: New file. * io/lstat64.c: New file. * io/stat64.c: New file. * io/ftw64.c: New file. * io/ftw.c: Rewrite to allow easy definition of ftw64. * io/ftw.h: Add LFS interface. * io/fcntl.h: Likewise. * io/sys/stat.h: Likewise. * io/sys/statfs.h: Likewise. * libio/Makefile (routines): Add iofgetpos64, iofopen64, iofsetpos64, freopen64, fseeko64, and ftello64. * libcio/fseeko64.c: New file. * libio/ftello64.c: New file. * libio/iofgetpos64.c: New file. * libio/iofopen64.c: New file. * libio/iofsetpos64.c: New file. * libio/fileops.c (_IO_file_fopen): Change to use _IO_off64_t. (_IO_file_attach): Likewise. (_IO_do_write): Likewise. (_IO_file_sync): Likewise. (_IO_file_seek): Likewise. (_IO_file_seekoff): Likewise. Use _G_stat64. (_IO_file_fopen64): New function. (_IO_file_jumps): Initialize showmanyc and imbue. * libio/genops.c (_IO_default_seekpos): Change to use _IO_fpos64_t. (_IO_default_seekoff): Likewise. (_IO_default_seek): Likewise. (_IO_default_showmanyc, _IO_default_imbue): New functions. * libio/iofopncook.c (_IO_cookie_seek): Change to use _IO_off64_t. * libio/iolibio.h: Add prototypes for LFS functions. * libio/ioseekoff.c: Change to use _IO_fpos64_t. * libio/ioseekpos.c: Likewise. * libio/libio.h: Define _IO_fpos64_t and _IO_off64_t. (_IO_FILE): Move _offset field to end and change type to _IO_off64_t. (_IO_seekoff, _IO_seekpos): Change prototype. * libio/libioP.h (_IO_seekoff_t, _IO_seekpos_t, _IO_seek_t): Change to use _IO_off64_t. Change prototypes for function from the *ops.c files. * libio/stdio.h: Add LFS interface definition. * libio/strops.c (_IO_str_seekoff): Change to use _IO_fpos64_t. * posix/Makefile (routines): Add pread64 and pwrite64. * posix/confstr.c: Handle _CS_LFS* requests. * posix/getconf.c: Handle LFS* requests. * sysdeps/generic/confname.h: Add _CS_LFS* constants. * posix/unistd.h: Document _LFS64_LARGEFILE and _LFS64_STDIO. Define off_t and off64_t appropriately. Change prototypes of LFS functions. * posix/sys/types.h: Add LFS types. * resources/Makefile (routines): Add getrlimit64 and setlimit64. * resource/sys/resource.h: Change prototypes of LFS functions. * stdio-common/Makefile (routines): Add tmpfile64. * stdio-common/tmpfile64.c: New file. * sysdeps/generic/_G_config.h: Define _G_fpos64_t and _G_off64_t. Define _G_OPEN64, _G_LSEEK64, _G_FSTAT64. * sysdeps/unix/sysv/linux/_G_config.h: Likewise. * sysdeps/generic/bits/resource.h: Add LFS definitions. * sysdeps/unix/bsd/sun/sunos4/bits/resource.h: Likewise. * sysdeps/unix/sysv/linux/bits/resource.h: Likewise. * sysdeps/generic/statfs.h: Use __fsblkcnt_t for some of the fields. * sysdeps/unix/sysv/linux/bits/statfs.h: Likewise. * sysdeps/unix/sysv/linux/mips/bits/statfs.h: Likewise. * sysdeps/generic/types.h: Define LFS types. * sysdeps/unix/sysv/linux/alpha/bits/types.h: Likewise. * sysdeps/unix/sysv/linux/bits/types.h: Likewise. * sysdeps/unix/sysv/linux/sparc/sparc64/bits/types.h: Likewise. * sysdeps/generic/sys/mman.h: Add LFS definitions. * sysdeps/unix/sysv/linux/sys/mman.h: Likewise. * sysdeps/generic/mach/hurd/bits/fcntl.h: Add flock LFS extensions. * sysdeps/unix/bsd/bits/fcntl.h: Likewise. * sysdeps/unix/sysv/linux/alpha/bits/fcntl.h: Likewise. * sysdeps/unix/sysv/linux/bits/fcntl.h: Likewise. * sysdeps/unix/sysv/linux/mips/bits/fcntl.h: Likewise. * sysdeps/generic/mach/hurd/bits/stat.h: Add stat LFS extensions. * sysdeps/unix/bsd/bits/stat.h: Likewise. * sysdeps/unix/bsd/osf/alpha/bits/stat.h: Likewise. * sysdeps/unix/sysv/linux/alpha/bits/stat.h: Likewise. * sysdeps/unix/sysv/linux/bits/stat.h: Likewise. * sysdeps/unix/sysv/linux/mips/bits/stat.h: Likewise. * sysdeps/unix/sysv/linux/sparc/bits/stat.h: Likewise. * sysdeps/unix/sysv/sysv4/i386/bits/stat.h: Likewise. * sysdeps/unix/sysv/sysv4/solaris2/bits/stat.h: Likewise. * sysdeps/posix/open64.c: New file. * sysdeps/stub/fstatfs64.c: New file. * sysdeps/stub/fxstat64.c: New file. * sysdeps/stub/getrlimit64.c: New file. * sysdeps/stub/lseek64.c: New file. * sysdeps/stub/lxstat64.c: New file. * sysdeps/stub/open64.c: New file. * sysdeps/stub/pread64.c: New file. * sysdeps/stub/pwrite64.c: New file. * sysdeps/stub/readdir64.c: New file. * sysdeps/stub/readdir64_r.c: New file. * sysdeps/stub/setrlimit64.c: New file. * sysdeps/stub/statfs64.c: New file. * sysdeps/stub/xstat64.c: New file. * sysdeps/unix/sysv/linux/llseek.c: Define as __llseek and make llseek and lseek64 weak aliases. * sysdeps/unix/sysv/linux/lseek64.c: New file. Empty. * sysdeps/unix/sysv/linux/alpha/bits/dirent.h: New file. * sysdeps/unix/sysv/linux/bits/dirent.h: Add LFS definitions. * sysdeps/posix/tempname.c: Add extra argument to trigger use of open64. * sysdeps/stub/tempname.c: Likewise. * stdio-common/tempnam.c: Call __stdio_gen_tempname with extra argument. * stdio-common/tmpfile.c: Likewise. * stdio-common/tmpnam.c: Likewise. * stdio-common/tmpnam_r.c: Likewise. * libio/libioP.h: Add definition ofr showmanyc and imbue callbacks. * libio/fileops.c (_IO_file_jumps): Initialize showmanyc and imbue. * libio/iofopncook.c (_IO_cookie_jumps): Likewise. * libio/iopopen.c (_IO_proc_jumps): Likewise. * libio/memstream.c (_IO_mem_jumps): Likewise. * libio/obprintf.c (_IO_obstack_jumps): Likewise. * libio/vsnprintf.c (_IO_strn_jumps): Likewise. * libio/strops.c (_IO_str_jumps): Likewise. * manual/arith.texi: Add a few words why cabs should be used. * manual/llio.texi: Describe sync, fsync, fdatasync. Tell about cleanup handlers & fcntl,lseek,write,read,close,open. * manual/process.texi: Tell about cleanup handlers & system,waitpid, wait. * manual/signal.texi: Likewise for pause. * manual/terminal.texi: Likewise for tcdrain. * manual/time.texi: Document nanosleep. * posix/exevp.c: Don't use nested function. * stdlib/ucontext.h: New file. * sysdeps/i386/sys/ucontext.h: New file. SysV/i386 API definitions. * sunrpc/xcrypt.c (hexval): Make a macro for efficiency. * sysdeps/i386/setjmp.h: Make `here` label local. * sysdeps/i386/elf/start.S: Define _fp_hw "variable". * sysdeps/stub/fstatfs.c: Correct warning. * sysdeps/stub/fxstat.c: Likewise. * sysdeps/stub/lxstat.c: Likewise. * sysdeps/unix/sysv/i386/i686/time.S: New file. 1997-10-03 20:56 Jason Merrill <jason@yorick.cygnus.com> * malloc/obstack.h (obstack_empty_p): New macro. 1997-10-04 17:41 Philip Blundell <Philip.Blundell@pobox.com> * inet/getnameinfo.c (getnameinfo): Remove spurious `#if INET6'. 1997-09-30 Zack Weinberg <zack@rabi.phys.columbia.edu> * maint.texi: Add copyright terms for libdb (Sleepycat, Harvard). Document new --with-binutils switch; delete reference to --with-gnu-as, --with-gnu-ld, --with-gnu-binutils. Add to description of --without-fp: a kernel FPU emulator is adequate (from FAQ) * INSTALL: Regenerated. 1997-09-30 17:29 Richard Henderson <rth@cygnus.com> * sysdeps/sparc/sparc32/dl-machine.h (elf_machine_rela): Move _dl_hwcap declaration to ... (elf_machine_fixup_plt): ... here.
657 lines
19 KiB
C
657 lines
19 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_init.c 8.1 (Berkeley) 6/7/93";
|
|
static char rcsid[] = "$Id$";
|
|
#endif /* LIBC_SCCS and not lint */
|
|
|
|
#include <sys/types.h>
|
|
#include <sys/param.h>
|
|
#include <sys/socket.h>
|
|
#include <sys/time.h>
|
|
#include <netinet/in.h>
|
|
#include <arpa/inet.h>
|
|
#include <arpa/nameser.h>
|
|
|
|
#include <stdio.h>
|
|
#include <ctype.h>
|
|
#include <resolv.h>
|
|
#if defined(BSD) && (BSD >= 199103)
|
|
# include <unistd.h>
|
|
# include <stdlib.h>
|
|
# include <string.h>
|
|
#else
|
|
# include "../conf/portability.h"
|
|
#endif
|
|
|
|
/*-------------------------------------- info about "sortlist" --------------
|
|
* Marc Majka 1994/04/16
|
|
* Allan Nathanson 1994/10/29 (BIND 4.9.3.x)
|
|
*
|
|
* NetInfo resolver configuration directory support.
|
|
*
|
|
* Allow a NetInfo directory to be created in the hierarchy which
|
|
* contains the same information as the resolver configuration file.
|
|
*
|
|
* - The local domain name is stored as the value of the "domain" property.
|
|
* - The Internet address(es) of the name server(s) are stored as values
|
|
* of the "nameserver" property.
|
|
* - The name server addresses are stored as values of the "nameserver"
|
|
* property.
|
|
* - The search list for host-name lookup is stored as values of the
|
|
* "search" property.
|
|
* - The sortlist comprised of IP address netmask pairs are stored as
|
|
* values of the "sortlist" property. The IP address and optional netmask
|
|
* should be separated by a slash (/) or ampersand (&) character.
|
|
* - Internal resolver variables can be set from the value of the "options"
|
|
* property.
|
|
*/
|
|
#if defined(NeXT)
|
|
# include <netinfo/ni.h>
|
|
# define NI_PATH_RESCONF "/locations/resolver"
|
|
# define NI_TIMEOUT 10
|
|
static int netinfo_res_init __P((int *haveenv, int *havesearch));
|
|
#endif
|
|
|
|
#if defined(USE_OPTIONS_H)
|
|
# include "../conf/options.h"
|
|
#endif
|
|
|
|
static void res_setoptions __P((char *, char *)) internal_function;
|
|
|
|
#ifdef RESOLVSORT
|
|
static const char sort_mask[] = "/&";
|
|
#define ISSORTMASK(ch) (strchr(sort_mask, ch) != NULL)
|
|
static u_int32_t net_mask __P((struct in_addr));
|
|
#endif
|
|
|
|
#if !defined(isascii) /* XXX - could be a function */
|
|
# define isascii(c) (!(c & 0200))
|
|
#endif
|
|
|
|
/*
|
|
* Resolver state default settings.
|
|
*/
|
|
|
|
struct __res_state _res
|
|
# if defined(__BIND_RES_TEXT)
|
|
= { RES_TIMEOUT, } /* Motorola, et al. */
|
|
# endif
|
|
;
|
|
|
|
/*
|
|
* Set up default settings. If the configuration file exist, the values
|
|
* there will have precedence. Otherwise, the server address is set to
|
|
* INADDR_ANY and the default domain name comes from the gethostname().
|
|
*
|
|
* An interrim version of this code (BIND 4.9, pre-4.4BSD) used 127.0.0.1
|
|
* rather than INADDR_ANY ("0.0.0.0") as the default name server address
|
|
* since it was noted that INADDR_ANY actually meant ``the first interface
|
|
* you "ifconfig"'d at boot time'' and if this was a SLIP or PPP interface,
|
|
* it had to be "up" in order for you to reach your own name server. It
|
|
* was later decided that since the recommended practice is to always
|
|
* install local static routes through 127.0.0.1 for all your network
|
|
* interfaces, that we could solve this problem without a code change.
|
|
*
|
|
* The configuration file should always be used, since it is the only way
|
|
* to specify a default domain. If you are running a server on your local
|
|
* machine, you should say "nameserver 0.0.0.0" or "nameserver 127.0.0.1"
|
|
* in the configuration file.
|
|
*
|
|
* Return 0 if completes successfully, -1 on error
|
|
*/
|
|
int
|
|
res_init()
|
|
{
|
|
register FILE *fp;
|
|
register char *cp, **pp;
|
|
register int n;
|
|
char buf[MAXDNAME];
|
|
int nserv = 0; /* number of nameserver records read from file */
|
|
int haveenv = 0;
|
|
int havesearch = 0;
|
|
#ifdef RESOLVSORT
|
|
int nsort = 0;
|
|
char *net;
|
|
#endif
|
|
#ifndef RFC1535
|
|
int dots;
|
|
#endif
|
|
|
|
/*
|
|
* These three fields used to be statically initialized. This made
|
|
* it hard to use this code in a shared library. It is necessary,
|
|
* now that we're doing dynamic initialization here, that we preserve
|
|
* the old semantics: if an application modifies one of these three
|
|
* fields of _res before res_init() is called, res_init() will not
|
|
* alter them. Of course, if an application is setting them to
|
|
* _zero_ before calling res_init(), hoping to override what used
|
|
* to be the static default, we can't detect it and unexpected results
|
|
* will follow. Zero for any of these fields would make no sense,
|
|
* so one can safely assume that the applications were already getting
|
|
* unexpected results.
|
|
*
|
|
* _res.options is tricky since some apps were known to diddle the bits
|
|
* before res_init() was first called. We can't replicate that semantic
|
|
* with dynamic initialization (they may have turned bits off that are
|
|
* set in RES_DEFAULT). Our solution is to declare such applications
|
|
* "broken". They could fool us by setting RES_INIT but none do (yet).
|
|
*/
|
|
if (!_res.retrans)
|
|
_res.retrans = RES_TIMEOUT;
|
|
if (!_res.retry)
|
|
_res.retry = 4;
|
|
if (!(_res.options & RES_INIT))
|
|
_res.options = RES_DEFAULT;
|
|
|
|
/*
|
|
* This one used to initialize implicitly to zero, so unless the app
|
|
* has set it to something in particular, we can randomize it now.
|
|
*/
|
|
if (!_res.id)
|
|
_res.id = res_randomid();
|
|
|
|
#ifdef USELOOPBACK
|
|
_res.nsaddr.sin_addr = inet_makeaddr(IN_LOOPBACKNET, 1);
|
|
#else
|
|
_res.nsaddr.sin_addr.s_addr = INADDR_ANY;
|
|
#endif
|
|
_res.nsaddr.sin_family = AF_INET;
|
|
_res.nsaddr.sin_port = htons(NAMESERVER_PORT);
|
|
_res.nscount = 1;
|
|
_res.ndots = 1;
|
|
_res.pfcode = 0;
|
|
|
|
/* Allow user to override the local domain definition */
|
|
if ((cp = __secure_getenv("LOCALDOMAIN")) != NULL) {
|
|
(void)strncpy(_res.defdname, cp, sizeof(_res.defdname) - 1);
|
|
haveenv++;
|
|
|
|
/*
|
|
* Set search list to be blank-separated strings
|
|
* from rest of env value. Permits users of LOCALDOMAIN
|
|
* to still have a search list, and anyone to set the
|
|
* one that they want to use as an individual (even more
|
|
* important now that the rfc1535 stuff restricts searches)
|
|
*/
|
|
cp = _res.defdname;
|
|
pp = _res.dnsrch;
|
|
*pp++ = cp;
|
|
for (n = 0; *cp && pp < _res.dnsrch + MAXDNSRCH; cp++) {
|
|
if (*cp == '\n') /* silly backwards compat */
|
|
break;
|
|
else if (*cp == ' ' || *cp == '\t') {
|
|
*cp = 0;
|
|
n = 1;
|
|
} else if (n) {
|
|
*pp++ = cp;
|
|
n = 0;
|
|
havesearch = 1;
|
|
}
|
|
}
|
|
/* null terminate last domain if there are excess */
|
|
while (*cp != '\0' && *cp != ' ' && *cp != '\t' && *cp != '\n')
|
|
cp++;
|
|
*cp = '\0';
|
|
*pp++ = 0;
|
|
}
|
|
|
|
#define MATCH(line, name) \
|
|
(!strncmp(line, name, sizeof(name) - 1) && \
|
|
(line[sizeof(name) - 1] == ' ' || \
|
|
line[sizeof(name) - 1] == '\t'))
|
|
|
|
#ifdef NeXT
|
|
if (netinfo_res_init(&haveenv, &havesearch) == 0)
|
|
#endif
|
|
if ((fp = fopen(_PATH_RESCONF, "r")) != NULL) {
|
|
/* read the config file */
|
|
while (fgets(buf, sizeof(buf), fp) != NULL) {
|
|
/* skip comments */
|
|
if (*buf == ';' || *buf == '#')
|
|
continue;
|
|
/* read default domain name */
|
|
if (MATCH(buf, "domain")) {
|
|
if (haveenv) /* skip if have from environ */
|
|
continue;
|
|
cp = buf + sizeof("domain") - 1;
|
|
while (*cp == ' ' || *cp == '\t')
|
|
cp++;
|
|
if ((*cp == '\0') || (*cp == '\n'))
|
|
continue;
|
|
strncpy(_res.defdname, cp, sizeof(_res.defdname) - 1);
|
|
if ((cp = strpbrk(_res.defdname, " \t\n")) != NULL)
|
|
*cp = '\0';
|
|
havesearch = 0;
|
|
continue;
|
|
}
|
|
/* set search list */
|
|
if (MATCH(buf, "search")) {
|
|
if (haveenv) /* skip if have from environ */
|
|
continue;
|
|
cp = buf + sizeof("search") - 1;
|
|
while (*cp == ' ' || *cp == '\t')
|
|
cp++;
|
|
if ((*cp == '\0') || (*cp == '\n'))
|
|
continue;
|
|
strncpy(_res.defdname, cp, sizeof(_res.defdname) - 1);
|
|
if ((cp = strchr(_res.defdname, '\n')) != NULL)
|
|
*cp = '\0';
|
|
/*
|
|
* Set search list to be blank-separated strings
|
|
* on rest of line.
|
|
*/
|
|
cp = _res.defdname;
|
|
pp = _res.dnsrch;
|
|
*pp++ = cp;
|
|
for (n = 0; *cp && pp < _res.dnsrch + MAXDNSRCH; cp++) {
|
|
if (*cp == ' ' || *cp == '\t') {
|
|
*cp = 0;
|
|
n = 1;
|
|
} else if (n) {
|
|
*pp++ = cp;
|
|
n = 0;
|
|
}
|
|
}
|
|
/* null terminate last domain if there are excess */
|
|
while (*cp != '\0' && *cp != ' ' && *cp != '\t')
|
|
cp++;
|
|
*cp = '\0';
|
|
*pp++ = 0;
|
|
havesearch = 1;
|
|
continue;
|
|
}
|
|
/* read nameservers to query */
|
|
if (MATCH(buf, "nameserver") && nserv < MAXNS) {
|
|
struct in_addr a;
|
|
|
|
cp = buf + sizeof("nameserver") - 1;
|
|
while (*cp == ' ' || *cp == '\t')
|
|
cp++;
|
|
if ((*cp != '\0') && (*cp != '\n') && inet_aton(cp, &a)) {
|
|
_res.nsaddr_list[nserv].sin_addr = a;
|
|
_res.nsaddr_list[nserv].sin_family = AF_INET;
|
|
_res.nsaddr_list[nserv].sin_port =
|
|
htons(NAMESERVER_PORT);
|
|
nserv++;
|
|
}
|
|
continue;
|
|
}
|
|
#ifdef RESOLVSORT
|
|
if (MATCH(buf, "sortlist")) {
|
|
struct in_addr a;
|
|
|
|
cp = buf + sizeof("sortlist") - 1;
|
|
while (nsort < MAXRESOLVSORT) {
|
|
while (*cp == ' ' || *cp == '\t')
|
|
cp++;
|
|
if (*cp == '\0' || *cp == '\n' || *cp == ';')
|
|
break;
|
|
net = cp;
|
|
while (*cp && !ISSORTMASK(*cp) && *cp != ';' &&
|
|
isascii(*cp) && !isspace(*cp))
|
|
cp++;
|
|
n = *cp;
|
|
*cp = 0;
|
|
if (inet_aton(net, &a)) {
|
|
_res.sort_list[nsort].addr = a;
|
|
if (ISSORTMASK(n)) {
|
|
*cp++ = n;
|
|
net = cp;
|
|
while (*cp && *cp != ';' &&
|
|
isascii(*cp) && !isspace(*cp))
|
|
cp++;
|
|
n = *cp;
|
|
*cp = 0;
|
|
if (inet_aton(net, &a)) {
|
|
_res.sort_list[nsort].mask = a.s_addr;
|
|
} else {
|
|
_res.sort_list[nsort].mask =
|
|
net_mask(_res.sort_list[nsort].addr);
|
|
}
|
|
} else {
|
|
_res.sort_list[nsort].mask =
|
|
net_mask(_res.sort_list[nsort].addr);
|
|
}
|
|
nsort++;
|
|
}
|
|
*cp = n;
|
|
}
|
|
continue;
|
|
}
|
|
#endif
|
|
if (MATCH(buf, "options")) {
|
|
res_setoptions(buf + sizeof("options") - 1, "conf");
|
|
continue;
|
|
}
|
|
}
|
|
if (nserv > 1)
|
|
_res.nscount = nserv;
|
|
#ifdef RESOLVSORT
|
|
_res.nsort = nsort;
|
|
#endif
|
|
(void) fclose(fp);
|
|
}
|
|
if (_res.defdname[0] == 0 &&
|
|
gethostname(buf, sizeof(_res.defdname) - 1) == 0 &&
|
|
(cp = strchr(buf, '.')) != NULL)
|
|
strcpy(_res.defdname, cp + 1);
|
|
|
|
/* find components of local domain that might be searched */
|
|
if (havesearch == 0) {
|
|
pp = _res.dnsrch;
|
|
*pp++ = _res.defdname;
|
|
*pp = NULL;
|
|
|
|
#ifndef RFC1535
|
|
dots = 0;
|
|
for (cp = _res.defdname; *cp; cp++)
|
|
dots += (*cp == '.');
|
|
|
|
cp = _res.defdname;
|
|
while (pp < _res.dnsrch + MAXDFLSRCH) {
|
|
if (dots < LOCALDOMAINPARTS)
|
|
break;
|
|
cp = strchr(cp, '.') + 1; /* we know there is one */
|
|
*pp++ = cp;
|
|
dots--;
|
|
}
|
|
*pp = NULL;
|
|
#ifdef DEBUG
|
|
if (_res.options & RES_DEBUG) {
|
|
printf(";; res_init()... default dnsrch list:\n");
|
|
for (pp = _res.dnsrch; *pp; pp++)
|
|
printf(";;\t%s\n", *pp);
|
|
printf(";;\t..END..\n");
|
|
}
|
|
#endif /* DEBUG */
|
|
#endif /* !RFC1535 */
|
|
}
|
|
|
|
if ((cp = __secure_getenv("RES_OPTIONS")) != NULL)
|
|
res_setoptions(cp, "env");
|
|
_res.options |= RES_INIT;
|
|
return (0);
|
|
}
|
|
|
|
static void
|
|
internal_function
|
|
res_setoptions(options, source)
|
|
char *options, *source;
|
|
{
|
|
char *cp = options;
|
|
int i;
|
|
|
|
#ifdef DEBUG
|
|
if (_res.options & RES_DEBUG)
|
|
printf(";; res_setoptions(\"%s\", \"%s\")...\n",
|
|
options, source);
|
|
#endif
|
|
while (*cp) {
|
|
/* skip leading and inner runs of spaces */
|
|
while (*cp == ' ' || *cp == '\t')
|
|
cp++;
|
|
/* search for and process individual options */
|
|
if (!strncmp(cp, "ndots:", sizeof("ndots:") - 1)) {
|
|
i = atoi(cp + sizeof("ndots:") - 1);
|
|
if (i <= RES_MAXNDOTS)
|
|
_res.ndots = i;
|
|
else
|
|
_res.ndots = RES_MAXNDOTS;
|
|
#ifdef DEBUG
|
|
if (_res.options & RES_DEBUG)
|
|
printf(";;\tndots=%d\n", _res.ndots);
|
|
#endif
|
|
} else if (!strncmp(cp, "debug", sizeof("debug") - 1)) {
|
|
#ifdef DEBUG
|
|
if (!(_res.options & RES_DEBUG)) {
|
|
printf(";; res_setoptions(\"%s\", \"%s\")..\n",
|
|
options, source);
|
|
_res.options |= RES_DEBUG;
|
|
}
|
|
printf(";;\tdebug\n");
|
|
#endif
|
|
} else if (!strncmp(cp, "inet6", sizeof("inet6") - 1)) {
|
|
_res.options |= RES_USE_INET6;
|
|
} else {
|
|
/* XXX - print a warning here? */
|
|
}
|
|
/* skip to next run of spaces */
|
|
while (*cp && *cp != ' ' && *cp != '\t')
|
|
cp++;
|
|
}
|
|
}
|
|
|
|
#ifdef RESOLVSORT
|
|
/* XXX - should really support CIDR which means explicit masks always. */
|
|
static u_int32_t
|
|
net_mask(in) /* XXX - should really use system's version of this */
|
|
struct in_addr in;
|
|
{
|
|
register u_int32_t i = ntohl(in.s_addr);
|
|
|
|
if (IN_CLASSA(i))
|
|
return (htonl(IN_CLASSA_NET));
|
|
else if (IN_CLASSB(i))
|
|
return (htonl(IN_CLASSB_NET));
|
|
return (htonl(IN_CLASSC_NET));
|
|
}
|
|
#endif
|
|
|
|
#ifdef NeXT
|
|
static int
|
|
netinfo_res_init(haveenv, havesearch)
|
|
int *haveenv;
|
|
int *havesearch;
|
|
{
|
|
register int n;
|
|
void *domain, *parent;
|
|
ni_id dir;
|
|
ni_status status;
|
|
ni_namelist nl;
|
|
int nserv = 0;
|
|
#ifdef RESOLVSORT
|
|
int nsort = 0;
|
|
#endif
|
|
|
|
status = ni_open(NULL, ".", &domain);
|
|
if (status == NI_OK) {
|
|
ni_setreadtimeout(domain, NI_TIMEOUT);
|
|
ni_setabort(domain, 1);
|
|
|
|
/* climb the NetInfo hierarchy to find a resolver directory */
|
|
while (status == NI_OK) {
|
|
status = ni_pathsearch(domain, &dir, NI_PATH_RESCONF);
|
|
if (status == NI_OK) {
|
|
/* found a resolver directory */
|
|
|
|
if (*haveenv == 0) {
|
|
/* get the default domain name */
|
|
status = ni_lookupprop(domain, &dir, "domain", &nl);
|
|
if (status == NI_OK && nl.ni_namelist_len > 0) {
|
|
(void)strncpy(_res.defdname,
|
|
nl.ni_namelist_val[0],
|
|
sizeof(_res.defdname) - 1);
|
|
_res.defdname[sizeof(_res.defdname) - 1] = '\0';
|
|
ni_namelist_free(&nl);
|
|
*havesearch = 0;
|
|
}
|
|
|
|
/* get search list */
|
|
status = ni_lookupprop(domain, &dir, "search", &nl);
|
|
if (status == NI_OK && nl.ni_namelist_len > 0) {
|
|
(void)strncpy(_res.defdname,
|
|
nl.ni_namelist_val[0],
|
|
sizeof(_res.defdname) - 1);
|
|
_res.defdname[sizeof(_res.defdname) - 1] = '\0';
|
|
/* copy */
|
|
for (n = 0;
|
|
n < nl.ni_namelist_len && n < MAXDNSRCH;
|
|
n++) {
|
|
/* duplicate up to MAXDNSRCH servers */
|
|
char *cp = nl.ni_namelist_val[n];
|
|
_res.dnsrch[n] =
|
|
strcpy((char *)malloc(strlen(cp) + 1), cp);
|
|
}
|
|
ni_namelist_free(&nl);
|
|
*havesearch = 1;
|
|
}
|
|
}
|
|
|
|
/* get list of nameservers */
|
|
status = ni_lookupprop(domain, &dir, "nameserver", &nl);
|
|
if (status == NI_OK && nl.ni_namelist_len > 0) {
|
|
/* copy up to MAXNS servers */
|
|
for (n = 0;
|
|
n < nl.ni_namelist_len && nserv < MAXNS;
|
|
n++) {
|
|
struct in_addr a;
|
|
|
|
if (inet_aton(nl.ni_namelist_val[n], &a)) {
|
|
_res.nsaddr_list[nserv].sin_addr = a;
|
|
_res.nsaddr_list[nserv].sin_family = AF_INET;
|
|
_res.nsaddr_list[nserv].sin_port =
|
|
htons(NAMESERVER_PORT);
|
|
nserv++;
|
|
}
|
|
}
|
|
ni_namelist_free(&nl);
|
|
}
|
|
|
|
if (nserv > 1)
|
|
_res.nscount = nserv;
|
|
|
|
#ifdef RESOLVSORT
|
|
/* get sort order */
|
|
status = ni_lookupprop(domain, &dir, "sortlist", &nl);
|
|
if (status == NI_OK && nl.ni_namelist_len > 0) {
|
|
|
|
/* copy up to MAXRESOLVSORT address/netmask pairs */
|
|
for (n = 0;
|
|
n < nl.ni_namelist_len && nsort < MAXRESOLVSORT;
|
|
n++) {
|
|
char ch;
|
|
char *cp;
|
|
const char *sp;
|
|
struct in_addr a;
|
|
|
|
cp = NULL;
|
|
for (sp = sort_mask; *sp; sp++) {
|
|
char *cp1;
|
|
cp1 = strchr(nl.ni_namelist_val[n], *sp);
|
|
if (cp && cp1)
|
|
cp = (cp < cp1)? cp : cp1;
|
|
else if (cp1)
|
|
cp = cp1;
|
|
}
|
|
if (cp != NULL) {
|
|
ch = *cp;
|
|
*cp = '\0';
|
|
break;
|
|
}
|
|
if (inet_aton(nl.ni_namelist_val[n], &a)) {
|
|
_res.sort_list[nsort].addr = a;
|
|
if (*cp && ISSORTMASK(ch)) {
|
|
*cp++ = ch;
|
|
if (inet_aton(cp, &a)) {
|
|
_res.sort_list[nsort].mask = a.s_addr;
|
|
} else {
|
|
_res.sort_list[nsort].mask =
|
|
net_mask(_res.sort_list[nsort].addr);
|
|
}
|
|
} else {
|
|
_res.sort_list[nsort].mask =
|
|
net_mask(_res.sort_list[nsort].addr);
|
|
}
|
|
nsort++;
|
|
}
|
|
}
|
|
ni_namelist_free(&nl);
|
|
}
|
|
|
|
_res.nsort = nsort;
|
|
#endif
|
|
|
|
/* get resolver options */
|
|
status = ni_lookupprop(domain, &dir, "options", &nl);
|
|
if (status == NI_OK && nl.ni_namelist_len > 0) {
|
|
res_setoptions(nl.ni_namelist_val[0], "conf");
|
|
ni_namelist_free(&nl);
|
|
}
|
|
|
|
ni_free(domain);
|
|
return(1); /* using DNS configuration from NetInfo */
|
|
}
|
|
|
|
status = ni_open(domain, "..", &parent);
|
|
ni_free(domain);
|
|
if (status == NI_OK)
|
|
domain = parent;
|
|
}
|
|
}
|
|
return(0); /* if not using DNS configuration from NetInfo */
|
|
}
|
|
#endif /* NeXT */
|
|
|
|
u_int
|
|
res_randomid()
|
|
{
|
|
struct timeval now;
|
|
|
|
gettimeofday(&now, NULL);
|
|
return (0xffff & (now.tv_sec ^ now.tv_usec ^ getpid()));
|
|
}
|