mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-19 11:30:06 +00:00
dfd2257ad9
1997-10-12 05:09 Ulrich Drepper <drepper@cygnus.com> * libio/Makefile (routines): Remove iofprintf. * stdio-common/fprintf.c [USE_IN_LIBIO]: Define _IO_fprintf. * libio/filedoalloc.c: Use _G_stat64 instead of stat. * libio/fileops.c (_IO_file_open): Change to take extra argument indicating whether 32 or 64 bit mode is wanted. * libio/iofopen.c: Call _IO_file_open with extra argument set to 0. * libio/iofopen64.c: Call _IO_file_open with extra argument set to 0. * libio/iolibio.h (_IO_freopen, _IO_freopen64): Likewise. * libio/iofgetpos.c: Pretty print. * libio/iofgetpos64.c: Use _IO_fpos64_t for local variable `pos'. * manual/conf.texi: Document all the _SC_ and _CS_ constants. * manual/creature.texi: Document _LARGEFILE_SOURCE, _LARGEFILE64_SOURCE and _FILE_OFFSET_BITS. * manual/llio.texi: Document truncate and ftruncate. * manual/stdio.texi: Document positional parameters for printf. * math/Makefile (headers): Add tgmath.h. (libm-support): Remove s_lrint, s_llrint, s_lround, and s_llround and move to ... (libm-calls): ... here. Add scalbln, s_nextafterx and s_fma. * math/libm-test.c (lround_test, llround_test): Test for all FP formats by using FUNC(). * math/libm.map: Add fma, fmaf, fmal, nextafterx, nextafterxf, nextafterxl, scalbln, scalblnf, scalblnl, lrintf, lrintl, llrintf, llrintl, lroundf, lroundl, llroundf, and llroundl. * math/math.h: Document new platform specific macros from mathdef.h. Remove declaration of lrint, llrint, lround, and llround. * math/test-double.c: Define TEST_DOUBLE. * math/test-idouble.c: Likewise. * math/test-float.c: Define TEST_FLOAT. * math/test-ifloat.c: Likewise. * math/tgmath.h: New file. * math/bits/mathcalls.h: Add nextafterx, scalbln, fma, lrint, llrint, lround, and llround. Change second argument of scalbn to `int'. * sysdeps/libm-ieee754/s_fma.S: New file. * sysdeps/libm-ieee754/s_fmaf.S: New file. * sysdeps/libm-ieee754/s_fmal.S: New file. * sysdeps/libm-i387/s_fma.S: New file. * sysdeps/libm-i387/s_fmaf.S: New file. * sysdeps/libm-i387/s_fmal.S: New file. * sysdeps/libm-i387/s_llrint.S: Change to take double argument. * sysdeps/libm-i387/s_lrint.S: Likewise. * sysdeps/libm-i387/s_llrintf.S: New file. * sysdeps/libm-i387/s_llrintl.S: New file. * sysdeps/libm-i387/s_lrintf.S: New file. * sysdeps/libm-i387/s_lrintl.S: New file. * sysdeps/libm-ieee754/s_llrint.c: Remove version which works on 80bit double. * sysdeps/libm-ieee754/s_lrint.c: Likewise. * sysdeps/libm-ieee754/s_llrintf.S: New file. * sysdeps/libm-ieee754/s_llrintl.S: New file. * sysdeps/libm-ieee754/s_lrintf.S: New file. * sysdeps/libm-ieee754/s_lrintl.S: New file. * sysdeps/libm-i387/s_scalbln.c: New file. Empty file. * sysdeps/libm-i387/s_scalblnf.c: New file. Empty file. * sysdeps/libm-i387/s_scalblnl.c: New file. Empty file. * sysdeps/libm-i387/s_scalbn.c: Add scalbln as alias. * sysdeps/libm-i387/s_scalbnf.c: Add scalblnf as alias. * sysdeps/libm-i387/s_scalbnl.c: Add scalblnl as alias. * sysdeps/libm-ieee754/s_llround.c: Remove version which works on 80bit double. * sysdeps/libm-ieee754/s_lround.c: Likewise. * sysdeps/libm-ieee754/s_llroundf.c: Likewise. * sysdeps/libm-ieee754/s_llroundl.c: Likewise. * sysdeps/libm-ieee754/s_lroundf.c: Likewise. * sysdeps/libm-ieee754/s_lroundl.c: Likewise. * sysdeps/libm-ieee754/s_nextafterl.c: Add alias fo nextafterxl. * sysdeps/libm-ieee754/s_nextafterx.c: New file. * sysdeps/libm-ieee754/s_nextafterxf.c: New file. * sysdeps/libm-ieee754/s_nextafterxl.c: New file. * sysdeps/libm-ieee754/s_scalbln.c: New file. * sysdeps/libm-ieee754/s_scalblnf.c: New file. * sysdeps/libm-ieee754/s_scalblnl.c: New file. * sysdeps/libm-ieee754/s_scalbn.c: Change to take `int' as second arg. * sysdeps/libm-ieee754/s_scalbnf.c: Likewise. * sysdeps/libm-ieee754/s_scalbnl.c: Likewise. * stdlib/stdlib.h: Protect declarations of __strto*l_internal functions by #ifdefs since they are duplicated in inttypes.h. * sysdeps/wordsize-32/inttypes.h: Add definition of strtoimax and strtoumax plus needed declarations. * sysdeps/generic/confname.h (_SC_AIO_LISTIO_MAX): Fix typo. 1997-10-09 Andreas Jaeger <aj@arthur.rhein-neckar.de> * locale/programs/locfile.c (locfile_read): Correct while loop. * db2/makedb.c (main): Add missing parameter for error output. (process_input): Likewise. * resolv/gethnamaddr.c (getanswer): Rewrite a bit to avoid warning. 1997-10-12 05:05 Ulrich Drepper <drepper@cygnus.com> * libc-map: Add __bzero, __mempcpy. 1997-10-10 18:51 David S. Miller <davem@tanya.rutgers.edu> * sysdeps/unix/sysv/linux/sparc/bits/ioctls.h: Remove dependencies on kernel_termios.h 1997-10-09 10:24 Thorsten Kukuk <kukuk@vt.uni-paderborn.de> Add the changes from the Solaris 2.6 header files, use the new public defines/functions. * nis/nis_addmember.c: Updated. * nis/nis_checkpoint.c: Updated. * nis/nis_creategroup.c: updated. * nis/nis_destroygroup.c: Updated. * nis/nis_getservlist.c: Updated. * nis/nis_ismember.c: Updated. * nis/nis_lookup.c: Updated. * nis/nis_modify.c: Updated. * nis/nis_ping.c: Updated. * nis/nis_print.c: Updated. * nis/nis_print_group_entry.c: Updated. * nis/nis_remove.c: Updated. * nis/nis_removemember.c: Updated. * nis/nis_xdr.c: Updated. * nis/nss_nisplus/nisplus-alias.c: Updated. * nis/nss_nisplus/nisplus-ethers.c: Updated. * nis/nss_nisplus/nisplus-hosts.c: Updated. * nis/nss_nisplus/nisplus-network.c: Updated. * nis/nss_nisplus/nisplus-parser.c: Updated. * nis/nss_nisplus/nisplus-proto.c: Updated. * nis/nss_nisplus/nisplus-rpc.c: Updated. * nis/nss_nisplus/nisplus-service.c: Updated. * nis/rpcsvc/nis.h: Updated. * nis/rpcsvc/nis.x: Updated. * nis/rpcsvc/nis_object.x: Updated. * nis/rpcsvc/nis_tags.h: Updated. * nis/rpcsvc/nislib.h: Updated. * nis/lckcache.c: Removed, since Sun has dropped the directory signatures. The old cache version is now a security risk and not longer supported by Sun. * nis/nis_cache.c: Likewise. * nis/rpcsvc/nis_cache.h: Likewise. * nis/rpcsvc/nis_cache.x: Likewise. * nis/nis_call.c: Remove calls to the cache functions. * nis/libnsl.map: Remove cache and depending functions. * nis/nis_intern.h: Likewise. * nis/nis_add.c: Remove #include <rpcsvc/nislib.h>. * nis/nis_domain_of.c: Likewise. * nis/nis_domain_of_r.c: Likewise. * nis/nis_error.c: Likewise. * nis/nis_file.c: Likewise. * nis/nis_local_names.c: Likewise. * nis/nis_mkdir.c: Likewise. * nis/nis_rmdir.c: Likewise. * nis/nis_subr.c: Likewise. * nis/nis_verifygroup.c: Likewise. * nis/nis_clone.c: Removed, replaced by ... * nis/nis_clone_dir.c: New. * nis/nis_clone_obj.c: New. * nis/nis_clone_res.c: New. * nis/nis_table.c: Fixed bugs shown through the new clone functions. * nis/nis_defaults.c: Fixed a lot of race conditions. * nis/nis_free.c: Rewritten. * sunrpc/auth_des.c: Fix use of free'ed pointer. * nis/Makefile (libnsl-routines): Remove nis_clone, nis_cache and lckcache. Add nis_clone_dir, nis_clone_obj, and nis_clone_res. 1997-10-09 Andreas Jaeger <aj@arthur.rhein-neckar.de> * wctype/test_wctype.c (TEST): Add parens to avoid ambiguity. 1997-10-08 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * include/features.h: Don't crash if _XOPEN_SOURCE is defined to be empty. 1997-10-09 05:54 Ulrich Drepper <drepper@cygnus.com> * nss/digits_dots.c: Place `result' in resbuf and not in `buffer'. * nss/getXXbyYY_r.c: Make sure digits_dots.c sees `resbuf' as struct and not a pointer. Little optimizations. 1997-10-09 05:00 Ulrich Drepper <drepper@cygnus.com> * sysdeps/stub/getenv.c: Remove unused file. * sysdeps/stub/lxstat.c: Likewise. * sysdeps/stub/morecore.c: Likewise. * sysdeps/stub/putenv.c: Likewise. * sysdeps/stub/sbrk.c: Likewise. * sysdeps/stub/setenv.c: Likewise. * sysdeps/stub/sysd-stdio.c: Likewise. * sysdeps/stub/sysdep.h: Likewise. Reported by Zack Weinberg <zack@rabi.phys.columbia.edu>. 1997-10-09 04:58 Ulrich Drepper <drepper@cygnus.com> * configure.in: Add __bzero definition to DWARF2 unwind test. Reported by David S. Miller <davem@caip.rutgers.edu>. 1997-10-07 Paul Eggert <eggert@twinsun.com> * intl/loadmsgcat.c (_nl_load_domain): Fix &&/|| typo when checking file size. Check for overflow when stuffing off_t into size_t. 1997-10-07 18:11 Ulrich Drepper <drepper@cygnus.com> * time/africa: Update from tzdata1997i. 1997-10-07 Andreas Jaeger <aj@arthur.rhein-neckar.de> * posix/globtest.sh: Add arguments for name of dynamic linker and call dynamic linker to execute globtest. * posix/Makefile (tests): Supply arguments to globtest.sh. 1997-10-07 Andreas Jaeger <aj@arthur.rhein-neckar.de> * nis/rpcsvc/ypupd.h: Add missing __END_DECLS. 1997-10-03 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * libc.map: Add mempcpy, prctl. 1997-09-30 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/generic/memcmp.c: Avoid warnings. * sysdeps/generic/memset.c: Likewise. * sysdeps/generic/strchr.c: Likewise. * sysdeps/generic/strlen.c: Likewise. 1997-09-29 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * malloc/Makefile ($(objpfx)mtrace): Fix typo. 1997-09-29 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/m68k/dl-machine.h (elf_machine_rela): Fix last change. The R_68K_GLOB_DAT and R_68K_JMP_SLOT relocations really ignore the addend, Richard. (elf_machine_fixup_plt): Don't add the addend. (elf_machine_plt_value): New function. * sysdeps/alpha/dl-machine.h (elf_machine_plt_value): New function. * sysdeps/sparc/sparc32/dl-machine.h (elf_machine_plt_value): New function. * sysdeps/sparc/sparc64/dl-machine.h (elf_machine_plt_value): New function. * sysdeps/powerpc/dl-machine.h (elf_machine_plt_value): New function. * sysdeps/i386/dl-machine.h (elf_machine_plt_value): New function. * elf/dl-runtime.c (fixup, profile_fixup): Don't add in the addend, instead let the machine dependent setup decide. 1997-09-20 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/m68k/m68020/bits/string.h: New file. 1997-10-07 04:27 Richard Henderson <rth@cygnus.com> * Makeconfig (+includes): Add -I$(objpfx). * stdlib/longlong.h [__sparc__]: Prototype __udiv_qrnnd. * sysdeps/alpha/setjmp.S: __setjmp is the same as _setjmp. Make the former a strong symbol and the later a weak alias. * sysdeps/sparc/sparc32/setjmp.S: Likewise. * sysdeps/unix/sysv/linux/sparc/sparc64/setjmp.S: Likewise. 1997-10-06 21:01 David S. Miller <davem@tanya.rutgers.edu> * sysdeps/unix/sysv/linux/sparc/sparc64/bits/types.h: Make ino_t 64-bits. * sysdeps/unix/sysv/linux/sparc/sparc64/kernel_stat.h: Make st_ino member 64-bits as well, to match the kernel. 1997-10-06 19:35 Ulrich Drepper <drepper@cygnus.com> * sysdeps/sparc/sparc64/sub_n.S: Fix typo. Patch by Jakub Jelinek <jj@sunsite.ms.mff.cuni.cz>. 1997-10-06 01:09 Zack Weinberg <zack@rabi.phys.columbia.edu> * time/README: Correct list of files from tzcode package. Add contact information for tzcode/tzdata maintainers. Correct spelling of author's name. Compact lists. 1997-10-06 01:48 Ulrich Drepper <drepper@cygnus.com> * malloc/malloc.h: Remove hook definition without caller argument. * malloc/malloc.c: Likewise. * string/tester.c: Correct strsep test. * string/bits/string2.h: Define __string2_1bptr_p and use it. Patch by David S. Miller <davem@tanya.rutgers.edu>. * math/Makefile (routines): Add s_clog10. * math/libm-test.c: Add test for clog10. * math/libm.map: Add clog10{,f,l}. * math/bits/cmathcalls.h [__USE_GNU]: Add clog10. * sysdeps/libm-ieee754/s_clog10.c: New file. * sysdeps/libm-ieee754/s_clog10f.c: New file. * sysdeps/libm-ieee754/s_clog10l.c: New file. * manual/math.texi: Describe clog10. * config.h.in: Add USE_REGPARMS and define internal_function based on this. * configure.in: Define USE_REGPARMS for ix86 machines. * gmon/gmon.c: Mark write_hist, write_call_graph and write_bb_counts as internal functions. * inet/getnameinfo.c: Likewise for nrl_domainname. * inet/getnetgrent_r.c: Likewise for __internal_setnetgrent_reuse. * inet/rcmd.c: Likewise for __icheckhost. * intl/dcgettext.c: Likewise for category_to_name and guess_category_value. * intl/localealias.c: Likewise for read_alias_file. * io/fts.c: Likewise for fts_alloc, fts_build, fts_lfree, fts_maxarglen, fts_padjust, fts_palloc, fts_sort, and fts_stat. * libio/genops.c: Likewise for save_for_backup. * malloc/malloc.c (chunk_free, chunk_alloc, chunk_realloc, chunk_align, main_trim, heap_trim): Likewise. * malloc/mtrace.c (tr_where): Likewise. * misc/fstab.c (mnt2fs): Likewise. * misc/getttyent.c (skip, value): Likewise. * misc/syslog.c (openlog_internal): Likewise. * misc/tsearch.c (trecurse, tdestroy_internal): Likewise. * nss/nsswitch.c (nss_lookup_function, nss_parse_file, nss_getline, nss_parse_service_list, nss_new_service): Likewise. * posix/wordexp.c (parse_dollars, parse_backtick, eval_expr): Likewise. * resolv/inet_ntop.c (inet_ntop4, inet_ntop6): Likewise. * resolv/inet_pton.c (inet_pton4, inet_pton6): Likewise. * resolv/res_init.c (res_setoptions): Likewise. * stdio-common/printf_fp.c (group_number): Likewise. * stdio-common/vfprintf.c (buffered_vfprintf, group_number): Likewise. * stdlib/fmtmsg.c (internal_addseverity): Likewise. * sunrpc/auth_des.c (synchronize): Likewise. * sunrpc/auth_unix.c (marshal_new_auth): Likewise. * sunrpc/clnt_perr.c (auth_errmsg): Likewise. * sunrpc/key_call.c (key_call): Likewise. * sunprc/pmap_rmt.c (getbroadcastnets): Likewise. * sunrpc/svc_tcp.c (makefd_xprt): Likewise. * sunrpc/svcauth_des.c (cache_init, cache_spot, cache_ref, invalidate): Likewise. * sunrpc/xdr_rec.c (fix_buf_size, skip_input_bytes, flush_out, set_input_fragment, get_input_bytes): Likewise. * sysdeps/unix/sysv/linux/getsysstats.c (get_proc_path, phys_pages_info): Likewise. * sysdeps/unix/sysv/linux/if_index.c (opensock): Likewise. * sysdeps/unix/sysv/linux/poll.c (__emulate_poll): Likewise. * sysdeps/unix/sysv/linux/readv.c (__atomic_readv_replacement): Likewise. * sysdeps/unix/sysv/linux/readv.c (__atomic_writev_replacement): Likewise. * time/strptime.c (strptime_internal): Likewise. * time/tzfile.c (find_transition, compute_tzname_max): Likewise. * time/tzset.c (compute_change, tz_compute, tzset_internal): Likewise. * libc.map: Remove _libio_using_thunks, add _fp_hw and _dl_addr. * ctype/ctype.h: Pretty print. * grp/grp.h: Likewise. * include/libc-symbols.h: Likewise. * include/limits.h: Likewise. * include/values.h: Likewise. * io/fcntl.h: Likewise. * io/sys/stat.h: Likewise. * libio/stdio.h: Likewise. * malloc/malloc.h: Likewise. * misc/err.h: Likewise. * misc/regexp.h: Likewise. * misc/sys/cdefs.h: Likewise. * misc/sys/file.h: Likewise. * posix/sys/utsname.h: Likewise. * posix/sys/wait.h: Likewise. * pwd/pwd.h: Likewise. * resolv/netdb.h: Likewise. * signal/signal.h: Likewise. * stdlib/stdlib.h: Likewise. * string/endian.h: Likewise. * string/memory.h: Likewise. * sysdeps/mach/hurd/bits/fcntl.h: Likewise. * sysdeps/mach/hurd/sys/param.h: Likewise. * sysdeps/unix/sysv/linux/sys/param.h: Likewise. * termios/termios.h: Likewise. * wcsmbs/wchar.h: Likewise. * wctype/wctype.h: Likewise. * sysdeps/unix/bsd/bsd4.4/wait3.c: Use __WAIT_STATUS in definition. Implement Large File Support API. * include/features.h: Add suuport for _LARGEFILE_SOURCE, _LARGEFILE64_SOURCE, and _FILE_OFFSET_BITS. * libc.map: Add new functions for LFS. * dirent/Makefile (routines): Add readdir64 and readdir64_r. * dirent/dirent.h: Update readdir prototype for LFS and add new prototypes for above functions. * io/Makefile (routines): Add xstat64, fxstat64, lxstat64, statfs64, fstatfs64, lstat64, open64, lseek64, creat64, and ftw64. * io/creat64.c: New file. * io/fstat64.c: New file. * io/lstat64.c: New file. * io/stat64.c: New file. * io/ftw64.c: New file. * io/ftw.c: Rewrite to allow easy definition of ftw64. * io/ftw.h: Add LFS interface. * io/fcntl.h: Likewise. * io/sys/stat.h: Likewise. * io/sys/statfs.h: Likewise. * libio/Makefile (routines): Add iofgetpos64, iofopen64, iofsetpos64, freopen64, fseeko64, and ftello64. * libcio/fseeko64.c: New file. * libio/ftello64.c: New file. * libio/iofgetpos64.c: New file. * libio/iofopen64.c: New file. * libio/iofsetpos64.c: New file. * libio/fileops.c (_IO_file_fopen): Change to use _IO_off64_t. (_IO_file_attach): Likewise. (_IO_do_write): Likewise. (_IO_file_sync): Likewise. (_IO_file_seek): Likewise. (_IO_file_seekoff): Likewise. Use _G_stat64. (_IO_file_fopen64): New function. (_IO_file_jumps): Initialize showmanyc and imbue. * libio/genops.c (_IO_default_seekpos): Change to use _IO_fpos64_t. (_IO_default_seekoff): Likewise. (_IO_default_seek): Likewise. (_IO_default_showmanyc, _IO_default_imbue): New functions. * libio/iofopncook.c (_IO_cookie_seek): Change to use _IO_off64_t. * libio/iolibio.h: Add prototypes for LFS functions. * libio/ioseekoff.c: Change to use _IO_fpos64_t. * libio/ioseekpos.c: Likewise. * libio/libio.h: Define _IO_fpos64_t and _IO_off64_t. (_IO_FILE): Move _offset field to end and change type to _IO_off64_t. (_IO_seekoff, _IO_seekpos): Change prototype. * libio/libioP.h (_IO_seekoff_t, _IO_seekpos_t, _IO_seek_t): Change to use _IO_off64_t. Change prototypes for function from the *ops.c files. * libio/stdio.h: Add LFS interface definition. * libio/strops.c (_IO_str_seekoff): Change to use _IO_fpos64_t. * posix/Makefile (routines): Add pread64 and pwrite64. * posix/confstr.c: Handle _CS_LFS* requests. * posix/getconf.c: Handle LFS* requests. * sysdeps/generic/confname.h: Add _CS_LFS* constants. * posix/unistd.h: Document _LFS64_LARGEFILE and _LFS64_STDIO. Define off_t and off64_t appropriately. Change prototypes of LFS functions. * posix/sys/types.h: Add LFS types. * resources/Makefile (routines): Add getrlimit64 and setlimit64. * resource/sys/resource.h: Change prototypes of LFS functions. * stdio-common/Makefile (routines): Add tmpfile64. * stdio-common/tmpfile64.c: New file. * sysdeps/generic/_G_config.h: Define _G_fpos64_t and _G_off64_t. Define _G_OPEN64, _G_LSEEK64, _G_FSTAT64. * sysdeps/unix/sysv/linux/_G_config.h: Likewise. * sysdeps/generic/bits/resource.h: Add LFS definitions. * sysdeps/unix/bsd/sun/sunos4/bits/resource.h: Likewise. * sysdeps/unix/sysv/linux/bits/resource.h: Likewise. * sysdeps/generic/statfs.h: Use __fsblkcnt_t for some of the fields. * sysdeps/unix/sysv/linux/bits/statfs.h: Likewise. * sysdeps/unix/sysv/linux/mips/bits/statfs.h: Likewise. * sysdeps/generic/types.h: Define LFS types. * sysdeps/unix/sysv/linux/alpha/bits/types.h: Likewise. * sysdeps/unix/sysv/linux/bits/types.h: Likewise. * sysdeps/unix/sysv/linux/sparc/sparc64/bits/types.h: Likewise. * sysdeps/generic/sys/mman.h: Add LFS definitions. * sysdeps/unix/sysv/linux/sys/mman.h: Likewise. * sysdeps/generic/mach/hurd/bits/fcntl.h: Add flock LFS extensions. * sysdeps/unix/bsd/bits/fcntl.h: Likewise. * sysdeps/unix/sysv/linux/alpha/bits/fcntl.h: Likewise. * sysdeps/unix/sysv/linux/bits/fcntl.h: Likewise. * sysdeps/unix/sysv/linux/mips/bits/fcntl.h: Likewise. * sysdeps/generic/mach/hurd/bits/stat.h: Add stat LFS extensions. * sysdeps/unix/bsd/bits/stat.h: Likewise. * sysdeps/unix/bsd/osf/alpha/bits/stat.h: Likewise. * sysdeps/unix/sysv/linux/alpha/bits/stat.h: Likewise. * sysdeps/unix/sysv/linux/bits/stat.h: Likewise. * sysdeps/unix/sysv/linux/mips/bits/stat.h: Likewise. * sysdeps/unix/sysv/linux/sparc/bits/stat.h: Likewise. * sysdeps/unix/sysv/sysv4/i386/bits/stat.h: Likewise. * sysdeps/unix/sysv/sysv4/solaris2/bits/stat.h: Likewise. * sysdeps/posix/open64.c: New file. * sysdeps/stub/fstatfs64.c: New file. * sysdeps/stub/fxstat64.c: New file. * sysdeps/stub/getrlimit64.c: New file. * sysdeps/stub/lseek64.c: New file. * sysdeps/stub/lxstat64.c: New file. * sysdeps/stub/open64.c: New file. * sysdeps/stub/pread64.c: New file. * sysdeps/stub/pwrite64.c: New file. * sysdeps/stub/readdir64.c: New file. * sysdeps/stub/readdir64_r.c: New file. * sysdeps/stub/setrlimit64.c: New file. * sysdeps/stub/statfs64.c: New file. * sysdeps/stub/xstat64.c: New file. * sysdeps/unix/sysv/linux/llseek.c: Define as __llseek and make llseek and lseek64 weak aliases. * sysdeps/unix/sysv/linux/lseek64.c: New file. Empty. * sysdeps/unix/sysv/linux/alpha/bits/dirent.h: New file. * sysdeps/unix/sysv/linux/bits/dirent.h: Add LFS definitions. * sysdeps/posix/tempname.c: Add extra argument to trigger use of open64. * sysdeps/stub/tempname.c: Likewise. * stdio-common/tempnam.c: Call __stdio_gen_tempname with extra argument. * stdio-common/tmpfile.c: Likewise. * stdio-common/tmpnam.c: Likewise. * stdio-common/tmpnam_r.c: Likewise. * libio/libioP.h: Add definition ofr showmanyc and imbue callbacks. * libio/fileops.c (_IO_file_jumps): Initialize showmanyc and imbue. * libio/iofopncook.c (_IO_cookie_jumps): Likewise. * libio/iopopen.c (_IO_proc_jumps): Likewise. * libio/memstream.c (_IO_mem_jumps): Likewise. * libio/obprintf.c (_IO_obstack_jumps): Likewise. * libio/vsnprintf.c (_IO_strn_jumps): Likewise. * libio/strops.c (_IO_str_jumps): Likewise. * manual/arith.texi: Add a few words why cabs should be used. * manual/llio.texi: Describe sync, fsync, fdatasync. Tell about cleanup handlers & fcntl,lseek,write,read,close,open. * manual/process.texi: Tell about cleanup handlers & system,waitpid, wait. * manual/signal.texi: Likewise for pause. * manual/terminal.texi: Likewise for tcdrain. * manual/time.texi: Document nanosleep. * posix/exevp.c: Don't use nested function. * stdlib/ucontext.h: New file. * sysdeps/i386/sys/ucontext.h: New file. SysV/i386 API definitions. * sunrpc/xcrypt.c (hexval): Make a macro for efficiency. * sysdeps/i386/setjmp.h: Make `here` label local. * sysdeps/i386/elf/start.S: Define _fp_hw "variable". * sysdeps/stub/fstatfs.c: Correct warning. * sysdeps/stub/fxstat.c: Likewise. * sysdeps/stub/lxstat.c: Likewise. * sysdeps/unix/sysv/i386/i686/time.S: New file. 1997-10-03 20:56 Jason Merrill <jason@yorick.cygnus.com> * malloc/obstack.h (obstack_empty_p): New macro. 1997-10-04 17:41 Philip Blundell <Philip.Blundell@pobox.com> * inet/getnameinfo.c (getnameinfo): Remove spurious `#if INET6'. 1997-09-30 Zack Weinberg <zack@rabi.phys.columbia.edu> * maint.texi: Add copyright terms for libdb (Sleepycat, Harvard). Document new --with-binutils switch; delete reference to --with-gnu-as, --with-gnu-ld, --with-gnu-binutils. Add to description of --without-fp: a kernel FPU emulator is adequate (from FAQ) * INSTALL: Regenerated. 1997-09-30 17:29 Richard Henderson <rth@cygnus.com> * sysdeps/sparc/sparc32/dl-machine.h (elf_machine_rela): Move _dl_hwcap declaration to ... (elf_machine_fixup_plt): ... here.
1677 lines
53 KiB
C
1677 lines
53 KiB
C
/* Copyright (C) 1991, 92, 93, 94, 95, 96, 97 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 Library General Public License as
|
||
published by the Free Software Foundation; either version 2 of the
|
||
License, or (at your option) any later version.
|
||
|
||
The GNU C Library is distributed in the hope that it will be useful,
|
||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||
Library General Public License for more details.
|
||
|
||
You should have received a copy of the GNU Library General Public
|
||
License along with the GNU C Library; see the file COPYING.LIB. If not,
|
||
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
||
Boston, MA 02111-1307, USA. */
|
||
|
||
#include <ctype.h>
|
||
#include <limits.h>
|
||
#include <printf.h>
|
||
#include <stdarg.h>
|
||
#include <stdlib.h>
|
||
#include <errno.h>
|
||
#include <wchar.h>
|
||
#include <bits/libc-lock.h>
|
||
#include <sys/param.h>
|
||
#include "_itoa.h"
|
||
#include "../locale/localeinfo.h"
|
||
|
||
/* This code is shared between the standard stdio implementation found
|
||
in GNU C library and the libio implementation originally found in
|
||
GNU libg++.
|
||
|
||
Beside this it is also shared between the normal and wide character
|
||
implementation as defined in ISO/IEC 9899:1990/Amendment 1:1995. */
|
||
|
||
#ifndef COMPILE_WPRINTF
|
||
# define CHAR_T char
|
||
# define UCHAR_T unsigned char
|
||
# define INT_T int
|
||
# define L_(Str) Str
|
||
# define ISDIGIT(Ch) isdigit (Ch)
|
||
|
||
# ifdef USE_IN_LIBIO
|
||
# define PUT(F, S, N) _IO_sputn ((F), (S), (N))
|
||
# define PAD(Padchar) \
|
||
if (width > 0) \
|
||
done += _IO_padn (s, (Padchar), width)
|
||
# else
|
||
# define PUTC(C, F) putc (C, F)
|
||
ssize_t __printf_pad __P ((FILE *, char pad, size_t n));
|
||
# define PAD(Padchar) \
|
||
if (width > 0) \
|
||
{ ssize_t __res = __printf_pad (s, (Padchar), width); \
|
||
if (__res == -1) return -1; \
|
||
done += __res; }
|
||
# endif
|
||
#else
|
||
# define vfprintf vfwprintf
|
||
# define CHAR_T wchar_t
|
||
# define UCHAR_T uwchar_t
|
||
# define INT_T wint_t
|
||
# define L_(Str) L##Str
|
||
# define ISDIGIT(Ch) iswdigit (Ch)
|
||
|
||
# ifdef USE_IN_LIBIO
|
||
# define PUT(F, S, N) _IO_sputn ((F), (S), (N))
|
||
# define PAD(Padchar) \
|
||
if (width > 0) \
|
||
done += _IO_wpadn (s, (Padchar), width)
|
||
# else
|
||
# define PUTC(C, F) wputc (C, F)
|
||
ssize_t __wprintf_pad __P ((FILE *, wchar_t pad, size_t n));
|
||
# define PAD(Padchar) \
|
||
if (width > 0) \
|
||
{ ssize_t __res = __wprintf_pad (s, (Padchar), width); \
|
||
if (__res == -1) return -1; \
|
||
done += __res; }
|
||
# endif
|
||
#endif
|
||
|
||
/* Include the shared code for parsing the format string. */
|
||
#include "printf-parse.h"
|
||
|
||
|
||
#ifdef USE_IN_LIBIO
|
||
/* This code is for use in libio. */
|
||
# include <libioP.h>
|
||
# define PUTC(C, F) _IO_putc_unlocked (C, F)
|
||
# define vfprintf _IO_vfprintf
|
||
# define FILE _IO_FILE
|
||
# undef va_list
|
||
# define va_list _IO_va_list
|
||
# undef BUFSIZ
|
||
# define BUFSIZ _IO_BUFSIZ
|
||
# define ARGCHECK(S, Format) \
|
||
do \
|
||
{ \
|
||
/* Check file argument for consistence. */ \
|
||
CHECK_FILE (S, -1); \
|
||
if (S->_flags & _IO_NO_WRITES) \
|
||
{ \
|
||
__set_errno (EBADF); \
|
||
return -1; \
|
||
} \
|
||
if (Format == NULL) \
|
||
{ \
|
||
MAYBE_SET_EINVAL; \
|
||
return -1; \
|
||
} \
|
||
} while (0)
|
||
# define UNBUFFERED_P(S) ((S)->_IO_file_flags & _IO_UNBUFFERED)
|
||
#else /* ! USE_IN_LIBIO */
|
||
/* This code is for use in the GNU C library. */
|
||
# include <stdio.h>
|
||
# define PUT(F, S, N) fwrite (S, 1, N, F)
|
||
# define ARGCHECK(S, Format) \
|
||
do \
|
||
{ \
|
||
/* Check file argument for consistence. */ \
|
||
if (!__validfp (S) || !S->__mode.__write) \
|
||
{ \
|
||
__set_errno (EBADF); \
|
||
return -1; \
|
||
} \
|
||
if (Format == NULL) \
|
||
{ \
|
||
__set_errno (EINVAL); \
|
||
return -1; \
|
||
} \
|
||
if (!S->__seen) \
|
||
{ \
|
||
if (__flshfp (S, EOF) == EOF) \
|
||
return -1; \
|
||
} \
|
||
} \
|
||
while (0)
|
||
# define UNBUFFERED_P(s) ((s)->__buffer == NULL)
|
||
|
||
/* XXX These declarations should go as soon as the stdio header files
|
||
have these prototypes. */
|
||
extern void __flockfile (FILE *);
|
||
extern void __funlockfile (FILE *);
|
||
#endif /* USE_IN_LIBIO */
|
||
|
||
|
||
#define outchar(Ch) \
|
||
do \
|
||
{ \
|
||
register const int outc = (Ch); \
|
||
if (PUTC (outc, s) == EOF) \
|
||
return -1; \
|
||
else \
|
||
++done; \
|
||
} \
|
||
while (0)
|
||
|
||
#define outstring(String, Len) \
|
||
do \
|
||
{ \
|
||
if ((size_t) PUT (s, (String), (Len)) != (size_t) (Len)) \
|
||
return -1; \
|
||
done += (Len); \
|
||
} \
|
||
while (0)
|
||
|
||
/* For handling long_double and longlong we use the same flag. */
|
||
#ifndef is_longlong
|
||
# define is_longlong is_long_double
|
||
#endif
|
||
|
||
|
||
/* Global variables. */
|
||
static const char null[] = "(null)";
|
||
|
||
|
||
/* Helper function to provide temporary buffering for unbuffered streams. */
|
||
static int buffered_vfprintf __P ((FILE *stream, const CHAR_T *fmt, va_list))
|
||
internal_function;
|
||
|
||
/* Handle unknown format specifier. */
|
||
static int printf_unknown __P ((FILE *, const struct printf_info *,
|
||
const void *const *));
|
||
|
||
/* Group digits of number string. */
|
||
static char *group_number __P ((CHAR_T *, CHAR_T *, const CHAR_T *, wchar_t))
|
||
internal_function;
|
||
|
||
|
||
/* The function itself. */
|
||
int
|
||
vfprintf (FILE *s, const CHAR_T *format, va_list ap)
|
||
{
|
||
/* The character used as thousands separator. */
|
||
wchar_t thousands_sep;
|
||
|
||
/* The string describing the size of groups of digits. */
|
||
const char *grouping;
|
||
|
||
/* Place to accumulate the result. */
|
||
int done;
|
||
|
||
/* Current character in format string. */
|
||
const UCHAR_T *f;
|
||
|
||
/* End of leading constant string. */
|
||
const UCHAR_T *lead_str_end;
|
||
|
||
/* Points to next format specifier. */
|
||
const UCHAR_T *end_of_spec;
|
||
|
||
/* Buffer intermediate results. */
|
||
char work_buffer[1000];
|
||
#define workend (&work_buffer[sizeof (work_buffer) - 1])
|
||
|
||
/* State for restartable multibyte character handling functions. */
|
||
mbstate_t mbstate;
|
||
|
||
/* We have to save the original argument pointer. */
|
||
va_list ap_save;
|
||
|
||
/* Count number of specifiers we already processed. */
|
||
int nspecs_done;
|
||
|
||
/* For the %m format we may need the current `errno' value. */
|
||
int save_errno = errno;
|
||
|
||
|
||
/* This table maps a character into a number representing a
|
||
class. In each step there is a destination label for each
|
||
class. */
|
||
static const int jump_table[] =
|
||
{
|
||
/* ' ' */ 1, 0, 0, /* '#' */ 4,
|
||
0, /* '%' */ 14, 0, /* '\''*/ 6,
|
||
0, 0, /* '*' */ 7, /* '+' */ 2,
|
||
0, /* '-' */ 3, /* '.' */ 9, 0,
|
||
/* '0' */ 5, /* '1' */ 8, /* '2' */ 8, /* '3' */ 8,
|
||
/* '4' */ 8, /* '5' */ 8, /* '6' */ 8, /* '7' */ 8,
|
||
/* '8' */ 8, /* '9' */ 8, 0, 0,
|
||
0, 0, 0, 0,
|
||
0, /* 'A' */ 26, 0, /* 'C' */ 25,
|
||
0, /* 'E' */ 19, 0, /* 'G' */ 19,
|
||
0, 0, 0, 0,
|
||
/* 'L' */ 12, 0, 0, 0,
|
||
0, 0, 0, /* 'S' */ 21,
|
||
0, 0, 0, 0,
|
||
/* 'X' */ 18, 0, /* 'Z' */ 13, 0,
|
||
0, 0, 0, 0,
|
||
0, /* 'a' */ 26, 0, /* 'c' */ 20,
|
||
/* 'd' */ 15, /* 'e' */ 19, /* 'f' */ 19, /* 'g' */ 19,
|
||
/* 'h' */ 10, /* 'i' */ 15, 0, 0,
|
||
/* 'l' */ 11, /* 'm' */ 24, /* 'n' */ 23, /* 'o' */ 17,
|
||
/* 'p' */ 22, /* 'q' */ 12, 0, /* 's' */ 21,
|
||
0, /* 'u' */ 16, 0, 0,
|
||
/* 'x' */ 18
|
||
};
|
||
|
||
#define NOT_IN_JUMP_RANGE(Ch) ((Ch) < ' ' || (Ch) > 'x')
|
||
#define CHAR_CLASS(Ch) (jump_table[(int) (Ch) - ' '])
|
||
#define JUMP(ChExpr, table) \
|
||
do \
|
||
{ \
|
||
const void *ptr; \
|
||
spec = (ChExpr); \
|
||
ptr = NOT_IN_JUMP_RANGE (spec) ? REF (form_unknown) \
|
||
: table[CHAR_CLASS (spec)]; \
|
||
goto *ptr; \
|
||
} \
|
||
while (0)
|
||
|
||
#define STEP0_3_TABLE \
|
||
/* Step 0: at the beginning. */ \
|
||
static const void *step0_jumps[27] = \
|
||
{ \
|
||
REF (form_unknown), \
|
||
REF (flag_space), /* for ' ' */ \
|
||
REF (flag_plus), /* for '+' */ \
|
||
REF (flag_minus), /* for '-' */ \
|
||
REF (flag_hash), /* for '<hash>' */ \
|
||
REF (flag_zero), /* for '0' */ \
|
||
REF (flag_quote), /* for '\'' */ \
|
||
REF (width_asterics), /* for '*' */ \
|
||
REF (width), /* for '1'...'9' */ \
|
||
REF (precision), /* for '.' */ \
|
||
REF (mod_half), /* for 'h' */ \
|
||
REF (mod_long), /* for 'l' */ \
|
||
REF (mod_longlong), /* for 'L', 'q' */ \
|
||
REF (mod_size_t), /* for 'Z' */ \
|
||
REF (form_percent), /* for '%' */ \
|
||
REF (form_integer), /* for 'd', 'i' */ \
|
||
REF (form_unsigned), /* for 'u' */ \
|
||
REF (form_octal), /* for 'o' */ \
|
||
REF (form_hexa), /* for 'X', 'x' */ \
|
||
REF (form_float), /* for 'E', 'e', 'f', 'G', 'g' */ \
|
||
REF (form_character), /* for 'c' */ \
|
||
REF (form_string), /* for 's', 'S' */ \
|
||
REF (form_pointer), /* for 'p' */ \
|
||
REF (form_number), /* for 'n' */ \
|
||
REF (form_strerror), /* for 'm' */ \
|
||
REF (form_wcharacter), /* for 'C' */ \
|
||
REF (form_floathex) /* for 'A', 'a' */ \
|
||
}; \
|
||
/* Step 1: after processing width. */ \
|
||
static const void *step1_jumps[27] = \
|
||
{ \
|
||
REF (form_unknown), \
|
||
REF (form_unknown), /* for ' ' */ \
|
||
REF (form_unknown), /* for '+' */ \
|
||
REF (form_unknown), /* for '-' */ \
|
||
REF (form_unknown), /* for '<hash>' */ \
|
||
REF (form_unknown), /* for '0' */ \
|
||
REF (form_unknown), /* for '\'' */ \
|
||
REF (form_unknown), /* for '*' */ \
|
||
REF (form_unknown), /* for '1'...'9' */ \
|
||
REF (precision), /* for '.' */ \
|
||
REF (mod_half), /* for 'h' */ \
|
||
REF (mod_long), /* for 'l' */ \
|
||
REF (mod_longlong), /* for 'L', 'q' */ \
|
||
REF (mod_size_t), /* for 'Z' */ \
|
||
REF (form_percent), /* for '%' */ \
|
||
REF (form_integer), /* for 'd', 'i' */ \
|
||
REF (form_unsigned), /* for 'u' */ \
|
||
REF (form_octal), /* for 'o' */ \
|
||
REF (form_hexa), /* for 'X', 'x' */ \
|
||
REF (form_float), /* for 'E', 'e', 'f', 'G', 'g' */ \
|
||
REF (form_character), /* for 'c' */ \
|
||
REF (form_string), /* for 's', 'S' */ \
|
||
REF (form_pointer), /* for 'p' */ \
|
||
REF (form_number), /* for 'n' */ \
|
||
REF (form_strerror), /* for 'm' */ \
|
||
REF (form_wcharacter), /* for 'C' */ \
|
||
REF (form_floathex) /* for 'A', 'a' */ \
|
||
}; \
|
||
/* Step 2: after processing precision. */ \
|
||
static const void *step2_jumps[27] = \
|
||
{ \
|
||
REF (form_unknown), \
|
||
REF (form_unknown), /* for ' ' */ \
|
||
REF (form_unknown), /* for '+' */ \
|
||
REF (form_unknown), /* for '-' */ \
|
||
REF (form_unknown), /* for '<hash>' */ \
|
||
REF (form_unknown), /* for '0' */ \
|
||
REF (form_unknown), /* for '\'' */ \
|
||
REF (form_unknown), /* for '*' */ \
|
||
REF (form_unknown), /* for '1'...'9' */ \
|
||
REF (form_unknown), /* for '.' */ \
|
||
REF (mod_half), /* for 'h' */ \
|
||
REF (mod_long), /* for 'l' */ \
|
||
REF (mod_longlong), /* for 'L', 'q' */ \
|
||
REF (mod_size_t), /* for 'Z' */ \
|
||
REF (form_percent), /* for '%' */ \
|
||
REF (form_integer), /* for 'd', 'i' */ \
|
||
REF (form_unsigned), /* for 'u' */ \
|
||
REF (form_octal), /* for 'o' */ \
|
||
REF (form_hexa), /* for 'X', 'x' */ \
|
||
REF (form_float), /* for 'E', 'e', 'f', 'G', 'g' */ \
|
||
REF (form_character), /* for 'c' */ \
|
||
REF (form_string), /* for 's', 'S' */ \
|
||
REF (form_pointer), /* for 'p' */ \
|
||
REF (form_number), /* for 'n' */ \
|
||
REF (form_strerror), /* for 'm' */ \
|
||
REF (form_wcharacter), /* for 'C' */ \
|
||
REF (form_floathex) /* for 'A', 'a' */ \
|
||
}; \
|
||
/* Step 3: after processing first 'l' modifier. */ \
|
||
static const void *step3_jumps[27] = \
|
||
{ \
|
||
REF (form_unknown), \
|
||
REF (form_unknown), /* for ' ' */ \
|
||
REF (form_unknown), /* for '+' */ \
|
||
REF (form_unknown), /* for '-' */ \
|
||
REF (form_unknown), /* for '<hash>' */ \
|
||
REF (form_unknown), /* for '0' */ \
|
||
REF (form_unknown), /* for '\'' */ \
|
||
REF (form_unknown), /* for '*' */ \
|
||
REF (form_unknown), /* for '1'...'9' */ \
|
||
REF (form_unknown), /* for '.' */ \
|
||
REF (form_unknown), /* for 'h' */ \
|
||
REF (mod_longlong), /* for 'l' */ \
|
||
REF (form_unknown), /* for 'L', 'q' */ \
|
||
REF (form_unknown), /* for 'Z' */ \
|
||
REF (form_percent), /* for '%' */ \
|
||
REF (form_integer), /* for 'd', 'i' */ \
|
||
REF (form_unsigned), /* for 'u' */ \
|
||
REF (form_octal), /* for 'o' */ \
|
||
REF (form_hexa), /* for 'X', 'x' */ \
|
||
REF (form_float), /* for 'E', 'e', 'f', 'G', 'g' */ \
|
||
REF (form_character), /* for 'c' */ \
|
||
REF (form_string), /* for 's', 'S' */ \
|
||
REF (form_pointer), /* for 'p' */ \
|
||
REF (form_number), /* for 'n' */ \
|
||
REF (form_strerror), /* for 'm' */ \
|
||
REF (form_wcharacter), /* for 'C' */ \
|
||
REF (form_floathex) /* for 'A', 'a' */ \
|
||
}
|
||
|
||
#define STEP4_TABLE \
|
||
/* Step 4: processing format specifier. */ \
|
||
static const void *step4_jumps[27] = \
|
||
{ \
|
||
REF (form_unknown), \
|
||
REF (form_unknown), /* for ' ' */ \
|
||
REF (form_unknown), /* for '+' */ \
|
||
REF (form_unknown), /* for '-' */ \
|
||
REF (form_unknown), /* for '<hash>' */ \
|
||
REF (form_unknown), /* for '0' */ \
|
||
REF (form_unknown), /* for '\'' */ \
|
||
REF (form_unknown), /* for '*' */ \
|
||
REF (form_unknown), /* for '1'...'9' */ \
|
||
REF (form_unknown), /* for '.' */ \
|
||
REF (form_unknown), /* for 'h' */ \
|
||
REF (form_unknown), /* for 'l' */ \
|
||
REF (form_unknown), /* for 'L', 'q' */ \
|
||
REF (form_unknown), /* for 'Z' */ \
|
||
REF (form_percent), /* for '%' */ \
|
||
REF (form_integer), /* for 'd', 'i' */ \
|
||
REF (form_unsigned), /* for 'u' */ \
|
||
REF (form_octal), /* for 'o' */ \
|
||
REF (form_hexa), /* for 'X', 'x' */ \
|
||
REF (form_float), /* for 'E', 'e', 'f', 'G', 'g' */ \
|
||
REF (form_character), /* for 'c' */ \
|
||
REF (form_string), /* for 's', 'S' */ \
|
||
REF (form_pointer), /* for 'p' */ \
|
||
REF (form_number), /* for 'n' */ \
|
||
REF (form_strerror), /* for 'm' */ \
|
||
REF (form_wcharacter), /* for 'C' */ \
|
||
REF (form_floathex) /* for 'A', 'a' */ \
|
||
}
|
||
|
||
|
||
#define process_arg(fspec) \
|
||
/* Start real work. We know about all flags and modifiers and \
|
||
now process the wanted format specifier. */ \
|
||
LABEL (form_percent): \
|
||
/* Write a literal "%". */ \
|
||
outchar ('%'); \
|
||
break; \
|
||
\
|
||
LABEL (form_integer): \
|
||
/* Signed decimal integer. */ \
|
||
base = 10; \
|
||
\
|
||
if (is_longlong) \
|
||
{ \
|
||
long long int signed_number; \
|
||
\
|
||
if (fspec == NULL) \
|
||
signed_number = va_arg (ap, long long int); \
|
||
else \
|
||
signed_number = args_value[fspec->data_arg].pa_long_long_int; \
|
||
\
|
||
is_negative = signed_number < 0; \
|
||
number.longlong = is_negative ? (- signed_number) : signed_number; \
|
||
\
|
||
goto LABEL (longlong_number); \
|
||
} \
|
||
else \
|
||
{ \
|
||
long int signed_number; \
|
||
\
|
||
if (fspec == NULL) \
|
||
if (is_long) \
|
||
signed_number = va_arg (ap, long int); \
|
||
else /* `short int' will be promoted to `int'. */ \
|
||
signed_number = va_arg (ap, int); \
|
||
else \
|
||
if (is_long) \
|
||
signed_number = args_value[fspec->data_arg].pa_long_int; \
|
||
else \
|
||
signed_number = args_value[fspec->data_arg].pa_int; \
|
||
\
|
||
is_negative = signed_number < 0; \
|
||
number.word = is_negative ? (- signed_number) : signed_number; \
|
||
\
|
||
goto LABEL (number); \
|
||
} \
|
||
/* NOTREACHED */ \
|
||
\
|
||
LABEL (form_unsigned): \
|
||
/* Unsigned decimal integer. */ \
|
||
base = 10; \
|
||
goto LABEL (unsigned_number); \
|
||
/* NOTREACHED */ \
|
||
\
|
||
LABEL (form_octal): \
|
||
/* Unsigned octal integer. */ \
|
||
base = 8; \
|
||
goto LABEL (unsigned_number); \
|
||
/* NOTREACHED */ \
|
||
\
|
||
LABEL (form_hexa): \
|
||
/* Unsigned hexadecimal integer. */ \
|
||
base = 16; \
|
||
\
|
||
LABEL (unsigned_number): /* Unsigned number of base BASE. */ \
|
||
\
|
||
/* ANSI specifies the `+' and ` ' flags only for signed \
|
||
conversions. */ \
|
||
is_negative = 0; \
|
||
showsign = 0; \
|
||
space = 0; \
|
||
\
|
||
if (is_longlong) \
|
||
{ \
|
||
if (fspec == NULL) \
|
||
number.longlong = va_arg (ap, unsigned long long int); \
|
||
else \
|
||
number.longlong = args_value[fspec->data_arg].pa_u_long_long_int; \
|
||
\
|
||
LABEL (longlong_number): \
|
||
if (prec < 0) \
|
||
/* Supply a default precision if none was given. */ \
|
||
prec = 1; \
|
||
else \
|
||
/* We have to take care for the '0' flag. If a precision \
|
||
is given it must be ignored. */ \
|
||
pad = ' '; \
|
||
\
|
||
/* If the precision is 0 and the number is 0 nothing has to \
|
||
be written for the number. */ \
|
||
if (prec == 0 && number.longlong == 0) \
|
||
string = workend; \
|
||
else \
|
||
{ \
|
||
/* Put the number in WORK. */ \
|
||
string = _itoa (number.longlong, workend + 1, base, \
|
||
spec == 'X'); \
|
||
string -= 1; \
|
||
if (group && grouping) \
|
||
string = group_number (string, workend, grouping, \
|
||
thousands_sep); \
|
||
} \
|
||
/* Simply further test for num != 0. */ \
|
||
number.word = number.longlong != 0; \
|
||
} \
|
||
else \
|
||
{ \
|
||
if (fspec == NULL) \
|
||
if (is_long) \
|
||
number.word = va_arg (ap, unsigned long int); \
|
||
else if (!is_short) \
|
||
number.word = va_arg (ap, unsigned int); \
|
||
else \
|
||
number.word = (unsigned short int) va_arg (ap, unsigned int); \
|
||
else \
|
||
if (is_long) \
|
||
number.word = args_value[fspec->data_arg].pa_u_long_int; \
|
||
else if (!is_short) \
|
||
number.word = args_value[fspec->data_arg].pa_u_int; \
|
||
else \
|
||
number.word = (unsigned short int) \
|
||
args_value[fspec->data_arg].pa_u_short_int; \
|
||
\
|
||
LABEL (number): \
|
||
if (prec < 0) \
|
||
/* Supply a default precision if none was given. */ \
|
||
prec = 1; \
|
||
else \
|
||
/* We have to take care for the '0' flag. If a precision \
|
||
is given it must be ignored. */ \
|
||
pad = ' '; \
|
||
\
|
||
/* If the precision is 0 and the number is 0 nothing has to \
|
||
be written for the number. */ \
|
||
if (prec == 0 && number.word == 0) \
|
||
string = workend; \
|
||
else \
|
||
{ \
|
||
/* Put the number in WORK. */ \
|
||
string = _itoa_word (number.word, workend + 1, base, \
|
||
spec == 'X'); \
|
||
string -= 1; \
|
||
if (group && grouping) \
|
||
string = group_number (string, workend, grouping, \
|
||
thousands_sep); \
|
||
} \
|
||
} \
|
||
\
|
||
prec -= workend - string; \
|
||
\
|
||
if (prec > 0) \
|
||
/* Add zeros to the precision. */ \
|
||
while (prec-- > 0) \
|
||
*string-- = '0'; \
|
||
else if (number.word != 0 && alt && base == 8) \
|
||
/* Add octal marker. */ \
|
||
*string-- = '0'; \
|
||
\
|
||
if (!left) \
|
||
{ \
|
||
width -= workend - string; \
|
||
\
|
||
if (number.word != 0 && alt && base == 16) \
|
||
/* Account for 0X hex marker. */ \
|
||
width -= 2; \
|
||
\
|
||
if (is_negative || showsign || space) \
|
||
--width; \
|
||
\
|
||
if (pad == '0') \
|
||
{ \
|
||
while (width-- > 0) \
|
||
*string-- = '0'; \
|
||
\
|
||
if (number.word != 0 && alt && base == 16) \
|
||
{ \
|
||
*string-- = spec; \
|
||
*string-- = '0'; \
|
||
} \
|
||
\
|
||
if (is_negative) \
|
||
*string-- = '-'; \
|
||
else if (showsign) \
|
||
*string-- = '+'; \
|
||
else if (space) \
|
||
*string-- = ' '; \
|
||
} \
|
||
else \
|
||
{ \
|
||
if (number.word != 0 && alt && base == 16) \
|
||
{ \
|
||
*string-- = spec; \
|
||
*string-- = '0'; \
|
||
} \
|
||
\
|
||
if (is_negative) \
|
||
*string-- = '-'; \
|
||
else if (showsign) \
|
||
*string-- = '+'; \
|
||
else if (space) \
|
||
*string-- = ' '; \
|
||
\
|
||
while (width-- > 0) \
|
||
*string-- = ' '; \
|
||
} \
|
||
\
|
||
outstring (string + 1, workend - string); \
|
||
\
|
||
break; \
|
||
} \
|
||
else \
|
||
{ \
|
||
if (number.word != 0 && alt && base == 16) \
|
||
{ \
|
||
*string-- = spec; \
|
||
*string-- = '0'; \
|
||
} \
|
||
\
|
||
if (is_negative) \
|
||
*string-- = '-'; \
|
||
else if (showsign) \
|
||
*string-- = '+'; \
|
||
else if (space) \
|
||
*string-- = ' '; \
|
||
\
|
||
width -= workend - string; \
|
||
outstring (string + 1, workend - string); \
|
||
\
|
||
PAD (' '); \
|
||
break; \
|
||
} \
|
||
\
|
||
LABEL (form_float): \
|
||
{ \
|
||
/* Floating-point number. This is handled by printf_fp.c. */ \
|
||
extern int __printf_fp __P ((FILE *, const struct printf_info *, \
|
||
const void **const)); \
|
||
const void *ptr; \
|
||
int function_done; \
|
||
\
|
||
if (fspec == NULL) \
|
||
{ \
|
||
struct printf_info info = { prec: prec, \
|
||
width: width, \
|
||
spec: spec, \
|
||
is_long_double: is_long_double, \
|
||
is_short: is_short, \
|
||
is_long: is_long, \
|
||
alt: alt, \
|
||
space: space, \
|
||
left: left, \
|
||
showsign: showsign, \
|
||
group: group, \
|
||
pad: pad, \
|
||
extra: 0 }; \
|
||
\
|
||
if (is_long_double) \
|
||
the_arg.pa_long_double = va_arg (ap, long double); \
|
||
else \
|
||
the_arg.pa_double = va_arg (ap, double); \
|
||
ptr = (const void *) &the_arg; \
|
||
\
|
||
function_done = __printf_fp (s, &info, &ptr); \
|
||
} \
|
||
else \
|
||
{ \
|
||
ptr = (const void *) &args_value[fspec->data_arg]; \
|
||
\
|
||
function_done = __printf_fp (s, &fspec->info, &ptr); \
|
||
} \
|
||
\
|
||
if (function_done < 0) \
|
||
/* Error in print handler. */ \
|
||
return -1; \
|
||
\
|
||
done += function_done; \
|
||
} \
|
||
break; \
|
||
\
|
||
LABEL (form_floathex): \
|
||
{ \
|
||
/* FLoating point number printed as hexadecimal number. */ \
|
||
extern int __printf_fphex __P ((FILE *, const struct printf_info *, \
|
||
const void **const)); \
|
||
const void *ptr; \
|
||
int function_done; \
|
||
\
|
||
if (fspec == NULL) \
|
||
{ \
|
||
struct printf_info info = { prec: prec, \
|
||
width: width, \
|
||
spec: spec, \
|
||
is_long_double: is_long_double, \
|
||
is_short: is_short, \
|
||
is_long: is_long, \
|
||
alt: alt, \
|
||
space: space, \
|
||
left: left, \
|
||
showsign: showsign, \
|
||
group: group, \
|
||
pad: pad, \
|
||
extra: 0 }; \
|
||
\
|
||
if (is_long_double) \
|
||
the_arg.pa_long_double = va_arg (ap, long double); \
|
||
else \
|
||
the_arg.pa_double = va_arg (ap, double); \
|
||
ptr = (const void *) &the_arg; \
|
||
\
|
||
function_done = __printf_fphex (s, &info, &ptr); \
|
||
} \
|
||
else \
|
||
{ \
|
||
ptr = (const void *) &args_value[fspec->data_arg]; \
|
||
\
|
||
function_done = __printf_fphex (s, &fspec->info, &ptr); \
|
||
} \
|
||
\
|
||
if (function_done < 0) \
|
||
/* Error in print handler. */ \
|
||
return -1; \
|
||
\
|
||
done += function_done; \
|
||
} \
|
||
break; \
|
||
\
|
||
LABEL (form_character): \
|
||
/* Character. */ \
|
||
if (is_long) \
|
||
goto LABEL (form_wcharacter); \
|
||
--width; /* Account for the character itself. */ \
|
||
if (!left) \
|
||
PAD (' '); \
|
||
if (fspec == NULL) \
|
||
outchar ((unsigned char) va_arg (ap, int)); /* Promoted. */ \
|
||
else \
|
||
outchar ((unsigned char) args_value[fspec->data_arg].pa_char); \
|
||
if (left) \
|
||
PAD (' '); \
|
||
break; \
|
||
\
|
||
LABEL (form_wcharacter): \
|
||
{ \
|
||
/* Wide character. */ \
|
||
char buf[MB_CUR_MAX]; \
|
||
mbstate_t mbstate; \
|
||
size_t len; \
|
||
\
|
||
len = __wcrtomb (buf, (fspec == NULL ? va_arg (ap, wint_t) \
|
||
: args_value[fspec->data_arg].pa_wchar), \
|
||
&mbstate); \
|
||
width -= len; \
|
||
if (!left) \
|
||
PAD (' '); \
|
||
outstring (buf, len); \
|
||
if (left) \
|
||
PAD (' '); \
|
||
} \
|
||
break; \
|
||
\
|
||
LABEL (form_string): \
|
||
{ \
|
||
size_t len; \
|
||
\
|
||
/* The string argument could in fact be `char *' or `wchar_t *'. \
|
||
But this should not make a difference here. */ \
|
||
if (fspec == NULL) \
|
||
string = (char *) va_arg (ap, const char *); \
|
||
else \
|
||
string = (char *) args_value[fspec->data_arg].pa_string; \
|
||
\
|
||
/* Entry point for printing other strings. */ \
|
||
LABEL (print_string): \
|
||
\
|
||
if (string == NULL) \
|
||
{ \
|
||
/* Write "(null)" if there's space. */ \
|
||
if (prec == -1 || prec >= (int) sizeof (null) - 1) \
|
||
{ \
|
||
string = (char *) null; \
|
||
len = sizeof (null) - 1; \
|
||
} \
|
||
else \
|
||
{ \
|
||
string = (char *) ""; \
|
||
len = 0; \
|
||
} \
|
||
} \
|
||
else if (!is_long && spec != L_('S')) \
|
||
{ \
|
||
if (prec != -1) \
|
||
/* Search for the end of the string, but don't search past \
|
||
the length specified by the precision. */ \
|
||
len = strnlen (string, prec); \
|
||
else \
|
||
len = strlen (string); \
|
||
} \
|
||
else \
|
||
{ \
|
||
const wchar_t *s2 = (const wchar_t *) string; \
|
||
mbstate_t mbstate; \
|
||
\
|
||
len = __wcsrtombs (NULL, &s2, 0, &mbstate); \
|
||
if (len == (size_t) -1) \
|
||
/* Illegal wide-character string. */ \
|
||
return -1; \
|
||
\
|
||
s2 = (const wchar_t *) string; \
|
||
string = alloca (len + 1); \
|
||
(void) __wcsrtombs (string, &s2, prec != -1 ? prec : UINT_MAX, \
|
||
&mbstate); \
|
||
} \
|
||
\
|
||
if ((width -= len) < 0) \
|
||
{ \
|
||
outstring (string, len); \
|
||
break; \
|
||
} \
|
||
\
|
||
if (!left) \
|
||
PAD (' '); \
|
||
outstring (string, len); \
|
||
if (left) \
|
||
PAD (' '); \
|
||
} \
|
||
break; \
|
||
\
|
||
LABEL (form_pointer): \
|
||
/* Generic pointer. */ \
|
||
{ \
|
||
const void *ptr; \
|
||
if (fspec == NULL) \
|
||
ptr = va_arg (ap, void *); \
|
||
else \
|
||
ptr = args_value[fspec->data_arg].pa_pointer; \
|
||
if (ptr != NULL) \
|
||
{ \
|
||
/* If the pointer is not NULL, write it as a %#x spec. */ \
|
||
base = 16; \
|
||
number.word = (unsigned long int) ptr; \
|
||
is_negative = 0; \
|
||
alt = 1; \
|
||
group = 0; \
|
||
spec = 'x'; \
|
||
goto LABEL (number); \
|
||
} \
|
||
else \
|
||
{ \
|
||
/* Write "(nil)" for a nil pointer. */ \
|
||
string = (char *) "(nil)"; \
|
||
/* Make sure the full string "(nil)" is printed. */ \
|
||
if (prec < 5) \
|
||
prec = 5; \
|
||
is_long = 0; /* This is no wide-char string. */ \
|
||
goto LABEL (print_string); \
|
||
} \
|
||
} \
|
||
/* NOTREACHED */ \
|
||
\
|
||
LABEL (form_number): \
|
||
/* Answer the count of characters written. */ \
|
||
if (fspec == NULL) \
|
||
if (is_longlong) \
|
||
*(long long int *) va_arg (ap, void *) = done; \
|
||
else if (is_long) \
|
||
*(long int *) va_arg (ap, void *) = done; \
|
||
else if (!is_short) \
|
||
*(int *) va_arg (ap, void *) = done; \
|
||
else \
|
||
*(short int *) va_arg (ap, void *) = done; \
|
||
else \
|
||
if (is_longlong) \
|
||
*(long long int *) args_value[fspec->data_arg].pa_pointer = done; \
|
||
else if (is_long) \
|
||
*(long int *) args_value[fspec->data_arg].pa_pointer = done; \
|
||
else if (!is_short) \
|
||
*(int *) args_value[fspec->data_arg].pa_pointer = done; \
|
||
else \
|
||
*(short int *) args_value[fspec->data_arg].pa_pointer = done; \
|
||
break; \
|
||
\
|
||
LABEL (form_strerror): \
|
||
/* Print description of error ERRNO. */ \
|
||
{ \
|
||
extern char *_strerror_internal __P ((int, char *buf, size_t)); \
|
||
\
|
||
string = (char *) \
|
||
_strerror_internal (save_errno, work_buffer, sizeof work_buffer); \
|
||
} \
|
||
is_long = 0; /* This is no wide-char string. */ \
|
||
goto LABEL (print_string)
|
||
|
||
|
||
/* Sanity check of arguments. */
|
||
ARGCHECK (s, format);
|
||
|
||
if (UNBUFFERED_P (s))
|
||
/* Use a helper function which will allocate a local temporary buffer
|
||
for the stream and then call us again. */
|
||
return buffered_vfprintf (s, format, ap);
|
||
|
||
/* Initialize local variables. */
|
||
done = 0;
|
||
grouping = (const char *) -1;
|
||
#ifdef __va_copy
|
||
/* This macro will be available soon in gcc's <stdarg.h>. We need it
|
||
since on some systems `va_list' is not an integral type. */
|
||
__va_copy (ap_save, ap);
|
||
#else
|
||
ap_save = ap;
|
||
#endif
|
||
nspecs_done = 0;
|
||
|
||
/* Find the first format specifier. */
|
||
f = lead_str_end = find_spec (format, &mbstate);
|
||
|
||
/* Lock stream. */
|
||
#ifdef USE_IN_LIBIO
|
||
__libc_cleanup_region_start ((void (*) (void *)) &_IO_funlockfile, s);
|
||
_IO_flockfile (s);
|
||
#else
|
||
__libc_cleanup_region_start ((void (*) (void *)) &__funlockfile, s);
|
||
__flockfile (s);
|
||
#endif
|
||
|
||
/* Write the literal text before the first format. */
|
||
outstring ((const UCHAR_T *) format,
|
||
lead_str_end - (const UCHAR_T *) format);
|
||
|
||
/* If we only have to print a simple string, return now. */
|
||
if (*f == L_('\0'))
|
||
goto all_done;
|
||
|
||
/* Process whole format string. */
|
||
do
|
||
{
|
||
#define REF(Name) &&do_##Name
|
||
#define LABEL(Name) do_##Name
|
||
STEP0_3_TABLE;
|
||
STEP4_TABLE;
|
||
|
||
union printf_arg *args_value; /* This is not used here but ... */
|
||
int is_negative; /* Flag for negative number. */
|
||
union
|
||
{
|
||
unsigned long long int longlong;
|
||
unsigned long int word;
|
||
} number;
|
||
int base;
|
||
union printf_arg the_arg;
|
||
char *string; /* Pointer to argument string. */
|
||
int alt = 0; /* Alternate format. */
|
||
int space = 0; /* Use space prefix if no sign is needed. */
|
||
int left = 0; /* Left-justify output. */
|
||
int showsign = 0; /* Always begin with plus or minus sign. */
|
||
int group = 0; /* Print numbers according grouping rules. */
|
||
int is_long_double = 0; /* Argument is long double/ long long int. */
|
||
int is_short = 0; /* Argument is long int. */
|
||
int is_long = 0; /* Argument is short int. */
|
||
int width = 0; /* Width of output; 0 means none specified. */
|
||
int prec = -1; /* Precision of output; -1 means none specified. */
|
||
char pad = ' '; /* Padding character. */
|
||
CHAR_T spec;
|
||
|
||
/* Get current character in format string. */
|
||
JUMP (*++f, step0_jumps);
|
||
|
||
/* ' ' flag. */
|
||
LABEL (flag_space):
|
||
space = 1;
|
||
JUMP (*++f, step0_jumps);
|
||
|
||
/* '+' flag. */
|
||
LABEL (flag_plus):
|
||
showsign = 1;
|
||
JUMP (*++f, step0_jumps);
|
||
|
||
/* The '-' flag. */
|
||
LABEL (flag_minus):
|
||
left = 1;
|
||
pad = L_(' ');
|
||
JUMP (*++f, step0_jumps);
|
||
|
||
/* The '#' flag. */
|
||
LABEL (flag_hash):
|
||
alt = 1;
|
||
JUMP (*++f, step0_jumps);
|
||
|
||
/* The '0' flag. */
|
||
LABEL (flag_zero):
|
||
if (!left)
|
||
pad = L_('0');
|
||
JUMP (*++f, step0_jumps);
|
||
|
||
/* The '\'' flag. */
|
||
LABEL (flag_quote):
|
||
group = 1;
|
||
|
||
/* XXX Completely wrong. Use wctob. */
|
||
if (grouping == (const char *) -1)
|
||
{
|
||
/* Figure out the thousands separator character. */
|
||
if (mbtowc (&thousands_sep,
|
||
_NL_CURRENT (LC_NUMERIC, THOUSANDS_SEP),
|
||
strlen (_NL_CURRENT (LC_NUMERIC, THOUSANDS_SEP))) <= 0)
|
||
thousands_sep = (wchar_t)
|
||
*_NL_CURRENT (LC_NUMERIC, THOUSANDS_SEP);
|
||
grouping = _NL_CURRENT (LC_NUMERIC, GROUPING);
|
||
if (*grouping == '\0' || *grouping == CHAR_MAX
|
||
|| thousands_sep == L'\0')
|
||
grouping = NULL;
|
||
}
|
||
JUMP (*++f, step0_jumps);
|
||
|
||
/* Get width from argument. */
|
||
LABEL (width_asterics):
|
||
{
|
||
const UCHAR_T *tmp; /* Temporary value. */
|
||
|
||
tmp = ++f;
|
||
if (ISDIGIT (*tmp) && read_int (&tmp) && *tmp == L_('$'))
|
||
/* The width comes from a positional parameter. */
|
||
goto do_positional;
|
||
|
||
width = va_arg (ap, int);
|
||
|
||
/* Negative width means left justified. */
|
||
if (width < 0)
|
||
{
|
||
width = -width;
|
||
pad = L_(' ');
|
||
left = 1;
|
||
}
|
||
}
|
||
JUMP (*f, step1_jumps);
|
||
|
||
/* Given width in format string. */
|
||
LABEL (width):
|
||
width = read_int (&f);
|
||
if (*f == L_('$'))
|
||
/* Oh, oh. The argument comes from a positional parameter. */
|
||
goto do_positional;
|
||
JUMP (*f, step1_jumps);
|
||
|
||
LABEL (precision):
|
||
++f;
|
||
if (*f == L_('*'))
|
||
{
|
||
const UCHAR_T *tmp; /* Temporary value. */
|
||
|
||
tmp = ++f;
|
||
if (ISDIGIT (*tmp) && read_int (&tmp) > 0 && *tmp == L_('$'))
|
||
/* The precision comes from a positional parameter. */
|
||
goto do_positional;
|
||
|
||
prec = va_arg (ap, int);
|
||
|
||
/* If the precision is negative the precision is omitted. */
|
||
if (prec < 0)
|
||
prec = -1;
|
||
}
|
||
else if (ISDIGIT (*f))
|
||
prec = read_int (&f);
|
||
else
|
||
prec = 0;
|
||
JUMP (*f, step2_jumps);
|
||
|
||
/* Process 'h' modifier. No other modifier is allowed to
|
||
follow. */
|
||
LABEL (mod_half):
|
||
is_short = 1;
|
||
JUMP (*++f, step4_jumps);
|
||
|
||
/* Process 'l' modifier. There might another 'l' follow. */
|
||
LABEL (mod_long):
|
||
is_long = 1;
|
||
JUMP (*++f, step3_jumps);
|
||
|
||
/* Process 'L', 'q', or 'll' modifier. No other modifier is
|
||
allowed to follow. */
|
||
LABEL (mod_longlong):
|
||
is_long_double = 1;
|
||
JUMP (*++f, step4_jumps);
|
||
|
||
LABEL (mod_size_t):
|
||
is_longlong = sizeof (size_t) > sizeof (unsigned long int);
|
||
is_long = sizeof (size_t) > sizeof (unsigned int);
|
||
JUMP (*++f, step4_jumps);
|
||
|
||
/* Process current format. */
|
||
while (1)
|
||
{
|
||
process_arg (((struct printf_spec *) NULL));
|
||
|
||
LABEL (form_unknown):
|
||
if (spec == L_('\0'))
|
||
{
|
||
/* The format string ended before the specifier is complete. */
|
||
done = -1;
|
||
goto all_done;
|
||
}
|
||
|
||
/* If we are in the fast loop force entering the complicated
|
||
one. */
|
||
goto do_positional;
|
||
}
|
||
|
||
/* The format is correctly handled. */
|
||
++nspecs_done;
|
||
|
||
/* Look for next format specifier. */
|
||
f = find_spec ((end_of_spec = ++f), &mbstate);
|
||
|
||
/* Write the following constant string. */
|
||
outstring (end_of_spec, f - end_of_spec);
|
||
}
|
||
while (*f != L_('\0'));
|
||
|
||
/* Unlock stream and return. */
|
||
goto all_done;
|
||
|
||
/* Here starts the more complex loop to handle positional parameters. */
|
||
do_positional:
|
||
{
|
||
/* Array with information about the needed arguments. This has to
|
||
be dynamically extensible. */
|
||
size_t nspecs = 0;
|
||
size_t nspecs_max = 32; /* A more or less arbitrary start value. */
|
||
struct printf_spec *specs
|
||
= alloca (nspecs_max * sizeof (struct printf_spec));
|
||
|
||
/* The number of arguments the format string requests. This will
|
||
determine the size of the array needed to store the argument
|
||
attributes. */
|
||
size_t nargs = 0;
|
||
int *args_type;
|
||
union printf_arg *args_value;
|
||
|
||
/* Positional parameters refer to arguments directly. This could
|
||
also determine the maximum number of arguments. Track the
|
||
maximum number. */
|
||
size_t max_ref_arg = 0;
|
||
|
||
/* Just a counter. */
|
||
size_t cnt;
|
||
|
||
|
||
if (grouping == (const char *) -1)
|
||
{
|
||
/* XXX Use wctob. But this is incompatible for now. */
|
||
/* Figure out the thousands separator character. */
|
||
if (mbtowc (&thousands_sep,
|
||
_NL_CURRENT (LC_NUMERIC, THOUSANDS_SEP),
|
||
strlen (_NL_CURRENT (LC_NUMERIC, THOUSANDS_SEP))) <= 0)
|
||
thousands_sep = (wchar_t) *_NL_CURRENT (LC_NUMERIC, THOUSANDS_SEP);
|
||
grouping = _NL_CURRENT (LC_NUMERIC, GROUPING);
|
||
if (*grouping == '\0' || *grouping == CHAR_MAX
|
||
|| thousands_sep == L'\0')
|
||
grouping = NULL;
|
||
}
|
||
|
||
for (f = lead_str_end; *f != '\0'; f = specs[nspecs++].next_fmt)
|
||
{
|
||
if (nspecs >= nspecs_max)
|
||
{
|
||
/* Extend the array of format specifiers. */
|
||
struct printf_spec *old = specs;
|
||
|
||
nspecs_max *= 2;
|
||
specs = alloca (nspecs_max * sizeof (struct printf_spec));
|
||
|
||
if (specs == &old[nspecs])
|
||
/* Stack grows up, OLD was the last thing allocated;
|
||
extend it. */
|
||
nspecs_max += nspecs_max / 2;
|
||
else
|
||
{
|
||
/* Copy the old array's elements to the new space. */
|
||
memcpy (specs, old, nspecs * sizeof (struct printf_spec));
|
||
if (old == &specs[nspecs])
|
||
/* Stack grows down, OLD was just below the new
|
||
SPECS. We can use that space when the new space
|
||
runs out. */
|
||
nspecs_max += nspecs_max / 2;
|
||
}
|
||
}
|
||
|
||
/* Parse the format specifier. */
|
||
nargs += parse_one_spec (f, nargs, &specs[nspecs], &max_ref_arg,
|
||
&mbstate);
|
||
}
|
||
|
||
/* Determine the number of arguments the format string consumes. */
|
||
nargs = MAX (nargs, max_ref_arg);
|
||
|
||
/* Allocate memory for the argument descriptions. */
|
||
args_type = alloca (nargs * sizeof (int));
|
||
memset (args_type, 0, nargs * sizeof (int));
|
||
args_value = alloca (nargs * sizeof (union printf_arg));
|
||
|
||
/* XXX Could do sanity check here: If any element in ARGS_TYPE is
|
||
still zero after this loop, format is invalid. For now we
|
||
simply use 0 as the value. */
|
||
|
||
/* Fill in the types of all the arguments. */
|
||
for (cnt = 0; cnt < nspecs; ++cnt)
|
||
{
|
||
/* If the width is determined by an argument this is an int. */
|
||
if (specs[cnt].width_arg != -1)
|
||
args_type[specs[cnt].width_arg] = PA_INT;
|
||
|
||
/* If the precision is determined by an argument this is an int. */
|
||
if (specs[cnt].prec_arg != -1)
|
||
args_type[specs[cnt].prec_arg] = PA_INT;
|
||
|
||
switch (specs[cnt].ndata_args)
|
||
{
|
||
case 0: /* No arguments. */
|
||
break;
|
||
case 1: /* One argument; we already have the type. */
|
||
args_type[specs[cnt].data_arg] = specs[cnt].data_arg_type;
|
||
break;
|
||
default:
|
||
/* We have more than one argument for this format spec.
|
||
We must call the arginfo function again to determine
|
||
all the types. */
|
||
(void) (*__printf_arginfo_table[specs[cnt].info.spec])
|
||
(&specs[cnt].info,
|
||
specs[cnt].ndata_args, &args_type[specs[cnt].data_arg]);
|
||
break;
|
||
}
|
||
}
|
||
|
||
/* Now we know all the types and the order. Fill in the argument
|
||
values. */
|
||
for (cnt = 0; cnt < nargs; ++cnt)
|
||
switch (args_type[cnt])
|
||
{
|
||
#define T(tag, mem, type) \
|
||
case tag: \
|
||
args_value[cnt].mem = va_arg (ap_save, type); \
|
||
break
|
||
|
||
T (PA_CHAR, pa_char, int); /* Promoted. */
|
||
T (PA_WCHAR, pa_wchar, wint_t);
|
||
T (PA_INT|PA_FLAG_SHORT, pa_short_int, int); /* Promoted. */
|
||
T (PA_INT, pa_int, int);
|
||
T (PA_INT|PA_FLAG_LONG, pa_long_int, long int);
|
||
T (PA_INT|PA_FLAG_LONG_LONG, pa_long_long_int, long long int);
|
||
T (PA_FLOAT, pa_float, double); /* Promoted. */
|
||
T (PA_DOUBLE, pa_double, double);
|
||
T (PA_DOUBLE|PA_FLAG_LONG_DOUBLE, pa_long_double, long double);
|
||
T (PA_STRING, pa_string, const char *);
|
||
T (PA_WSTRING, pa_wstring, const wchar_t *);
|
||
T (PA_POINTER, pa_pointer, void *);
|
||
#undef T
|
||
default:
|
||
if ((args_type[cnt] & PA_FLAG_PTR) != 0)
|
||
args_value[cnt].pa_pointer = va_arg (ap_save, void *);
|
||
else
|
||
args_value[cnt].pa_long_double = 0.0;
|
||
break;
|
||
}
|
||
|
||
/* Now walk through all format specifiers and process them. */
|
||
for (; (size_t) nspecs_done < nspecs; ++nspecs_done)
|
||
{
|
||
#undef REF
|
||
#define REF(Name) &&do2_##Name
|
||
#undef LABEL
|
||
#define LABEL(Name) do2_##Name
|
||
STEP4_TABLE;
|
||
|
||
int is_negative;
|
||
union
|
||
{
|
||
unsigned long long int longlong;
|
||
unsigned long int word;
|
||
} number;
|
||
int base;
|
||
union printf_arg the_arg;
|
||
char *string; /* Pointer to argument string. */
|
||
|
||
/* Fill variables from values in struct. */
|
||
int alt = specs[nspecs_done].info.alt;
|
||
int space = specs[nspecs_done].info.space;
|
||
int left = specs[nspecs_done].info.left;
|
||
int showsign = specs[nspecs_done].info.showsign;
|
||
int group = specs[nspecs_done].info.group;
|
||
int is_long_double = specs[nspecs_done].info.is_long_double;
|
||
int is_short = specs[nspecs_done].info.is_short;
|
||
int is_long = specs[nspecs_done].info.is_long;
|
||
int width = specs[nspecs_done].info.width;
|
||
int prec = specs[nspecs_done].info.prec;
|
||
char pad = specs[nspecs_done].info.pad;
|
||
CHAR_T spec = specs[nspecs_done].info.spec;
|
||
|
||
/* Fill in last information. */
|
||
if (specs[nspecs_done].width_arg != -1)
|
||
{
|
||
/* Extract the field width from an argument. */
|
||
specs[nspecs_done].info.width =
|
||
args_value[specs[nspecs_done].width_arg].pa_int;
|
||
|
||
if (specs[nspecs_done].info.width < 0)
|
||
/* If the width value is negative left justification is
|
||
selected and the value is taken as being positive. */
|
||
{
|
||
specs[nspecs_done].info.width *= -1;
|
||
left = specs[nspecs_done].info.left = 1;
|
||
}
|
||
width = specs[nspecs_done].info.width;
|
||
}
|
||
|
||
if (specs[nspecs_done].prec_arg != -1)
|
||
{
|
||
/* Extract the precision from an argument. */
|
||
specs[nspecs_done].info.prec =
|
||
args_value[specs[nspecs_done].prec_arg].pa_int;
|
||
|
||
if (specs[nspecs_done].info.prec < 0)
|
||
/* If the precision is negative the precision is
|
||
omitted. */
|
||
specs[nspecs_done].info.prec = -1;
|
||
|
||
prec = specs[nspecs_done].info.prec;
|
||
}
|
||
|
||
/* Process format specifiers. */
|
||
while (1)
|
||
{
|
||
JUMP (spec, step4_jumps);
|
||
|
||
process_arg ((&specs[nspecs_done]));
|
||
|
||
LABEL (form_unknown):
|
||
{
|
||
extern printf_function **__printf_function_table;
|
||
int function_done;
|
||
printf_function *function;
|
||
unsigned int i;
|
||
const void **ptr;
|
||
|
||
function =
|
||
(__printf_function_table == NULL ? NULL :
|
||
__printf_function_table[specs[nspecs_done].info.spec]);
|
||
|
||
if (function == NULL)
|
||
function = &printf_unknown;
|
||
|
||
ptr = alloca (specs[nspecs_done].ndata_args
|
||
* sizeof (const void *));
|
||
|
||
/* Fill in an array of pointers to the argument values. */
|
||
for (i = 0; i < specs[nspecs_done].ndata_args; ++i)
|
||
ptr[i] = &args_value[specs[nspecs_done].data_arg + i];
|
||
|
||
/* Call the function. */
|
||
function_done = (*function) (s, &specs[nspecs_done].info, ptr);
|
||
|
||
/* If an error occurred we don't have information about #
|
||
of chars. */
|
||
if (function_done < 0)
|
||
{
|
||
done = -1;
|
||
goto all_done;
|
||
}
|
||
|
||
done += function_done;
|
||
}
|
||
break;
|
||
}
|
||
|
||
/* Write the following constant string. */
|
||
outstring (specs[nspecs_done].end_of_fmt,
|
||
specs[nspecs_done].next_fmt
|
||
- specs[nspecs_done].end_of_fmt);
|
||
}
|
||
}
|
||
|
||
all_done:
|
||
/* Unlock the stream. */
|
||
__libc_cleanup_region_end (1);
|
||
|
||
return done;
|
||
}
|
||
|
||
#ifdef USE_IN_LIBIO
|
||
# undef vfprintf
|
||
# ifdef strong_alias
|
||
/* This is for glibc. */
|
||
strong_alias (_IO_vfprintf, vfprintf);
|
||
# else
|
||
# if defined __ELF__ || defined __GNU_LIBRARY__
|
||
# include <gnu-stabs.h>
|
||
# ifdef weak_alias
|
||
weak_alias (_IO_vfprintf, vfprintf);
|
||
# endif
|
||
# endif
|
||
# endif
|
||
#endif
|
||
|
||
/* Handle an unknown format specifier. This prints out a canonicalized
|
||
representation of the format spec itself. */
|
||
static int
|
||
printf_unknown (FILE *s, const struct printf_info *info,
|
||
const void *const *args)
|
||
|
||
{
|
||
int done = 0;
|
||
char work_buffer[BUFSIZ];
|
||
register char *w;
|
||
|
||
outchar ('%');
|
||
|
||
if (info->alt)
|
||
outchar ('#');
|
||
if (info->group)
|
||
outchar ('\'');
|
||
if (info->showsign)
|
||
outchar ('+');
|
||
else if (info->space)
|
||
outchar (' ');
|
||
if (info->left)
|
||
outchar ('-');
|
||
if (info->pad == '0')
|
||
outchar ('0');
|
||
|
||
if (info->width != 0)
|
||
{
|
||
w = _itoa_word (info->width, workend + 1, 10, 0);
|
||
while (w <= workend)
|
||
outchar (*w++);
|
||
}
|
||
|
||
if (info->prec != -1)
|
||
{
|
||
outchar ('.');
|
||
w = _itoa_word (info->prec, workend + 1, 10, 0);
|
||
while (w <= workend)
|
||
outchar (*w++);
|
||
}
|
||
|
||
if (info->spec != '\0')
|
||
outchar (info->spec);
|
||
|
||
return done;
|
||
}
|
||
|
||
/* Group the digits according to the grouping rules of the current locale.
|
||
The interpretation of GROUPING is as in `struct lconv' from <locale.h>. */
|
||
static char *
|
||
internal_function
|
||
group_number (CHAR_T *w, CHAR_T *rear_ptr, const CHAR_T *grouping,
|
||
wchar_t thousands_sep)
|
||
{
|
||
int len;
|
||
char *src, *s;
|
||
|
||
/* We treat all negative values like CHAR_MAX. */
|
||
|
||
if (*grouping == CHAR_MAX || *grouping <= 0)
|
||
/* No grouping should be done. */
|
||
return w;
|
||
|
||
len = *grouping;
|
||
|
||
/* Copy existing string so that nothing gets overwritten. */
|
||
src = (char *) alloca (rear_ptr - w);
|
||
memcpy (src, w + 1, rear_ptr - w);
|
||
s = &src[rear_ptr - w - 1];
|
||
w = rear_ptr;
|
||
|
||
/* Process all characters in the string. */
|
||
while (s >= src)
|
||
{
|
||
*w-- = *s--;
|
||
|
||
if (--len == 0 && s >= src)
|
||
{
|
||
/* A new group begins. */
|
||
*w-- = thousands_sep;
|
||
|
||
len = *grouping++;
|
||
if (*grouping == '\0')
|
||
/* The previous grouping repeats ad infinitum. */
|
||
--grouping;
|
||
else if (*grouping == CHAR_MAX
|
||
#if CHAR_MIN < 0
|
||
|| *grouping < 0
|
||
#endif
|
||
)
|
||
{
|
||
/* No further grouping to be done.
|
||
Copy the rest of the number. */
|
||
do
|
||
*w-- = *s--;
|
||
while (s >= src);
|
||
break;
|
||
}
|
||
}
|
||
}
|
||
return w;
|
||
}
|
||
|
||
#ifdef USE_IN_LIBIO
|
||
/* Helper "class" for `fprintf to unbuffered': creates a temporary buffer. */
|
||
struct helper_file
|
||
{
|
||
struct _IO_FILE_plus _f;
|
||
_IO_FILE *_put_stream;
|
||
#ifdef _IO_MTSAFE_IO
|
||
_IO_lock_t lock;
|
||
#endif
|
||
};
|
||
|
||
static int
|
||
_IO_helper_overflow (_IO_FILE *s, int c)
|
||
{
|
||
_IO_FILE *target = ((struct helper_file*) s)->_put_stream;
|
||
int used = s->_IO_write_ptr - s->_IO_write_base;
|
||
if (used)
|
||
{
|
||
_IO_size_t written = _IO_sputn (target, s->_IO_write_base, used);
|
||
s->_IO_write_ptr -= written;
|
||
}
|
||
return PUTC (c, s);
|
||
}
|
||
|
||
static const struct _IO_jump_t _IO_helper_jumps =
|
||
{
|
||
JUMP_INIT_DUMMY,
|
||
JUMP_INIT (finish, _IO_default_finish),
|
||
JUMP_INIT (overflow, _IO_helper_overflow),
|
||
JUMP_INIT (underflow, _IO_default_underflow),
|
||
JUMP_INIT (uflow, _IO_default_uflow),
|
||
JUMP_INIT (pbackfail, _IO_default_pbackfail),
|
||
JUMP_INIT (xsputn, _IO_default_xsputn),
|
||
JUMP_INIT (xsgetn, _IO_default_xsgetn),
|
||
JUMP_INIT (seekoff, _IO_default_seekoff),
|
||
JUMP_INIT (seekpos, _IO_default_seekpos),
|
||
JUMP_INIT (setbuf, _IO_default_setbuf),
|
||
JUMP_INIT (sync, _IO_default_sync),
|
||
JUMP_INIT (doallocate, _IO_default_doallocate),
|
||
JUMP_INIT (read, _IO_default_read),
|
||
JUMP_INIT (write, _IO_default_write),
|
||
JUMP_INIT (seek, _IO_default_seek),
|
||
JUMP_INIT (close, _IO_default_close),
|
||
JUMP_INIT (stat, _IO_default_stat)
|
||
};
|
||
|
||
static int
|
||
internal_function
|
||
buffered_vfprintf (register _IO_FILE *s, const CHAR_T *format,
|
||
_IO_va_list args)
|
||
{
|
||
char buf[_IO_BUFSIZ];
|
||
struct helper_file helper;
|
||
register _IO_FILE *hp = (_IO_FILE *) &helper;
|
||
int result, to_flush;
|
||
|
||
/* Initialize helper. */
|
||
helper._put_stream = s;
|
||
hp->_IO_write_base = buf;
|
||
hp->_IO_write_ptr = buf;
|
||
hp->_IO_write_end = buf + sizeof buf;
|
||
hp->_IO_file_flags = _IO_MAGIC|_IO_NO_READS;
|
||
#ifdef _IO_MTSAFE_IO
|
||
hp->_lock = &helper.lock;
|
||
__libc_lock_init (*hp->_lock);
|
||
#endif
|
||
_IO_JUMPS (hp) = (struct _IO_jump_t *) &_IO_helper_jumps;
|
||
|
||
/* Now print to helper instead. */
|
||
result = _IO_vfprintf (hp, format, args);
|
||
|
||
/* Now flush anything from the helper to the S. */
|
||
if ((to_flush = hp->_IO_write_ptr - hp->_IO_write_base) > 0)
|
||
{
|
||
if ((int) _IO_sputn (s, hp->_IO_write_base, to_flush) != to_flush)
|
||
return -1;
|
||
}
|
||
|
||
return result;
|
||
}
|
||
|
||
#else /* !USE_IN_LIBIO */
|
||
|
||
static int
|
||
internal_function
|
||
buffered_vfprintf (register FILE *s, const CHAR_T *format, va_list args)
|
||
{
|
||
char buf[BUFSIZ];
|
||
int result;
|
||
|
||
s->__bufp = s->__buffer = buf;
|
||
s->__bufsize = sizeof buf;
|
||
s->__put_limit = s->__buffer + s->__bufsize;
|
||
s->__get_limit = s->__buffer;
|
||
|
||
/* Now use buffer to print. */
|
||
result = vfprintf (s, format, args);
|
||
|
||
if (fflush (s) == EOF)
|
||
result = -1;
|
||
s->__buffer = s->__bufp = s->__get_limit = s->__put_limit = NULL;
|
||
s->__bufsize = 0;
|
||
|
||
return result;
|
||
}
|
||
|
||
/* Pads string with given number of a specified character.
|
||
This code is taken from iopadn.c of the GNU I/O library. */
|
||
#define PADSIZE 16
|
||
static const CHAR_T blanks[PADSIZE] =
|
||
{ L_(' '), L_(' '), L_(' '), L_(' '), L_(' '), L_(' '), L_(' '), L_(' '),
|
||
L_(' '), L_(' '), L_(' '), L_(' '), L_(' '), L_(' '), L_(' '), L_(' ') };
|
||
static const CHAR_T zeroes[PADSIZE] =
|
||
{ L_('0'), L_('0'), L_('0'), L_('0'), L_('0'), L_('0'), L_('0'), L_('0'),
|
||
L_('0'), L_('0'), L_('0'), L_('0'), L_('0'), L_('0'), L_('0'), L_('0') };
|
||
|
||
ssize_t
|
||
#ifndef COMPILE_WPRINTF
|
||
__printf_pad (FILE *s, char pad, size_t count)
|
||
#else
|
||
__wprintf_pad (FILE *s, wchar_t pad, size_t count)
|
||
#endif
|
||
{
|
||
const CHAR_T *padptr;
|
||
register size_t i;
|
||
|
||
padptr = pad == L_(' ') ? blanks : zeroes;
|
||
|
||
for (i = count; i >= PADSIZE; i -= PADSIZE)
|
||
if (PUT (s, padptr, PADSIZE) != PADSIZE)
|
||
return -1;
|
||
if (i > 0)
|
||
if (PUT (s, padptr, i) != i)
|
||
return -1;
|
||
|
||
return count;
|
||
}
|
||
#undef PADSIZE
|
||
#endif /* USE_IN_LIBIO */
|