mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-27 03:41:23 +08: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.
569 lines
16 KiB
C
569 lines
16 KiB
C
/* Operating system support for run-time dynamic linker. Generic Unix version.
|
|
Copyright (C) 1995-1998, 2000-2005, 2006 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
|
|
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. */
|
|
|
|
#include <assert.h>
|
|
#include <elf.h>
|
|
#include <errno.h>
|
|
#include <fcntl.h>
|
|
#include <libintl.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
#include <sys/types.h>
|
|
#include <sys/stat.h>
|
|
#include <sys/mman.h>
|
|
#include <ldsodefs.h>
|
|
#include <stdio-common/_itoa.h>
|
|
#include <fpu_control.h>
|
|
|
|
#include <entry.h>
|
|
#include <dl-machine.h>
|
|
#include <dl-procinfo.h>
|
|
#include <dl-osinfo.h>
|
|
#include <hp-timing.h>
|
|
#include <tls.h>
|
|
|
|
#ifdef _DL_FIRST_PLATFORM
|
|
# define _DL_FIRST_EXTRA (_DL_FIRST_PLATFORM + _DL_PLATFORMS_COUNT)
|
|
#else
|
|
# define _DL_FIRST_EXTRA _DL_HWCAP_COUNT
|
|
#endif
|
|
|
|
extern char **_environ attribute_hidden;
|
|
extern void _end attribute_hidden;
|
|
|
|
/* Protect SUID program against misuse of file descriptors. */
|
|
extern void __libc_check_standard_fds (void);
|
|
|
|
#ifdef NEED_DL_BASE_ADDR
|
|
ElfW(Addr) _dl_base_addr;
|
|
#endif
|
|
int __libc_enable_secure attribute_relro = 0;
|
|
INTVARDEF(__libc_enable_secure)
|
|
int __libc_multiple_libcs = 0; /* Defining this here avoids the inclusion
|
|
of init-first. */
|
|
/* This variable contains the lowest stack address ever used. */
|
|
void *__libc_stack_end attribute_relro = NULL;
|
|
rtld_hidden_data_def(__libc_stack_end)
|
|
static ElfW(auxv_t) *_dl_auxv attribute_relro;
|
|
|
|
#ifndef DL_FIND_ARG_COMPONENTS
|
|
# define DL_FIND_ARG_COMPONENTS(cookie, argc, argv, envp, auxp) \
|
|
do { \
|
|
void **_tmp; \
|
|
(argc) = *(long int *) cookie; \
|
|
(argv) = (char **) ((long int *) cookie + 1); \
|
|
(envp) = (argv) + (argc) + 1; \
|
|
for (_tmp = (void **) (envp); *_tmp; ++_tmp) \
|
|
continue; \
|
|
(auxp) = (void *) ++_tmp; \
|
|
} while (0)
|
|
#endif
|
|
|
|
#ifndef DL_STACK_END
|
|
# define DL_STACK_END(cookie) ((void *) (cookie))
|
|
#endif
|
|
|
|
ElfW(Addr)
|
|
_dl_sysdep_start (void **start_argptr,
|
|
void (*dl_main) (const ElfW(Phdr) *phdr, ElfW(Word) phnum,
|
|
ElfW(Addr) *user_entry))
|
|
{
|
|
const ElfW(Phdr) *phdr = NULL;
|
|
ElfW(Word) phnum = 0;
|
|
ElfW(Addr) user_entry;
|
|
ElfW(auxv_t) *av;
|
|
#ifdef HAVE_AUX_SECURE
|
|
# define set_seen(tag) (tag) /* Evaluate for the side effects. */
|
|
# define set_seen_secure() ((void) 0)
|
|
#else
|
|
uid_t uid = 0;
|
|
gid_t gid = 0;
|
|
unsigned int seen = 0;
|
|
# define set_seen_secure() (seen = -1)
|
|
# ifdef HAVE_AUX_XID
|
|
# define set_seen(tag) (tag) /* Evaluate for the side effects. */
|
|
# else
|
|
# define M(type) (1 << (type))
|
|
# define set_seen(tag) seen |= M ((tag)->a_type)
|
|
# endif
|
|
#endif
|
|
#ifdef NEED_DL_SYSINFO
|
|
uintptr_t new_sysinfo = 0;
|
|
#endif
|
|
|
|
__libc_stack_end = DL_STACK_END (start_argptr);
|
|
DL_FIND_ARG_COMPONENTS (start_argptr, _dl_argc, INTUSE(_dl_argv), _environ,
|
|
_dl_auxv);
|
|
|
|
user_entry = (ElfW(Addr)) ENTRY_POINT;
|
|
GLRO(dl_platform) = NULL; /* Default to nothing known about the platform. */
|
|
|
|
for (av = _dl_auxv; av->a_type != AT_NULL; set_seen (av++))
|
|
switch (av->a_type)
|
|
{
|
|
case AT_PHDR:
|
|
phdr = (void *) av->a_un.a_val;
|
|
break;
|
|
case AT_PHNUM:
|
|
phnum = av->a_un.a_val;
|
|
break;
|
|
case AT_PAGESZ:
|
|
GLRO(dl_pagesize) = av->a_un.a_val;
|
|
break;
|
|
case AT_ENTRY:
|
|
user_entry = av->a_un.a_val;
|
|
break;
|
|
#ifdef NEED_DL_BASE_ADDR
|
|
case AT_BASE:
|
|
_dl_base_addr = av->a_un.a_val;
|
|
break;
|
|
#endif
|
|
#ifndef HAVE_AUX_SECURE
|
|
case AT_UID:
|
|
case AT_EUID:
|
|
uid ^= av->a_un.a_val;
|
|
break;
|
|
case AT_GID:
|
|
case AT_EGID:
|
|
gid ^= av->a_un.a_val;
|
|
break;
|
|
#endif
|
|
case AT_SECURE:
|
|
#ifndef HAVE_AUX_SECURE
|
|
seen = -1;
|
|
#endif
|
|
INTUSE(__libc_enable_secure) = av->a_un.a_val;
|
|
break;
|
|
case AT_PLATFORM:
|
|
GLRO(dl_platform) = (void *) av->a_un.a_val;
|
|
break;
|
|
case AT_HWCAP:
|
|
GLRO(dl_hwcap) = (unsigned long int) av->a_un.a_val;
|
|
break;
|
|
case AT_CLKTCK:
|
|
GLRO(dl_clktck) = av->a_un.a_val;
|
|
break;
|
|
case AT_FPUCW:
|
|
GLRO(dl_fpu_control) = av->a_un.a_val;
|
|
break;
|
|
#ifdef NEED_DL_SYSINFO
|
|
case AT_SYSINFO:
|
|
new_sysinfo = av->a_un.a_val;
|
|
break;
|
|
#endif
|
|
#if defined NEED_DL_SYSINFO || defined NEED_DL_SYSINFO_DSO
|
|
case AT_SYSINFO_EHDR:
|
|
GLRO(dl_sysinfo_dso) = (void *) av->a_un.a_val;
|
|
break;
|
|
#endif
|
|
#ifdef DL_PLATFORM_AUXV
|
|
DL_PLATFORM_AUXV
|
|
#endif
|
|
}
|
|
|
|
#ifndef HAVE_AUX_SECURE
|
|
if (seen != -1)
|
|
{
|
|
/* Fill in the values we have not gotten from the kernel through the
|
|
auxiliary vector. */
|
|
# ifndef HAVE_AUX_XID
|
|
# define SEE(UID, var, uid) \
|
|
if ((seen & M (AT_##UID)) == 0) var ^= __get##uid ()
|
|
SEE (UID, uid, uid);
|
|
SEE (EUID, uid, euid);
|
|
SEE (GID, gid, gid);
|
|
SEE (EGID, gid, egid);
|
|
# endif
|
|
|
|
/* If one of the two pairs of IDs does not match this is a setuid
|
|
or setgid run. */
|
|
INTUSE(__libc_enable_secure) = uid | gid;
|
|
}
|
|
#endif
|
|
|
|
#ifndef HAVE_AUX_PAGESIZE
|
|
if (GLRO(dl_pagesize) == 0)
|
|
GLRO(dl_pagesize) = __getpagesize ();
|
|
#endif
|
|
|
|
#if defined NEED_DL_SYSINFO
|
|
/* Only set the sysinfo value if we also have the vsyscall DSO. */
|
|
if (GLRO(dl_sysinfo_dso) != 0 && new_sysinfo)
|
|
GLRO(dl_sysinfo) = new_sysinfo;
|
|
#endif
|
|
|
|
#ifdef DL_SYSDEP_INIT
|
|
DL_SYSDEP_INIT;
|
|
#endif
|
|
|
|
#ifdef DL_PLATFORM_INIT
|
|
DL_PLATFORM_INIT;
|
|
#endif
|
|
|
|
/* Determine the length of the platform name. */
|
|
if (GLRO(dl_platform) != NULL)
|
|
GLRO(dl_platformlen) = strlen (GLRO(dl_platform));
|
|
|
|
if (__sbrk (0) == &_end)
|
|
/* The dynamic linker was run as a program, and so the initial break
|
|
starts just after our bss, at &_end. The malloc in dl-minimal.c
|
|
will consume the rest of this page, so tell the kernel to move the
|
|
break up that far. When the user program examines its break, it
|
|
will see this new value and not clobber our data. */
|
|
__sbrk (GLRO(dl_pagesize)
|
|
- ((&_end - (void *) 0) & (GLRO(dl_pagesize) - 1)));
|
|
|
|
/* If this is a SUID program we make sure that FDs 0, 1, and 2 are
|
|
allocated. If necessary we are doing it ourself. If it is not
|
|
possible we stop the program. */
|
|
if (__builtin_expect (INTUSE(__libc_enable_secure), 0))
|
|
__libc_check_standard_fds ();
|
|
|
|
(*dl_main) (phdr, phnum, &user_entry);
|
|
return user_entry;
|
|
}
|
|
|
|
void
|
|
internal_function
|
|
_dl_sysdep_start_cleanup (void)
|
|
{
|
|
}
|
|
|
|
void
|
|
internal_function
|
|
_dl_show_auxv (void)
|
|
{
|
|
char buf[64];
|
|
ElfW(auxv_t) *av;
|
|
|
|
/* Terminate string. */
|
|
buf[63] = '\0';
|
|
|
|
/* The following code assumes that the AT_* values are encoded
|
|
starting from 0 with AT_NULL, 1 for AT_IGNORE, and all other values
|
|
close by (otherwise the array will be too large). In case we have
|
|
to support a platform where these requirements are not fulfilled
|
|
some alternative implementation has to be used. */
|
|
for (av = _dl_auxv; av->a_type != AT_NULL; ++av)
|
|
{
|
|
static const struct
|
|
{
|
|
const char label[20];
|
|
enum { unknown = 0, dec, hex, str, ignore } form;
|
|
} auxvars[] =
|
|
{
|
|
[AT_EXECFD - 2] = { "AT_EXECFD: ", dec },
|
|
[AT_PHDR - 2] = { "AT_PHDR: 0x", hex },
|
|
[AT_PHENT - 2] = { "AT_PHENT: ", dec },
|
|
[AT_PHNUM - 2] = { "AT_PHNUM: ", dec },
|
|
[AT_PAGESZ - 2] = { "AT_PAGESZ: ", dec },
|
|
[AT_BASE - 2] = { "AT_BASE: 0x", hex },
|
|
[AT_FLAGS - 2] = { "AT_FLAGS: 0x", hex },
|
|
[AT_ENTRY - 2] = { "AT_ENTRY: 0x", hex },
|
|
[AT_NOTELF - 2] = { "AT_NOTELF: ", hex },
|
|
[AT_UID - 2] = { "AT_UID: ", dec },
|
|
[AT_EUID - 2] = { "AT_EUID: ", dec },
|
|
[AT_GID - 2] = { "AT_GID: ", dec },
|
|
[AT_EGID - 2] = { "AT_EGID: ", dec },
|
|
[AT_PLATFORM - 2] = { "AT_PLATFORM: ", str },
|
|
[AT_HWCAP - 2] = { "AT_HWCAP: ", hex },
|
|
[AT_CLKTCK - 2] = { "AT_CLKTCK: ", dec },
|
|
[AT_FPUCW - 2] = { "AT_FPUCW: ", hex },
|
|
[AT_DCACHEBSIZE - 2] = { "AT_DCACHEBSIZE: 0x", hex },
|
|
[AT_ICACHEBSIZE - 2] = { "AT_ICACHEBSIZE: 0x", hex },
|
|
[AT_UCACHEBSIZE - 2] = { "AT_UCACHEBSIZE: 0x", hex },
|
|
[AT_IGNOREPPC - 2] = { "AT_IGNOREPPC", ignore },
|
|
[AT_SECURE - 2] = { "AT_SECURE: ", dec },
|
|
[AT_SYSINFO - 2] = { "AT_SYSINFO: 0x", hex },
|
|
[AT_SYSINFO_EHDR - 2] = { "AT_SYSINFO_EHDR: 0x", hex },
|
|
};
|
|
unsigned int idx = (unsigned int) (av->a_type - 2);
|
|
|
|
if ((unsigned int) av->a_type < 2u || auxvars[idx].form == ignore)
|
|
continue;
|
|
|
|
assert (AT_NULL == 0);
|
|
assert (AT_IGNORE == 1);
|
|
|
|
if (av->a_type == AT_HWCAP)
|
|
{
|
|
/* This is handled special. */
|
|
if (_dl_procinfo (av->a_un.a_val) == 0)
|
|
continue;
|
|
}
|
|
|
|
if (idx < sizeof (auxvars) / sizeof (auxvars[0])
|
|
&& auxvars[idx].form != unknown)
|
|
{
|
|
const char *val = (char *) av->a_un.a_val;
|
|
|
|
if (__builtin_expect (auxvars[idx].form, dec) == dec)
|
|
val = _itoa ((unsigned long int) av->a_un.a_val,
|
|
buf + sizeof buf - 1, 10, 0);
|
|
else if (__builtin_expect (auxvars[idx].form, hex) == hex)
|
|
val = _itoa ((unsigned long int) av->a_un.a_val,
|
|
buf + sizeof buf - 1, 16, 0);
|
|
|
|
_dl_printf ("%s%s\n", auxvars[idx].label, val);
|
|
|
|
continue;
|
|
}
|
|
|
|
/* Unknown value: print a generic line. */
|
|
char buf2[17];
|
|
buf[sizeof (buf2) - 1] = '\0';
|
|
const char *val2 = _itoa ((unsigned long int) av->a_un.a_val,
|
|
buf2 + sizeof buf2 - 1, 16, 0);
|
|
const char *val = _itoa ((unsigned long int) av->a_type,
|
|
buf + sizeof buf - 1, 16, 0);
|
|
_dl_printf ("AT_??? (0x%s): 0x%s\n", val, val2);
|
|
}
|
|
}
|
|
|
|
|
|
/* Return an array of useful/necessary hardware capability names. */
|
|
const struct r_strlenpair *
|
|
internal_function
|
|
_dl_important_hwcaps (const char *platform, size_t platform_len, size_t *sz,
|
|
size_t *max_capstrlen)
|
|
{
|
|
/* Determine how many important bits are set. */
|
|
uint64_t masked = GLRO(dl_hwcap) & GLRO(dl_hwcap_mask);
|
|
size_t cnt = platform != NULL;
|
|
size_t n, m;
|
|
size_t total;
|
|
struct r_strlenpair *temp;
|
|
struct r_strlenpair *result;
|
|
struct r_strlenpair *rp;
|
|
char *cp;
|
|
|
|
/* Count the number of bits set in the masked value. */
|
|
for (n = 0; (~((1ULL << n) - 1) & masked) != 0; ++n)
|
|
if ((masked & (1ULL << n)) != 0)
|
|
++cnt;
|
|
|
|
#if (defined NEED_DL_SYSINFO || defined NEED_DL_SYSINFO_DSO) && defined SHARED
|
|
/* The system-supplied DSO can contain a note of type 2, vendor "GNU".
|
|
This gives us a list of names to treat as fake hwcap bits. */
|
|
|
|
const char *dsocaps = NULL;
|
|
size_t dsocapslen = 0;
|
|
if (GLRO(dl_sysinfo_map) != NULL)
|
|
{
|
|
const ElfW(Phdr) *const phdr = GLRO(dl_sysinfo_map)->l_phdr;
|
|
const ElfW(Word) phnum = GLRO(dl_sysinfo_map)->l_phnum;
|
|
for (uint_fast16_t i = 0; i < phnum; ++i)
|
|
if (phdr[i].p_type == PT_NOTE)
|
|
{
|
|
const ElfW(Addr) start = (phdr[i].p_vaddr
|
|
+ GLRO(dl_sysinfo_map)->l_addr);
|
|
const struct
|
|
{
|
|
ElfW(Word) vendorlen;
|
|
ElfW(Word) datalen;
|
|
ElfW(Word) type;
|
|
} *note = (const void *) start;
|
|
while ((ElfW(Addr)) (note + 1) - start < phdr[i].p_memsz)
|
|
{
|
|
#define ROUND(len) (((len) + sizeof (ElfW(Word)) - 1) & -sizeof (ElfW(Word)))
|
|
if (note->type == 2
|
|
&& note->vendorlen == sizeof "GNU"
|
|
&& !memcmp ((note + 1), "GNU", sizeof "GNU")
|
|
&& note->datalen > 2 * sizeof (ElfW(Word)) + 2)
|
|
{
|
|
const ElfW(Word) *p = ((const void *) (note + 1)
|
|
+ ROUND (sizeof "GNU"));
|
|
cnt += *p++;
|
|
++p; /* Skip mask word. */
|
|
dsocaps = (const char *) p;
|
|
dsocapslen = note->datalen - sizeof *p * 2;
|
|
break;
|
|
}
|
|
note = ((const void *) (note + 1)
|
|
+ ROUND (note->vendorlen) + ROUND (note->datalen));
|
|
}
|
|
if (dsocaps != NULL)
|
|
break;
|
|
}
|
|
}
|
|
#endif
|
|
|
|
/* For TLS enabled builds always add 'tls'. */
|
|
++cnt;
|
|
|
|
/* Create temporary data structure to generate result table. */
|
|
temp = (struct r_strlenpair *) alloca (cnt * sizeof (*temp));
|
|
m = 0;
|
|
#if defined NEED_DL_SYSINFO || defined NEED_DL_SYSINFO_DSO
|
|
if (dsocaps != NULL)
|
|
{
|
|
const ElfW(Word) mask = ((const ElfW(Word) *) dsocaps)[-1];
|
|
GLRO(dl_hwcap) |= (uint64_t) mask << _DL_FIRST_EXTRA;
|
|
size_t len;
|
|
for (const char *p = dsocaps; p < dsocaps + dsocapslen; p += len + 1)
|
|
{
|
|
uint_fast8_t bit = *p++;
|
|
len = strlen (p);
|
|
|
|
/* Skip entries that are not enabled in the mask word. */
|
|
if (__builtin_expect (mask & ((ElfW(Word)) 1 << bit), 1))
|
|
{
|
|
temp[m].str = p;
|
|
temp[m].len = len;
|
|
++m;
|
|
}
|
|
else
|
|
--cnt;
|
|
}
|
|
}
|
|
#endif
|
|
for (n = 0; masked != 0; ++n)
|
|
if ((masked & (1ULL << n)) != 0)
|
|
{
|
|
temp[m].str = _dl_hwcap_string (n);
|
|
temp[m].len = strlen (temp[m].str);
|
|
masked ^= 1ULL << n;
|
|
++m;
|
|
}
|
|
if (platform != NULL)
|
|
{
|
|
temp[m].str = platform;
|
|
temp[m].len = platform_len;
|
|
++m;
|
|
}
|
|
|
|
temp[m].str = "tls";
|
|
temp[m].len = 3;
|
|
++m;
|
|
|
|
assert (m == cnt);
|
|
|
|
/* Determine the total size of all strings together. */
|
|
if (cnt == 1)
|
|
total = temp[0].len + 1;
|
|
else
|
|
{
|
|
total = (1UL << (cnt - 2)) * (temp[0].len + temp[cnt - 1].len + 2);
|
|
for (n = 1; n + 1 < cnt; ++n)
|
|
total += (1UL << (cnt - 3)) * (temp[n].len + 1);
|
|
}
|
|
|
|
/* The result structure: we use a very compressed way to store the
|
|
various combinations of capability names. */
|
|
*sz = 1 << cnt;
|
|
result = (struct r_strlenpair *) malloc (*sz * sizeof (*result) + total);
|
|
if (result == NULL)
|
|
_dl_signal_error (ENOMEM, NULL, NULL,
|
|
N_("cannot create capability list"));
|
|
|
|
if (cnt == 1)
|
|
{
|
|
result[0].str = (char *) (result + *sz);
|
|
result[0].len = temp[0].len + 1;
|
|
result[1].str = (char *) (result + *sz);
|
|
result[1].len = 0;
|
|
cp = __mempcpy ((char *) (result + *sz), temp[0].str, temp[0].len);
|
|
*cp = '/';
|
|
*sz = 2;
|
|
*max_capstrlen = result[0].len;
|
|
|
|
return result;
|
|
}
|
|
|
|
/* Fill in the information. This follows the following scheme
|
|
(indeces from TEMP for four strings):
|
|
entry #0: 0, 1, 2, 3 binary: 1111
|
|
#1: 0, 1, 3 1101
|
|
#2: 0, 2, 3 1011
|
|
#3: 0, 3 1001
|
|
This allows the representation of all possible combinations of
|
|
capability names in the string. First generate the strings. */
|
|
result[1].str = result[0].str = cp = (char *) (result + *sz);
|
|
#define add(idx) \
|
|
cp = __mempcpy (__mempcpy (cp, temp[idx].str, temp[idx].len), "/", 1);
|
|
if (cnt == 2)
|
|
{
|
|
add (1);
|
|
add (0);
|
|
}
|
|
else
|
|
{
|
|
n = 1 << (cnt - 1);
|
|
do
|
|
{
|
|
n -= 2;
|
|
|
|
/* We always add the last string. */
|
|
add (cnt - 1);
|
|
|
|
/* Add the strings which have the bit set in N. */
|
|
for (m = cnt - 2; m > 0; --m)
|
|
if ((n & (1 << m)) != 0)
|
|
add (m);
|
|
|
|
/* Always add the first string. */
|
|
add (0);
|
|
}
|
|
while (n != 0);
|
|
}
|
|
#undef add
|
|
|
|
/* Now we are ready to install the string pointers and length. */
|
|
for (n = 0; n < (1UL << cnt); ++n)
|
|
result[n].len = 0;
|
|
n = cnt;
|
|
do
|
|
{
|
|
size_t mask = 1 << --n;
|
|
|
|
rp = result;
|
|
for (m = 1 << cnt; m > 0; ++rp)
|
|
if ((--m & mask) != 0)
|
|
rp->len += temp[n].len + 1;
|
|
}
|
|
while (n != 0);
|
|
|
|
/* The first half of the strings all include the first string. */
|
|
n = (1 << cnt) - 2;
|
|
rp = &result[2];
|
|
while (n != (1UL << (cnt - 1)))
|
|
{
|
|
if ((--n & 1) != 0)
|
|
rp[0].str = rp[-2].str + rp[-2].len;
|
|
else
|
|
rp[0].str = rp[-1].str;
|
|
++rp;
|
|
}
|
|
|
|
/* The second half starts right after the first part of the string of
|
|
the corresponding entry in the first half. */
|
|
do
|
|
{
|
|
rp[0].str = rp[-(1 << (cnt - 1))].str + temp[cnt - 1].len + 1;
|
|
++rp;
|
|
}
|
|
while (--n != 0);
|
|
|
|
/* The maximum string length. */
|
|
*max_capstrlen = result[0].len;
|
|
|
|
return result;
|
|
}
|