mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-01 17:30:07 +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.
1264 lines
34 KiB
C
1264 lines
34 KiB
C
/* Floating point output for `printf'.
|
||
Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2006
|
||
Free Software Foundation, Inc.
|
||
This file is part of the GNU C Library.
|
||
Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
|
||
|
||
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. */
|
||
|
||
/* The gmp headers need some configuration frobs. */
|
||
#define HAVE_ALLOCA 1
|
||
|
||
#include <libioP.h>
|
||
#include <alloca.h>
|
||
#include <ctype.h>
|
||
#include <float.h>
|
||
#include <gmp-mparam.h>
|
||
#include <gmp.h>
|
||
#include <stdlib/gmp-impl.h>
|
||
#include <stdlib/longlong.h>
|
||
#include <stdlib/fpioconst.h>
|
||
#include <locale/localeinfo.h>
|
||
#include <limits.h>
|
||
#include <math.h>
|
||
#include <printf.h>
|
||
#include <string.h>
|
||
#include <unistd.h>
|
||
#include <stdlib.h>
|
||
#include <wchar.h>
|
||
|
||
#ifdef COMPILE_WPRINTF
|
||
# define CHAR_T wchar_t
|
||
#else
|
||
# define CHAR_T char
|
||
#endif
|
||
|
||
#include "_i18n_number.h"
|
||
|
||
#ifndef NDEBUG
|
||
# define NDEBUG /* Undefine this for debugging assertions. */
|
||
#endif
|
||
#include <assert.h>
|
||
|
||
/* This defines make it possible to use the same code for GNU C library and
|
||
the GNU I/O library. */
|
||
#define PUT(f, s, n) _IO_sputn (f, s, n)
|
||
#define PAD(f, c, n) (wide ? _IO_wpadn (f, c, n) : INTUSE(_IO_padn) (f, c, n))
|
||
/* We use this file GNU C library and GNU I/O library. So make
|
||
names equal. */
|
||
#undef putc
|
||
#define putc(c, f) (wide \
|
||
? (int)_IO_putwc_unlocked (c, f) : _IO_putc_unlocked (c, f))
|
||
#define size_t _IO_size_t
|
||
#define FILE _IO_FILE
|
||
|
||
/* Macros for doing the actual output. */
|
||
|
||
#define outchar(ch) \
|
||
do \
|
||
{ \
|
||
register const int outc = (ch); \
|
||
if (putc (outc, fp) == EOF) \
|
||
{ \
|
||
if (buffer_malloced) \
|
||
free (wbuffer); \
|
||
return -1; \
|
||
} \
|
||
++done; \
|
||
} while (0)
|
||
|
||
#define PRINT(ptr, wptr, len) \
|
||
do \
|
||
{ \
|
||
register size_t outlen = (len); \
|
||
if (len > 20) \
|
||
{ \
|
||
if (PUT (fp, wide ? (const char *) wptr : ptr, outlen) != outlen) \
|
||
{ \
|
||
if (buffer_malloced) \
|
||
free (wbuffer); \
|
||
return -1; \
|
||
} \
|
||
ptr += outlen; \
|
||
done += outlen; \
|
||
} \
|
||
else \
|
||
{ \
|
||
if (wide) \
|
||
while (outlen-- > 0) \
|
||
outchar (*wptr++); \
|
||
else \
|
||
while (outlen-- > 0) \
|
||
outchar (*ptr++); \
|
||
} \
|
||
} while (0)
|
||
|
||
#define PADN(ch, len) \
|
||
do \
|
||
{ \
|
||
if (PAD (fp, ch, len) != len) \
|
||
{ \
|
||
if (buffer_malloced) \
|
||
free (wbuffer); \
|
||
return -1; \
|
||
} \
|
||
done += len; \
|
||
} \
|
||
while (0)
|
||
|
||
/* We use the GNU MP library to handle large numbers.
|
||
|
||
An MP variable occupies a varying number of entries in its array. We keep
|
||
track of this number for efficiency reasons. Otherwise we would always
|
||
have to process the whole array. */
|
||
#define MPN_VAR(name) mp_limb_t *name; mp_size_t name##size
|
||
|
||
#define MPN_ASSIGN(dst,src) \
|
||
memcpy (dst, src, (dst##size = src##size) * sizeof (mp_limb_t))
|
||
#define MPN_GE(u,v) \
|
||
(u##size > v##size || (u##size == v##size && __mpn_cmp (u, v, u##size) >= 0))
|
||
|
||
extern int __isinfl_internal (long double) attribute_hidden;
|
||
extern int __isnanl_internal (long double) attribute_hidden;
|
||
|
||
extern mp_size_t __mpn_extract_double (mp_ptr res_ptr, mp_size_t size,
|
||
int *expt, int *is_neg,
|
||
double value);
|
||
extern mp_size_t __mpn_extract_long_double (mp_ptr res_ptr, mp_size_t size,
|
||
int *expt, int *is_neg,
|
||
long double value);
|
||
extern unsigned int __guess_grouping (unsigned int intdig_max,
|
||
const char *grouping);
|
||
|
||
|
||
static wchar_t *group_number (wchar_t *buf, wchar_t *bufend,
|
||
unsigned int intdig_no, const char *grouping,
|
||
wchar_t thousands_sep, int ngroups)
|
||
internal_function;
|
||
|
||
|
||
int
|
||
___printf_fp (FILE *fp,
|
||
const struct printf_info *info,
|
||
const void *const *args)
|
||
{
|
||
/* The floating-point value to output. */
|
||
union
|
||
{
|
||
double dbl;
|
||
__long_double_t ldbl;
|
||
}
|
||
fpnum;
|
||
|
||
/* Locale-dependent representation of decimal point. */
|
||
const char *decimal;
|
||
wchar_t decimalwc;
|
||
|
||
/* Locale-dependent thousands separator and grouping specification. */
|
||
const char *thousands_sep = NULL;
|
||
wchar_t thousands_sepwc = 0;
|
||
const char *grouping;
|
||
|
||
/* "NaN" or "Inf" for the special cases. */
|
||
const char *special = NULL;
|
||
const wchar_t *wspecial = NULL;
|
||
|
||
/* We need just a few limbs for the input before shifting to the right
|
||
position. */
|
||
mp_limb_t fp_input[(LDBL_MANT_DIG + BITS_PER_MP_LIMB - 1) / BITS_PER_MP_LIMB];
|
||
/* We need to shift the contents of fp_input by this amount of bits. */
|
||
int to_shift = 0;
|
||
|
||
/* The fraction of the floting-point value in question */
|
||
MPN_VAR(frac);
|
||
/* and the exponent. */
|
||
int exponent;
|
||
/* Sign of the exponent. */
|
||
int expsign = 0;
|
||
/* Sign of float number. */
|
||
int is_neg = 0;
|
||
|
||
/* Scaling factor. */
|
||
MPN_VAR(scale);
|
||
|
||
/* Temporary bignum value. */
|
||
MPN_VAR(tmp);
|
||
|
||
/* Digit which is result of last hack_digit() call. */
|
||
wchar_t digit;
|
||
|
||
/* The type of output format that will be used: 'e'/'E' or 'f'. */
|
||
int type;
|
||
|
||
/* Counter for number of written characters. */
|
||
int done = 0;
|
||
|
||
/* General helper (carry limb). */
|
||
mp_limb_t cy;
|
||
|
||
/* Nonzero if this is output on a wide character stream. */
|
||
int wide = info->wide;
|
||
|
||
/* Buffer in which we produce the output. */
|
||
wchar_t *wbuffer = NULL;
|
||
/* Flag whether wbuffer is malloc'ed or not. */
|
||
int buffer_malloced = 0;
|
||
|
||
auto wchar_t hack_digit (void);
|
||
|
||
wchar_t hack_digit (void)
|
||
{
|
||
mp_limb_t hi;
|
||
|
||
if (expsign != 0 && type == 'f' && exponent-- > 0)
|
||
hi = 0;
|
||
else if (scalesize == 0)
|
||
{
|
||
hi = frac[fracsize - 1];
|
||
frac[fracsize - 1] = __mpn_mul_1 (frac, frac, fracsize - 1, 10);
|
||
}
|
||
else
|
||
{
|
||
if (fracsize < scalesize)
|
||
hi = 0;
|
||
else
|
||
{
|
||
hi = mpn_divmod (tmp, frac, fracsize, scale, scalesize);
|
||
tmp[fracsize - scalesize] = hi;
|
||
hi = tmp[0];
|
||
|
||
fracsize = scalesize;
|
||
while (fracsize != 0 && frac[fracsize - 1] == 0)
|
||
--fracsize;
|
||
if (fracsize == 0)
|
||
{
|
||
/* We're not prepared for an mpn variable with zero
|
||
limbs. */
|
||
fracsize = 1;
|
||
return L'0' + hi;
|
||
}
|
||
}
|
||
|
||
mp_limb_t _cy = __mpn_mul_1 (frac, frac, fracsize, 10);
|
||
if (_cy != 0)
|
||
frac[fracsize++] = _cy;
|
||
}
|
||
|
||
return L'0' + hi;
|
||
}
|
||
|
||
|
||
/* Figure out the decimal point character. */
|
||
if (info->extra == 0)
|
||
{
|
||
decimal = _NL_CURRENT (LC_NUMERIC, DECIMAL_POINT);
|
||
decimalwc = _NL_CURRENT_WORD (LC_NUMERIC, _NL_NUMERIC_DECIMAL_POINT_WC);
|
||
}
|
||
else
|
||
{
|
||
decimal = _NL_CURRENT (LC_MONETARY, MON_DECIMAL_POINT);
|
||
if (*decimal == '\0')
|
||
decimal = _NL_CURRENT (LC_NUMERIC, DECIMAL_POINT);
|
||
decimalwc = _NL_CURRENT_WORD (LC_MONETARY,
|
||
_NL_MONETARY_DECIMAL_POINT_WC);
|
||
if (decimalwc == L'\0')
|
||
decimalwc = _NL_CURRENT_WORD (LC_NUMERIC,
|
||
_NL_NUMERIC_DECIMAL_POINT_WC);
|
||
}
|
||
/* The decimal point character must not be zero. */
|
||
assert (*decimal != '\0');
|
||
assert (decimalwc != L'\0');
|
||
|
||
if (info->group)
|
||
{
|
||
if (info->extra == 0)
|
||
grouping = _NL_CURRENT (LC_NUMERIC, GROUPING);
|
||
else
|
||
grouping = _NL_CURRENT (LC_MONETARY, MON_GROUPING);
|
||
|
||
if (*grouping <= 0 || *grouping == CHAR_MAX)
|
||
grouping = NULL;
|
||
else
|
||
{
|
||
/* Figure out the thousands separator character. */
|
||
if (wide)
|
||
{
|
||
if (info->extra == 0)
|
||
thousands_sepwc =
|
||
_NL_CURRENT_WORD (LC_NUMERIC, _NL_NUMERIC_THOUSANDS_SEP_WC);
|
||
else
|
||
thousands_sepwc =
|
||
_NL_CURRENT_WORD (LC_MONETARY,
|
||
_NL_MONETARY_THOUSANDS_SEP_WC);
|
||
}
|
||
else
|
||
{
|
||
if (info->extra == 0)
|
||
thousands_sep = _NL_CURRENT (LC_NUMERIC, THOUSANDS_SEP);
|
||
else
|
||
thousands_sep = _NL_CURRENT (LC_MONETARY, MON_THOUSANDS_SEP);
|
||
}
|
||
|
||
if ((wide && thousands_sepwc == L'\0')
|
||
|| (! wide && *thousands_sep == '\0'))
|
||
grouping = NULL;
|
||
else if (thousands_sepwc == L'\0')
|
||
/* If we are printing multibyte characters and there is a
|
||
multibyte representation for the thousands separator,
|
||
we must ensure the wide character thousands separator
|
||
is available, even if it is fake. */
|
||
thousands_sepwc = 0xfffffffe;
|
||
}
|
||
}
|
||
else
|
||
grouping = NULL;
|
||
|
||
/* Fetch the argument value. */
|
||
#ifndef __NO_LONG_DOUBLE_MATH
|
||
if (info->is_long_double && sizeof (long double) > sizeof (double))
|
||
{
|
||
fpnum.ldbl = *(const long double *) args[0];
|
||
|
||
/* Check for special values: not a number or infinity. */
|
||
if (__isnanl (fpnum.ldbl))
|
||
{
|
||
if (isupper (info->spec))
|
||
{
|
||
special = "NAN";
|
||
wspecial = L"NAN";
|
||
}
|
||
else
|
||
{
|
||
special = "nan";
|
||
wspecial = L"nan";
|
||
}
|
||
is_neg = 0;
|
||
}
|
||
else if (__isinfl (fpnum.ldbl))
|
||
{
|
||
if (isupper (info->spec))
|
||
{
|
||
special = "INF";
|
||
wspecial = L"INF";
|
||
}
|
||
else
|
||
{
|
||
special = "inf";
|
||
wspecial = L"inf";
|
||
}
|
||
is_neg = fpnum.ldbl < 0;
|
||
}
|
||
else
|
||
{
|
||
fracsize = __mpn_extract_long_double (fp_input,
|
||
(sizeof (fp_input) /
|
||
sizeof (fp_input[0])),
|
||
&exponent, &is_neg,
|
||
fpnum.ldbl);
|
||
to_shift = 1 + fracsize * BITS_PER_MP_LIMB - LDBL_MANT_DIG;
|
||
}
|
||
}
|
||
else
|
||
#endif /* no long double */
|
||
{
|
||
fpnum.dbl = *(const double *) args[0];
|
||
|
||
/* Check for special values: not a number or infinity. */
|
||
if (__isnan (fpnum.dbl))
|
||
{
|
||
is_neg = 0;
|
||
if (isupper (info->spec))
|
||
{
|
||
special = "NAN";
|
||
wspecial = L"NAN";
|
||
}
|
||
else
|
||
{
|
||
special = "nan";
|
||
wspecial = L"nan";
|
||
}
|
||
}
|
||
else if (__isinf (fpnum.dbl))
|
||
{
|
||
is_neg = fpnum.dbl < 0;
|
||
if (isupper (info->spec))
|
||
{
|
||
special = "INF";
|
||
wspecial = L"INF";
|
||
}
|
||
else
|
||
{
|
||
special = "inf";
|
||
wspecial = L"inf";
|
||
}
|
||
}
|
||
else
|
||
{
|
||
fracsize = __mpn_extract_double (fp_input,
|
||
(sizeof (fp_input)
|
||
/ sizeof (fp_input[0])),
|
||
&exponent, &is_neg, fpnum.dbl);
|
||
to_shift = 1 + fracsize * BITS_PER_MP_LIMB - DBL_MANT_DIG;
|
||
}
|
||
}
|
||
|
||
if (special)
|
||
{
|
||
int width = info->width;
|
||
|
||
if (is_neg || info->showsign || info->space)
|
||
--width;
|
||
width -= 3;
|
||
|
||
if (!info->left && width > 0)
|
||
PADN (' ', width);
|
||
|
||
if (is_neg)
|
||
outchar ('-');
|
||
else if (info->showsign)
|
||
outchar ('+');
|
||
else if (info->space)
|
||
outchar (' ');
|
||
|
||
PRINT (special, wspecial, 3);
|
||
|
||
if (info->left && width > 0)
|
||
PADN (' ', width);
|
||
|
||
return done;
|
||
}
|
||
|
||
|
||
/* We need three multiprecision variables. Now that we have the exponent
|
||
of the number we can allocate the needed memory. It would be more
|
||
efficient to use variables of the fixed maximum size but because this
|
||
would be really big it could lead to memory problems. */
|
||
{
|
||
mp_size_t bignum_size = ((ABS (exponent) + BITS_PER_MP_LIMB - 1)
|
||
/ BITS_PER_MP_LIMB
|
||
+ (LDBL_MANT_DIG / BITS_PER_MP_LIMB > 2 ? 8 : 4))
|
||
* sizeof (mp_limb_t);
|
||
frac = (mp_limb_t *) alloca (bignum_size);
|
||
tmp = (mp_limb_t *) alloca (bignum_size);
|
||
scale = (mp_limb_t *) alloca (bignum_size);
|
||
}
|
||
|
||
/* We now have to distinguish between numbers with positive and negative
|
||
exponents because the method used for the one is not applicable/efficient
|
||
for the other. */
|
||
scalesize = 0;
|
||
if (exponent > 2)
|
||
{
|
||
/* |FP| >= 8.0. */
|
||
int scaleexpo = 0;
|
||
int explog = LDBL_MAX_10_EXP_LOG;
|
||
int exp10 = 0;
|
||
const struct mp_power *powers = &_fpioconst_pow10[explog + 1];
|
||
int cnt_h, cnt_l, i;
|
||
|
||
if ((exponent + to_shift) % BITS_PER_MP_LIMB == 0)
|
||
{
|
||
MPN_COPY_DECR (frac + (exponent + to_shift) / BITS_PER_MP_LIMB,
|
||
fp_input, fracsize);
|
||
fracsize += (exponent + to_shift) / BITS_PER_MP_LIMB;
|
||
}
|
||
else
|
||
{
|
||
cy = __mpn_lshift (frac + (exponent + to_shift) / BITS_PER_MP_LIMB,
|
||
fp_input, fracsize,
|
||
(exponent + to_shift) % BITS_PER_MP_LIMB);
|
||
fracsize += (exponent + to_shift) / BITS_PER_MP_LIMB;
|
||
if (cy)
|
||
frac[fracsize++] = cy;
|
||
}
|
||
MPN_ZERO (frac, (exponent + to_shift) / BITS_PER_MP_LIMB);
|
||
|
||
assert (powers > &_fpioconst_pow10[0]);
|
||
do
|
||
{
|
||
--powers;
|
||
|
||
/* The number of the product of two binary numbers with n and m
|
||
bits respectively has m+n or m+n-1 bits. */
|
||
if (exponent >= scaleexpo + powers->p_expo - 1)
|
||
{
|
||
if (scalesize == 0)
|
||
{
|
||
#ifndef __NO_LONG_DOUBLE_MATH
|
||
if (LDBL_MANT_DIG > _FPIO_CONST_OFFSET * BITS_PER_MP_LIMB
|
||
&& info->is_long_double)
|
||
{
|
||
#define _FPIO_CONST_SHIFT \
|
||
(((LDBL_MANT_DIG + BITS_PER_MP_LIMB - 1) / BITS_PER_MP_LIMB) \
|
||
- _FPIO_CONST_OFFSET)
|
||
/* 64bit const offset is not enough for
|
||
IEEE quad long double. */
|
||
tmpsize = powers->arraysize + _FPIO_CONST_SHIFT;
|
||
memcpy (tmp + _FPIO_CONST_SHIFT,
|
||
&__tens[powers->arrayoff],
|
||
tmpsize * sizeof (mp_limb_t));
|
||
MPN_ZERO (tmp, _FPIO_CONST_SHIFT);
|
||
/* Adjust exponent, as scaleexpo will be this much
|
||
bigger too. */
|
||
exponent += _FPIO_CONST_SHIFT * BITS_PER_MP_LIMB;
|
||
}
|
||
else
|
||
#endif
|
||
{
|
||
tmpsize = powers->arraysize;
|
||
memcpy (tmp, &__tens[powers->arrayoff],
|
||
tmpsize * sizeof (mp_limb_t));
|
||
}
|
||
}
|
||
else
|
||
{
|
||
cy = __mpn_mul (tmp, scale, scalesize,
|
||
&__tens[powers->arrayoff
|
||
+ _FPIO_CONST_OFFSET],
|
||
powers->arraysize - _FPIO_CONST_OFFSET);
|
||
tmpsize = scalesize + powers->arraysize - _FPIO_CONST_OFFSET;
|
||
if (cy == 0)
|
||
--tmpsize;
|
||
}
|
||
|
||
if (MPN_GE (frac, tmp))
|
||
{
|
||
int cnt;
|
||
MPN_ASSIGN (scale, tmp);
|
||
count_leading_zeros (cnt, scale[scalesize - 1]);
|
||
scaleexpo = (scalesize - 2) * BITS_PER_MP_LIMB - cnt - 1;
|
||
exp10 |= 1 << explog;
|
||
}
|
||
}
|
||
--explog;
|
||
}
|
||
while (powers > &_fpioconst_pow10[0]);
|
||
exponent = exp10;
|
||
|
||
/* Optimize number representations. We want to represent the numbers
|
||
with the lowest number of bytes possible without losing any
|
||
bytes. Also the highest bit in the scaling factor has to be set
|
||
(this is a requirement of the MPN division routines). */
|
||
if (scalesize > 0)
|
||
{
|
||
/* Determine minimum number of zero bits at the end of
|
||
both numbers. */
|
||
for (i = 0; scale[i] == 0 && frac[i] == 0; i++)
|
||
;
|
||
|
||
/* Determine number of bits the scaling factor is misplaced. */
|
||
count_leading_zeros (cnt_h, scale[scalesize - 1]);
|
||
|
||
if (cnt_h == 0)
|
||
{
|
||
/* The highest bit of the scaling factor is already set. So
|
||
we only have to remove the trailing empty limbs. */
|
||
if (i > 0)
|
||
{
|
||
MPN_COPY_INCR (scale, scale + i, scalesize - i);
|
||
scalesize -= i;
|
||
MPN_COPY_INCR (frac, frac + i, fracsize - i);
|
||
fracsize -= i;
|
||
}
|
||
}
|
||
else
|
||
{
|
||
if (scale[i] != 0)
|
||
{
|
||
count_trailing_zeros (cnt_l, scale[i]);
|
||
if (frac[i] != 0)
|
||
{
|
||
int cnt_l2;
|
||
count_trailing_zeros (cnt_l2, frac[i]);
|
||
if (cnt_l2 < cnt_l)
|
||
cnt_l = cnt_l2;
|
||
}
|
||
}
|
||
else
|
||
count_trailing_zeros (cnt_l, frac[i]);
|
||
|
||
/* Now shift the numbers to their optimal position. */
|
||
if (i == 0 && BITS_PER_MP_LIMB - cnt_h > cnt_l)
|
||
{
|
||
/* We cannot save any memory. So just roll both numbers
|
||
so that the scaling factor has its highest bit set. */
|
||
|
||
(void) __mpn_lshift (scale, scale, scalesize, cnt_h);
|
||
cy = __mpn_lshift (frac, frac, fracsize, cnt_h);
|
||
if (cy != 0)
|
||
frac[fracsize++] = cy;
|
||
}
|
||
else if (BITS_PER_MP_LIMB - cnt_h <= cnt_l)
|
||
{
|
||
/* We can save memory by removing the trailing zero limbs
|
||
and by packing the non-zero limbs which gain another
|
||
free one. */
|
||
|
||
(void) __mpn_rshift (scale, scale + i, scalesize - i,
|
||
BITS_PER_MP_LIMB - cnt_h);
|
||
scalesize -= i + 1;
|
||
(void) __mpn_rshift (frac, frac + i, fracsize - i,
|
||
BITS_PER_MP_LIMB - cnt_h);
|
||
fracsize -= frac[fracsize - i - 1] == 0 ? i + 1 : i;
|
||
}
|
||
else
|
||
{
|
||
/* We can only save the memory of the limbs which are zero.
|
||
The non-zero parts occupy the same number of limbs. */
|
||
|
||
(void) __mpn_rshift (scale, scale + (i - 1),
|
||
scalesize - (i - 1),
|
||
BITS_PER_MP_LIMB - cnt_h);
|
||
scalesize -= i;
|
||
(void) __mpn_rshift (frac, frac + (i - 1),
|
||
fracsize - (i - 1),
|
||
BITS_PER_MP_LIMB - cnt_h);
|
||
fracsize -= frac[fracsize - (i - 1) - 1] == 0 ? i : i - 1;
|
||
}
|
||
}
|
||
}
|
||
}
|
||
else if (exponent < 0)
|
||
{
|
||
/* |FP| < 1.0. */
|
||
int exp10 = 0;
|
||
int explog = LDBL_MAX_10_EXP_LOG;
|
||
const struct mp_power *powers = &_fpioconst_pow10[explog + 1];
|
||
mp_size_t used_limbs = fracsize - 1;
|
||
|
||
/* Now shift the input value to its right place. */
|
||
cy = __mpn_lshift (frac, fp_input, fracsize, to_shift);
|
||
frac[fracsize++] = cy;
|
||
assert (cy == 1 || (frac[fracsize - 2] == 0 && frac[0] == 0));
|
||
|
||
expsign = 1;
|
||
exponent = -exponent;
|
||
|
||
assert (powers != &_fpioconst_pow10[0]);
|
||
do
|
||
{
|
||
--powers;
|
||
|
||
if (exponent >= powers->m_expo)
|
||
{
|
||
int i, incr, cnt_h, cnt_l;
|
||
mp_limb_t topval[2];
|
||
|
||
/* The __mpn_mul function expects the first argument to be
|
||
bigger than the second. */
|
||
if (fracsize < powers->arraysize - _FPIO_CONST_OFFSET)
|
||
cy = __mpn_mul (tmp, &__tens[powers->arrayoff
|
||
+ _FPIO_CONST_OFFSET],
|
||
powers->arraysize - _FPIO_CONST_OFFSET,
|
||
frac, fracsize);
|
||
else
|
||
cy = __mpn_mul (tmp, frac, fracsize,
|
||
&__tens[powers->arrayoff + _FPIO_CONST_OFFSET],
|
||
powers->arraysize - _FPIO_CONST_OFFSET);
|
||
tmpsize = fracsize + powers->arraysize - _FPIO_CONST_OFFSET;
|
||
if (cy == 0)
|
||
--tmpsize;
|
||
|
||
count_leading_zeros (cnt_h, tmp[tmpsize - 1]);
|
||
incr = (tmpsize - fracsize) * BITS_PER_MP_LIMB
|
||
+ BITS_PER_MP_LIMB - 1 - cnt_h;
|
||
|
||
assert (incr <= powers->p_expo);
|
||
|
||
/* If we increased the exponent by exactly 3 we have to test
|
||
for overflow. This is done by comparing with 10 shifted
|
||
to the right position. */
|
||
if (incr == exponent + 3)
|
||
{
|
||
if (cnt_h <= BITS_PER_MP_LIMB - 4)
|
||
{
|
||
topval[0] = 0;
|
||
topval[1]
|
||
= ((mp_limb_t) 10) << (BITS_PER_MP_LIMB - 4 - cnt_h);
|
||
}
|
||
else
|
||
{
|
||
topval[0] = ((mp_limb_t) 10) << (BITS_PER_MP_LIMB - 4);
|
||
topval[1] = 0;
|
||
(void) __mpn_lshift (topval, topval, 2,
|
||
BITS_PER_MP_LIMB - cnt_h);
|
||
}
|
||
}
|
||
|
||
/* We have to be careful when multiplying the last factor.
|
||
If the result is greater than 1.0 be have to test it
|
||
against 10.0. If it is greater or equal to 10.0 the
|
||
multiplication was not valid. This is because we cannot
|
||
determine the number of bits in the result in advance. */
|
||
if (incr < exponent + 3
|
||
|| (incr == exponent + 3 &&
|
||
(tmp[tmpsize - 1] < topval[1]
|
||
|| (tmp[tmpsize - 1] == topval[1]
|
||
&& tmp[tmpsize - 2] < topval[0]))))
|
||
{
|
||
/* The factor is right. Adapt binary and decimal
|
||
exponents. */
|
||
exponent -= incr;
|
||
exp10 |= 1 << explog;
|
||
|
||
/* If this factor yields a number greater or equal to
|
||
1.0, we must not shift the non-fractional digits down. */
|
||
if (exponent < 0)
|
||
cnt_h += -exponent;
|
||
|
||
/* Now we optimize the number representation. */
|
||
for (i = 0; tmp[i] == 0; ++i);
|
||
if (cnt_h == BITS_PER_MP_LIMB - 1)
|
||
{
|
||
MPN_COPY (frac, tmp + i, tmpsize - i);
|
||
fracsize = tmpsize - i;
|
||
}
|
||
else
|
||
{
|
||
count_trailing_zeros (cnt_l, tmp[i]);
|
||
|
||
/* Now shift the numbers to their optimal position. */
|
||
if (i == 0 && BITS_PER_MP_LIMB - 1 - cnt_h > cnt_l)
|
||
{
|
||
/* We cannot save any memory. Just roll the
|
||
number so that the leading digit is in a
|
||
separate limb. */
|
||
|
||
cy = __mpn_lshift (frac, tmp, tmpsize, cnt_h + 1);
|
||
fracsize = tmpsize + 1;
|
||
frac[fracsize - 1] = cy;
|
||
}
|
||
else if (BITS_PER_MP_LIMB - 1 - cnt_h <= cnt_l)
|
||
{
|
||
(void) __mpn_rshift (frac, tmp + i, tmpsize - i,
|
||
BITS_PER_MP_LIMB - 1 - cnt_h);
|
||
fracsize = tmpsize - i;
|
||
}
|
||
else
|
||
{
|
||
/* We can only save the memory of the limbs which
|
||
are zero. The non-zero parts occupy the same
|
||
number of limbs. */
|
||
|
||
(void) __mpn_rshift (frac, tmp + (i - 1),
|
||
tmpsize - (i - 1),
|
||
BITS_PER_MP_LIMB - 1 - cnt_h);
|
||
fracsize = tmpsize - (i - 1);
|
||
}
|
||
}
|
||
used_limbs = fracsize - 1;
|
||
}
|
||
}
|
||
--explog;
|
||
}
|
||
while (powers != &_fpioconst_pow10[1] && exponent > 0);
|
||
/* All factors but 10^-1 are tested now. */
|
||
if (exponent > 0)
|
||
{
|
||
int cnt_l;
|
||
|
||
cy = __mpn_mul_1 (tmp, frac, fracsize, 10);
|
||
tmpsize = fracsize;
|
||
assert (cy == 0 || tmp[tmpsize - 1] < 20);
|
||
|
||
count_trailing_zeros (cnt_l, tmp[0]);
|
||
if (cnt_l < MIN (4, exponent))
|
||
{
|
||
cy = __mpn_lshift (frac, tmp, tmpsize,
|
||
BITS_PER_MP_LIMB - MIN (4, exponent));
|
||
if (cy != 0)
|
||
frac[tmpsize++] = cy;
|
||
}
|
||
else
|
||
(void) __mpn_rshift (frac, tmp, tmpsize, MIN (4, exponent));
|
||
fracsize = tmpsize;
|
||
exp10 |= 1;
|
||
assert (frac[fracsize - 1] < 10);
|
||
}
|
||
exponent = exp10;
|
||
}
|
||
else
|
||
{
|
||
/* This is a special case. We don't need a factor because the
|
||
numbers are in the range of 0.0 <= fp < 8.0. We simply
|
||
shift it to the right place and divide it by 1.0 to get the
|
||
leading digit. (Of course this division is not really made.) */
|
||
assert (0 <= exponent && exponent < 3 &&
|
||
exponent + to_shift < BITS_PER_MP_LIMB);
|
||
|
||
/* Now shift the input value to its right place. */
|
||
cy = __mpn_lshift (frac, fp_input, fracsize, (exponent + to_shift));
|
||
frac[fracsize++] = cy;
|
||
exponent = 0;
|
||
}
|
||
|
||
{
|
||
int width = info->width;
|
||
wchar_t *wstartp, *wcp;
|
||
int chars_needed;
|
||
int expscale;
|
||
int intdig_max, intdig_no = 0;
|
||
int fracdig_min, fracdig_max, fracdig_no = 0;
|
||
int dig_max;
|
||
int significant;
|
||
int ngroups = 0;
|
||
|
||
if (_tolower (info->spec) == 'e')
|
||
{
|
||
type = info->spec;
|
||
intdig_max = 1;
|
||
fracdig_min = fracdig_max = info->prec < 0 ? 6 : info->prec;
|
||
chars_needed = 1 + 1 + fracdig_max + 1 + 1 + 4;
|
||
/* d . ddd e +- ddd */
|
||
dig_max = INT_MAX; /* Unlimited. */
|
||
significant = 1; /* Does not matter here. */
|
||
}
|
||
else if (_tolower (info->spec) == 'f')
|
||
{
|
||
type = 'f';
|
||
fracdig_min = fracdig_max = info->prec < 0 ? 6 : info->prec;
|
||
dig_max = INT_MAX; /* Unlimited. */
|
||
significant = 1; /* Does not matter here. */
|
||
if (expsign == 0)
|
||
{
|
||
intdig_max = exponent + 1;
|
||
/* This can be really big! */ /* XXX Maybe malloc if too big? */
|
||
chars_needed = exponent + 1 + 1 + fracdig_max;
|
||
}
|
||
else
|
||
{
|
||
intdig_max = 1;
|
||
chars_needed = 1 + 1 + fracdig_max;
|
||
}
|
||
}
|
||
else
|
||
{
|
||
dig_max = info->prec < 0 ? 6 : (info->prec == 0 ? 1 : info->prec);
|
||
if ((expsign == 0 && exponent >= dig_max)
|
||
|| (expsign != 0 && exponent > 4))
|
||
{
|
||
if ('g' - 'G' == 'e' - 'E')
|
||
type = 'E' + (info->spec - 'G');
|
||
else
|
||
type = isupper (info->spec) ? 'E' : 'e';
|
||
fracdig_max = dig_max - 1;
|
||
intdig_max = 1;
|
||
chars_needed = 1 + 1 + fracdig_max + 1 + 1 + 4;
|
||
}
|
||
else
|
||
{
|
||
type = 'f';
|
||
intdig_max = expsign == 0 ? exponent + 1 : 0;
|
||
fracdig_max = dig_max - intdig_max;
|
||
/* We need space for the significant digits and perhaps
|
||
for leading zeros when < 1.0. The number of leading
|
||
zeros can be as many as would be required for
|
||
exponential notation with a negative two-digit
|
||
exponent, which is 4. */
|
||
chars_needed = dig_max + 1 + 4;
|
||
}
|
||
fracdig_min = info->alt ? fracdig_max : 0;
|
||
significant = 0; /* We count significant digits. */
|
||
}
|
||
|
||
if (grouping)
|
||
{
|
||
/* Guess the number of groups we will make, and thus how
|
||
many spaces we need for separator characters. */
|
||
ngroups = __guess_grouping (intdig_max, grouping);
|
||
chars_needed += ngroups;
|
||
}
|
||
|
||
/* Allocate buffer for output. We need two more because while rounding
|
||
it is possible that we need two more characters in front of all the
|
||
other output. If the amount of memory we have to allocate is too
|
||
large use `malloc' instead of `alloca'. */
|
||
buffer_malloced = ! __libc_use_alloca (chars_needed * 2 * sizeof (wchar_t));
|
||
if (buffer_malloced)
|
||
{
|
||
wbuffer = (wchar_t *) malloc ((2 + chars_needed) * sizeof (wchar_t));
|
||
if (wbuffer == NULL)
|
||
/* Signal an error to the caller. */
|
||
return -1;
|
||
}
|
||
else
|
||
wbuffer = (wchar_t *) alloca ((2 + chars_needed) * sizeof (wchar_t));
|
||
wcp = wstartp = wbuffer + 2; /* Let room for rounding. */
|
||
|
||
/* Do the real work: put digits in allocated buffer. */
|
||
if (expsign == 0 || type != 'f')
|
||
{
|
||
assert (expsign == 0 || intdig_max == 1);
|
||
while (intdig_no < intdig_max)
|
||
{
|
||
++intdig_no;
|
||
*wcp++ = hack_digit ();
|
||
}
|
||
significant = 1;
|
||
if (info->alt
|
||
|| fracdig_min > 0
|
||
|| (fracdig_max > 0 && (fracsize > 1 || frac[0] != 0)))
|
||
*wcp++ = decimalwc;
|
||
}
|
||
else
|
||
{
|
||
/* |fp| < 1.0 and the selected type is 'f', so put "0."
|
||
in the buffer. */
|
||
*wcp++ = L'0';
|
||
--exponent;
|
||
*wcp++ = decimalwc;
|
||
}
|
||
|
||
/* Generate the needed number of fractional digits. */
|
||
while (fracdig_no < fracdig_min
|
||
|| (fracdig_no < fracdig_max && (fracsize > 1 || frac[0] != 0)))
|
||
{
|
||
++fracdig_no;
|
||
*wcp = hack_digit ();
|
||
if (*wcp++ != L'0')
|
||
significant = 1;
|
||
else if (significant == 0)
|
||
{
|
||
++fracdig_max;
|
||
if (fracdig_min > 0)
|
||
++fracdig_min;
|
||
}
|
||
}
|
||
|
||
/* Do rounding. */
|
||
digit = hack_digit ();
|
||
if (digit > L'4')
|
||
{
|
||
wchar_t *wtp = wcp;
|
||
|
||
if (digit == L'5'
|
||
&& ((*(wcp - 1) != decimalwc && (*(wcp - 1) & 1) == 0)
|
||
|| ((*(wcp - 1) == decimalwc && (*(wcp - 2) & 1) == 0))))
|
||
{
|
||
/* This is the critical case. */
|
||
if (fracsize == 1 && frac[0] == 0)
|
||
/* Rest of the number is zero -> round to even.
|
||
(IEEE 754-1985 4.1 says this is the default rounding.) */
|
||
goto do_expo;
|
||
else if (scalesize == 0)
|
||
{
|
||
/* Here we have to see whether all limbs are zero since no
|
||
normalization happened. */
|
||
size_t lcnt = fracsize;
|
||
while (lcnt >= 1 && frac[lcnt - 1] == 0)
|
||
--lcnt;
|
||
if (lcnt == 0)
|
||
/* Rest of the number is zero -> round to even.
|
||
(IEEE 754-1985 4.1 says this is the default rounding.) */
|
||
goto do_expo;
|
||
}
|
||
}
|
||
|
||
if (fracdig_no > 0)
|
||
{
|
||
/* Process fractional digits. Terminate if not rounded or
|
||
radix character is reached. */
|
||
while (*--wtp != decimalwc && *wtp == L'9')
|
||
*wtp = '0';
|
||
if (*wtp != decimalwc)
|
||
/* Round up. */
|
||
(*wtp)++;
|
||
}
|
||
|
||
if (fracdig_no == 0 || *wtp == decimalwc)
|
||
{
|
||
/* Round the integer digits. */
|
||
if (*(wtp - 1) == decimalwc)
|
||
--wtp;
|
||
|
||
while (--wtp >= wstartp && *wtp == L'9')
|
||
*wtp = L'0';
|
||
|
||
if (wtp >= wstartp)
|
||
/* Round up. */
|
||
(*wtp)++;
|
||
else
|
||
/* It is more critical. All digits were 9's. */
|
||
{
|
||
if (type != 'f')
|
||
{
|
||
*wstartp = '1';
|
||
exponent += expsign == 0 ? 1 : -1;
|
||
}
|
||
else if (intdig_no == dig_max)
|
||
{
|
||
/* This is the case where for type %g the number fits
|
||
really in the range for %f output but after rounding
|
||
the number of digits is too big. */
|
||
*--wstartp = decimalwc;
|
||
*--wstartp = L'1';
|
||
|
||
if (info->alt || fracdig_no > 0)
|
||
{
|
||
/* Overwrite the old radix character. */
|
||
wstartp[intdig_no + 2] = L'0';
|
||
++fracdig_no;
|
||
}
|
||
|
||
fracdig_no += intdig_no;
|
||
intdig_no = 1;
|
||
fracdig_max = intdig_max - intdig_no;
|
||
++exponent;
|
||
/* Now we must print the exponent. */
|
||
type = isupper (info->spec) ? 'E' : 'e';
|
||
}
|
||
else
|
||
{
|
||
/* We can simply add another another digit before the
|
||
radix. */
|
||
*--wstartp = L'1';
|
||
++intdig_no;
|
||
}
|
||
|
||
/* While rounding the number of digits can change.
|
||
If the number now exceeds the limits remove some
|
||
fractional digits. */
|
||
if (intdig_no + fracdig_no > dig_max)
|
||
{
|
||
wcp -= intdig_no + fracdig_no - dig_max;
|
||
fracdig_no -= intdig_no + fracdig_no - dig_max;
|
||
}
|
||
}
|
||
}
|
||
}
|
||
|
||
do_expo:
|
||
/* Now remove unnecessary '0' at the end of the string. */
|
||
while (fracdig_no > fracdig_min && *(wcp - 1) == L'0')
|
||
{
|
||
--wcp;
|
||
--fracdig_no;
|
||
}
|
||
/* If we eliminate all fractional digits we perhaps also can remove
|
||
the radix character. */
|
||
if (fracdig_no == 0 && !info->alt && *(wcp - 1) == decimalwc)
|
||
--wcp;
|
||
|
||
if (grouping)
|
||
/* Add in separator characters, overwriting the same buffer. */
|
||
wcp = group_number (wstartp, wcp, intdig_no, grouping, thousands_sepwc,
|
||
ngroups);
|
||
|
||
/* Write the exponent if it is needed. */
|
||
if (type != 'f')
|
||
{
|
||
*wcp++ = (wchar_t) type;
|
||
*wcp++ = expsign ? L'-' : L'+';
|
||
|
||
/* Find the magnitude of the exponent. */
|
||
expscale = 10;
|
||
while (expscale <= exponent)
|
||
expscale *= 10;
|
||
|
||
if (exponent < 10)
|
||
/* Exponent always has at least two digits. */
|
||
*wcp++ = L'0';
|
||
else
|
||
do
|
||
{
|
||
expscale /= 10;
|
||
*wcp++ = L'0' + (exponent / expscale);
|
||
exponent %= expscale;
|
||
}
|
||
while (expscale > 10);
|
||
*wcp++ = L'0' + exponent;
|
||
}
|
||
|
||
/* Compute number of characters which must be filled with the padding
|
||
character. */
|
||
if (is_neg || info->showsign || info->space)
|
||
--width;
|
||
width -= wcp - wstartp;
|
||
|
||
if (!info->left && info->pad != '0' && width > 0)
|
||
PADN (info->pad, width);
|
||
|
||
if (is_neg)
|
||
outchar ('-');
|
||
else if (info->showsign)
|
||
outchar ('+');
|
||
else if (info->space)
|
||
outchar (' ');
|
||
|
||
if (!info->left && info->pad == '0' && width > 0)
|
||
PADN ('0', width);
|
||
|
||
{
|
||
char *buffer = NULL;
|
||
char *cp = NULL;
|
||
char *tmpptr;
|
||
|
||
if (! wide)
|
||
{
|
||
/* Create the single byte string. */
|
||
size_t decimal_len;
|
||
size_t thousands_sep_len;
|
||
wchar_t *copywc;
|
||
|
||
decimal_len = strlen (decimal);
|
||
|
||
if (thousands_sep == NULL)
|
||
thousands_sep_len = 0;
|
||
else
|
||
thousands_sep_len = strlen (thousands_sep);
|
||
|
||
if (buffer_malloced)
|
||
{
|
||
buffer = (char *) malloc (2 + chars_needed + decimal_len
|
||
+ ngroups * thousands_sep_len);
|
||
if (buffer == NULL)
|
||
{
|
||
/* Signal an error to the caller. */
|
||
if (buffer_malloced)
|
||
free (wbuffer);
|
||
return -1;
|
||
}
|
||
}
|
||
else
|
||
buffer = (char *) alloca (2 + chars_needed + decimal_len
|
||
+ ngroups * thousands_sep_len);
|
||
|
||
/* Now copy the wide character string. Since the character
|
||
(except for the decimal point and thousands separator) must
|
||
be coming from the ASCII range we can esily convert the
|
||
string without mapping tables. */
|
||
for (cp = buffer, copywc = wstartp; copywc < wcp; ++copywc)
|
||
if (*copywc == decimalwc)
|
||
cp = (char *) __mempcpy (cp, decimal, decimal_len);
|
||
else if (*copywc == thousands_sepwc)
|
||
cp = (char *) __mempcpy (cp, thousands_sep, thousands_sep_len);
|
||
else
|
||
*cp++ = (char) *copywc;
|
||
}
|
||
|
||
tmpptr = buffer;
|
||
if (__builtin_expect (info->i18n, 0))
|
||
{
|
||
#ifdef COMPILE_WPRINTF
|
||
wstartp = _i18n_number_rewrite (wstartp, wcp);
|
||
#else
|
||
tmpptr = _i18n_number_rewrite (tmpptr, cp);
|
||
#endif
|
||
}
|
||
|
||
PRINT (tmpptr, wstartp, wide ? wcp - wstartp : cp - tmpptr);
|
||
|
||
/* Free the memory if necessary. */
|
||
if (buffer_malloced)
|
||
{
|
||
free (buffer);
|
||
free (wbuffer);
|
||
}
|
||
}
|
||
|
||
if (info->left && width > 0)
|
||
PADN (info->pad, width);
|
||
}
|
||
return done;
|
||
}
|
||
ldbl_hidden_def (___printf_fp, __printf_fp)
|
||
ldbl_strong_alias (___printf_fp, __printf_fp)
|
||
|
||
/* Return the number of extra grouping characters that will be inserted
|
||
into a number with INTDIG_MAX integer digits. */
|
||
|
||
unsigned int
|
||
__guess_grouping (unsigned int intdig_max, const char *grouping)
|
||
{
|
||
unsigned int groups;
|
||
|
||
/* We treat all negative values like CHAR_MAX. */
|
||
|
||
if (*grouping == CHAR_MAX || *grouping <= 0)
|
||
/* No grouping should be done. */
|
||
return 0;
|
||
|
||
groups = 0;
|
||
while (intdig_max > (unsigned int) *grouping)
|
||
{
|
||
++groups;
|
||
intdig_max -= *grouping++;
|
||
|
||
if (*grouping == CHAR_MAX
|
||
#if CHAR_MIN < 0
|
||
|| *grouping < 0
|
||
#endif
|
||
)
|
||
/* No more grouping should be done. */
|
||
break;
|
||
else if (*grouping == 0)
|
||
{
|
||
/* Same grouping repeats. */
|
||
groups += (intdig_max - 1) / grouping[-1];
|
||
break;
|
||
}
|
||
}
|
||
|
||
return groups;
|
||
}
|
||
|
||
/* Group the INTDIG_NO integer digits of the number in [BUF,BUFEND).
|
||
There is guaranteed enough space past BUFEND to extend it.
|
||
Return the new end of buffer. */
|
||
|
||
static wchar_t *
|
||
internal_function
|
||
group_number (wchar_t *buf, wchar_t *bufend, unsigned int intdig_no,
|
||
const char *grouping, wchar_t thousands_sep, int ngroups)
|
||
{
|
||
wchar_t *p;
|
||
|
||
if (ngroups == 0)
|
||
return bufend;
|
||
|
||
/* Move the fractional part down. */
|
||
__wmemmove (buf + intdig_no + ngroups, buf + intdig_no,
|
||
bufend - (buf + intdig_no));
|
||
|
||
p = buf + intdig_no + ngroups - 1;
|
||
do
|
||
{
|
||
unsigned int len = *grouping++;
|
||
do
|
||
*p-- = buf[--intdig_no];
|
||
while (--len > 0);
|
||
*p-- = thousands_sep;
|
||
|
||
if (*grouping == CHAR_MAX
|
||
#if CHAR_MIN < 0
|
||
|| *grouping < 0
|
||
#endif
|
||
)
|
||
/* No more grouping should be done. */
|
||
break;
|
||
else if (*grouping == 0)
|
||
/* Same grouping repeats. */
|
||
--grouping;
|
||
} while (intdig_no > (unsigned int) *grouping);
|
||
|
||
/* Copy the remaining ungrouped digits. */
|
||
do
|
||
*p-- = buf[--intdig_no];
|
||
while (p > buf);
|
||
|
||
return bufend + ngroups;
|
||
}
|