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.
659 lines
18 KiB
C
659 lines
18 KiB
C
/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Bernd Schmidt <crux@Pool.Informatik.RWTH-Aachen.DE>, 1997.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Library General Public License as
|
|
published by the Free Software Foundation; either version 2 of the
|
|
License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Library General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Library General Public
|
|
License along with the GNU C Library; see the file COPYING.LIB. If not,
|
|
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
Boston, MA 02111-1307, USA. */
|
|
|
|
/* Tree search for red/black trees.
|
|
The algorithm for adding nodes is taken from one of the many "Algorithms"
|
|
books by Robert Sedgewick, although the implementation differs.
|
|
The algorithm for deleting nodes can probably be found in a book named
|
|
"Introduction to Algorithms" by Cormen/Leiserson/Rivest. At least that's
|
|
the book that my professor took most algorithms from during the "Data
|
|
Structures" course...
|
|
|
|
Totally public domain. */
|
|
|
|
/* Red/black trees are binary trees in which the edges are colored either red
|
|
or black. They have the following properties:
|
|
1. The number of black edges on every path from the root to a leaf is
|
|
constant.
|
|
2. No two red edges are adjacent.
|
|
Therefore there is an upper bound on the length of every path, it's
|
|
O(log n) where n is the number of nodes in the tree. No path can be longer
|
|
than 1+2*P where P is the length of the shortest path in the tree.
|
|
Useful for the implementation:
|
|
3. If one of the children of a node is NULL, then the other one is red
|
|
(if it exists).
|
|
|
|
In the implementation, not the edges are colored, but the nodes. The color
|
|
interpreted as the color of the edge leading to this node. The color is
|
|
meaningless for the root node, but we color the root node black for
|
|
convenience. All added nodes are red initially.
|
|
|
|
Adding to a red/black tree is rather easy. The right place is searched
|
|
with a usual binary tree search. Additionally, whenever a node N is
|
|
reached that has two red successors, the successors are colored black and
|
|
the node itself colored red. This moves red edges up the tree where they
|
|
pose less of a problem once we get to really insert the new node. Changing
|
|
N's color to red may violate rule 2, however, so rotations may become
|
|
necessary to restore the invariants. Adding a new red leaf may violate
|
|
the same rule, so afterwards an additional check is run and the tree
|
|
possibly rotated.
|
|
|
|
Deleting is hairy. There are mainly two nodes involved: the node to be
|
|
deleted (n1), and another node that is to be unchained from the tree (n2).
|
|
If n1 has a successor (the node with a smallest key that is larger than
|
|
n1), then the successor becomes n2 and its contents are copied into n1,
|
|
otherwise n1 becomes n2.
|
|
Unchaining a node may violate rule 1: if n2 is black, one subtree is
|
|
missing one black edge afterwards. The algorithm must try to move this
|
|
error upwards towards the root, so that the subtree that does not have
|
|
enough black edges becomes the whole tree. Once that happens, the error
|
|
has disappeared. It may not be necessary to go all the way up, since it
|
|
is possible that rotations and recoloring can fix the error before that.
|
|
|
|
Although the deletion algorithm must walk upwards through the tree, we
|
|
do not store parent pointers in the nodes. Instead, delete allocates a
|
|
small array of parent pointers and fills it while descending the tree.
|
|
Since we know that the length of a path is O(log n), where n is the number
|
|
of nodes, this is likely to use less memory. */
|
|
|
|
/* Tree rotations look like this:
|
|
A C
|
|
/ \ / \
|
|
B C A G
|
|
/ \ / \ --> / \
|
|
D E F G B F
|
|
/ \
|
|
D E
|
|
|
|
In this case, A has been rotated left. This preserves the ordering of the
|
|
binary tree. */
|
|
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <search.h>
|
|
|
|
typedef struct node_t
|
|
{
|
|
/* Callers expect this to be the first element in the structure - do not
|
|
move! */
|
|
const void *key;
|
|
struct node_t *left;
|
|
struct node_t *right;
|
|
unsigned int red:1;
|
|
} *node;
|
|
|
|
#undef DEBUGGING
|
|
|
|
#ifdef DEBUGGING
|
|
|
|
/* Routines to check tree invariants. */
|
|
|
|
#include <assert.h>
|
|
|
|
#define CHECK_TREE(a) check_tree(a)
|
|
|
|
static void
|
|
check_tree_recurse (node p, int d_sofar, int d_total)
|
|
{
|
|
if (p == NULL)
|
|
{
|
|
assert (d_sofar == d_total);
|
|
return;
|
|
}
|
|
|
|
check_tree_recurse (p->left, d_sofar + (p->left && !p->left->red), d_total);
|
|
check_tree_recurse (p->right, d_sofar + (p->right && !p->right->red), d_total);
|
|
if (p->left)
|
|
assert (!(p->left->red && p->red));
|
|
if (p->right)
|
|
assert (!(p->right->red && p->red));
|
|
}
|
|
|
|
static void
|
|
check_tree (node root)
|
|
{
|
|
int cnt = 0;
|
|
node p;
|
|
if (root == NULL)
|
|
return;
|
|
root->red = 0;
|
|
for(p = root->left; p; p = p->left)
|
|
cnt += !p->red;
|
|
check_tree_recurse (root, 0, cnt);
|
|
}
|
|
|
|
|
|
#else
|
|
|
|
#define CHECK_TREE(a)
|
|
|
|
#endif
|
|
|
|
/* Possibly "split" a node with two red successors, and/or fix up two red
|
|
edges in a row. ROOTP is a pointer to the lowest node we visited, PARENTP
|
|
and GPARENTP pointers to its parent/grandparent. P_R and GP_R contain the
|
|
comparison values that determined which way was taken in the tree to reach
|
|
ROOTP. MODE is 1 if we need not do the split, but must check for two red
|
|
edges between GPARENTP and ROOTP. */
|
|
static void
|
|
maybe_split_for_insert (node *rootp, node *parentp, node *gparentp,
|
|
int p_r, int gp_r, int mode)
|
|
{
|
|
node root = *rootp;
|
|
node *rp, *lp;
|
|
rp = &(*rootp)->right;
|
|
lp = &(*rootp)->left;
|
|
|
|
/* See if we have to split this node (both successors red). */
|
|
if (mode == 1
|
|
|| ((*rp) != NULL && (*lp) != NULL && (*rp)->red && (*lp)->red))
|
|
{
|
|
/* This node becomes red, its successors black. */
|
|
root->red = 1;
|
|
if (*rp)
|
|
(*rp)->red = 0;
|
|
if (*lp)
|
|
(*lp)->red = 0;
|
|
|
|
/* If the parent of this node is also red, we have to do
|
|
rotations. */
|
|
if (parentp != NULL && (*parentp)->red)
|
|
{
|
|
node gp = *gparentp;
|
|
node p = *parentp;
|
|
/* There are two main cases:
|
|
1. The edge types (left or right) of the two red edges differ.
|
|
2. Both red edges are of the same type.
|
|
There exist two symmetries of each case, so there is a total of
|
|
4 cases. */
|
|
if ((p_r > 0) != (gp_r > 0))
|
|
{
|
|
/* Put the child at the top of the tree, with its parent
|
|
and grandparent as successors. */
|
|
p->red = 1;
|
|
gp->red = 1;
|
|
root->red = 0;
|
|
if (p_r < 0)
|
|
{
|
|
/* Child is left of parent. */
|
|
p->left = *rp;
|
|
*rp = p;
|
|
gp->right = *lp;
|
|
*lp = gp;
|
|
}
|
|
else
|
|
{
|
|
/* Child is right of parent. */
|
|
p->right = *lp;
|
|
*lp = p;
|
|
gp->left = *rp;
|
|
*rp = gp;
|
|
}
|
|
*gparentp = root;
|
|
}
|
|
else
|
|
{
|
|
*gparentp = *parentp;
|
|
/* Parent becomes the top of the tree, grandparent and
|
|
child are its successors. */
|
|
p->red = 0;
|
|
gp->red = 1;
|
|
if (p_r < 0)
|
|
{
|
|
/* Left edges. */
|
|
gp->left = p->right;
|
|
p->right = gp;
|
|
}
|
|
else
|
|
{
|
|
/* Right edges. */
|
|
gp->right = p->left;
|
|
p->left = gp;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
/* Find or insert datum into search tree.
|
|
KEY is the key to be located, ROOTP is the address of tree root,
|
|
COMPAR the ordering function. */
|
|
void *
|
|
__tsearch (const void *key, void **vrootp, __compar_fn_t compar)
|
|
{
|
|
node q;
|
|
node *parentp = NULL, *gparentp = NULL;
|
|
node *rootp = (node *) vrootp;
|
|
node *nextp;
|
|
int r = 0, p_r = 0, gp_r = 0; /* No they might not, Mr Compiler. */
|
|
|
|
if (rootp == NULL)
|
|
return NULL;
|
|
|
|
/* This saves some additional tests below. */
|
|
if (*rootp != NULL)
|
|
(*rootp)->red = 0;
|
|
|
|
CHECK_TREE (*rootp);
|
|
|
|
nextp = rootp;
|
|
while (*nextp != NULL)
|
|
{
|
|
node root = *rootp;
|
|
r = (*compar) (key, root->key);
|
|
if (r == 0)
|
|
return root;
|
|
|
|
maybe_split_for_insert (rootp, parentp, gparentp, p_r, gp_r, 0);
|
|
/* If that did any rotations, parentp and gparentp are now garbage.
|
|
That doesn't matter, because the values they contain are never
|
|
used again in that case. */
|
|
|
|
nextp = r < 0 ? &root->left : &root->right;
|
|
if (*nextp == NULL)
|
|
break;
|
|
|
|
gparentp = parentp;
|
|
parentp = rootp;
|
|
rootp = nextp;
|
|
|
|
gp_r = p_r;
|
|
p_r = r;
|
|
}
|
|
|
|
q = (struct node_t *) malloc (sizeof (struct node_t));
|
|
if (q != NULL)
|
|
{
|
|
*nextp = q; /* link new node to old */
|
|
q->key = key; /* initialize new node */
|
|
q->red = 1;
|
|
q->left = q->right = NULL;
|
|
}
|
|
if (nextp != rootp)
|
|
/* There may be two red edges in a row now, which we must avoid by
|
|
rotating the tree. */
|
|
maybe_split_for_insert (nextp, rootp, parentp, r, p_r, 1);
|
|
|
|
return q;
|
|
}
|
|
weak_alias (__tsearch, tsearch)
|
|
|
|
|
|
/* Find datum in search tree.
|
|
KEY is the key to be located, ROOTP is the address of tree root,
|
|
COMPAR the ordering function. */
|
|
void *
|
|
__tfind (key, vrootp, compar)
|
|
const void *key;
|
|
void *const *vrootp;
|
|
__compar_fn_t compar;
|
|
{
|
|
node *rootp = (node *) vrootp;
|
|
|
|
if (rootp == NULL)
|
|
return NULL;
|
|
|
|
CHECK_TREE (*rootp);
|
|
|
|
while (*rootp != NULL)
|
|
{
|
|
node root = *rootp;
|
|
int r;
|
|
|
|
r = (*compar) (key, root->key);
|
|
if (r == 0)
|
|
return root;
|
|
|
|
rootp = r < 0 ? &root->left : &root->right;
|
|
}
|
|
return NULL;
|
|
}
|
|
weak_alias (__tfind, tfind)
|
|
|
|
|
|
/* Delete node with given key.
|
|
KEY is the key to be deleted, ROOTP is the address of the root of tree,
|
|
COMPAR the comparison function. */
|
|
void *
|
|
__tdelete (const void *key, void **vrootp, __compar_fn_t compar)
|
|
{
|
|
node p, q, r, retval;
|
|
int cmp;
|
|
node *rootp = (node *) vrootp;
|
|
node root, unchained;
|
|
/* Stack of nodes so we remember the parents without recursion. It's
|
|
_very_ unlikely that there are paths longer than 40 nodes. The tree
|
|
would need to have around 250.000 nodes. */
|
|
int stacksize = 40;
|
|
int sp = 0;
|
|
node **nodestack = alloca (sizeof (node *) * stacksize);
|
|
|
|
if (rootp == NULL)
|
|
return NULL;
|
|
p = *rootp;
|
|
if (p == NULL)
|
|
return NULL;
|
|
|
|
CHECK_TREE (p);
|
|
|
|
while ((cmp = (*compar) (key, (*rootp)->key)) != 0)
|
|
{
|
|
if (sp == stacksize)
|
|
{
|
|
node **newstack;
|
|
stacksize += 20;
|
|
newstack = alloca (sizeof (node *) * stacksize);
|
|
memcpy (newstack, nodestack, sp * sizeof (node *));
|
|
nodestack = newstack;
|
|
}
|
|
|
|
nodestack[sp++] = rootp;
|
|
p = *rootp;
|
|
rootp = ((cmp < 0)
|
|
? &(*rootp)->left
|
|
: &(*rootp)->right);
|
|
if (*rootp == NULL)
|
|
return NULL;
|
|
}
|
|
|
|
/* This is bogus if the node to be deleted is the root... this routine
|
|
really should return an integer with 0 for success, -1 for failure
|
|
and errno = ESRCH or something. */
|
|
retval = p;
|
|
|
|
/* We don't unchain the node we want to delete. Instead, we overwrite
|
|
it with its successor and unchain the successor. If there is no
|
|
successor, we really unchain the node to be deleted. */
|
|
|
|
root = *rootp;
|
|
|
|
r = root->right;
|
|
q = root->left;
|
|
|
|
if (q == NULL || r == NULL)
|
|
unchained = root;
|
|
else
|
|
{
|
|
node *parent = rootp, *up = &root->right;
|
|
for (;;)
|
|
{
|
|
if (sp == stacksize)
|
|
{
|
|
node **newstack;
|
|
stacksize += 20;
|
|
newstack = alloca (sizeof (node *) * stacksize);
|
|
memcpy (newstack, nodestack, sp * sizeof (node *));
|
|
nodestack = newstack;
|
|
}
|
|
nodestack[sp++] = parent;
|
|
parent = up;
|
|
if ((*up)->left == NULL)
|
|
break;
|
|
up = &(*up)->left;
|
|
}
|
|
unchained = *up;
|
|
}
|
|
|
|
/* We know that either the left or right successor of UNCHAINED is NULL.
|
|
R becomes the other one, it is chained into the parent of UNCHAINED. */
|
|
r = unchained->left;
|
|
if (r == NULL)
|
|
r = unchained->right;
|
|
if (sp == 0)
|
|
*rootp = r;
|
|
else
|
|
{
|
|
q = *nodestack[sp-1];
|
|
if (unchained == q->right)
|
|
q->right = r;
|
|
else
|
|
q->left = r;
|
|
}
|
|
|
|
if (unchained != root)
|
|
root->key = unchained->key;
|
|
if (!unchained->red)
|
|
{
|
|
/* Now we lost a black edge, which means that the number of black
|
|
edges on every path is no longer constant. We must balance the
|
|
tree. */
|
|
/* NODESTACK now contains all parents of R. R is likely to be NULL
|
|
in the first iteration. */
|
|
/* NULL nodes are considered black throughout - this is necessary for
|
|
correctness. */
|
|
while (sp > 0 && (r == NULL || !r->red))
|
|
{
|
|
node *pp = nodestack[sp - 1];
|
|
p = *pp;
|
|
/* Two symmetric cases. */
|
|
if (r == p->left)
|
|
{
|
|
/* Q is R's brother, P is R's parent. The subtree with root
|
|
R has one black edge less than the subtree with root Q. */
|
|
q = p->right;
|
|
if (q != NULL && q->red)
|
|
{
|
|
/* If Q is red, we know that P is black. We rotate P left
|
|
so that Q becomes the top node in the tree, with P below
|
|
it. P is colored red, Q is colored black.
|
|
This action does not change the black edge count for any
|
|
leaf in the tree, but we will be able to recognize one
|
|
of the following situations, which all require that Q
|
|
is black. */
|
|
q->red = 0;
|
|
p->red = 1;
|
|
/* Left rotate p. */
|
|
p->right = q->left;
|
|
q->left = p;
|
|
*pp = q;
|
|
/* Make sure pp is right if the case below tries to use
|
|
it. */
|
|
nodestack[sp++] = pp = &q->left;
|
|
q = p->right;
|
|
}
|
|
/* We know that Q can't be NULL here. We also know that Q is
|
|
black. */
|
|
if ((q->left == NULL || !q->left->red)
|
|
&& (q->right == NULL || !q->right->red))
|
|
{
|
|
/* Q has two black successors. We can simply color Q red.
|
|
The whole subtree with root P is now missing one black
|
|
edge. Note that this action can temporarily make the
|
|
tree invalid (if P is red). But we will exit the loop
|
|
in that case and set P black, which both makes the tree
|
|
valid and also makes the black edge count come out
|
|
right. If P is black, we are at least one step closer
|
|
to the root and we'll try again the next iteration. */
|
|
q->red = 1;
|
|
r = p;
|
|
}
|
|
else
|
|
{
|
|
/* Q is black, one of Q's successors is red. We can
|
|
repair the tree with one operation and will exit the
|
|
loop afterwards. */
|
|
if (q->right == NULL || !q->right->red)
|
|
{
|
|
/* The left one is red. We perform the same action as
|
|
in maybe_split_for_insert where two red edges are
|
|
adjacent but point in different directions:
|
|
Q's left successor (let's call it Q2) becomes the
|
|
top of the subtree we are looking at, its parent (Q)
|
|
and grandparent (P) become its successors. The former
|
|
successors of Q2 are placed below P and Q.
|
|
P becomes black, and Q2 gets the color that P had.
|
|
This changes the black edge count only for node R and
|
|
its successors. */
|
|
node q2 = q->left;
|
|
q2->red = p->red;
|
|
p->right = q2->left;
|
|
q->left = q2->right;
|
|
q2->right = q;
|
|
q2->left = p;
|
|
*pp = q2;
|
|
p->red = 0;
|
|
}
|
|
else
|
|
{
|
|
/* It's the right one. Rotate P left. P becomes black,
|
|
and Q gets the color that P had. Q's right successor
|
|
also becomes black. This changes the black edge
|
|
count only for node R and its successors. */
|
|
q->red = p->red;
|
|
p->red = 0;
|
|
|
|
q->right->red = 0;
|
|
|
|
/* left rotate p */
|
|
p->right = q->left;
|
|
q->left = p;
|
|
*pp = q;
|
|
}
|
|
|
|
/* We're done. */
|
|
sp = 1;
|
|
r = NULL;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
/* Comments: see above. */
|
|
q = p->left;
|
|
if (q != NULL && q->red)
|
|
{
|
|
q->red = 0;
|
|
p->red = 1;
|
|
p->left = q->right;
|
|
q->right = p;
|
|
*pp = q;
|
|
nodestack[sp++] = pp = &q->right;
|
|
q = p->left;
|
|
}
|
|
if ((q->right == NULL || !q->right->red)
|
|
&& (q->left == NULL || !q->left->red))
|
|
{
|
|
q->red = 1;
|
|
r = p;
|
|
}
|
|
else
|
|
{
|
|
if (q->left == NULL || !q->left->red)
|
|
{
|
|
node q2 = q->right;
|
|
q2->red = p->red;
|
|
p->left = q2->right;
|
|
q->right = q2->left;
|
|
q2->left = q;
|
|
q2->right = p;
|
|
*pp = q2;
|
|
p->red = 0;
|
|
}
|
|
else
|
|
{
|
|
q->red = p->red;
|
|
p->red = 0;
|
|
q->left->red = 0;
|
|
p->left = q->right;
|
|
q->right = p;
|
|
*pp = q;
|
|
}
|
|
sp = 1;
|
|
r = NULL;
|
|
}
|
|
}
|
|
--sp;
|
|
}
|
|
if (r != NULL)
|
|
r->red = 0;
|
|
}
|
|
|
|
free (unchained);
|
|
return retval;
|
|
}
|
|
weak_alias (__tdelete, tdelete)
|
|
|
|
|
|
/* Walk the nodes of a tree.
|
|
ROOT is the root of the tree to be walked, ACTION the function to be
|
|
called at each node. LEVEL is the level of ROOT in the whole tree. */
|
|
static void
|
|
internal_function
|
|
trecurse (const void *vroot, __action_fn_t action, int level)
|
|
{
|
|
node root = (node ) vroot;
|
|
|
|
if (root->left == NULL && root->right == NULL)
|
|
(*action) (root, leaf, level);
|
|
else
|
|
{
|
|
(*action) (root, preorder, level);
|
|
if (root->left != NULL)
|
|
trecurse (root->left, action, level + 1);
|
|
(*action) (root, postorder, level);
|
|
if (root->right != NULL)
|
|
trecurse (root->right, action, level + 1);
|
|
(*action) (root, endorder, level);
|
|
}
|
|
}
|
|
|
|
|
|
/* Walk the nodes of a tree.
|
|
ROOT is the root of the tree to be walked, ACTION the function to be
|
|
called at each node. */
|
|
void
|
|
__twalk (const void *vroot, __action_fn_t action)
|
|
{
|
|
const node root = (node) vroot;
|
|
|
|
CHECK_TREE (root);
|
|
|
|
if (root != NULL && action != NULL)
|
|
trecurse (root, action, 0);
|
|
}
|
|
weak_alias (__twalk, twalk)
|
|
|
|
|
|
|
|
/* The standardized functions miss an important functionality: the
|
|
tree cannot be removed easily. We provide a function to do this. */
|
|
static void
|
|
internal_function
|
|
tdestroy_recurse (node root, __free_fn_t freefct)
|
|
{
|
|
if (root->left != NULL)
|
|
tdestroy_recurse (root->left, freefct);
|
|
if (root->right != NULL)
|
|
tdestroy_recurse (root->right, freefct);
|
|
(*freefct) ((void *) root->key);
|
|
/* Free the node itself. */
|
|
free (root);
|
|
}
|
|
|
|
void
|
|
__tdestroy (void *vroot, __free_fn_t freefct)
|
|
{
|
|
node root = (node) vroot;
|
|
|
|
CHECK_TREE (root);
|
|
|
|
if (root != NULL)
|
|
tdestroy_recurse (root, freefct);
|
|
}
|
|
weak_alias (__tdestroy, tdestroy)
|