mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-09 23:00: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.
2480 lines
58 KiB
C
2480 lines
58 KiB
C
/* Copyright (C) 1991-2002, 2003, 2004, 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 <errno.h>
|
|
#include <limits.h>
|
|
#include <ctype.h>
|
|
#include <stdarg.h>
|
|
#include <stdio.h>
|
|
#include <stdint.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <wchar.h>
|
|
#include <wctype.h>
|
|
#include <bits/libc-lock.h>
|
|
#include <locale/localeinfo.h>
|
|
|
|
#ifdef __GNUC__
|
|
# define HAVE_LONGLONG
|
|
# define LONGLONG long long
|
|
#else
|
|
# define LONGLONG long
|
|
#endif
|
|
|
|
/* Determine whether we have to handle `long long' at all. */
|
|
#if LONG_MAX == LONG_LONG_MAX
|
|
# define need_longlong 0
|
|
#else
|
|
# define need_longlong 1
|
|
#endif
|
|
|
|
/* Determine whether we have to handle `long'. */
|
|
#if INT_MAX == LONG_MAX
|
|
# define need_long 0
|
|
#else
|
|
# define need_long 1
|
|
#endif
|
|
|
|
/* Those are flags in the conversion format. */
|
|
#define LONG 0x001 /* l: long or double */
|
|
#define LONGDBL 0x002 /* L: long long or long double */
|
|
#define SHORT 0x004 /* h: short */
|
|
#define SUPPRESS 0x008 /* *: suppress assignment */
|
|
#define POINTER 0x010 /* weird %p pointer (`fake hex') */
|
|
#define NOSKIP 0x020 /* do not skip blanks */
|
|
#define WIDTH 0x040 /* width was given */
|
|
#define GROUP 0x080 /* ': group numbers */
|
|
#define MALLOC 0x100 /* a: malloc strings */
|
|
#define CHAR 0x200 /* hh: char */
|
|
#define I18N 0x400 /* I: use locale's digits */
|
|
|
|
|
|
#include <locale/localeinfo.h>
|
|
#include <libioP.h>
|
|
#include <libio.h>
|
|
|
|
#undef va_list
|
|
#define va_list _IO_va_list
|
|
|
|
#ifdef COMPILE_WSCANF
|
|
# define ungetc(c, s) ((void) (c == WEOF \
|
|
|| (--read_in, \
|
|
INTUSE(_IO_sputbackwc) (s, c))))
|
|
# define ungetc_not_eof(c, s) ((void) (--read_in, \
|
|
INTUSE(_IO_sputbackwc) (s, c)))
|
|
# define inchar() (c == WEOF ? ((errno = inchar_errno), WEOF) \
|
|
: ((c = _IO_getwc_unlocked (s)), \
|
|
(void) (c != WEOF \
|
|
? ++read_in \
|
|
: (size_t) (inchar_errno = errno)), c))
|
|
|
|
# define MEMCPY(d, s, n) __wmemcpy (d, s, n)
|
|
# define ISSPACE(Ch) iswspace (Ch)
|
|
# define ISDIGIT(Ch) iswdigit (Ch)
|
|
# define ISXDIGIT(Ch) iswxdigit (Ch)
|
|
# define TOLOWER(Ch) towlower (Ch)
|
|
# define ORIENT if (_IO_fwide (s, 1) != 1) return WEOF
|
|
# define __strtoll_internal __wcstoll_internal
|
|
# define __strtoull_internal __wcstoull_internal
|
|
# define __strtol_internal __wcstol_internal
|
|
# define __strtoul_internal __wcstoul_internal
|
|
# define __strtold_internal __wcstold_internal
|
|
# define __strtod_internal __wcstod_internal
|
|
# define __strtof_internal __wcstof_internal
|
|
|
|
# define L_(Str) L##Str
|
|
# define CHAR_T wchar_t
|
|
# define UCHAR_T unsigned int
|
|
# define WINT_T wint_t
|
|
# undef EOF
|
|
# define EOF WEOF
|
|
#else
|
|
# define ungetc(c, s) ((void) ((int) c == EOF \
|
|
|| (--read_in, \
|
|
INTUSE(_IO_sputbackc) (s, (unsigned char) c))))
|
|
# define ungetc_not_eof(c, s) ((void) (--read_in, \
|
|
INTUSE(_IO_sputbackc) (s, (unsigned char) c)))
|
|
# define inchar() (c == EOF ? ((errno = inchar_errno), EOF) \
|
|
: ((c = _IO_getc_unlocked (s)), \
|
|
(void) (c != EOF \
|
|
? ++read_in \
|
|
: (size_t) (inchar_errno = errno)), c))
|
|
# define MEMCPY(d, s, n) memcpy (d, s, n)
|
|
# define ISSPACE(Ch) __isspace_l (Ch, loc)
|
|
# define ISDIGIT(Ch) __isdigit_l (Ch, loc)
|
|
# define ISXDIGIT(Ch) __isxdigit_l (Ch, loc)
|
|
# define TOLOWER(Ch) __tolower_l ((unsigned char) (Ch), loc)
|
|
# define ORIENT if (_IO_vtable_offset (s) == 0 \
|
|
&& _IO_fwide (s, -1) != -1) \
|
|
return EOF
|
|
|
|
# define L_(Str) Str
|
|
# define CHAR_T char
|
|
# define UCHAR_T unsigned char
|
|
# define WINT_T int
|
|
#endif
|
|
|
|
#define encode_error() do { \
|
|
errval = 4; \
|
|
__set_errno (EILSEQ); \
|
|
goto errout; \
|
|
} while (0)
|
|
#define conv_error() do { \
|
|
errval = 2; \
|
|
goto errout; \
|
|
} while (0)
|
|
#define input_error() do { \
|
|
errval = 1; \
|
|
if (done == 0) done = EOF; \
|
|
goto errout; \
|
|
} while (0)
|
|
#define ARGCHECK(s, format) \
|
|
do \
|
|
{ \
|
|
/* Check file argument for consistence. */ \
|
|
CHECK_FILE (s, EOF); \
|
|
if (s->_flags & _IO_NO_READS) \
|
|
{ \
|
|
__set_errno (EBADF); \
|
|
return EOF; \
|
|
} \
|
|
else if (format == NULL) \
|
|
{ \
|
|
MAYBE_SET_EINVAL; \
|
|
return EOF; \
|
|
} \
|
|
} while (0)
|
|
#define LOCK_STREAM(S) \
|
|
__libc_cleanup_region_start (1, (void (*) (void *)) &_IO_funlockfile, (S)); \
|
|
_IO_flockfile (S)
|
|
#define UNLOCK_STREAM(S) \
|
|
_IO_funlockfile (S); \
|
|
__libc_cleanup_region_end (0)
|
|
|
|
|
|
/* Read formatted input from S according to the format string
|
|
FORMAT, using the argument list in ARG.
|
|
Return the number of assignments made, or -1 for an input error. */
|
|
#ifdef COMPILE_WSCANF
|
|
int
|
|
_IO_vfwscanf (_IO_FILE *s, const wchar_t *format, _IO_va_list argptr,
|
|
int *errp)
|
|
#else
|
|
int
|
|
_IO_vfscanf_internal (_IO_FILE *s, const char *format, _IO_va_list argptr,
|
|
int *errp)
|
|
#endif
|
|
{
|
|
va_list arg;
|
|
register const CHAR_T *f = format;
|
|
register UCHAR_T fc; /* Current character of the format. */
|
|
register WINT_T done = 0; /* Assignments done. */
|
|
register size_t read_in = 0; /* Chars read in. */
|
|
register WINT_T c = 0; /* Last char read. */
|
|
register int width; /* Maximum field width. */
|
|
register int flags; /* Modifiers for current format element. */
|
|
int errval = 0;
|
|
#ifndef COMPILE_WSCANF
|
|
__locale_t loc = _NL_CURRENT_LOCALE;
|
|
struct locale_data *const curctype = loc->__locales[LC_CTYPE];
|
|
#endif
|
|
|
|
/* Errno of last failed inchar call. */
|
|
int inchar_errno = 0;
|
|
/* Status for reading F-P nums. */
|
|
char got_dot, got_e, negative;
|
|
/* If a [...] is a [^...]. */
|
|
CHAR_T not_in;
|
|
#define exp_char not_in
|
|
/* Base for integral numbers. */
|
|
int base;
|
|
/* Signedness for integral numbers. */
|
|
int number_signed;
|
|
#define is_hexa number_signed
|
|
/* Decimal point character. */
|
|
#ifdef COMPILE_WSCANF
|
|
wint_t decimal;
|
|
#else
|
|
const char *decimal;
|
|
#endif
|
|
/* The thousands character of the current locale. */
|
|
#ifdef COMPILE_WSCANF
|
|
wint_t thousands;
|
|
#else
|
|
const char *thousands;
|
|
#endif
|
|
/* State for the conversions. */
|
|
mbstate_t state;
|
|
/* Integral holding variables. */
|
|
union
|
|
{
|
|
long long int q;
|
|
unsigned long long int uq;
|
|
long int l;
|
|
unsigned long int ul;
|
|
} num;
|
|
/* Character-buffer pointer. */
|
|
char *str = NULL;
|
|
wchar_t *wstr = NULL;
|
|
char **strptr = NULL;
|
|
ssize_t strsize = 0;
|
|
/* We must not react on white spaces immediately because they can
|
|
possibly be matched even if in the input stream no character is
|
|
available anymore. */
|
|
int skip_space = 0;
|
|
/* Nonzero if we are reading a pointer. */
|
|
int read_pointer;
|
|
/* Workspace. */
|
|
CHAR_T *tw; /* Temporary pointer. */
|
|
CHAR_T *wp = NULL; /* Workspace. */
|
|
size_t wpmax = 0; /* Maximal size of workspace. */
|
|
size_t wpsize; /* Currently used bytes in workspace. */
|
|
#define ADDW(Ch) \
|
|
do \
|
|
{ \
|
|
if (wpsize == wpmax) \
|
|
{ \
|
|
CHAR_T *old = wp; \
|
|
wpmax = (UCHAR_MAX + 1 > 2 * wpmax ? UCHAR_MAX + 1 : 2 * wpmax); \
|
|
wp = (CHAR_T *) alloca (wpmax * sizeof (wchar_t)); \
|
|
if (old != NULL) \
|
|
MEMCPY (wp, old, wpsize); \
|
|
} \
|
|
wp[wpsize++] = (Ch); \
|
|
} \
|
|
while (0)
|
|
|
|
#ifdef __va_copy
|
|
__va_copy (arg, argptr);
|
|
#else
|
|
arg = (va_list) argptr;
|
|
#endif
|
|
|
|
#ifdef ORIENT
|
|
ORIENT;
|
|
#endif
|
|
|
|
ARGCHECK (s, format);
|
|
|
|
{
|
|
#ifndef COMPILE_WSCANF
|
|
struct locale_data *const curnumeric = loc->__locales[LC_NUMERIC];
|
|
#endif
|
|
|
|
/* Figure out the decimal point character. */
|
|
#ifdef COMPILE_WSCANF
|
|
decimal = _NL_CURRENT_WORD (LC_NUMERIC, _NL_NUMERIC_DECIMAL_POINT_WC);
|
|
#else
|
|
decimal = curnumeric->values[_NL_ITEM_INDEX (DECIMAL_POINT)].string;
|
|
#endif
|
|
/* Figure out the thousands separator character. */
|
|
#ifdef COMPILE_WSCANF
|
|
thousands = _NL_CURRENT_WORD (LC_NUMERIC, _NL_NUMERIC_THOUSANDS_SEP_WC);
|
|
#else
|
|
thousands = curnumeric->values[_NL_ITEM_INDEX (THOUSANDS_SEP)].string;
|
|
if (*thousands == '\0')
|
|
thousands = NULL;
|
|
#endif
|
|
}
|
|
|
|
/* Lock the stream. */
|
|
LOCK_STREAM (s);
|
|
|
|
|
|
#ifndef COMPILE_WSCANF
|
|
/* From now on we use `state' to convert the format string. */
|
|
memset (&state, '\0', sizeof (state));
|
|
#endif
|
|
|
|
/* Run through the format string. */
|
|
while (*f != '\0')
|
|
{
|
|
unsigned int argpos;
|
|
/* Extract the next argument, which is of type TYPE.
|
|
For a %N$... spec, this is the Nth argument from the beginning;
|
|
otherwise it is the next argument after the state now in ARG. */
|
|
#ifdef __va_copy
|
|
# define ARG(type) (argpos == 0 ? va_arg (arg, type) : \
|
|
({ unsigned int pos = argpos; \
|
|
va_list arg; \
|
|
__va_copy (arg, argptr); \
|
|
while (--pos > 0) \
|
|
(void) va_arg (arg, void *); \
|
|
va_arg (arg, type); \
|
|
}))
|
|
#else
|
|
# if 0
|
|
/* XXX Possible optimization. */
|
|
# define ARG(type) (argpos == 0 ? va_arg (arg, type) : \
|
|
({ va_list arg = (va_list) argptr; \
|
|
arg = (va_list) ((char *) arg \
|
|
+ (argpos - 1) \
|
|
* __va_rounded_size (void *)); \
|
|
va_arg (arg, type); \
|
|
}))
|
|
# else
|
|
# define ARG(type) (argpos == 0 ? va_arg (arg, type) : \
|
|
({ unsigned int pos = argpos; \
|
|
va_list arg = (va_list) argptr; \
|
|
while (--pos > 0) \
|
|
(void) va_arg (arg, void *); \
|
|
va_arg (arg, type); \
|
|
}))
|
|
# endif
|
|
#endif
|
|
|
|
#ifndef COMPILE_WSCANF
|
|
if (!isascii ((unsigned char) *f))
|
|
{
|
|
/* Non-ASCII, may be a multibyte. */
|
|
int len = __mbrlen (f, strlen (f), &state);
|
|
if (len > 0)
|
|
{
|
|
do
|
|
{
|
|
c = inchar ();
|
|
if (__builtin_expect (c == EOF, 0))
|
|
input_error ();
|
|
else if (c != (unsigned char) *f++)
|
|
{
|
|
ungetc_not_eof (c, s);
|
|
conv_error ();
|
|
}
|
|
}
|
|
while (--len > 0);
|
|
continue;
|
|
}
|
|
}
|
|
#endif
|
|
|
|
fc = *f++;
|
|
if (fc != '%')
|
|
{
|
|
/* Remember to skip spaces. */
|
|
if (ISSPACE (fc))
|
|
{
|
|
skip_space = 1;
|
|
continue;
|
|
}
|
|
|
|
/* Read a character. */
|
|
c = inchar ();
|
|
|
|
/* Characters other than format specs must just match. */
|
|
if (__builtin_expect (c == EOF, 0))
|
|
input_error ();
|
|
|
|
/* We saw white space char as the last character in the format
|
|
string. Now it's time to skip all leading white space. */
|
|
if (skip_space)
|
|
{
|
|
while (ISSPACE (c))
|
|
if (__builtin_expect (inchar () == EOF, 0))
|
|
input_error ();
|
|
skip_space = 0;
|
|
}
|
|
|
|
if (__builtin_expect (c != fc, 0))
|
|
{
|
|
ungetc (c, s);
|
|
conv_error ();
|
|
}
|
|
|
|
continue;
|
|
}
|
|
|
|
/* This is the start of the conversion string. */
|
|
flags = 0;
|
|
|
|
/* Not yet decided whether we read a pointer or not. */
|
|
read_pointer = 0;
|
|
|
|
/* Initialize state of modifiers. */
|
|
argpos = 0;
|
|
|
|
/* Prepare temporary buffer. */
|
|
wpsize = 0;
|
|
|
|
/* Check for a positional parameter specification. */
|
|
if (ISDIGIT ((UCHAR_T) *f))
|
|
{
|
|
argpos = (UCHAR_T) *f++ - L_('0');
|
|
while (ISDIGIT ((UCHAR_T) *f))
|
|
argpos = argpos * 10 + ((UCHAR_T) *f++ - L_('0'));
|
|
if (*f == L_('$'))
|
|
++f;
|
|
else
|
|
{
|
|
/* Oops; that was actually the field width. */
|
|
width = argpos;
|
|
flags |= WIDTH;
|
|
argpos = 0;
|
|
goto got_width;
|
|
}
|
|
}
|
|
|
|
/* Check for the assignment-suppressing, the number grouping flag,
|
|
and the signal to use the locale's digit representation. */
|
|
while (*f == L_('*') || *f == L_('\'') || *f == L_('I'))
|
|
switch (*f++)
|
|
{
|
|
case L_('*'):
|
|
flags |= SUPPRESS;
|
|
break;
|
|
case L_('\''):
|
|
flags |= GROUP;
|
|
break;
|
|
case L_('I'):
|
|
flags |= I18N;
|
|
break;
|
|
}
|
|
|
|
/* We have seen width. */
|
|
if (ISDIGIT ((UCHAR_T) *f))
|
|
flags |= WIDTH;
|
|
|
|
/* Find the maximum field width. */
|
|
width = 0;
|
|
while (ISDIGIT ((UCHAR_T) *f))
|
|
{
|
|
width *= 10;
|
|
width += (UCHAR_T) *f++ - L_('0');
|
|
}
|
|
got_width:
|
|
if (width == 0)
|
|
width = -1;
|
|
|
|
/* Check for type modifiers. */
|
|
switch (*f++)
|
|
{
|
|
case L_('h'):
|
|
/* ints are short ints or chars. */
|
|
if (*f == L_('h'))
|
|
{
|
|
++f;
|
|
flags |= CHAR;
|
|
}
|
|
else
|
|
flags |= SHORT;
|
|
break;
|
|
case L_('l'):
|
|
if (*f == L_('l'))
|
|
{
|
|
/* A double `l' is equivalent to an `L'. */
|
|
++f;
|
|
flags |= LONGDBL | LONG;
|
|
}
|
|
else
|
|
/* ints are long ints. */
|
|
flags |= LONG;
|
|
break;
|
|
case L_('q'):
|
|
case L_('L'):
|
|
/* doubles are long doubles, and ints are long long ints. */
|
|
flags |= LONGDBL | LONG;
|
|
break;
|
|
case L_('a'):
|
|
/* The `a' is used as a flag only if followed by `s', `S' or
|
|
`['. */
|
|
if (*f != L_('s') && *f != L_('S') && *f != L_('['))
|
|
{
|
|
--f;
|
|
break;
|
|
}
|
|
/* String conversions (%s, %[) take a `char **'
|
|
arg and fill it in with a malloc'd pointer. */
|
|
flags |= MALLOC;
|
|
break;
|
|
case L_('z'):
|
|
if (need_longlong && sizeof (size_t) > sizeof (unsigned long int))
|
|
flags |= LONGDBL;
|
|
else if (sizeof (size_t) > sizeof (unsigned int))
|
|
flags |= LONG;
|
|
break;
|
|
case L_('j'):
|
|
if (need_longlong && sizeof (uintmax_t) > sizeof (unsigned long int))
|
|
flags |= LONGDBL;
|
|
else if (sizeof (uintmax_t) > sizeof (unsigned int))
|
|
flags |= LONG;
|
|
break;
|
|
case L_('t'):
|
|
if (need_longlong && sizeof (ptrdiff_t) > sizeof (long int))
|
|
flags |= LONGDBL;
|
|
else if (sizeof (ptrdiff_t) > sizeof (int))
|
|
flags |= LONG;
|
|
break;
|
|
default:
|
|
/* Not a recognized modifier. Backup. */
|
|
--f;
|
|
break;
|
|
}
|
|
|
|
/* End of the format string? */
|
|
if (__builtin_expect (*f == L_('\0'), 0))
|
|
conv_error ();
|
|
|
|
/* Find the conversion specifier. */
|
|
fc = *f++;
|
|
if (skip_space || (fc != L_('[') && fc != L_('c')
|
|
&& fc != L_('C') && fc != L_('n')))
|
|
{
|
|
/* Eat whitespace. */
|
|
int save_errno = errno;
|
|
errno = 0;
|
|
do
|
|
if (__builtin_expect (inchar () == EOF && errno == EINTR, 0))
|
|
input_error ();
|
|
while (ISSPACE (c));
|
|
errno = save_errno;
|
|
ungetc (c, s);
|
|
skip_space = 0;
|
|
}
|
|
|
|
switch (fc)
|
|
{
|
|
case L_('%'): /* Must match a literal '%'. */
|
|
c = inchar ();
|
|
if (__builtin_expect (c == EOF, 0))
|
|
input_error ();
|
|
if (__builtin_expect (c != fc, 0))
|
|
{
|
|
ungetc_not_eof (c, s);
|
|
conv_error ();
|
|
}
|
|
break;
|
|
|
|
case L_('n'): /* Answer number of assignments done. */
|
|
/* Corrigendum 1 to ISO C 1990 describes the allowed flags
|
|
with the 'n' conversion specifier. */
|
|
if (!(flags & SUPPRESS))
|
|
{
|
|
/* Don't count the read-ahead. */
|
|
if (need_longlong && (flags & LONGDBL))
|
|
*ARG (long long int *) = read_in;
|
|
else if (need_long && (flags & LONG))
|
|
*ARG (long int *) = read_in;
|
|
else if (flags & SHORT)
|
|
*ARG (short int *) = read_in;
|
|
else if (!(flags & CHAR))
|
|
*ARG (int *) = read_in;
|
|
else
|
|
*ARG (char *) = read_in;
|
|
|
|
#ifdef NO_BUG_IN_ISO_C_CORRIGENDUM_1
|
|
/* We have a severe problem here. The ISO C standard
|
|
contradicts itself in explaining the effect of the %n
|
|
format in `scanf'. While in ISO C:1990 and the ISO C
|
|
Amendement 1:1995 the result is described as
|
|
|
|
Execution of a %n directive does not effect the
|
|
assignment count returned at the completion of
|
|
execution of the f(w)scanf function.
|
|
|
|
in ISO C Corrigendum 1:1994 the following was added:
|
|
|
|
Subclause 7.9.6.2
|
|
Add the following fourth example:
|
|
In:
|
|
#include <stdio.h>
|
|
int d1, d2, n1, n2, i;
|
|
i = sscanf("123", "%d%n%n%d", &d1, &n1, &n2, &d2);
|
|
the value 123 is assigned to d1 and the value3 to n1.
|
|
Because %n can never get an input failure the value
|
|
of 3 is also assigned to n2. The value of d2 is not
|
|
affected. The value 3 is assigned to i.
|
|
|
|
We go for now with the historically correct code from ISO C,
|
|
i.e., we don't count the %n assignments. When it ever
|
|
should proof to be wrong just remove the #ifdef above. */
|
|
++done;
|
|
#endif
|
|
}
|
|
break;
|
|
|
|
case L_('c'): /* Match characters. */
|
|
if ((flags & LONG) == 0)
|
|
{
|
|
if (!(flags & SUPPRESS))
|
|
{
|
|
str = ARG (char *);
|
|
if (str == NULL)
|
|
conv_error ();
|
|
}
|
|
|
|
c = inchar ();
|
|
if (__builtin_expect (c == EOF, 0))
|
|
input_error ();
|
|
|
|
if (width == -1)
|
|
width = 1;
|
|
|
|
#ifdef COMPILE_WSCANF
|
|
/* We have to convert the wide character(s) into multibyte
|
|
characters and store the result. */
|
|
memset (&state, '\0', sizeof (state));
|
|
|
|
do
|
|
{
|
|
size_t n;
|
|
|
|
n = __wcrtomb (!(flags & SUPPRESS) ? str : NULL, c, &state);
|
|
if (__builtin_expect (n == (size_t) -1, 0))
|
|
/* No valid wide character. */
|
|
input_error ();
|
|
|
|
/* Increment the output pointer. Even if we don't
|
|
write anything. */
|
|
str += n;
|
|
}
|
|
while (--width > 0 && inchar () != EOF);
|
|
#else
|
|
if (!(flags & SUPPRESS))
|
|
{
|
|
do
|
|
*str++ = c;
|
|
while (--width > 0 && inchar () != EOF);
|
|
}
|
|
else
|
|
while (--width > 0 && inchar () != EOF);
|
|
#endif
|
|
|
|
if (!(flags & SUPPRESS))
|
|
++done;
|
|
|
|
break;
|
|
}
|
|
/* FALLTHROUGH */
|
|
case L_('C'):
|
|
if (!(flags & SUPPRESS))
|
|
{
|
|
wstr = ARG (wchar_t *);
|
|
if (wstr == NULL)
|
|
conv_error ();
|
|
}
|
|
|
|
c = inchar ();
|
|
if (__builtin_expect (c == EOF, 0))
|
|
input_error ();
|
|
|
|
#ifdef COMPILE_WSCANF
|
|
/* Just store the incoming wide characters. */
|
|
if (!(flags & SUPPRESS))
|
|
{
|
|
do
|
|
*wstr++ = c;
|
|
while (--width > 0 && inchar () != EOF);
|
|
}
|
|
else
|
|
while (--width > 0 && inchar () != EOF);
|
|
#else
|
|
{
|
|
/* We have to convert the multibyte input sequence to wide
|
|
characters. */
|
|
char buf[1];
|
|
mbstate_t cstate;
|
|
|
|
memset (&cstate, '\0', sizeof (cstate));
|
|
|
|
do
|
|
{
|
|
/* This is what we present the mbrtowc function first. */
|
|
buf[0] = c;
|
|
|
|
while (1)
|
|
{
|
|
size_t n;
|
|
|
|
n = __mbrtowc (!(flags & SUPPRESS) ? wstr : NULL,
|
|
buf, 1, &cstate);
|
|
|
|
if (n == (size_t) -2)
|
|
{
|
|
/* Possibly correct character, just not enough
|
|
input. */
|
|
if (__builtin_expect (inchar () == EOF, 0))
|
|
encode_error ();
|
|
|
|
buf[0] = c;
|
|
continue;
|
|
}
|
|
|
|
if (__builtin_expect (n != 1, 0))
|
|
encode_error ();
|
|
|
|
/* We have a match. */
|
|
break;
|
|
}
|
|
|
|
/* Advance the result pointer. */
|
|
++wstr;
|
|
}
|
|
while (--width > 0 && inchar () != EOF);
|
|
}
|
|
#endif
|
|
|
|
if (!(flags & SUPPRESS))
|
|
++done;
|
|
|
|
break;
|
|
|
|
case L_('s'): /* Read a string. */
|
|
if (!(flags & LONG))
|
|
{
|
|
#define STRING_ARG(Str, Type) \
|
|
do if (!(flags & SUPPRESS)) \
|
|
{ \
|
|
if (flags & MALLOC) \
|
|
{ \
|
|
/* The string is to be stored in a malloc'd buffer. */ \
|
|
strptr = ARG (char **); \
|
|
if (strptr == NULL) \
|
|
conv_error (); \
|
|
/* Allocate an initial buffer. */ \
|
|
strsize = 100; \
|
|
*strptr = (char *) malloc (strsize * sizeof (Type)); \
|
|
Str = (Type *) *strptr; \
|
|
} \
|
|
else \
|
|
Str = ARG (Type *); \
|
|
if (Str == NULL) \
|
|
conv_error (); \
|
|
} while (0)
|
|
STRING_ARG (str, char);
|
|
|
|
c = inchar ();
|
|
if (__builtin_expect (c == EOF, 0))
|
|
input_error ();
|
|
|
|
#ifdef COMPILE_WSCANF
|
|
memset (&state, '\0', sizeof (state));
|
|
#endif
|
|
|
|
do
|
|
{
|
|
if (ISSPACE (c))
|
|
{
|
|
ungetc_not_eof (c, s);
|
|
break;
|
|
}
|
|
|
|
#ifdef COMPILE_WSCANF
|
|
/* This is quite complicated. We have to convert the
|
|
wide characters into multibyte characters and then
|
|
store them. */
|
|
{
|
|
size_t n;
|
|
|
|
if (!(flags & SUPPRESS) && (flags & MALLOC)
|
|
&& str + MB_CUR_MAX >= *strptr + strsize)
|
|
{
|
|
/* We have to enlarge the buffer if the `a' flag
|
|
was given. */
|
|
size_t strleng = str - *strptr;
|
|
char *newstr;
|
|
|
|
newstr = (char *) realloc (*strptr, strsize * 2);
|
|
if (newstr == NULL)
|
|
{
|
|
/* Can't allocate that much. Last-ditch
|
|
effort. */
|
|
newstr = (char *) realloc (*strptr,
|
|
strleng + MB_CUR_MAX);
|
|
if (newstr == NULL)
|
|
{
|
|
/* We lose. Oh well. Terminate the
|
|
string and stop converting,
|
|
so at least we don't skip any input. */
|
|
((char *) (*strptr))[strleng] = '\0';
|
|
++done;
|
|
conv_error ();
|
|
}
|
|
else
|
|
{
|
|
*strptr = newstr;
|
|
str = newstr + strleng;
|
|
strsize = strleng + MB_CUR_MAX;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
*strptr = newstr;
|
|
str = newstr + strleng;
|
|
strsize *= 2;
|
|
}
|
|
}
|
|
|
|
n = __wcrtomb (!(flags & SUPPRESS) ? str : NULL, c,
|
|
&state);
|
|
if (__builtin_expect (n == (size_t) -1, 0))
|
|
encode_error ();
|
|
|
|
assert (n <= MB_CUR_MAX);
|
|
str += n;
|
|
}
|
|
#else
|
|
/* This is easy. */
|
|
if (!(flags & SUPPRESS))
|
|
{
|
|
*str++ = c;
|
|
if ((flags & MALLOC)
|
|
&& (char *) str == *strptr + strsize)
|
|
{
|
|
/* Enlarge the buffer. */
|
|
str = (char *) realloc (*strptr, 2 * strsize);
|
|
if (str == NULL)
|
|
{
|
|
/* Can't allocate that much. Last-ditch
|
|
effort. */
|
|
str = (char *) realloc (*strptr, strsize + 1);
|
|
if (str == NULL)
|
|
{
|
|
/* We lose. Oh well. Terminate the
|
|
string and stop converting,
|
|
so at least we don't skip any input. */
|
|
((char *) (*strptr))[strsize - 1] = '\0';
|
|
++done;
|
|
conv_error ();
|
|
}
|
|
else
|
|
{
|
|
*strptr = (char *) str;
|
|
str += strsize;
|
|
++strsize;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
*strptr = (char *) str;
|
|
str += strsize;
|
|
strsize *= 2;
|
|
}
|
|
}
|
|
}
|
|
#endif
|
|
}
|
|
while ((width <= 0 || --width > 0) && inchar () != EOF);
|
|
|
|
if (!(flags & SUPPRESS))
|
|
{
|
|
#ifdef COMPILE_WSCANF
|
|
/* We have to emit the code to get into the initial
|
|
state. */
|
|
char buf[MB_LEN_MAX];
|
|
size_t n = __wcrtomb (buf, L'\0', &state);
|
|
if (n > 0 && (flags & MALLOC)
|
|
&& str + n >= *strptr + strsize)
|
|
{
|
|
/* Enlarge the buffer. */
|
|
size_t strleng = str - *strptr;
|
|
char *newstr;
|
|
|
|
newstr = (char *) realloc (*strptr, strleng + n + 1);
|
|
if (newstr == NULL)
|
|
{
|
|
/* We lose. Oh well. Terminate the string
|
|
and stop converting, so at least we don't
|
|
skip any input. */
|
|
((char *) (*strptr))[strleng] = '\0';
|
|
++done;
|
|
conv_error ();
|
|
}
|
|
else
|
|
{
|
|
*strptr = newstr;
|
|
str = newstr + strleng;
|
|
strsize = strleng + n + 1;
|
|
}
|
|
}
|
|
|
|
str = __mempcpy (str, buf, n);
|
|
#endif
|
|
*str++ = '\0';
|
|
|
|
if ((flags & MALLOC) && str - *strptr != strsize)
|
|
{
|
|
char *cp = (char *) realloc (*strptr, str - *strptr);
|
|
if (cp != NULL)
|
|
*strptr = cp;
|
|
}
|
|
|
|
++done;
|
|
}
|
|
break;
|
|
}
|
|
/* FALLTHROUGH */
|
|
|
|
case L_('S'):
|
|
{
|
|
#ifndef COMPILE_WSCANF
|
|
mbstate_t cstate;
|
|
#endif
|
|
|
|
/* Wide character string. */
|
|
STRING_ARG (wstr, wchar_t);
|
|
|
|
c = inchar ();
|
|
if (__builtin_expect (c == EOF, 0))
|
|
input_error ();
|
|
|
|
#ifndef COMPILE_WSCANF
|
|
memset (&cstate, '\0', sizeof (cstate));
|
|
#endif
|
|
|
|
do
|
|
{
|
|
if (ISSPACE (c))
|
|
{
|
|
ungetc_not_eof (c, s);
|
|
break;
|
|
}
|
|
|
|
#ifdef COMPILE_WSCANF
|
|
/* This is easy. */
|
|
if (!(flags & SUPPRESS))
|
|
{
|
|
*wstr++ = c;
|
|
if ((flags & MALLOC)
|
|
&& wstr == (wchar_t *) *strptr + strsize)
|
|
{
|
|
/* Enlarge the buffer. */
|
|
wstr = (wchar_t *) realloc (*strptr,
|
|
(2 * strsize)
|
|
* sizeof (wchar_t));
|
|
if (wstr == NULL)
|
|
{
|
|
/* Can't allocate that much. Last-ditch
|
|
effort. */
|
|
wstr = (wchar_t *) realloc (*strptr,
|
|
(strsize + 1)
|
|
* sizeof (wchar_t));
|
|
if (wstr == NULL)
|
|
{
|
|
/* We lose. Oh well. Terminate the string
|
|
and stop converting, so at least we don't
|
|
skip any input. */
|
|
((wchar_t *) (*strptr))[strsize - 1] = L'\0';
|
|
++done;
|
|
conv_error ();
|
|
}
|
|
else
|
|
{
|
|
*strptr = (char *) wstr;
|
|
wstr += strsize;
|
|
++strsize;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
*strptr = (char *) wstr;
|
|
wstr += strsize;
|
|
strsize *= 2;
|
|
}
|
|
}
|
|
}
|
|
#else
|
|
{
|
|
char buf[1];
|
|
|
|
buf[0] = c;
|
|
|
|
while (1)
|
|
{
|
|
size_t n;
|
|
|
|
n = __mbrtowc (!(flags & SUPPRESS) ? wstr : NULL,
|
|
buf, 1, &cstate);
|
|
|
|
if (n == (size_t) -2)
|
|
{
|
|
/* Possibly correct character, just not enough
|
|
input. */
|
|
if (__builtin_expect (inchar () == EOF, 0))
|
|
encode_error ();
|
|
|
|
buf[0] = c;
|
|
continue;
|
|
}
|
|
|
|
if (__builtin_expect (n != 1, 0))
|
|
encode_error ();
|
|
|
|
/* We have a match. */
|
|
++wstr;
|
|
break;
|
|
}
|
|
|
|
if (!(flags & SUPPRESS) && (flags & MALLOC)
|
|
&& wstr == (wchar_t *) *strptr + strsize)
|
|
{
|
|
/* Enlarge the buffer. */
|
|
wstr = (wchar_t *) realloc (*strptr,
|
|
(2 * strsize
|
|
* sizeof (wchar_t)));
|
|
if (wstr == NULL)
|
|
{
|
|
/* Can't allocate that much. Last-ditch effort. */
|
|
wstr = (wchar_t *) realloc (*strptr,
|
|
((strsize + 1)
|
|
* sizeof (wchar_t)));
|
|
if (wstr == NULL)
|
|
{
|
|
/* We lose. Oh well. Terminate the
|
|
string and stop converting, so at
|
|
least we don't skip any input. */
|
|
((wchar_t *) (*strptr))[strsize - 1] = L'\0';
|
|
++done;
|
|
conv_error ();
|
|
}
|
|
else
|
|
{
|
|
*strptr = (char *) wstr;
|
|
wstr += strsize;
|
|
++strsize;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
*strptr = (char *) wstr;
|
|
wstr += strsize;
|
|
strsize *= 2;
|
|
}
|
|
}
|
|
}
|
|
#endif
|
|
}
|
|
while ((width <= 0 || --width > 0) && inchar () != EOF);
|
|
|
|
if (!(flags & SUPPRESS))
|
|
{
|
|
*wstr++ = L'\0';
|
|
|
|
if ((flags & MALLOC) && wstr - (wchar_t *) *strptr != strsize)
|
|
{
|
|
wchar_t *cp = (wchar_t *) realloc (*strptr,
|
|
((wstr
|
|
- (wchar_t *) *strptr)
|
|
* sizeof(wchar_t)));
|
|
if (cp != NULL)
|
|
*strptr = (char *) cp;
|
|
}
|
|
|
|
++done;
|
|
}
|
|
}
|
|
break;
|
|
|
|
case L_('x'): /* Hexadecimal integer. */
|
|
case L_('X'): /* Ditto. */
|
|
base = 16;
|
|
number_signed = 0;
|
|
goto number;
|
|
|
|
case L_('o'): /* Octal integer. */
|
|
base = 8;
|
|
number_signed = 0;
|
|
goto number;
|
|
|
|
case L_('u'): /* Unsigned decimal integer. */
|
|
base = 10;
|
|
number_signed = 0;
|
|
goto number;
|
|
|
|
case L_('d'): /* Signed decimal integer. */
|
|
base = 10;
|
|
number_signed = 1;
|
|
goto number;
|
|
|
|
case L_('i'): /* Generic number. */
|
|
base = 0;
|
|
number_signed = 1;
|
|
|
|
number:
|
|
c = inchar ();
|
|
if (__builtin_expect (c == EOF, 0))
|
|
input_error ();
|
|
|
|
/* Check for a sign. */
|
|
if (c == L_('-') || c == L_('+'))
|
|
{
|
|
ADDW (c);
|
|
if (width > 0)
|
|
--width;
|
|
c = inchar ();
|
|
}
|
|
|
|
/* Look for a leading indication of base. */
|
|
if (width != 0 && c == L_('0'))
|
|
{
|
|
if (width > 0)
|
|
--width;
|
|
|
|
ADDW (c);
|
|
c = inchar ();
|
|
|
|
if (width != 0 && TOLOWER (c) == L_('x'))
|
|
{
|
|
if (base == 0)
|
|
base = 16;
|
|
if (base == 16)
|
|
{
|
|
if (width > 0)
|
|
--width;
|
|
c = inchar ();
|
|
}
|
|
}
|
|
else if (base == 0)
|
|
base = 8;
|
|
}
|
|
|
|
if (base == 0)
|
|
base = 10;
|
|
|
|
if (base == 10 && __builtin_expect ((flags & I18N) != 0, 0))
|
|
{
|
|
int from_level;
|
|
int to_level;
|
|
int level;
|
|
#ifdef COMPILE_WSCANF
|
|
const wchar_t *wcdigits[10];
|
|
const wchar_t *wcdigits_extended[10];
|
|
#else
|
|
const char *mbdigits[10];
|
|
const char *mbdigits_extended[10];
|
|
#endif
|
|
/* "to_inpunct" is a map from ASCII digits to their
|
|
equivalent in locale. This is defined for locales
|
|
which use an extra digits set. */
|
|
wctrans_t map = __wctrans ("to_inpunct");
|
|
int n;
|
|
|
|
from_level = 0;
|
|
#ifdef COMPILE_WSCANF
|
|
to_level = _NL_CURRENT_WORD (LC_CTYPE,
|
|
_NL_CTYPE_INDIGITS_WC_LEN) - 1;
|
|
#else
|
|
to_level = (uint32_t) curctype->values[_NL_ITEM_INDEX (_NL_CTYPE_INDIGITS_MB_LEN)].word - 1;
|
|
#endif
|
|
|
|
/* Get the alternative digit forms if there are any. */
|
|
if (__builtin_expect (map != NULL, 0))
|
|
{
|
|
/* Adding new level for extra digits set in locale file. */
|
|
++to_level;
|
|
|
|
for (n = 0; n < 10; ++n)
|
|
{
|
|
#ifdef COMPILE_WSCANF
|
|
wcdigits[n] = (const wchar_t *)
|
|
_NL_CURRENT (LC_CTYPE, _NL_CTYPE_INDIGITS0_WC + n);
|
|
|
|
wchar_t *wc_extended = (wchar_t *)
|
|
alloca ((to_level + 2) * sizeof (wchar_t));
|
|
__wmemcpy (wc_extended, wcdigits[n], to_level);
|
|
wc_extended[to_level] = __towctrans (L'0' + n, map);
|
|
wc_extended[to_level + 1] = '\0';
|
|
wcdigits_extended[n] = wc_extended;
|
|
#else
|
|
mbdigits[n]
|
|
= curctype->values[_NL_CTYPE_INDIGITS0_MB + n].string;
|
|
|
|
/* Get the equivalent wide char in map. */
|
|
wint_t extra_wcdigit = __towctrans (L'0' + n, map);
|
|
|
|
/* Convert it to multibyte representation. */
|
|
mbstate_t state;
|
|
memset (&state, '\0', sizeof (state));
|
|
|
|
char extra_mbdigit[MB_LEN_MAX];
|
|
size_t mblen
|
|
= __wcrtomb (extra_mbdigit, extra_wcdigit, &state);
|
|
|
|
if (mblen == (size_t) -1)
|
|
{
|
|
/* Ignore this new level. */
|
|
map = NULL;
|
|
break;
|
|
}
|
|
|
|
/* Calculate the length of mbdigits[n]. */
|
|
const char *last_char = mbdigits[n];
|
|
for (level = 0; level < to_level; ++level)
|
|
last_char = strchr (last_char, '\0') + 1;
|
|
|
|
size_t mbdigits_len = last_char - mbdigits[n];
|
|
|
|
/* Allocate memory for extended multibyte digit. */
|
|
char *mb_extended;
|
|
mb_extended = (char *) alloca (mbdigits_len + mblen + 1);
|
|
|
|
/* And get the mbdigits + extra_digit string. */
|
|
*(char *) __mempcpy (__mempcpy (mb_extended, mbdigits[n],
|
|
mbdigits_len),
|
|
extra_mbdigit, mblen) = '\0';
|
|
mbdigits_extended[n] = mb_extended;
|
|
#endif
|
|
}
|
|
}
|
|
|
|
/* Read the number into workspace. */
|
|
while (c != EOF && width != 0)
|
|
{
|
|
/* In this round we get the pointer to the digit strings
|
|
and also perform the first round of comparisons. */
|
|
for (n = 0; n < 10; ++n)
|
|
{
|
|
/* Get the string for the digits with value N. */
|
|
#ifdef COMPILE_WSCANF
|
|
if (__builtin_expect (map != NULL, 0))
|
|
wcdigits[n] = wcdigits_extended[n];
|
|
else
|
|
wcdigits[n] = (const wchar_t *)
|
|
_NL_CURRENT (LC_CTYPE, _NL_CTYPE_INDIGITS0_WC + n);
|
|
wcdigits[n] += from_level;
|
|
|
|
if (c == (wint_t) *wcdigits[n])
|
|
{
|
|
to_level = from_level;
|
|
break;
|
|
}
|
|
|
|
/* Advance the pointer to the next string. */
|
|
++wcdigits[n];
|
|
#else
|
|
const char *cmpp;
|
|
int avail = width > 0 ? width : INT_MAX;
|
|
|
|
if (__builtin_expect (map != NULL, 0))
|
|
mbdigits[n] = mbdigits_extended[n];
|
|
else
|
|
mbdigits[n]
|
|
= curctype->values[_NL_CTYPE_INDIGITS0_MB + n].string;
|
|
|
|
for (level = 0; level < from_level; level++)
|
|
mbdigits[n] = strchr (mbdigits[n], '\0') + 1;
|
|
|
|
cmpp = mbdigits[n];
|
|
while ((unsigned char) *cmpp == c && avail > 0)
|
|
{
|
|
if (*++cmpp == '\0')
|
|
break;
|
|
else
|
|
{
|
|
if ((c = inchar ()) == EOF)
|
|
break;
|
|
--avail;
|
|
}
|
|
}
|
|
|
|
if (*cmpp == '\0')
|
|
{
|
|
if (width > 0)
|
|
width = avail;
|
|
to_level = from_level;
|
|
break;
|
|
}
|
|
|
|
/* We are pushing all read characters back. */
|
|
if (cmpp > mbdigits[n])
|
|
{
|
|
ungetc (c, s);
|
|
while (--cmpp > mbdigits[n])
|
|
ungetc_not_eof ((unsigned char) *cmpp, s);
|
|
c = (unsigned char) *cmpp;
|
|
}
|
|
|
|
/* Advance the pointer to the next string. */
|
|
mbdigits[n] = strchr (mbdigits[n], '\0') + 1;
|
|
#endif
|
|
}
|
|
|
|
if (n == 10)
|
|
{
|
|
/* Have not yet found the digit. */
|
|
for (level = from_level + 1; level <= to_level; ++level)
|
|
{
|
|
/* Search all ten digits of this level. */
|
|
for (n = 0; n < 10; ++n)
|
|
{
|
|
#ifdef COMPILE_WSCANF
|
|
if (c == (wint_t) *wcdigits[n])
|
|
break;
|
|
|
|
/* Advance the pointer to the next string. */
|
|
++wcdigits[n];
|
|
#else
|
|
const char *cmpp;
|
|
int avail = width > 0 ? width : INT_MAX;
|
|
|
|
cmpp = mbdigits[n];
|
|
while ((unsigned char) *cmpp == c && avail > 0)
|
|
{
|
|
if (*++cmpp == '\0')
|
|
break;
|
|
else
|
|
{
|
|
if ((c = inchar ()) == EOF)
|
|
break;
|
|
--avail;
|
|
}
|
|
}
|
|
|
|
if (*cmpp == '\0')
|
|
{
|
|
if (width > 0)
|
|
width = avail;
|
|
break;
|
|
}
|
|
|
|
/* We are pushing all read characters back. */
|
|
if (cmpp > mbdigits[n])
|
|
{
|
|
ungetc (c, s);
|
|
while (--cmpp > mbdigits[n])
|
|
ungetc_not_eof ((unsigned char) *cmpp, s);
|
|
c = (unsigned char) *cmpp;
|
|
}
|
|
|
|
/* Advance the pointer to the next string. */
|
|
mbdigits[n] = strchr (mbdigits[n], '\0') + 1;
|
|
#endif
|
|
}
|
|
|
|
if (n < 10)
|
|
{
|
|
/* Found it. */
|
|
from_level = level;
|
|
to_level = level;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
if (n < 10)
|
|
c = L_('0') + n;
|
|
else if ((flags & GROUP)
|
|
#ifdef COMPILE_WSCANF
|
|
&& thousands != L'\0'
|
|
#else
|
|
&& thousands != NULL
|
|
#endif
|
|
)
|
|
{
|
|
/* Try matching against the thousands separator. */
|
|
#ifdef COMPILE_WSCANF
|
|
if (c != thousands)
|
|
break;
|
|
#else
|
|
const char *cmpp = thousands;
|
|
int avail = width > 0 ? width : INT_MAX;
|
|
|
|
while ((unsigned char) *cmpp == c && avail > 0)
|
|
{
|
|
ADDW (c);
|
|
if (*++cmpp == '\0')
|
|
break;
|
|
else
|
|
{
|
|
if ((c = inchar ()) == EOF)
|
|
break;
|
|
--avail;
|
|
}
|
|
}
|
|
|
|
if (*cmpp != '\0')
|
|
{
|
|
/* We are pushing all read characters back. */
|
|
if (cmpp > thousands)
|
|
{
|
|
wpsize -= cmpp - thousands;
|
|
ungetc (c, s);
|
|
while (--cmpp > thousands)
|
|
ungetc_not_eof ((unsigned char) *cmpp, s);
|
|
c = (unsigned char) *cmpp;
|
|
}
|
|
break;
|
|
}
|
|
|
|
if (width > 0)
|
|
width = avail;
|
|
|
|
/* The last thousands character will be added back by
|
|
the ADDW below. */
|
|
--wpsize;
|
|
#endif
|
|
}
|
|
else
|
|
break;
|
|
|
|
ADDW (c);
|
|
if (width > 0)
|
|
--width;
|
|
|
|
c = inchar ();
|
|
}
|
|
}
|
|
else
|
|
/* Read the number into workspace. */
|
|
while (c != EOF && width != 0)
|
|
{
|
|
if (base == 16)
|
|
{
|
|
if (!ISXDIGIT (c))
|
|
break;
|
|
}
|
|
else if (!ISDIGIT (c) || (int) (c - L_('0')) >= base)
|
|
{
|
|
if (base == 10 && (flags & GROUP)
|
|
#ifdef COMPILE_WSCANF
|
|
&& thousands != L'\0'
|
|
#else
|
|
&& thousands != NULL
|
|
#endif
|
|
)
|
|
{
|
|
/* Try matching against the thousands separator. */
|
|
#ifdef COMPILE_WSCANF
|
|
if (c != thousands)
|
|
break;
|
|
#else
|
|
const char *cmpp = thousands;
|
|
int avail = width > 0 ? width : INT_MAX;
|
|
|
|
while ((unsigned char) *cmpp == c && avail > 0)
|
|
{
|
|
ADDW (c);
|
|
if (*++cmpp == '\0')
|
|
break;
|
|
else
|
|
{
|
|
if ((c = inchar ()) == EOF)
|
|
break;
|
|
--avail;
|
|
}
|
|
}
|
|
|
|
if (*cmpp != '\0')
|
|
{
|
|
/* We are pushing all read characters back. */
|
|
if (cmpp > thousands)
|
|
{
|
|
wpsize -= cmpp - thousands;
|
|
ungetc (c, s);
|
|
while (--cmpp > thousands)
|
|
ungetc_not_eof ((unsigned char) *cmpp, s);
|
|
c = (unsigned char) *cmpp;
|
|
}
|
|
break;
|
|
}
|
|
|
|
if (width > 0)
|
|
width = avail;
|
|
|
|
/* The last thousands character will be added back by
|
|
the ADDW below. */
|
|
--wpsize;
|
|
#endif
|
|
}
|
|
else
|
|
break;
|
|
}
|
|
ADDW (c);
|
|
if (width > 0)
|
|
--width;
|
|
|
|
c = inchar ();
|
|
}
|
|
|
|
if (wpsize == 0
|
|
|| (wpsize == 1 && (wp[0] == L_('+') || wp[0] == L_('-'))))
|
|
{
|
|
/* There was no number. If we are supposed to read a pointer
|
|
we must recognize "(nil)" as well. */
|
|
if (__builtin_expect (wpsize == 0
|
|
&& read_pointer
|
|
&& (width < 0 || width >= 0)
|
|
&& c == '('
|
|
&& TOLOWER (inchar ()) == L_('n')
|
|
&& TOLOWER (inchar ()) == L_('i')
|
|
&& TOLOWER (inchar ()) == L_('l')
|
|
&& inchar () == L_(')'), 1))
|
|
/* We must produce the value of a NULL pointer. A single
|
|
'0' digit is enough. */
|
|
ADDW (L_('0'));
|
|
else
|
|
{
|
|
/* The last read character is not part of the number
|
|
anymore. */
|
|
ungetc (c, s);
|
|
|
|
conv_error ();
|
|
}
|
|
}
|
|
else
|
|
/* The just read character is not part of the number anymore. */
|
|
ungetc (c, s);
|
|
|
|
/* Convert the number. */
|
|
ADDW (L_('\0'));
|
|
if (need_longlong && (flags & LONGDBL))
|
|
{
|
|
if (number_signed)
|
|
num.q = __strtoll_internal (wp, &tw, base, flags & GROUP);
|
|
else
|
|
num.uq = __strtoull_internal (wp, &tw, base, flags & GROUP);
|
|
}
|
|
else
|
|
{
|
|
if (number_signed)
|
|
num.l = __strtol_internal (wp, &tw, base, flags & GROUP);
|
|
else
|
|
num.ul = __strtoul_internal (wp, &tw, base, flags & GROUP);
|
|
}
|
|
if (__builtin_expect (wp == tw, 0))
|
|
conv_error ();
|
|
|
|
if (!(flags & SUPPRESS))
|
|
{
|
|
if (! number_signed)
|
|
{
|
|
if (need_longlong && (flags & LONGDBL))
|
|
*ARG (unsigned LONGLONG int *) = num.uq;
|
|
else if (need_long && (flags & LONG))
|
|
*ARG (unsigned long int *) = num.ul;
|
|
else if (flags & SHORT)
|
|
*ARG (unsigned short int *)
|
|
= (unsigned short int) num.ul;
|
|
else if (!(flags & CHAR))
|
|
*ARG (unsigned int *) = (unsigned int) num.ul;
|
|
else
|
|
*ARG (unsigned char *) = (unsigned char) num.ul;
|
|
}
|
|
else
|
|
{
|
|
if (need_longlong && (flags & LONGDBL))
|
|
*ARG (LONGLONG int *) = num.q;
|
|
else if (need_long && (flags & LONG))
|
|
*ARG (long int *) = num.l;
|
|
else if (flags & SHORT)
|
|
*ARG (short int *) = (short int) num.l;
|
|
else if (!(flags & CHAR))
|
|
*ARG (int *) = (int) num.l;
|
|
else
|
|
*ARG (signed char *) = (signed char) num.ul;
|
|
}
|
|
++done;
|
|
}
|
|
break;
|
|
|
|
case L_('e'): /* Floating-point numbers. */
|
|
case L_('E'):
|
|
case L_('f'):
|
|
case L_('F'):
|
|
case L_('g'):
|
|
case L_('G'):
|
|
case L_('a'):
|
|
case L_('A'):
|
|
c = inchar ();
|
|
if (__builtin_expect (c == EOF, 0))
|
|
input_error ();
|
|
|
|
got_dot = got_e = 0;
|
|
|
|
/* Check for a sign. */
|
|
if (c == L_('-') || c == L_('+'))
|
|
{
|
|
negative = c == L_('-');
|
|
if (__builtin_expect (width == 0 || inchar () == EOF, 0))
|
|
/* EOF is only an input error before we read any chars. */
|
|
conv_error ();
|
|
if (! ISDIGIT (c) && TOLOWER (c) != L_('i')
|
|
&& TOLOWER (c) != L_('n'))
|
|
{
|
|
#ifdef COMPILE_WSCANF
|
|
if (__builtin_expect (c != decimal, 0))
|
|
{
|
|
/* This is no valid number. */
|
|
ungetc (c, s);
|
|
conv_error ();
|
|
}
|
|
#else
|
|
/* Match against the decimal point. At this point
|
|
we are taking advantage of the fact that we can
|
|
push more than one character back. This is
|
|
(almost) never necessary since the decimal point
|
|
string hopefully never contains more than one
|
|
byte. */
|
|
const char *cmpp = decimal;
|
|
int avail = width > 0 ? width : INT_MAX;
|
|
|
|
while ((unsigned char) *cmpp == c && avail-- > 0)
|
|
if (*++cmpp == '\0')
|
|
break;
|
|
else
|
|
{
|
|
if (inchar () == EOF)
|
|
break;
|
|
}
|
|
|
|
if (__builtin_expect (*cmpp != '\0', 0))
|
|
{
|
|
/* This is no valid number. */
|
|
while (1)
|
|
{
|
|
ungetc (c, s);
|
|
if (cmpp == decimal)
|
|
break;
|
|
c = (unsigned char) *--cmpp;
|
|
}
|
|
|
|
conv_error ();
|
|
}
|
|
else
|
|
{
|
|
/* Add all the characters. */
|
|
for (cmpp = decimal; *cmpp != '\0'; ++cmpp)
|
|
ADDW ((unsigned char) *cmpp);
|
|
if (width > 0)
|
|
width = avail;
|
|
got_dot = 1;
|
|
|
|
c = inchar ();
|
|
}
|
|
if (width > 0)
|
|
width = avail;
|
|
#endif
|
|
}
|
|
if (width > 0)
|
|
--width;
|
|
}
|
|
else
|
|
negative = 0;
|
|
|
|
/* Take care for the special arguments "nan" and "inf". */
|
|
if (TOLOWER (c) == L_('n'))
|
|
{
|
|
/* Maybe "nan". */
|
|
ADDW (c);
|
|
if (__builtin_expect (width == 0
|
|
|| inchar () == EOF
|
|
|| TOLOWER (c) != L_('a'), 0))
|
|
conv_error ();
|
|
if (width > 0)
|
|
--width;
|
|
ADDW (c);
|
|
if (__builtin_expect (width == 0
|
|
|| inchar () == EOF
|
|
|| TOLOWER (c) != L_('n'), 0))
|
|
conv_error ();
|
|
if (width > 0)
|
|
--width;
|
|
ADDW (c);
|
|
/* It is "nan". */
|
|
goto scan_float;
|
|
}
|
|
else if (TOLOWER (c) == L_('i'))
|
|
{
|
|
/* Maybe "inf" or "infinity". */
|
|
ADDW (c);
|
|
if (__builtin_expect (width == 0
|
|
|| inchar () == EOF
|
|
|| TOLOWER (c) != L_('n'), 0))
|
|
conv_error ();
|
|
if (width > 0)
|
|
--width;
|
|
ADDW (c);
|
|
if (__builtin_expect (width == 0
|
|
|| inchar () == EOF
|
|
|| TOLOWER (c) != L_('f'), 0))
|
|
conv_error ();
|
|
if (width > 0)
|
|
--width;
|
|
ADDW (c);
|
|
/* It is as least "inf". */
|
|
if (width != 0 && inchar () != EOF)
|
|
{
|
|
if (TOLOWER (c) == L_('i'))
|
|
{
|
|
if (width > 0)
|
|
--width;
|
|
/* Now we have to read the rest as well. */
|
|
ADDW (c);
|
|
if (__builtin_expect (width == 0
|
|
|| inchar () == EOF
|
|
|| TOLOWER (c) != L_('n'), 0))
|
|
conv_error ();
|
|
if (width > 0)
|
|
--width;
|
|
ADDW (c);
|
|
if (__builtin_expect (width == 0
|
|
|| inchar () == EOF
|
|
|| TOLOWER (c) != L_('i'), 0))
|
|
conv_error ();
|
|
if (width > 0)
|
|
--width;
|
|
ADDW (c);
|
|
if (__builtin_expect (width == 0
|
|
|| inchar () == EOF
|
|
|| TOLOWER (c) != L_('t'), 0))
|
|
conv_error ();
|
|
if (width > 0)
|
|
--width;
|
|
ADDW (c);
|
|
if (__builtin_expect (width == 0
|
|
|| inchar () == EOF
|
|
|| TOLOWER (c) != L_('y'), 0))
|
|
conv_error ();
|
|
if (width > 0)
|
|
--width;
|
|
ADDW (c);
|
|
}
|
|
else
|
|
/* Never mind. */
|
|
ungetc (c, s);
|
|
}
|
|
goto scan_float;
|
|
}
|
|
|
|
is_hexa = 0;
|
|
exp_char = L_('e');
|
|
if (width != 0 && c == L_('0'))
|
|
{
|
|
ADDW (c);
|
|
c = inchar ();
|
|
if (width > 0)
|
|
--width;
|
|
if (width != 0 && TOLOWER (c) == L_('x'))
|
|
{
|
|
/* It is a number in hexadecimal format. */
|
|
ADDW (c);
|
|
|
|
is_hexa = 1;
|
|
exp_char = L_('p');
|
|
|
|
/* Grouping is not allowed. */
|
|
flags &= ~GROUP;
|
|
c = inchar ();
|
|
if (width > 0)
|
|
--width;
|
|
}
|
|
}
|
|
|
|
do
|
|
{
|
|
if (ISDIGIT (c))
|
|
ADDW (c);
|
|
else if (!got_e && is_hexa && ISXDIGIT (c))
|
|
ADDW (c);
|
|
else if (got_e && wp[wpsize - 1] == exp_char
|
|
&& (c == L_('-') || c == L_('+')))
|
|
ADDW (c);
|
|
else if (wpsize > 0 && !got_e
|
|
&& (CHAR_T) TOLOWER (c) == exp_char)
|
|
{
|
|
ADDW (exp_char);
|
|
got_e = got_dot = 1;
|
|
}
|
|
else
|
|
{
|
|
#ifdef COMPILE_WSCANF
|
|
if (! got_dot && c == decimal)
|
|
{
|
|
ADDW (c);
|
|
got_dot = 1;
|
|
}
|
|
else if ((flags & GROUP) != 0 && thousands != L'\0'
|
|
&& ! got_dot && c == thousands)
|
|
ADDW (c);
|
|
else
|
|
{
|
|
/* The last read character is not part of the number
|
|
anymore. */
|
|
ungetc (c, s);
|
|
break;
|
|
}
|
|
#else
|
|
const char *cmpp = decimal;
|
|
int avail = width > 0 ? width : INT_MAX;
|
|
|
|
if (! got_dot)
|
|
{
|
|
while ((unsigned char) *cmpp == c && avail > 0)
|
|
if (*++cmpp == '\0')
|
|
break;
|
|
else
|
|
{
|
|
if (inchar () == EOF)
|
|
break;
|
|
--avail;
|
|
}
|
|
}
|
|
|
|
if (*cmpp == '\0')
|
|
{
|
|
/* Add all the characters. */
|
|
for (cmpp = decimal; *cmpp != '\0'; ++cmpp)
|
|
ADDW ((unsigned char) *cmpp);
|
|
if (width > 0)
|
|
width = avail;
|
|
got_dot = 1;
|
|
}
|
|
else
|
|
{
|
|
/* Figure out whether it is a thousands separator.
|
|
There is one problem: we possibly read more than
|
|
one character. We cannot push them back but since
|
|
we know that parts of the `decimal' string matched,
|
|
we can compare against it. */
|
|
const char *cmp2p = thousands;
|
|
|
|
if ((flags & GROUP) != 0 && thousands != NULL
|
|
&& ! got_dot)
|
|
{
|
|
while (cmp2p - thousands < cmpp - decimal
|
|
&& *cmp2p == decimal[cmp2p - thousands])
|
|
++cmp2p;
|
|
if (cmp2p - thousands == cmpp - decimal)
|
|
{
|
|
while ((unsigned char) *cmp2p == c && avail > 0)
|
|
if (*++cmp2p == '\0')
|
|
break;
|
|
else
|
|
{
|
|
if (inchar () == EOF)
|
|
break;
|
|
--avail;
|
|
}
|
|
}
|
|
}
|
|
|
|
if (cmp2p != NULL && *cmp2p == '\0')
|
|
{
|
|
/* Add all the characters. */
|
|
for (cmpp = thousands; *cmpp != '\0'; ++cmpp)
|
|
ADDW ((unsigned char) *cmpp);
|
|
if (width > 0)
|
|
width = avail;
|
|
}
|
|
else
|
|
{
|
|
/* The last read character is not part of the number
|
|
anymore. */
|
|
ungetc (c, s);
|
|
break;
|
|
}
|
|
}
|
|
#endif
|
|
}
|
|
if (width > 0)
|
|
--width;
|
|
}
|
|
while (width != 0 && inchar () != EOF);
|
|
|
|
/* Have we read any character? If we try to read a number
|
|
in hexadecimal notation and we have read only the `0x'
|
|
prefix or no exponent this is an error. */
|
|
if (__builtin_expect (wpsize == 0
|
|
|| (is_hexa && (wpsize == 2 || ! got_e)), 0))
|
|
conv_error ();
|
|
|
|
scan_float:
|
|
/* Convert the number. */
|
|
ADDW (L_('\0'));
|
|
if ((flags & LONGDBL) && !__ldbl_is_dbl)
|
|
{
|
|
long double d = __strtold_internal (wp, &tw, flags & GROUP);
|
|
if (!(flags & SUPPRESS) && tw != wp)
|
|
*ARG (long double *) = negative ? -d : d;
|
|
}
|
|
else if (flags & (LONG | LONGDBL))
|
|
{
|
|
double d = __strtod_internal (wp, &tw, flags & GROUP);
|
|
if (!(flags & SUPPRESS) && tw != wp)
|
|
*ARG (double *) = negative ? -d : d;
|
|
}
|
|
else
|
|
{
|
|
float d = __strtof_internal (wp, &tw, flags & GROUP);
|
|
if (!(flags & SUPPRESS) && tw != wp)
|
|
*ARG (float *) = negative ? -d : d;
|
|
}
|
|
|
|
if (__builtin_expect (tw == wp, 0))
|
|
conv_error ();
|
|
|
|
if (!(flags & SUPPRESS))
|
|
++done;
|
|
break;
|
|
|
|
case L_('['): /* Character class. */
|
|
if (flags & LONG)
|
|
STRING_ARG (wstr, wchar_t);
|
|
else
|
|
STRING_ARG (str, char);
|
|
|
|
if (*f == L_('^'))
|
|
{
|
|
++f;
|
|
not_in = 1;
|
|
}
|
|
else
|
|
not_in = 0;
|
|
|
|
if (width < 0)
|
|
/* There is no width given so there is also no limit on the
|
|
number of characters we read. Therefore we set width to
|
|
a very high value to make the algorithm easier. */
|
|
width = INT_MAX;
|
|
|
|
#ifdef COMPILE_WSCANF
|
|
/* Find the beginning and the end of the scanlist. We are not
|
|
creating a lookup table since it would have to be too large.
|
|
Instead we search each time through the string. This is not
|
|
a constant lookup time but who uses this feature deserves to
|
|
be punished. */
|
|
tw = (wchar_t *) f; /* Marks the beginning. */
|
|
|
|
if (*f == L']')
|
|
++f;
|
|
|
|
while ((fc = *f++) != L'\0' && fc != L']');
|
|
|
|
if (__builtin_expect (fc == L'\0', 0))
|
|
conv_error ();
|
|
wp = (wchar_t *) f - 1;
|
|
#else
|
|
/* Fill WP with byte flags indexed by character.
|
|
We will use this flag map for matching input characters. */
|
|
if (wpmax < UCHAR_MAX + 1)
|
|
{
|
|
wpmax = UCHAR_MAX + 1;
|
|
wp = (char *) alloca (wpmax);
|
|
}
|
|
memset (wp, '\0', UCHAR_MAX + 1);
|
|
|
|
fc = *f;
|
|
if (fc == ']' || fc == '-')
|
|
{
|
|
/* If ] or - appears before any char in the set, it is not
|
|
the terminator or separator, but the first char in the
|
|
set. */
|
|
wp[fc] = 1;
|
|
++f;
|
|
}
|
|
|
|
while ((fc = *f++) != '\0' && fc != ']')
|
|
if (fc == '-' && *f != '\0' && *f != ']'
|
|
&& (unsigned char) f[-2] <= (unsigned char) *f)
|
|
{
|
|
/* Add all characters from the one before the '-'
|
|
up to (but not including) the next format char. */
|
|
for (fc = (unsigned char) f[-2]; fc < (unsigned char) *f; ++fc)
|
|
wp[fc] = 1;
|
|
}
|
|
else
|
|
/* Add the character to the flag map. */
|
|
wp[fc] = 1;
|
|
|
|
if (__builtin_expect (fc == '\0', 0))
|
|
conv_error();
|
|
#endif
|
|
|
|
if (flags & LONG)
|
|
{
|
|
size_t now = read_in;
|
|
#ifdef COMPILE_WSCANF
|
|
if (__builtin_expect (inchar () == WEOF, 0))
|
|
input_error ();
|
|
|
|
do
|
|
{
|
|
wchar_t *runp;
|
|
|
|
/* Test whether it's in the scanlist. */
|
|
runp = tw;
|
|
while (runp < wp)
|
|
{
|
|
if (runp[0] == L'-' && runp[1] != '\0' && runp + 1 != wp
|
|
&& runp != tw
|
|
&& (unsigned int) runp[-1] <= (unsigned int) runp[1])
|
|
{
|
|
/* Match against all characters in between the
|
|
first and last character of the sequence. */
|
|
wchar_t wc;
|
|
|
|
for (wc = runp[-1] + 1; wc <= runp[1]; ++wc)
|
|
if ((wint_t) wc == c)
|
|
break;
|
|
|
|
if (wc <= runp[1] && !not_in)
|
|
break;
|
|
if (wc <= runp[1] && not_in)
|
|
{
|
|
/* The current character is not in the
|
|
scanset. */
|
|
ungetc (c, s);
|
|
goto out;
|
|
}
|
|
|
|
runp += 2;
|
|
}
|
|
else
|
|
{
|
|
if ((wint_t) *runp == c && !not_in)
|
|
break;
|
|
if ((wint_t) *runp == c && not_in)
|
|
{
|
|
ungetc (c, s);
|
|
goto out;
|
|
}
|
|
|
|
++runp;
|
|
}
|
|
}
|
|
|
|
if (runp == wp && !not_in)
|
|
{
|
|
ungetc (c, s);
|
|
goto out;
|
|
}
|
|
|
|
if (!(flags & SUPPRESS))
|
|
{
|
|
*wstr++ = c;
|
|
|
|
if ((flags & MALLOC)
|
|
&& wstr == (wchar_t *) *strptr + strsize)
|
|
{
|
|
/* Enlarge the buffer. */
|
|
wstr = (wchar_t *) realloc (*strptr,
|
|
(2 * strsize)
|
|
* sizeof (wchar_t));
|
|
if (wstr == NULL)
|
|
{
|
|
/* Can't allocate that much. Last-ditch
|
|
effort. */
|
|
wstr = (wchar_t *)
|
|
realloc (*strptr, (strsize + 1)
|
|
* sizeof (wchar_t));
|
|
if (wstr == NULL)
|
|
{
|
|
/* We lose. Oh well. Terminate the string
|
|
and stop converting, so at least we don't
|
|
skip any input. */
|
|
((wchar_t *) (*strptr))[strsize - 1] = L'\0';
|
|
++done;
|
|
conv_error ();
|
|
}
|
|
else
|
|
{
|
|
*strptr = (char *) wstr;
|
|
wstr += strsize;
|
|
++strsize;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
*strptr = (char *) wstr;
|
|
wstr += strsize;
|
|
strsize *= 2;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
while (--width > 0 && inchar () != WEOF);
|
|
out:
|
|
#else
|
|
char buf[MB_LEN_MAX];
|
|
size_t cnt = 0;
|
|
mbstate_t cstate;
|
|
|
|
if (__builtin_expect (inchar () == EOF, 0))
|
|
input_error ();
|
|
|
|
memset (&cstate, '\0', sizeof (cstate));
|
|
|
|
do
|
|
{
|
|
if (wp[c] == not_in)
|
|
{
|
|
ungetc_not_eof (c, s);
|
|
break;
|
|
}
|
|
|
|
/* This is easy. */
|
|
if (!(flags & SUPPRESS))
|
|
{
|
|
size_t n;
|
|
|
|
/* Convert it into a wide character. */
|
|
buf[0] = c;
|
|
n = __mbrtowc (wstr, buf, 1, &cstate);
|
|
|
|
if (n == (size_t) -2)
|
|
{
|
|
/* Possibly correct character, just not enough
|
|
input. */
|
|
++cnt;
|
|
assert (cnt < MB_CUR_MAX);
|
|
continue;
|
|
}
|
|
cnt = 0;
|
|
|
|
++wstr;
|
|
if ((flags & MALLOC)
|
|
&& wstr == (wchar_t *) *strptr + strsize)
|
|
{
|
|
/* Enlarge the buffer. */
|
|
wstr = (wchar_t *) realloc (*strptr,
|
|
(2 * strsize
|
|
* sizeof (wchar_t)));
|
|
if (wstr == NULL)
|
|
{
|
|
/* Can't allocate that much. Last-ditch
|
|
effort. */
|
|
wstr = (wchar_t *)
|
|
realloc (*strptr, ((strsize + 1)
|
|
* sizeof (wchar_t)));
|
|
if (wstr == NULL)
|
|
{
|
|
/* We lose. Oh well. Terminate the
|
|
string and stop converting,
|
|
so at least we don't skip any input. */
|
|
((wchar_t *) (*strptr))[strsize - 1] = L'\0';
|
|
++done;
|
|
conv_error ();
|
|
}
|
|
else
|
|
{
|
|
*strptr = (char *) wstr;
|
|
wstr += strsize;
|
|
++strsize;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
*strptr = (char *) wstr;
|
|
wstr += strsize;
|
|
strsize *= 2;
|
|
}
|
|
}
|
|
}
|
|
|
|
if (--width <= 0)
|
|
break;
|
|
}
|
|
while (inchar () != EOF);
|
|
|
|
if (__builtin_expect (cnt != 0, 0))
|
|
/* We stopped in the middle of recognizing another
|
|
character. That's a problem. */
|
|
encode_error ();
|
|
#endif
|
|
|
|
if (__builtin_expect (now == read_in, 0))
|
|
/* We haven't succesfully read any character. */
|
|
conv_error ();
|
|
|
|
if (!(flags & SUPPRESS))
|
|
{
|
|
*wstr++ = L'\0';
|
|
|
|
if ((flags & MALLOC)
|
|
&& wstr - (wchar_t *) *strptr != strsize)
|
|
{
|
|
wchar_t *cp = (wchar_t *)
|
|
realloc (*strptr, ((wstr - (wchar_t *) *strptr)
|
|
* sizeof(wchar_t)));
|
|
if (cp != NULL)
|
|
*strptr = (char *) cp;
|
|
}
|
|
|
|
++done;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
size_t now = read_in;
|
|
|
|
if (__builtin_expect (inchar () == EOF, 0))
|
|
input_error ();
|
|
|
|
#ifdef COMPILE_WSCANF
|
|
|
|
memset (&state, '\0', sizeof (state));
|
|
|
|
do
|
|
{
|
|
wchar_t *runp;
|
|
size_t n;
|
|
|
|
/* Test whether it's in the scanlist. */
|
|
runp = tw;
|
|
while (runp < wp)
|
|
{
|
|
if (runp[0] == L'-' && runp[1] != '\0' && runp + 1 != wp
|
|
&& runp != tw
|
|
&& (unsigned int) runp[-1] <= (unsigned int) runp[1])
|
|
{
|
|
/* Match against all characters in between the
|
|
first and last character of the sequence. */
|
|
wchar_t wc;
|
|
|
|
for (wc = runp[-1] + 1; wc <= runp[1]; ++wc)
|
|
if ((wint_t) wc == c)
|
|
break;
|
|
|
|
if (wc <= runp[1] && !not_in)
|
|
break;
|
|
if (wc <= runp[1] && not_in)
|
|
{
|
|
/* The current character is not in the
|
|
scanset. */
|
|
ungetc (c, s);
|
|
goto out2;
|
|
}
|
|
|
|
runp += 2;
|
|
}
|
|
else
|
|
{
|
|
if ((wint_t) *runp == c && !not_in)
|
|
break;
|
|
if ((wint_t) *runp == c && not_in)
|
|
{
|
|
ungetc (c, s);
|
|
goto out2;
|
|
}
|
|
|
|
++runp;
|
|
}
|
|
}
|
|
|
|
if (runp == wp && !not_in)
|
|
{
|
|
ungetc (c, s);
|
|
goto out2;
|
|
}
|
|
|
|
if (!(flags & SUPPRESS))
|
|
{
|
|
if ((flags & MALLOC)
|
|
&& str + MB_CUR_MAX >= *strptr + strsize)
|
|
{
|
|
/* Enlarge the buffer. */
|
|
size_t strleng = str - *strptr;
|
|
char *newstr;
|
|
|
|
newstr = (char *) realloc (*strptr, 2 * strsize);
|
|
if (newstr == NULL)
|
|
{
|
|
/* Can't allocate that much. Last-ditch
|
|
effort. */
|
|
newstr = (char *) realloc (*strptr,
|
|
strleng + MB_CUR_MAX);
|
|
if (newstr == NULL)
|
|
{
|
|
/* We lose. Oh well. Terminate the string
|
|
and stop converting, so at least we don't
|
|
skip any input. */
|
|
((char *) (*strptr))[strleng] = '\0';
|
|
++done;
|
|
conv_error ();
|
|
}
|
|
else
|
|
{
|
|
*strptr = newstr;
|
|
str = newstr + strleng;
|
|
strsize = strleng + MB_CUR_MAX;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
*strptr = newstr;
|
|
str = newstr + strleng;
|
|
strsize *= 2;
|
|
}
|
|
}
|
|
}
|
|
|
|
n = __wcrtomb (!(flags & SUPPRESS) ? str : NULL, c, &state);
|
|
if (__builtin_expect (n == (size_t) -1, 0))
|
|
encode_error ();
|
|
|
|
assert (n <= MB_CUR_MAX);
|
|
str += n;
|
|
}
|
|
while (--width > 0 && inchar () != WEOF);
|
|
out2:
|
|
#else
|
|
do
|
|
{
|
|
if (wp[c] == not_in)
|
|
{
|
|
ungetc_not_eof (c, s);
|
|
break;
|
|
}
|
|
|
|
/* This is easy. */
|
|
if (!(flags & SUPPRESS))
|
|
{
|
|
*str++ = c;
|
|
if ((flags & MALLOC)
|
|
&& (char *) str == *strptr + strsize)
|
|
{
|
|
/* Enlarge the buffer. */
|
|
size_t newsize = 2 * strsize;
|
|
|
|
allocagain:
|
|
str = (char *) realloc (*strptr, newsize);
|
|
if (str == NULL)
|
|
{
|
|
/* Can't allocate that much. Last-ditch
|
|
effort. */
|
|
if (newsize > strsize + 1)
|
|
{
|
|
newsize = strsize + 1;
|
|
goto allocagain;
|
|
}
|
|
/* We lose. Oh well. Terminate the
|
|
string and stop converting,
|
|
so at least we don't skip any input. */
|
|
((char *) (*strptr))[strsize - 1] = '\0';
|
|
++done;
|
|
conv_error ();
|
|
}
|
|
else
|
|
{
|
|
*strptr = (char *) str;
|
|
str += strsize;
|
|
strsize = newsize;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
while (--width > 0 && inchar () != EOF);
|
|
#endif
|
|
|
|
if (__builtin_expect (now == read_in, 0))
|
|
/* We haven't succesfully read any character. */
|
|
conv_error ();
|
|
|
|
if (!(flags & SUPPRESS))
|
|
{
|
|
#ifdef COMPILE_WSCANF
|
|
/* We have to emit the code to get into the initial
|
|
state. */
|
|
char buf[MB_LEN_MAX];
|
|
size_t n = __wcrtomb (buf, L'\0', &state);
|
|
if (n > 0 && (flags & MALLOC)
|
|
&& str + n >= *strptr + strsize)
|
|
{
|
|
/* Enlarge the buffer. */
|
|
size_t strleng = str - *strptr;
|
|
char *newstr;
|
|
|
|
newstr = (char *) realloc (*strptr, strleng + n + 1);
|
|
if (newstr == NULL)
|
|
{
|
|
/* We lose. Oh well. Terminate the string
|
|
and stop converting, so at least we don't
|
|
skip any input. */
|
|
((char *) (*strptr))[strleng] = '\0';
|
|
++done;
|
|
conv_error ();
|
|
}
|
|
else
|
|
{
|
|
*strptr = newstr;
|
|
str = newstr + strleng;
|
|
strsize = strleng + n + 1;
|
|
}
|
|
}
|
|
|
|
str = __mempcpy (str, buf, n);
|
|
#endif
|
|
*str++ = '\0';
|
|
|
|
if ((flags & MALLOC) && str - *strptr != strsize)
|
|
{
|
|
char *cp = (char *) realloc (*strptr, str - *strptr);
|
|
if (cp != NULL)
|
|
*strptr = cp;
|
|
}
|
|
|
|
++done;
|
|
}
|
|
}
|
|
break;
|
|
|
|
case L_('p'): /* Generic pointer. */
|
|
base = 16;
|
|
/* A PTR must be the same size as a `long int'. */
|
|
flags &= ~(SHORT|LONGDBL);
|
|
if (need_long)
|
|
flags |= LONG;
|
|
number_signed = 0;
|
|
read_pointer = 1;
|
|
goto number;
|
|
|
|
default:
|
|
/* If this is an unknown format character punt. */
|
|
conv_error ();
|
|
}
|
|
}
|
|
|
|
/* The last thing we saw int the format string was a white space.
|
|
Consume the last white spaces. */
|
|
if (skip_space)
|
|
{
|
|
do
|
|
c = inchar ();
|
|
while (ISSPACE (c));
|
|
ungetc (c, s);
|
|
}
|
|
|
|
errout:
|
|
/* Unlock stream. */
|
|
UNLOCK_STREAM (s);
|
|
|
|
if (errp != NULL)
|
|
*errp |= errval;
|
|
|
|
return done;
|
|
}
|
|
|
|
#ifdef COMPILE_WSCANF
|
|
int
|
|
__vfwscanf (FILE *s, const wchar_t *format, va_list argptr)
|
|
{
|
|
return _IO_vfwscanf (s, format, argptr, NULL);
|
|
}
|
|
ldbl_weak_alias (__vfwscanf, vfwscanf)
|
|
#else
|
|
int
|
|
___vfscanf (FILE *s, const char *format, va_list argptr)
|
|
{
|
|
return _IO_vfscanf_internal (s, format, argptr, NULL);
|
|
}
|
|
ldbl_strong_alias (_IO_vfscanf_internal, _IO_vfscanf)
|
|
ldbl_strong_alias (___vfscanf, __vfscanf)
|
|
ldbl_hidden_def (___vfscanf, __vfscanf)
|
|
ldbl_weak_alias (___vfscanf, vfscanf)
|
|
#endif
|