mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-10 07:10:06 +00:00
11bf311edc
2007-01-11 Jakub Jelinek <jakub@redhat.com> * sysdeps/i386/soft-fp/sfp-machine.h: Remove. * sysdeps/x86_64/soft-fp/sfp-machine.h: Likewise. 2007-01-10 Ulrich Drepper <drepper@redhat.com> * io/fts.c: Make sure fts_cur is always valid after return from fts_read. Patch by Miloslav Trmac <mitr@redhat.com>. 2006-10-27 Richard Sandiford <richard@codesourcery.com> * elf/elf.h (R_MIPS_GLOB_DAT): Define. (R_MIPS_NUM): Bump by 1. 2007-01-03 Jakub Jelinek <jakub@redhat.com> * posix/execvp.c: Include alloca.h. (allocate_scripts_argv): Renamed to... (scripts_argv): ... this. Don't allocate buffer here nor count arguments. (execvp): Use alloca if possible. * posix/Makefile: Add rules to build and run tst-vfork3 test. * posix/tst-vfork3.c: New test. * stdlib/Makefile (tst-strtod3-ENV): Define. 2007-01-02 Ulrich Drepper <drepper@redhat.com> * posix/getconf.c: Update copyright year. * nss/getent.c: Likewise. * iconv/iconvconfig.c: Likewise. * iconv/iconv_prog.c: Likewise. * elf/ldconfig.c: Likewise. * catgets/gencat.c: Likewise. * csu/version.c: Likewise. * elf/ldd.bash.in: Likewise. * elf/sprof.c (print_version): Likewise. * locale/programs/locale.c: Likewise. * locale/programs/localedef.c: Likewise. * nscd/nscd.c (print_version): Likewise. * debug/xtrace.sh: Likewise. * malloc/memusage.sh: Likewise. * malloc/mtrace.pl: Likewise. * debug/catchsegv.sh: Likewise. 2006-12-24 Ulrich Drepper <drepper@redhat.com> * malloc/malloc.c (sYSMALLOc): Remove some unnecessary alignment attempts. 2006-12-23 Ulrich Drepper <drepper@redhat.com> * posix/wordexp.c: Remove some unnecessary tests. 2006-12-20 SUGIOKA Toshinobu <sugioka@itonet.co.jp> * sysdeps/unix/sysv/linux/sh/bits/shm.h: New file. * nss/getXXbyYY_r.c: Include atomic.h. (INTERNAL (REENTRANT_NAME)): Write startp after start_fct, add atomic_write_barrier () in between. 2006-11-28 Jakub Jelinek <jakub@redhat.com> * elf/dl-support.c: Include dl-procinfo.h. * sysdeps/powerpc/dl-procinfo.h (PPC_PLATFORM_POWER4, PPC_PLATFORM_PPC970, PPC_PLATFORM_POWER5, PPC_PLATFORM_POWER5_PLUS, PPC_PLATFORM_POWER6, PPC_PLATFORM_CELL_BE, PPC_PLATFORM_POWER6X): Define. (_dl_string_platform): Use PPC_PLATFORM_* macros instead of hardcoded constants. * sysdeps/powerpc/dl-procinfo.c (_dl_powerpc_platform): Use PPC_PLATFORM_* macros for array designators. 2006-11-11 Steven Munroe <sjmunroe@us.ibm.com> * sysdeps/powerpc/dl-procinfo.c (_dl_powerpc_cap_flags): Add 3 new cap names to the beginning. (_dl_powerpc_platforms): Add "power6x". * sysdeps/powerpc/dl-procinfo.h (_DL_HWCAP_FIRST): Decrease. (HWCAP_IMPORTANT): Add PPC_FEATURE_HAS_DFP. (_DL_PLATFORMS_COUNT): Increase. (_dl_string_platform): Handle power6x case. * sysdeps/powerpc/sysdep.h (PPC_FEATURE_PA6T, PPC_FEATURE_HAS_DFP, PPC_FEATURE_POWER6_EXT): Define. (PPC_FEATURE_POWER5, PPC_FEATURE_POWER5_PLUS): Correct Comment. [-2^31 .. 2^31) range. * sysdeps/unix/sysv/linux/bits/statvfs.h: Define ST_RELATIME. * sysdeps/unix/sysv/linux/internal_statvfs.c (__statvfs_getflags): Handle relatime mount option. 2006-12-13 Jakub Jelinek <jakub@redhat.com> * sysdeps/unix/sysv/linux/powerpc/powerpc32/setcontext.S: Include kernel-features.h. 2006-12-11 Ulrich Drepper <drepper@redhat.com> * stdlib/strtod_l.c (____STRTOF_INTERNAL): Parse thousand separators also if no non-zero digits found. * stdlib/Makefile (tests): Add tst-strtod3. [BZ #3664] * stdlib/strtod_l.c (____STRTOF_INTERNAL): Fix test to recognize empty parsed strings. * stdlib/Makefile (tests): Add tst-strtod2. * stdlib/tst-strtod2.c: New file. [BZ #3673] * stdlib/strtod_l.c (____STRTOF_INTERNAL): Fix exp_limit computation. * stdlib/Makefile (tests): Add tst-atof2. * stdlib/tst-atof2.c: New file. [BZ #3674] * stdlib/strtod_l.c (____STRTOF_INTERNAL): Adjust exponent value correctly if removing trailing zero of hex-float. * stdlib/Makefile (tests): Add tst-atof1. * stdlib/tst-atof1.c: New file. * misc/mntent_r.c (__hasmntopt): Check p[optlen] even when p == rest. Start searching for next comma at p rather than rest. * misc/Makefile (tests): Add tst-mntent2. * misc/tst-mntent2.c: New test. 2006-12-08 Ulrich Drepper <drepper@redhat.com> * malloc/memusage.c: Handle realloc with new size of zero and non-NULL pointer correctly. (me): Really write first record twice. (struct entry): Make format bi-arch safe. (dest): Write out more realloc statistics. * malloc/memusagestat.c (struct entry): Make format bi-arch safe. 2006-12-05 Jakub Jelinek <jakub@redhat.com> * nis/nis_subr.c (nis_getnames): Revert last change. 2006-12-03 Kaz Kojima <kkojima@rr.iij4u.or.jp> * sysdeps/unix/sysv/linux/sh/sys/io.h: Removed. 2006-11-30 H.J. Lu <hongjiu.lu@intel.com> * sysdeps/i386/i686/memcmp.S: Use jump table as the base of jump table entries. 2006-11-30 Jan Kratochvil <jan.kratochvil@redhat.com> * sysdeps/unix/sysv/linux/i386/clone.S: Provide CFI for the outermost `clone' function to ensure proper unwinding stop of gdb. * sysdeps/unix/sysv/linux/x86_64/clone.S: Likewise. 2006-12-01 Ulrich Drepper <drepper@redhat.com> * nscd/nscd.init: Remove obsolete and commented-out -S option handling. 2006-11-23 Jakub Jelinek <jakub@redhat.com> [BZ #3514] * manual/string.texi (strncmp): Fix pastos from wcscmp description. [BZ #3515] * manual/string.texi (strtok): Remove duplicate paragraph. 2006-12-01 Jan Kratochvil <jan.kratochvil@redhat.com> * sysdeps/unix/sysv/linux/x86_64/sigaction.c: Fix compatibility with libgcc not supporting `rflags' unwinding (register # >= 17). 2006-11-30 Jakub Jelinek <jakub@redhat.com> * sunrpc/svc_run.c (svc_run): Set my_pollfd to new_pollfd if realloc succeeded. 2006-11-29 Daniel Jacobowitz <dan@codesourcery.com> Jakub Jelinek <jakub@redhat.com> Jan Kratochvil <jan.kratochvil@redhat.com> * sysdeps/unix/sysv/linux/x86_64/sigaction.c (restore_rt): Add correct unwind information. * sysdeps/unix/sysv/linux/x86_64/Makefile: Provide symbols for 'restore_rt' even in the 'signal' directory. * sysdeps/unix/sysv/linux/x86_64/ucontext_i.sym: Extend the regs list. malloc crashed. Don't allocate memory unnecessarily in each loop. 2006-10-21 Jakub Jelinek <jakub@redhat.com> * resolv/mapv4v6addr.h (map_v4v6_address): Fix last change. 2006-11-20 Ulrich Drepper <drepper@redhat.com> * resolv/mapv4v6addr.h (map_v4v6_address): Optimize a bit. 2006-11-18 Bruno Haible <bruno@clisp.org> * sysdeps/unix/sysv/linux/i386/getgroups.c (__getgroups): Invoke __sysconf only after having tried to call getgroups32. 2006-11-19 Ulrich Drepper <drepper@redhat.com> * nss/nss_files/files-hosts.c (LINE_PARSER): Support IPv6-style addresses for IPv4 queries if they can be mapped. 2006-11-16 Jakub Jelinek <jakub@redhat.com> * sysdeps/x86_64/fpu/s_copysignf.S (__copysignf): Switch to .text. * sysdeps/x86_64/fpu/s_copysign.S (__copysign): Likewise. (signmask): Add .size directive. (othermask): Add .type directive. 2006-11-14 Ulrich Drepper <drepper@redhat.com> * po/nl.po: Update from translation team. * timezone/zdump.c: Redo fix for BZ #3137. 2006-11-14 Jakub Jelinek <jakub@redhat.com> * nss/nss_files/files-alias.c (get_next_alias): Set line back to first_unused after parsing :include: file. * timezone/africa: Update from tzdata2006o. * timezone/antarctica: Likewise. * timezone/asia: Likewise. * timezone/australasia: Likewise. * timezone/backward: Likewise. * timezone/europe: Likewise. * timezone/iso3166.tab: Likewise. * timezone/northamerica: Likewise. * timezone/southamerica: Likewise. * timezone/zone.tab: Likewise. * time/tzfile.c (__tzfile_read): Extend to handle new file format on machines with 64-bit time_t. * timezone/checktab.awk: Update from tzcode2006o. * timezone/ialloc.c: Likewise. * timezone/private.h: Likewise. * timezone/scheck.c: Likewise. * timezone/tzfile.h: Likewise. * timezone/tzselect.ksh: Likewise. * timezone/zdump.c: Likewise. * timezone/zic.c: Likewise. [BZ #3483] * elf/ldconfig.c (main): Call setlocale and textdomain. Patch mostly by Benno Schulenberg <bensberg@justemail.net>. [BZ #3480] * manual/argp.texi: Fix typos. * manual/charset.texi: Likewise. * manual/errno.texi: Likewise. * manual/filesys.texi: Likewise. * manual/lang.texi: Likewise. * manual/maint.texi: Likewise. * manual/memory.texi: Likewise. * manual/message.texi: Likewise. * manual/resource.texi: Likewise. * manual/search.texi: Likewise. * manual/signal.texi: Likewise. * manual/startup.texi: Likewise. * manual/stdio.texi: Likewise. * manual/sysinfo.texi: Likewise. * manual/syslog.texi: Likewise. * manual/time.texi: Likewise. Patch by Ralf Wildenhues <Ralf.Wildenhues@gmx.de>. [BZ #3465] * sunrpc/clnt_raw.c: Minimal message improvements. * sunrpc/pm_getmaps.c: Likewise. * nis/nss_nisplus/nisplus-publickey.c: Likewise. * nis/nis_print_group_entry.c: Likewise. * locale/programs/repertoire.c: Likewise. * locale/programs/charmap.c: Likewise. * malloc/memusage.sh: Likewise. * elf/dl-deps.c: Likewise. * locale/programs/ld-collate.c: Likewise. * libio/vswprintf.c: Likewise. * malloc/memusagestat.c: Likewise. * sunrpc/auth_unix.c: Likewise. * sunrpc/rpc_main.c: Likewise. * nscd/cache.c: Likewise. * locale/programs/repertoire.c: Unify output messages. * locale/programs/charmap.c: Likewise. * locale/programs/ld-ctype.c: Likewise. * locale/programs/ld-monetary.c: Likewise. * locale/programs/ld-numeric.c: Likewise. * locale/programs/ld-time.c: Likewise. * elf/ldconfig.c: Likewise. * nscd/selinux.c: Likewise. * elf/cache.c: Likewise. Patch mostly by Benno Schulenberg <bensberg@justemail.net>. 2006-11-10 Jakub Jelinek <jakub@redhat.com> * string/strxfrm_l.c (STRXFRM): Fix trailing \1 optimization if N is one bigger than return value. * string/tst-strxfrm2.c (do_test): Also test strxfrm with l1 + 1 and l1 last arguments, if buf is defined, verify the return value equals to strlen (buf) and verify no byte beyond passed length is modified. 2006-11-10 Ulrich Drepper <drepper@redhat.com> * po/sv.po: Update from translation team. * sysdeps/gnu/siglist.c (__old_sys_siglist, __old_sys_sigabbrev): Use __new_sys_siglist instead of _sys_siglist_internal as second macro argument. (_old_sys_siglist): Use declare_symbol_alias macro instead of strong_alias. 2006-11-09 Ulrich Drepper <drepper@redhat.com> [BZ #3493] * posix/unistd.h (sysconf): Remove const attribute. * sysdeps/posix/getaddrinfo.c (getaddrinfo): Fix test for temporary or deprecated addresses. Patch by Sridhar Samudrala <sri@us.ibm.com>. * string/Makefile (tests): Add tst-strxfrm2. * string/tst-strxfrm2.c: New file. 2006-10-09 Jakub Jelinek <jakub@redhat.com> * elf/dl-debug.c (_dl_debug_initialize): Check r->r_map for 0 rather than r->r_brk. * string/strxfrm_l.c (STRXFRM): Do the trailing \1 removal optimization even if needed > n. 2006-11-07 Jakub Jelinek <jakub@redhat.com> * include/libc-symbols.h (declare_symbol): Rename to... (declare_symbol_alias): ... this. Add ORIGINAL argument, imply strong_alias (ORIGINAL, SYMBOL) in asm to make sure it preceedes .size directive. * sysdeps/gnu/errlist-compat.awk: Adjust for declare_symbol_alias changes. * sysdeps/gnu/siglist.c: Likewise. 2006-11-03 Steven Munroe <sjmunroe@us.ibm.com> * sysdeps/powerpc/fpu/bits/mathinline.h [__LIBC_INTERNAL_MATH_INLINES]: Moved to ... * sysdeps/powerpc/fpu/math_private.h: ...here. New file. 2006-11-05 Ulrich Drepper <drepper@redhat.com> * sysdeps/unix/sysv/linux/i386/sysconf.c (intel_check_word): Update handling of cache descriptor 0x49 for new models. * sysdeps/unix/sysv/linux/x86_64/sysconf.c (intel_check_word): Likewise. 2006-11-02 Ulrich Drepper <drepper@redhat.com> * configure.in: Work around ld --help change and avoid -z relro test completely if the architecture doesn't care about security. 2006-11-01 Ulrich Drepper <drepper@redhat.com> * po/sv.po: Update from translation team. 2006-10-31 Ulrich Drepper <drepper@redhat.com> * stdlib/atexit.c (atexit): Don't mark as hidden when used to generate compatibility version. 2006-10-29 Ulrich Drepper <drepper@redhat.com> * configure.in: Relax -z relro requirement a bit. * po/sv.po: Update from translation team. 2006-10-29 Jakub Jelinek <jakub@redhat.com> * elf/dl-sym.c (do_sym): Use RTLD_SINGLE_THREAD_P. * elf/dl-runtime.c (_dl_fixup, _dl_profile_fixup): Likewise. * elf/dl-close.c (_dl_close_worker): Likewise. * elf/dl-open.c (_dl_open_worker): Likewise. * sysdeps/generic/sysdep-cancel.h (RTLD_SINGLE_THREAD_P): Define. * configure.in: Require assembler support for visibility, compiler support for visibility and aliases, linker support for various -z options. * Makeconfig: Remove conditional code which now is unnecessary. * config.h.in: Likewise. * config.make.in: Likewise. * dlfcn/Makefile: Likewise. * elf/Makefile: Likewise. * elf/dl-load.c: Likewise. * elf/rtld.c: Likewise. * include/libc-symbols.h: Likewise. * include/stdio.h: Likewise. * io/Makefile: Likewise. * io/fstat.c: Likewise. * io/fstat64.c: Likewise. * io/fstatat.c: Likewise. * io/fstatat64.c: Likewise. * io/lstat.c: Likewise. * io/lstat64.c: Likewise. * io/mknod.c: Likewise. * io/mknodat.c: Likewise. * io/stat.c: Likewise. * io/stat64.c: Likewise. * libio/stdio.c: Likewise. * nscd/Makefile: Likewise. * stdlib/Makefile: Likewise. * stdlib/atexit.c: Likewise. * sysdeps/generic/ldsodefs.h: Likewise. * sysdeps/i386/dl-machine.h: Likewise. * sysdeps/i386/sysdep.h: Likewise. * sysdeps/i386/i686/memcmp.S: Likewise. * sysdeps/powerpc/powerpc32/sysdep.h: Likewise. * sysdeps/unix/sysv/linux/i386/sigaction.c: Likewise. * sysdeps/unix/sysv/linux/x86_64/sigaction.c: Likewise. * Makerules: USE_TLS support is now default. * tls.make.c: Likewise. * csu/Versions: Likewise. * csu/libc-start.c: Likewise. * csu/libc-tls.c: Likewise. * csu/version.c: Likewise. * dlfcn/dlinfo.c: Likewise. * elf/dl-addr.c: Likewise. * elf/dl-cache.c: Likewise. * elf/dl-close.c: Likewise. * elf/dl-iteratephdr.c: Likewise. * elf/dl-load.c: Likewise. * elf/dl-lookup.c: Likewise. * elf/dl-object.c: Likewise. * elf/dl-open.c: Likewise. * elf/dl-reloc.c: Likewise. * elf/dl-support.c: Likewise. * elf/dl-sym.c: Likewise. * elf/dl-sysdep.c: Likewise. * elf/dl-tls.c: Likewise. * elf/ldconfig.c: Likewise. * elf/rtld.c: Likewise. * elf/tst-tls-dlinfo.c: Likewise. * elf/tst-tls1.c: Likewise. * elf/tst-tls10.h: Likewise. * elf/tst-tls14.c: Likewise. * elf/tst-tls2.c: Likewise. * elf/tst-tls3.c: Likewise. * elf/tst-tls4.c: Likewise. * elf/tst-tls5.c: Likewise. * elf/tst-tls6.c: Likewise. * elf/tst-tls7.c: Likewise. * elf/tst-tls8.c: Likewise. * elf/tst-tls9.c: Likewise. * elf/tst-tlsmod1.c: Likewise. * elf/tst-tlsmod13.c: Likewise. * elf/tst-tlsmod13a.c: Likewise. * elf/tst-tlsmod14a.c: Likewise. * elf/tst-tlsmod2.c: Likewise. * elf/tst-tlsmod3.c: Likewise. * elf/tst-tlsmod4.c: Likewise. * elf/tst-tlsmod5.c: Likewise. * elf/tst-tlsmod6.c: Likewise. * include/errno.h: Likewise. * include/link.h: Likewise. * include/tls.h: Likewise. * locale/global-locale.c: Likewise. * locale/localeinfo.h: Likewise. * malloc/arena.c: Likewise. * malloc/hooks.c: Likewise. * malloc/malloc.c: Likewise. * resolv/Versions: Likewise. * sysdeps/alpha/dl-machine.h: Likewise. * sysdeps/alpha/libc-tls.c: Likewise. * sysdeps/generic/ldsodefs.h: Likewise. * sysdeps/generic/tls.h: Likewise. * sysdeps/i386/dl-machine.h: Likewise. * sysdeps/ia64/dl-machine.h: Likewise. * sysdeps/ia64/libc-tls.c: Likewise. * sysdeps/mach/hurd/fork.c: Likewise. * sysdeps/mach/hurd/i386/tls.h: Likewise. * sysdeps/powerpc/powerpc32/dl-machine.c: Likwise. * sysdeps/powerpc/powerpc32/dl-machine.h: Likewise. * sysdeps/powerpc/powerpc64/dl-machine.h: Likewise. * sysdeps/s390/libc-tls.c: Likewise. * sysdeps/s390/s390-32/dl-machine.h: Likewise. * sysdeps/s390/s390-64/dl-machine.h: Likewise. * sysdeps/sh/dl-machine.h: Likewise. * sysdeps/sparc/sparc32/dl-machine.h: Likewise. * sysdeps/sparc/sparc64/dl-machine.h: Likewise. * sysdeps/x86_64/dl-machine.h: Likewise. [BZ #3426] * stdlib/stdlib.h: Adjust comment for canonicalize_file_name to reality. 2006-10-27 Jakub Jelinek <jakub@redhat.com> * elf/dl-lookup.c (_dl_debug_bindings): Remove unused symbol_scope argument. (_dl_lookup_symbol_x): Adjust caller. * sysdeps/generic/ldsodefs.h (struct link_namespaces): Remove _ns_global_scope. * elf/rtld.c (dl_main): Don't initialize _ns_global_scope. * elf/dl-libc.c: Revert l_scope name changes. * elf/dl-load.c: Likewise. * elf/dl-object.c: Likewise. * elf/rtld.c: Likewise. * elf/dl-close.c (_dl_close): Likewise. * elf/dl-open.c (dl_open_worker): Likewise. If not SINGLE_THREAD_P, always use __rtld_mrlock_{change,done}. Always free old scope list here if not l_scope_mem. * elf/dl-runtime.c (_dl_fixup, _dl_profile_fixup): Revert l_scope name change. Never free scope list here. Just __rtld_mrlock_lock before the lookup and __rtld_mrlock_unlock it after the lookup. * elf/dl-sym.c: Likewise. * include/link.h (struct r_scoperec): Remove. (struct link_map): Replace l_scoperec with l_scope, l_scoperec_mem with l_scope_mem and l_scoperec_lock with l_scope_lock. 2006-10-25 Ulrich Drepper <drepper@redhat.com> * sysdeps/gnu/netinet/tcp.h: Define TCP_CONGESTION. 2006-10-18 Ulrich Drepper <drepper@redhat.com> * configure.in: Disable building profile libraries by default. 2006-10-18 Ulrich Drepper <drepper@redhat.com> * elf/dl-lookup.c (_dl_lookup_symbol_x): Add warning to _dl_lookup_symbol_x code. 2006-10-17 Jakub Jelinek <jakub@redhat.com> * elf/dl-runtime.c: Include sysdep-cancel.h. (_dl_fixup, _dl_profile_fixup): Use __rtld_mrlock_* and scoperec->nusers only if !SINGLE_THREAD_P. Use atomic_* instead of catomic_* macros. * elf/dl-sym.c: Include sysdep-cancel.h. (do_sym): Use __rtld_mrlock_* and scoperec->nusers only if !SINGLE_THREAD_P. Use atomic_* instead of catomic_* macros. * elf/dl-close.c: Include sysdep-cancel.h. (_dl_close): Use __rtld_mrlock_* and scoperec->nusers only if !SINGLE_THREAD_P. Use atomic_* instead of catomic_* macros. * elf/dl-open.c: Include sysdep-cancel.h. (dl_open_worker): Use __rtld_mrlock_* and scoperec->nusers only if !SINGLE_THREAD_P. Use atomic_* instead of catomic_* macros. 2006-10-17 Jakub Jelinek <jakub@redhat.com> [BZ #3313] * malloc/malloc.c (malloc_consolidate): Set maxfb to address of last fastbin rather than end of fastbin array. 2006-10-18 Ulrich Drepper <drepper@redhat.com> * sysdeps/i386/i486/bits/atomic.h (catomic_decrement): Use correct body macro. * sysdeps/x86_64/bits/atomic.h (__arch_c_compare_and_exchange_val_64_acq): Add missing casts. (catomic_decrement): Use correct body macro. 2006-10-17 Jakub Jelinek <jakub@redhat.com> * include/atomic.h: Add a unique prefix to all local variables in macros. * csu/tst-atomic.c (do_test): Test also catomic_* macros. 2006-10-14 Ulrich Drepper <drepper@redhat.com> * resolv/arpa/nameser.h: Document that ns_t_a6 is deprecated. [BZ #3313] * malloc/malloc.c (malloc_consolidate): Don't use get_fast_max to determine highest fast bin to consolidate, always look into all of them. (do_check_malloc_state): Only require for empty bins for large sizes in main arena. * libio/stdio.h: Add more __wur attributes. 2006-11-12 Andreas Jaeger <aj@suse.de> [BZ #2510] * manual/search.texi (Hash Search Function): Clarify. (Array Search Function): Clarify. 2006-11-12 Joseph Myers <joseph@codesourcery.com> [BZ #2830] * math/atest-exp.c (main): Cast hex value to mp_limb_t before shifting. * math/atest-exp2.c (read_mpn_hex): Likewise. * math/atest-sincos.c (main): Likewise. * sysdeps/unix/sysv/linux/syscalls.list: Add epoll_pwait. * sysdeps/unix/sysv/linux/sys/epoll.h: Declare epoll_pwait. * sysdeps/unix/sysv/linux/Versions (libc): Add epoll_pwait for version GLIBC_2.6. * Versions.def: Add GLIBC_2.6 for libc. * sysdeps/i386/i486/bits/atomic.h: Add catomic_* support. 2006-10-11 Jakub Jelinek <jakub@redhat.com> * malloc/malloc.c (_int_malloc): Remove unused any_larger variable. * nis/nis_defaults.c (__nis_default_access): Don't call getenv twice. * nis/nis_subr.c (nis_getnames): Use __secure_getenv instead of getenv. * sysdeps/generic/unsecvars.h: Add NIS_PATH. 2006-10-11 Ulrich Drepper <drepper@redhat.com> * include/atomic.c: Define catomic_* operations. * sysdeps/x86_64/bits/atomic.h: Likewise. Fix a few minor problems. * stdlib/cxa_finalize.c: Use catomic_* operations instead of atomic_*. * malloc/memusage.c: Likewise. * gmon/mcount.c: Likewise. * elf/dl-close.c: Likewise. * elf/dl-open.c: Likewise. * elf/dl-profile.c: Likewise. * elf/dl-sym.c: Likewise. * elf/dl-runtime.c: Likewise. * elf/dl-fptr.c: Likewise. * resolv/res_libc.c: Likewise. 2006-10-10 Roland McGrath <roland@frob.com> * sysdeps/mach/hurd/utimes.c: Use a union to avoid an improper cast. * sysdeps/mach/hurd/futimes.c: Likewise. * sysdeps/mach/hurd/lutimes.c: Likewise. 2006-10-09 Ulrich Drepper <drepper@redhat.com> Jakub Jelinek <jakub@redhat.com> Implement reference counting of scope records. * elf/dl-close.c (_dl_close): Remove all scopes from removed objects from the list in objects which remain. Always allocate new scope record. * elf/dl-open.c (dl_open_worker): When growing array for scopes, don't resize, allocate a new one. * elf/dl-runtime.c: Update reference counters before using a scope array. * elf/dl-sym.c: Likewise. * elf/dl-libc.c: Adjust for l_scope name change. * elf/dl-load.c: Likewise. * elf/dl-object.c: Likewise. * elf/rtld.c: Likewise. * include/link.h: Include <rtld-lowlevel.h>. Define struct r_scoperec. Replace r_scope with pointer to r_scoperec structure. Add l_scoperec_lock. * sysdeps/generic/ldsodefs.h: Include <rtld-lowlevel.h>. * sysdeps/generic/rtld-lowlevel.h: New file. * include/atomic.h: Rename atomic_and to atomic_and_val and atomic_or to atomic_or_val. Define new macros atomic_and and atomic_or which do not return values. * sysdeps/x86_64/bits/atomic.h: Define atomic_and and atomic_or. Various cleanups. * sysdeps/i386/i486/bits/atomic.h: Likewise. * po/sv.po: Update from translation team. 2006-10-07 Ulrich Drepper <drepper@redhat.com> * Versions.def: Add GLIBC_2.6 to libpthread. * include/shlib-compat.h (SHLIB_COMPAT): Expand parameters before use. (versioned_symbol): Likewise. (compat_symbol): Likewise. * po/tr.po: Update from translation team. * nis/Banner: Removed. It's been integral part forever and the author info is incomplete anyway. * libio/Banner: Likewise. 2006-10-06 Ulrich Drepper <drepper@redhat.com> * version.h (VERSION): Bump to 2.5.90 for new development tree.
865 lines
21 KiB
C
865 lines
21 KiB
C
/* File tree walker functions.
|
|
Copyright (C) 1996-2003, 2004, 2006 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 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
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, write to the Free
|
|
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
|
02111-1307 USA. */
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
# include <config.h>
|
|
#endif
|
|
|
|
#if __GNUC__
|
|
# define alloca __builtin_alloca
|
|
#else
|
|
# if HAVE_ALLOCA_H
|
|
# include <alloca.h>
|
|
# else
|
|
# ifdef _AIX
|
|
# pragma alloca
|
|
# else
|
|
char *alloca ();
|
|
# endif
|
|
# endif
|
|
#endif
|
|
|
|
#ifdef _LIBC
|
|
# include <dirent.h>
|
|
# define NAMLEN(dirent) _D_EXACT_NAMLEN (dirent)
|
|
#else
|
|
# if HAVE_DIRENT_H
|
|
# include <dirent.h>
|
|
# define NAMLEN(dirent) strlen ((dirent)->d_name)
|
|
# else
|
|
# define dirent direct
|
|
# define NAMLEN(dirent) (dirent)->d_namlen
|
|
# if HAVE_SYS_NDIR_H
|
|
# include <sys/ndir.h>
|
|
# endif
|
|
# if HAVE_SYS_DIR_H
|
|
# include <sys/dir.h>
|
|
# endif
|
|
# if HAVE_NDIR_H
|
|
# include <ndir.h>
|
|
# endif
|
|
# endif
|
|
#endif
|
|
|
|
#include <errno.h>
|
|
#include <fcntl.h>
|
|
#include <ftw.h>
|
|
#include <limits.h>
|
|
#include <search.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
#include <not-cancel.h>
|
|
#if HAVE_SYS_PARAM_H || defined _LIBC
|
|
# include <sys/param.h>
|
|
#endif
|
|
#ifdef _LIBC
|
|
# include <include/sys/stat.h>
|
|
#else
|
|
# include <sys/stat.h>
|
|
#endif
|
|
|
|
#if ! _LIBC && !HAVE_DECL_STPCPY && !defined stpcpy
|
|
char *stpcpy ();
|
|
#endif
|
|
|
|
#if ! _LIBC && ! defined HAVE_MEMPCPY && ! defined mempcpy
|
|
/* Be CAREFUL that there are no side effects in N. */
|
|
# define mempcpy(D, S, N) ((void *) ((char *) memcpy (D, S, N) + (N)))
|
|
#endif
|
|
|
|
/* #define NDEBUG 1 */
|
|
#include <assert.h>
|
|
|
|
#ifndef _LIBC
|
|
# undef __chdir
|
|
# define __chdir chdir
|
|
# undef __closedir
|
|
# define __closedir closedir
|
|
# undef __fchdir
|
|
# define __fchdir fchdir
|
|
# undef __getcwd
|
|
# define __getcwd(P, N) xgetcwd ()
|
|
extern char *xgetcwd (void);
|
|
# undef __mempcpy
|
|
# define __mempcpy mempcpy
|
|
# undef __opendir
|
|
# define __opendir opendir
|
|
# undef __readdir64
|
|
# define __readdir64 readdir
|
|
# undef __stpcpy
|
|
# define __stpcpy stpcpy
|
|
# undef __tdestroy
|
|
# define __tdestroy tdestroy
|
|
# undef __tfind
|
|
# define __tfind tfind
|
|
# undef __tsearch
|
|
# define __tsearch tsearch
|
|
# undef internal_function
|
|
# define internal_function /* empty */
|
|
# undef dirent64
|
|
# define dirent64 dirent
|
|
# undef MAX
|
|
# define MAX(a, b) ((a) > (b) ? (a) : (b))
|
|
#endif
|
|
|
|
/* Arrange to make lstat calls go through the wrapper function
|
|
on systems with an lstat function that does not dereference symlinks
|
|
that are specified with a trailing slash. */
|
|
#if ! _LIBC && ! LSTAT_FOLLOWS_SLASHED_SYMLINK
|
|
int rpl_lstat (const char *, struct stat *);
|
|
# undef lstat
|
|
# define lstat(Name, Stat_buf) rpl_lstat(Name, Stat_buf)
|
|
#endif
|
|
|
|
#ifndef __set_errno
|
|
# define __set_errno(Val) errno = (Val)
|
|
#endif
|
|
|
|
/* Support for the LFS API version. */
|
|
#ifndef FTW_NAME
|
|
# define FTW_NAME ftw
|
|
# define NFTW_NAME nftw
|
|
# define NFTW_OLD_NAME __old_nftw
|
|
# define NFTW_NEW_NAME __new_nftw
|
|
# define INO_T ino_t
|
|
# define STAT stat
|
|
# ifdef _LIBC
|
|
# define LXSTAT __lxstat
|
|
# define XSTAT __xstat
|
|
# define FXSTATAT __fxstatat
|
|
# else
|
|
# define LXSTAT(V,f,sb) lstat (f,sb)
|
|
# define XSTAT(V,f,sb) stat (f,sb)
|
|
# define FXSTATAT(V,d,f,sb,m) fstatat (d, f, sb, m)
|
|
# endif
|
|
# define FTW_FUNC_T __ftw_func_t
|
|
# define NFTW_FUNC_T __nftw_func_t
|
|
#endif
|
|
|
|
/* We define PATH_MAX if the system does not provide a definition.
|
|
This does not artificially limit any operation. PATH_MAX is simply
|
|
used as a guesstimate for the expected maximal path length.
|
|
Buffers will be enlarged if necessary. */
|
|
#ifndef PATH_MAX
|
|
# define PATH_MAX 1024
|
|
#endif
|
|
|
|
struct dir_data
|
|
{
|
|
DIR *stream;
|
|
int streamfd;
|
|
char *content;
|
|
};
|
|
|
|
struct known_object
|
|
{
|
|
dev_t dev;
|
|
INO_T ino;
|
|
};
|
|
|
|
struct ftw_data
|
|
{
|
|
/* Array with pointers to open directory streams. */
|
|
struct dir_data **dirstreams;
|
|
size_t actdir;
|
|
size_t maxdir;
|
|
|
|
/* Buffer containing name of currently processed object. */
|
|
char *dirbuf;
|
|
size_t dirbufsize;
|
|
|
|
/* Passed as fourth argument to `nftw' callback. The `base' member
|
|
tracks the content of the `dirbuf'. */
|
|
struct FTW ftw;
|
|
|
|
/* Flags passed to `nftw' function. 0 for `ftw'. */
|
|
int flags;
|
|
|
|
/* Conversion array for flag values. It is the identity mapping for
|
|
`nftw' calls, otherwise it maps the values to those known by
|
|
`ftw'. */
|
|
const int *cvt_arr;
|
|
|
|
/* Callback function. We always use the `nftw' form. */
|
|
NFTW_FUNC_T func;
|
|
|
|
/* Device of starting point. Needed for FTW_MOUNT. */
|
|
dev_t dev;
|
|
|
|
/* Data structure for keeping fingerprints of already processed
|
|
object. This is needed when not using FTW_PHYS. */
|
|
void *known_objects;
|
|
};
|
|
|
|
|
|
/* Internally we use the FTW_* constants used for `nftw'. When invoked
|
|
as `ftw', map each flag to the subset of values used by `ftw'. */
|
|
static const int nftw_arr[] =
|
|
{
|
|
FTW_F, FTW_D, FTW_DNR, FTW_NS, FTW_SL, FTW_DP, FTW_SLN
|
|
};
|
|
|
|
static const int ftw_arr[] =
|
|
{
|
|
FTW_F, FTW_D, FTW_DNR, FTW_NS, FTW_F, FTW_D, FTW_NS
|
|
};
|
|
|
|
|
|
/* Forward declarations of local functions. */
|
|
static int ftw_dir (struct ftw_data *data, struct STAT *st,
|
|
struct dir_data *old_dir) internal_function;
|
|
|
|
|
|
static int
|
|
object_compare (const void *p1, const void *p2)
|
|
{
|
|
/* We don't need a sophisticated and useful comparison. We are only
|
|
interested in equality. However, we must be careful not to
|
|
accidentally compare `holes' in the structure. */
|
|
const struct known_object *kp1 = p1, *kp2 = p2;
|
|
int cmp1;
|
|
cmp1 = (kp1->ino > kp2->ino) - (kp1->ino < kp2->ino);
|
|
if (cmp1 != 0)
|
|
return cmp1;
|
|
return (kp1->dev > kp2->dev) - (kp1->dev < kp2->dev);
|
|
}
|
|
|
|
|
|
static inline int
|
|
add_object (struct ftw_data *data, struct STAT *st)
|
|
{
|
|
struct known_object *newp = malloc (sizeof (struct known_object));
|
|
if (newp == NULL)
|
|
return -1;
|
|
newp->dev = st->st_dev;
|
|
newp->ino = st->st_ino;
|
|
return __tsearch (newp, &data->known_objects, object_compare) ? 0 : -1;
|
|
}
|
|
|
|
|
|
static inline int
|
|
find_object (struct ftw_data *data, struct STAT *st)
|
|
{
|
|
struct known_object obj;
|
|
obj.dev = st->st_dev;
|
|
obj.ino = st->st_ino;
|
|
return __tfind (&obj, &data->known_objects, object_compare) != NULL;
|
|
}
|
|
|
|
|
|
static inline int
|
|
__attribute ((always_inline))
|
|
open_dir_stream (int *dfdp, struct ftw_data *data, struct dir_data *dirp)
|
|
{
|
|
int result = 0;
|
|
|
|
if (data->dirstreams[data->actdir] != NULL)
|
|
{
|
|
/* Oh, oh. We must close this stream. Get all remaining
|
|
entries and store them as a list in the `content' member of
|
|
the `struct dir_data' variable. */
|
|
size_t bufsize = 1024;
|
|
char *buf = malloc (bufsize);
|
|
|
|
if (buf == NULL)
|
|
result = -1;
|
|
else
|
|
{
|
|
DIR *st = data->dirstreams[data->actdir]->stream;
|
|
struct dirent64 *d;
|
|
size_t actsize = 0;
|
|
|
|
while ((d = __readdir64 (st)) != NULL)
|
|
{
|
|
size_t this_len = NAMLEN (d);
|
|
if (actsize + this_len + 2 >= bufsize)
|
|
{
|
|
char *newp;
|
|
bufsize += MAX (1024, 2 * this_len);
|
|
newp = (char *) realloc (buf, bufsize);
|
|
if (newp == NULL)
|
|
{
|
|
/* No more memory. */
|
|
int save_err = errno;
|
|
free (buf);
|
|
__set_errno (save_err);
|
|
return -1;
|
|
}
|
|
buf = newp;
|
|
}
|
|
|
|
*((char *) __mempcpy (buf + actsize, d->d_name, this_len))
|
|
= '\0';
|
|
actsize += this_len + 1;
|
|
}
|
|
|
|
/* Terminate the list with an additional NUL byte. */
|
|
buf[actsize++] = '\0';
|
|
|
|
/* Shrink the buffer to what we actually need. */
|
|
data->dirstreams[data->actdir]->content = realloc (buf, actsize);
|
|
if (data->dirstreams[data->actdir]->content == NULL)
|
|
{
|
|
int save_err = errno;
|
|
free (buf);
|
|
__set_errno (save_err);
|
|
result = -1;
|
|
}
|
|
else
|
|
{
|
|
__closedir (st);
|
|
data->dirstreams[data->actdir]->stream = NULL;
|
|
data->dirstreams[data->actdir]->streamfd = -1;
|
|
data->dirstreams[data->actdir] = NULL;
|
|
}
|
|
}
|
|
}
|
|
|
|
/* Open the new stream. */
|
|
if (result == 0)
|
|
{
|
|
assert (data->dirstreams[data->actdir] == NULL);
|
|
|
|
if (dfdp != NULL && *dfdp != -1)
|
|
{
|
|
int fd = openat64_not_cancel_3 (*dfdp, data->dirbuf + data->ftw.base,
|
|
O_RDONLY | O_DIRECTORY | O_NDELAY);
|
|
dirp->stream = NULL;
|
|
if (fd != -1 && (dirp->stream = __fdopendir (fd)) == NULL)
|
|
close_not_cancel_no_status (fd);
|
|
}
|
|
else
|
|
{
|
|
const char *name = ((data->flags & FTW_CHDIR)
|
|
? data->dirbuf + data->ftw.base: data->dirbuf);
|
|
dirp->stream = __opendir (name);
|
|
}
|
|
|
|
if (dirp->stream == NULL)
|
|
result = -1;
|
|
else
|
|
{
|
|
dirp->streamfd = dirfd (dirp->stream);
|
|
dirp->content = NULL;
|
|
data->dirstreams[data->actdir] = dirp;
|
|
|
|
if (++data->actdir == data->maxdir)
|
|
data->actdir = 0;
|
|
}
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
|
|
static int
|
|
internal_function
|
|
process_entry (struct ftw_data *data, struct dir_data *dir, const char *name,
|
|
size_t namlen, int d_type)
|
|
{
|
|
struct STAT st;
|
|
int result = 0;
|
|
int flag = 0;
|
|
size_t new_buflen;
|
|
|
|
if (name[0] == '.' && (name[1] == '\0'
|
|
|| (name[1] == '.' && name[2] == '\0')))
|
|
/* Don't process the "." and ".." entries. */
|
|
return 0;
|
|
|
|
new_buflen = data->ftw.base + namlen + 2;
|
|
if (data->dirbufsize < new_buflen)
|
|
{
|
|
/* Enlarge the buffer. */
|
|
char *newp;
|
|
|
|
data->dirbufsize = 2 * new_buflen;
|
|
newp = (char *) realloc (data->dirbuf, data->dirbufsize);
|
|
if (newp == NULL)
|
|
return -1;
|
|
data->dirbuf = newp;
|
|
}
|
|
|
|
*((char *) __mempcpy (data->dirbuf + data->ftw.base, name, namlen)) = '\0';
|
|
|
|
int statres;
|
|
if (dir->streamfd != -1)
|
|
statres = FXSTATAT (_STAT_VER, dir->streamfd, name, &st,
|
|
(data->flags & FTW_PHYS) ? AT_SYMLINK_NOFOLLOW : 0);
|
|
else
|
|
{
|
|
if ((data->flags & FTW_CHDIR) == 0)
|
|
name = data->dirbuf;
|
|
|
|
statres = ((data->flags & FTW_PHYS)
|
|
? LXSTAT (_STAT_VER, name, &st)
|
|
: XSTAT (_STAT_VER, name, &st));
|
|
}
|
|
|
|
if (statres < 0)
|
|
{
|
|
if (errno != EACCES && errno != ENOENT)
|
|
result = -1;
|
|
else if (data->flags & FTW_PHYS)
|
|
flag = FTW_NS;
|
|
else if (d_type == DT_LNK)
|
|
flag = FTW_SLN;
|
|
else
|
|
{
|
|
if (dir->streamfd != -1)
|
|
statres = FXSTATAT (_STAT_VER, dir->streamfd, name, &st,
|
|
AT_SYMLINK_NOFOLLOW);
|
|
else
|
|
statres = LXSTAT (_STAT_VER, name, &st);
|
|
if (statres == 0 && S_ISLNK (st.st_mode))
|
|
flag = FTW_SLN;
|
|
else
|
|
flag = FTW_NS;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
if (S_ISDIR (st.st_mode))
|
|
flag = FTW_D;
|
|
else if (S_ISLNK (st.st_mode))
|
|
flag = FTW_SL;
|
|
else
|
|
flag = FTW_F;
|
|
}
|
|
|
|
if (result == 0
|
|
&& (flag == FTW_NS
|
|
|| !(data->flags & FTW_MOUNT) || st.st_dev == data->dev))
|
|
{
|
|
if (flag == FTW_D)
|
|
{
|
|
if ((data->flags & FTW_PHYS)
|
|
|| (!find_object (data, &st)
|
|
/* Remember the object. */
|
|
&& (result = add_object (data, &st)) == 0))
|
|
result = ftw_dir (data, &st, dir);
|
|
}
|
|
else
|
|
result = (*data->func) (data->dirbuf, &st, data->cvt_arr[flag],
|
|
&data->ftw);
|
|
}
|
|
|
|
if ((data->flags & FTW_ACTIONRETVAL) && result == FTW_SKIP_SUBTREE)
|
|
result = 0;
|
|
|
|
return result;
|
|
}
|
|
|
|
|
|
static int
|
|
__attribute ((noinline))
|
|
internal_function
|
|
ftw_dir (struct ftw_data *data, struct STAT *st, struct dir_data *old_dir)
|
|
{
|
|
struct dir_data dir;
|
|
struct dirent64 *d;
|
|
int previous_base = data->ftw.base;
|
|
int result;
|
|
char *startp;
|
|
|
|
/* Open the stream for this directory. This might require that
|
|
another stream has to be closed. */
|
|
result = open_dir_stream (old_dir == NULL ? NULL : &old_dir->streamfd,
|
|
data, &dir);
|
|
if (result != 0)
|
|
{
|
|
if (errno == EACCES)
|
|
/* We cannot read the directory. Signal this with a special flag. */
|
|
result = (*data->func) (data->dirbuf, st, FTW_DNR, &data->ftw);
|
|
|
|
return result;
|
|
}
|
|
|
|
/* First, report the directory (if not depth-first). */
|
|
if (!(data->flags & FTW_DEPTH))
|
|
{
|
|
result = (*data->func) (data->dirbuf, st, FTW_D, &data->ftw);
|
|
if (result != 0)
|
|
{
|
|
int save_err;
|
|
fail:
|
|
save_err = errno;
|
|
__closedir (dir.stream);
|
|
dir.streamfd = -1;
|
|
__set_errno (save_err);
|
|
|
|
if (data->actdir-- == 0)
|
|
data->actdir = data->maxdir - 1;
|
|
data->dirstreams[data->actdir] = NULL;
|
|
return result;
|
|
}
|
|
}
|
|
|
|
/* If necessary, change to this directory. */
|
|
if (data->flags & FTW_CHDIR)
|
|
{
|
|
if (__fchdir (dirfd (dir.stream)) < 0)
|
|
{
|
|
result = -1;
|
|
goto fail;
|
|
}
|
|
}
|
|
|
|
/* Next, update the `struct FTW' information. */
|
|
++data->ftw.level;
|
|
startp = __rawmemchr (data->dirbuf, '\0');
|
|
/* There always must be a directory name. */
|
|
assert (startp != data->dirbuf);
|
|
if (startp[-1] != '/')
|
|
*startp++ = '/';
|
|
data->ftw.base = startp - data->dirbuf;
|
|
|
|
while (dir.stream != NULL && (d = __readdir64 (dir.stream)) != NULL)
|
|
{
|
|
result = process_entry (data, &dir, d->d_name, NAMLEN (d), d->d_type);
|
|
if (result != 0)
|
|
break;
|
|
}
|
|
|
|
if (dir.stream != NULL)
|
|
{
|
|
/* The stream is still open. I.e., we did not need more
|
|
descriptors. Simply close the stream now. */
|
|
int save_err = errno;
|
|
|
|
assert (dir.content == NULL);
|
|
|
|
__closedir (dir.stream);
|
|
dir.streamfd = -1;
|
|
__set_errno (save_err);
|
|
|
|
if (data->actdir-- == 0)
|
|
data->actdir = data->maxdir - 1;
|
|
data->dirstreams[data->actdir] = NULL;
|
|
}
|
|
else
|
|
{
|
|
int save_err;
|
|
char *runp = dir.content;
|
|
|
|
while (result == 0 && *runp != '\0')
|
|
{
|
|
char *endp = strchr (runp, '\0');
|
|
|
|
// XXX Should store the d_type values as well?!
|
|
result = process_entry (data, &dir, runp, endp - runp, DT_UNKNOWN);
|
|
|
|
runp = endp + 1;
|
|
}
|
|
|
|
save_err = errno;
|
|
free (dir.content);
|
|
__set_errno (save_err);
|
|
}
|
|
|
|
if ((data->flags & FTW_ACTIONRETVAL) && result == FTW_SKIP_SIBLINGS)
|
|
result = 0;
|
|
|
|
/* Prepare the return, revert the `struct FTW' information. */
|
|
data->dirbuf[data->ftw.base - 1] = '\0';
|
|
--data->ftw.level;
|
|
data->ftw.base = previous_base;
|
|
|
|
/* Finally, if we process depth-first report the directory. */
|
|
if (result == 0 && (data->flags & FTW_DEPTH))
|
|
result = (*data->func) (data->dirbuf, st, FTW_DP, &data->ftw);
|
|
|
|
if (old_dir
|
|
&& (data->flags & FTW_CHDIR)
|
|
&& (result == 0
|
|
|| ((data->flags & FTW_ACTIONRETVAL)
|
|
&& (result != -1 && result != FTW_STOP))))
|
|
{
|
|
/* Change back to the parent directory. */
|
|
int done = 0;
|
|
if (old_dir->stream != NULL)
|
|
if (__fchdir (dirfd (old_dir->stream)) == 0)
|
|
done = 1;
|
|
|
|
if (!done)
|
|
{
|
|
if (data->ftw.base == 1)
|
|
{
|
|
if (__chdir ("/") < 0)
|
|
result = -1;
|
|
}
|
|
else
|
|
if (__chdir ("..") < 0)
|
|
result = -1;
|
|
}
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
|
|
static int
|
|
__attribute ((noinline))
|
|
internal_function
|
|
ftw_startup (const char *dir, int is_nftw, void *func, int descriptors,
|
|
int flags)
|
|
{
|
|
struct ftw_data data;
|
|
struct STAT st;
|
|
int result = 0;
|
|
int save_err;
|
|
int cwdfd = -1;
|
|
char *cwd = NULL;
|
|
char *cp;
|
|
|
|
/* First make sure the parameters are reasonable. */
|
|
if (dir[0] == '\0')
|
|
{
|
|
__set_errno (ENOENT);
|
|
return -1;
|
|
}
|
|
|
|
data.maxdir = descriptors < 1 ? 1 : descriptors;
|
|
data.actdir = 0;
|
|
data.dirstreams = (struct dir_data **) alloca (data.maxdir
|
|
* sizeof (struct dir_data *));
|
|
memset (data.dirstreams, '\0', data.maxdir * sizeof (struct dir_data *));
|
|
|
|
/* PATH_MAX is always defined when we get here. */
|
|
data.dirbufsize = MAX (2 * strlen (dir), PATH_MAX);
|
|
data.dirbuf = (char *) malloc (data.dirbufsize);
|
|
if (data.dirbuf == NULL)
|
|
return -1;
|
|
cp = __stpcpy (data.dirbuf, dir);
|
|
/* Strip trailing slashes. */
|
|
while (cp > data.dirbuf + 1 && cp[-1] == '/')
|
|
--cp;
|
|
*cp = '\0';
|
|
|
|
data.ftw.level = 0;
|
|
|
|
/* Find basename. */
|
|
while (cp > data.dirbuf && cp[-1] != '/')
|
|
--cp;
|
|
data.ftw.base = cp - data.dirbuf;
|
|
|
|
data.flags = flags;
|
|
|
|
/* This assignment might seem to be strange but it is what we want.
|
|
The trick is that the first three arguments to the `ftw' and
|
|
`nftw' callback functions are equal. Therefore we can call in
|
|
every case the callback using the format of the `nftw' version
|
|
and get the correct result since the stack layout for a function
|
|
call in C allows this. */
|
|
data.func = (NFTW_FUNC_T) func;
|
|
|
|
/* Since we internally use the complete set of FTW_* values we need
|
|
to reduce the value range before calling a `ftw' callback. */
|
|
data.cvt_arr = is_nftw ? nftw_arr : ftw_arr;
|
|
|
|
/* No object known so far. */
|
|
data.known_objects = NULL;
|
|
|
|
/* Now go to the directory containing the initial file/directory. */
|
|
if (flags & FTW_CHDIR)
|
|
{
|
|
/* We have to be able to go back to the current working
|
|
directory. The best way to do this is to use a file
|
|
descriptor. */
|
|
cwdfd = __open (".", O_RDONLY | O_DIRECTORY);
|
|
if (cwdfd == -1)
|
|
{
|
|
/* Try getting the directory name. This can be needed if
|
|
the current directory is executable but not readable. */
|
|
if (errno == EACCES)
|
|
/* GNU extension ahead. */
|
|
cwd = __getcwd (NULL, 0);
|
|
|
|
if (cwd == NULL)
|
|
goto out_fail;
|
|
}
|
|
else if (data.maxdir > 1)
|
|
/* Account for the file descriptor we use here. */
|
|
--data.maxdir;
|
|
|
|
if (data.ftw.base > 0)
|
|
{
|
|
/* Change to the directory the file is in. In data.dirbuf
|
|
we have a writable copy of the file name. Just NUL
|
|
terminate it for now and change the directory. */
|
|
if (data.ftw.base == 1)
|
|
/* I.e., the file is in the root directory. */
|
|
result = __chdir ("/");
|
|
else
|
|
{
|
|
char ch = data.dirbuf[data.ftw.base - 1];
|
|
data.dirbuf[data.ftw.base - 1] = '\0';
|
|
result = __chdir (data.dirbuf);
|
|
data.dirbuf[data.ftw.base - 1] = ch;
|
|
}
|
|
}
|
|
}
|
|
|
|
/* Get stat info for start directory. */
|
|
if (result == 0)
|
|
{
|
|
const char *name = ((data.flags & FTW_CHDIR)
|
|
? data.dirbuf + data.ftw.base
|
|
: data.dirbuf);
|
|
|
|
if (((flags & FTW_PHYS)
|
|
? LXSTAT (_STAT_VER, name, &st)
|
|
: XSTAT (_STAT_VER, name, &st)) < 0)
|
|
{
|
|
if (!(flags & FTW_PHYS)
|
|
&& errno == ENOENT
|
|
&& LXSTAT (_STAT_VER, name, &st) == 0
|
|
&& S_ISLNK (st.st_mode))
|
|
result = (*data.func) (data.dirbuf, &st, data.cvt_arr[FTW_SLN],
|
|
&data.ftw);
|
|
else
|
|
/* No need to call the callback since we cannot say anything
|
|
about the object. */
|
|
result = -1;
|
|
}
|
|
else
|
|
{
|
|
if (S_ISDIR (st.st_mode))
|
|
{
|
|
/* Remember the device of the initial directory in case
|
|
FTW_MOUNT is given. */
|
|
data.dev = st.st_dev;
|
|
|
|
/* We know this directory now. */
|
|
if (!(flags & FTW_PHYS))
|
|
result = add_object (&data, &st);
|
|
|
|
if (result == 0)
|
|
result = ftw_dir (&data, &st, NULL);
|
|
}
|
|
else
|
|
{
|
|
int flag = S_ISLNK (st.st_mode) ? FTW_SL : FTW_F;
|
|
|
|
result = (*data.func) (data.dirbuf, &st, data.cvt_arr[flag],
|
|
&data.ftw);
|
|
}
|
|
}
|
|
|
|
if ((flags & FTW_ACTIONRETVAL)
|
|
&& (result == FTW_SKIP_SUBTREE || result == FTW_SKIP_SIBLINGS))
|
|
result = 0;
|
|
}
|
|
|
|
/* Return to the start directory (if necessary). */
|
|
if (cwdfd != -1)
|
|
{
|
|
int save_err = errno;
|
|
__fchdir (cwdfd);
|
|
__set_errno (save_err);
|
|
}
|
|
else if (cwd != NULL)
|
|
{
|
|
int save_err = errno;
|
|
__chdir (cwd);
|
|
free (cwd);
|
|
__set_errno (save_err);
|
|
}
|
|
|
|
/* Free all memory. */
|
|
out_fail:
|
|
save_err = errno;
|
|
__tdestroy (data.known_objects, free);
|
|
free (data.dirbuf);
|
|
__set_errno (save_err);
|
|
|
|
return result;
|
|
}
|
|
|
|
|
|
|
|
/* Entry points. */
|
|
|
|
int
|
|
FTW_NAME (path, func, descriptors)
|
|
const char *path;
|
|
FTW_FUNC_T func;
|
|
int descriptors;
|
|
{
|
|
return ftw_startup (path, 0, func, descriptors, 0);
|
|
}
|
|
|
|
#ifndef _LIBC
|
|
int
|
|
NFTW_NAME (path, func, descriptors, flags)
|
|
const char *path;
|
|
NFTW_FUNC_T func;
|
|
int descriptors;
|
|
int flags;
|
|
{
|
|
return ftw_startup (path, 1, func, descriptors, flags);
|
|
}
|
|
#else
|
|
|
|
# include <shlib-compat.h>
|
|
|
|
int NFTW_NEW_NAME (const char *, NFTW_FUNC_T, int, int);
|
|
|
|
int
|
|
NFTW_NEW_NAME (path, func, descriptors, flags)
|
|
const char *path;
|
|
NFTW_FUNC_T func;
|
|
int descriptors;
|
|
int flags;
|
|
{
|
|
if (flags
|
|
& ~(FTW_PHYS | FTW_MOUNT | FTW_CHDIR | FTW_DEPTH | FTW_ACTIONRETVAL))
|
|
{
|
|
__set_errno (EINVAL);
|
|
return -1;
|
|
}
|
|
return ftw_startup (path, 1, func, descriptors, flags);
|
|
}
|
|
|
|
versioned_symbol (libc, NFTW_NEW_NAME, NFTW_NAME, GLIBC_2_3_3);
|
|
|
|
# if SHLIB_COMPAT(libc, GLIBC_2_1, GLIBC_2_3_3)
|
|
|
|
/* Older nftw* version just ignored all unknown flags. */
|
|
|
|
int NFTW_OLD_NAME (const char *, NFTW_FUNC_T, int, int);
|
|
|
|
int
|
|
attribute_compat_text_section
|
|
NFTW_OLD_NAME (path, func, descriptors, flags)
|
|
const char *path;
|
|
NFTW_FUNC_T func;
|
|
int descriptors;
|
|
int flags;
|
|
{
|
|
flags &= (FTW_PHYS | FTW_MOUNT | FTW_CHDIR | FTW_DEPTH);
|
|
return ftw_startup (path, 1, func, descriptors, flags);
|
|
}
|
|
|
|
compat_symbol (libc, NFTW_OLD_NAME, NFTW_NAME, GLIBC_2_1);
|
|
# endif
|
|
#endif
|