mirror of
https://sourceware.org/git/glibc.git
synced 2025-04-24 21:47:24 +03:00
Mon Sep 23 15:31:04 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu> * hurd/Makefile ($(includedir)/rpc/netdb.h): There is no make variable `top_srcdir' in libc; use $(..) instead. * sysdeps/mach/hurd/Makefile (rtld-installed-name): Delete special definition. It was a *Mistake*. (With a capital M.) * sysdeps/mach/getsysstats.c (__get_nprocs): Renamed from __get_nproc. (__get_nprocs_conf): Renamed from __get_nproc_conf. Fri Sep 27 03:49:56 1996 Ulrich Drepper <drepper@cygnus.com> Add support for cancelable system calls. * csu/initfini.c: Make in crti.o reference to symbol __libc_force_cancel_wrapper when compiling reentrant version. * misc/Makefile (routines): Add force-wrapper. * misc/force-wrapper.c: New file. * posix/system.c: Rename function to __libc_system and make system a weak alias. * sysdeps/stub/system.c: Likewise. * posix/wait.c: Rename function to __libc_wait and make __wait a weak alias. De-ANSI-fy. * sysdeps/standalone/read.c: Rename function to __libc_read and make __read a weak alias. * sysdeps/stub/read.c: Likewise. * sysdeps/standalone/write.c: Rename function to __libc_write and make __write a weak alias. * sysdeps/stub/write.c: Likewise. * sysdeps/stub/tcdrain.c: Rename function to __libc_tcdrain and make tcdrain a weak alias. * sysdeps/unix/bsd/tcdrain.c: Likewise. * sysdeps/unix/bsd/bsd4.4/tcdrain.c: Likewise. * sysdeps/unix/sysv/tcdrain.c: Likewise. * sysdeps/unix/sysv/linux/tcdrain.c: Likewise. * sysdeps/unix/bsd/bsd4.4/wait.c: Rename function to __libc_wait and make __wait a weak alias. * sysdeps/stub/waitpid.c: Rename function to __libc_waitpid and make __waitpid a weak alias. * sysdeps/unix/bsd/bsd4.4/waitpid.c: Likewise. * sysdeps/unix/sysv/linux/waitpid.c: Likewise. * sysdeps/unix/sysv/sysv4/waitpid.c: Likewise. * sysdeps/unix/common/pause.c: Rename function to __libc_pause and make pause a weak alias. De-ANSI-fy. * sysdeps/unix/syscalls.list: Change name for close, fcntl, fsync, lseek, open, read, and write to have __libc_ prefix and make old names a weak alias. * sysdeps/unix/mman/syscalls.list: Likewise for msync. * sysdeps/unix/sysv/linux/syscalls.list: Likewise for nanosleep. * io/creat.c: De-ANSI-fy. * sysdeps/unix/sysv/linux/syscalls.list: Add pause. Thu Sep 26 19:15:55 1996 Ulrich Drepper <drepper@cygnus.com> * misc/mntent.h: Add MNTTYPE_* and MNTOPT_* macros. Reported by Hans Grobler <grobh@nolian.ee.sun.ac.za>. Thu Sep 26 14:40:10 1996 Ulrich Drepper <drepper@cygnus.com> * sysdeps/posix/pathconf.c: Pass descriptor for just opened file to fpathconf. Reported by Martin von Loewis <martin@mira.isdn.cs.tu-berlin.de>. Thu Sep 26 04:02:43 1996 Ulrich Drepper <drepper@cygnus.com> * locale/programs/locfile.c (write_locale_data): Allocate room even for file name for LC_MESSAGES locale. (locafile_read): `tok_era' must be handled as a string list. * locale/programs/ld-time.c: Finish correction of handling `era'. * locale/C-time.c (_nl_C_LC_TIME): Add initializer for new fields. * locale/categories.def: Add postload function for LC_TIME. * locale/setlocale.c: Make lock global and rename to __libc_setlocale_lock. * locale/localeinfo.h (struct era_entry): New type. Used in strftime. Add prototypes for _nl_get_era_entry and _nl_get_alt_digit. * locale/lc-time.c (_nl_postload_time): New function. Initialize lazy intialization. (_nl_get_era_entry): New function. Return era entry which corresponds to given year. (_nl_get_alt_digit): New function. Return string with alternate digit representation for given number. * time/strftime.c (strftime): Use _nl_get_alt_digit to get string representing alternate digit notation. Wed Sep 25 17:31:55 1996 Ulrich Drepper <drepper@cygnus.com> * sysdeps/generic/waitstatus.h (union wait): Add w_status field. Reported by Hans Grobler <grobh@nolian.ee.sun.ac.za>. * elf/rtld.c (dl_main): Process LD_PRELOAD before loading ld.so.preload. Suggested by David Engel <david@elo.ods.com>. Wed Sep 25 13:10:57 1996 Ulrich Drepper <drepper@cygnus.com> * catgets/gencat.c (main): Change --version again because RMS wants the package name in parentheses. * db/makedb.c: Likewise. * locale/programs/locale.c: Likewise. * locale/programs/localedef.c: Likewise. Tue Sep 24 01:28:05 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * Makefile ($(objpfx)sysd-dirs): Depend on Subdirs files, command rewritten. ($(objpfx)version-info.h): Depend on Banner files, command rewritten. Wed Sep 25 02:44:41 1996 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/linux/sleep.c: New file. Based on nanosleep. Tue Sep 24 21:46:02 1996 Ulrich Drepper <drepper@cygnus.com> * shadow/lckpwdf.c (PWD_LOCKFILE): Change to /etc/lock.pwd to be on the same device as the password file. * shadow/shadow.h (struct spwd): Change type of numeric fields to `long int' since there value are days, not seconds. * shadow/putspent.c: Change casts from time_t to `long int'. * shadow/sgetspent_r.c (LINE_READER): Likewise. Mon Sep 23 23:05:24 1996 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/linux/errnos.h: Define __set_errno to make sure the thread specific variable is set as well as the global variable. * sysdeps/mach/hurd/errnos.awk: Define macro for source code compatibility. * sysdeps/stub/errnos.h: Likewise. * sysdeps/unix/bsd/bsd4.4/errnos.h: Likewise. * shadow/putspent.c: Don't include <errno.h>. * dirent/scandir.c (scandir): Use __set_errno to set errno variable. * elf/dl-load.c (open_path): Likewise. * inet/rcmd.c (rcmd): Likewise. (rresvport): Likewise. * intl/dcgettext.c [!__set_errno]: Define __set_errno. (DCGETTEXT): Use __set_errno to set errno variable. * io/fts.c (fts_open): Likewise. (fts_close): Likewise. (fts_read): Likewise. (fts_set): Likewise. (fts_children): Likewise. (fts_build): Likewise. (fts_stat): Likewise. * io/ftw.c (ftw_dir): Likewise. (ftw): Likewise. * io/getwd.c (getwd): Likewise. * io/lockf.c (lockf): Likewise. * libio/libioP.h [EINVAL]: Use __set_errno to define MAYBE_SET_EINVAL. * libio/iofdopen.c (_IO_fdopen): Use MAYBE_SET_EINVAL to errno. * libio/iogetdelim.c (_IO_getdelim): Likewise. * libio/fileops.c (_IO_file_open): Use __set_errno to set errno variable. * libio/iofgetpos.c (_IO_fgetpos): Likewise. * libio/iofsetpos.c (_IO_fsetpos): Likewise. * libio/ioftell.c (_IO_ftell): Likewise. * locale/loadlocale.c (_nl_load_locale): Likewise. * locale/nl_langinfo.c (nl_langinfo): Likewise. * locale/setlocale.c (ERROR_RETURN): Likewise. * login/getutid_r (__getutid_r): Likewise. * login/getutline_r (__getutline_r): Likewise. * login/login.c (tty_name): Likewise. * login/oututline_r.c (__pututline_r): Likewise. * malloc/malloc.c (morecore): Likewise. * misc/efgcvt_r.c (fcvt_r): Likewise. * misc/hsearch_r.c (hcreate_r): Likewise. (hdestroy_r): Likewise. (hsearch_r): Likewise. * nss/nsswitch.c (__nss_configure_lookup): Likewise. * nss/nss_dns/dns-host.c (_nss_dns_gethostbyname2_r): Likewise. (_nss_dns_gethostbyaddr_r): Likewise. * nss/nss_files/files-XXX.c (internal_getent): Likewise. * nss/nss_files/files-parse.c (parse_list): Likewise. * posix/confstr.c (confstr): Likewise. De-ANSI-fy. * posix/execvp.c (execvp): Likewise. * posix/glob.c: Define __set_errno. (glob): Use __set_errno to set errno variable. (glob_in_dir): Likewise. * pwd/getpw.c: Likewise. De-ANSI-fy. * pwd/putpwent.c: Likewise. * resolv/inet_net_ntop.c: Likewise. * resolv/inet_net_pton.c: Likewise. * resolv/inet_neta.c: Likewise. * resolv/inet_ntop.c: Likewise. * resolv/inet_pton.c: Likewise. * resolv/res_query.c (res_search): Likewise. * resolv/res_send.c (Aerror): Likewise. (Perror): Likewise. (res_send): Likewise. * signal/sigaddset.c: Likewise. De-ANSI-fy. * signal/sigdelset.c: Likewise. * signal/sigempty.c: Likewise. * signal/sigfillset.c: Likewise. * signal/sigismem.c: Likewise. * stdio/fclose.c: Likewise. * stdio/feof.c: Likewise. * stdio/ferror.c: Likewise. * stdio/fflush.c: Likewise. * stdio/fgetc.c: Likewise. * stdio/fgetpos.c: Likewise. * stdio/fgets.c: Likewise. * stdio/fileno.c: Likewise. * stdio/fmemopen.c: Likewise. * stdio/fopen.c: Likewise. * stdio/fputc.c: Likewise. * stdio/fread.c: Likewise. * stdio/freopen.c: Likewise. * stdio/fseek.c: Likewise. * stdio/fsetpos.c: Likewise. * stdio/ftell.c: Likewise. * stdio/fwrite.c: Likewise. * stdio/getdelim.c: Likewise. * stdio/gets.c: Likewise. * stdio/glue.c: Likewise. * stdio/internals.c: Likewise. * stdio/memstream.c: Likewise. * stdio/setvbuf.c: Likewise. * stdio/ungetc.c: Likewise. * stdio/vsscanf.c: Likewise. * stdio-common/reg-printf.c: Likewise. * stdio-common/vfprintf.c: Likewise. * stdio-common/vfscanf.c: Likewise. * stdlib/canonicalize.c: Likewise. * stdlib/msort.c: Likewise. * stdlib/random_r.c: Likewise. * stdlib/strfmon.c: Likewise. * stdlib/strtod.c: Likewise. * stdlib/strtol.c: Likewise. * sunrpc/bindrsvprt.c: Likewise. * time/asctime.c: Likewise. * time/localtime.c: Likewise. * wcsmbs/mbrtowc.c: Likewise. * wcsmbs/mbsnrtowcs.c: Likewise. * wcsmbs/mbsrtowcs.c: Likewise. * wcsmbs/wcrtomb.c: Likewise. * wcsmbs/wcsnrtombs.c: Likewise. * wcsmbs/wcsrtombs.c: Likewise. * wcsmbs/wcstok.c: Likewise. * sysdeps/generic/ftime.c: Likewise. * sysdeps/generic/pty.c: Likewise. * sysdeps/generic/setenv.c: Likewise. * sysdeps/generic/speed.c: Likewise. * sysdeps/generic/sysd-stdio.c: Likewise. * sysdeps/generic/uname.c: Likewise. * sysdeps/generic/vlimit.c: Likewise. * sysdeps/libm-ieee754/k_standard.c: Likewise. * sysdeps/libm-ieee754/s_ldexp.c: Likewise. * sysdeps/libm-ieee754/s_ldexpf.c: Likewise. * sysdeps/libm-ieee754/s_ldexpl.c: Likewise. * sysdeps/libm-ieee754/w_scalb.c: Likewise. * sysdeps/libm-ieee754/w_scalbf.c: Likewise. * sysdeps/libm-ieee754/w_scalbl.c: Likewise. * sysdeps/posix/dup2.c: Likewise. * sysdeps/posix/euidaccess.c: Likewise. * sysdeps/posix/fdopen.c: Likewise. * sysdeps/posix/flock.c: Likewise. * sysdeps/posix/fpathconf.c: Likewise. * sysdeps/posix/getcwd.c: Likewise. * sysdeps/posix/gettimeofday.c: Likewise. * sysdeps/posix/isatty.c: Likewise. * sysdeps/posix/isfdtype.c: Likewise. * sysdeps/posix/killpg.c: Likewise. * sysdeps/posix/mkstemp.c: Likewise. * sysdeps/posix/mktemp.c: Likewise. * sysdeps/posix/pathconf.c: Likewise. * sysdeps/posix/pipestream.c: Likewise. * sysdeps/posix/remove.c: Likewise. * sysdeps/posix/rename.c: Likewise. * sysdeps/posix/sigintr.c: Likewise. * sysdeps/posix/signal.c: Likewise. * sysdeps/posix/sigsuspend.c: Likewise. * sysdeps/posix/sigvec.c: Likewise. * sysdeps/posix/sleep.c: Likewise. * sysdeps/posix/sysconf.c: Likewise. * sysdeps/posix/system.c: Likewise. * sysdeps/posix/tempname.c: Likewise. * sysdeps/posix/truncate.c: Likewise. * sysdeps/posix/ttyname.c: Likewise. * sysdeps/posix/ttyname_r.c: Likewise. * sysdeps/posix/wait3.c: Likewise. * sysdeps/standalone/close.c: Likewise. * sysdeps/standalone/open.c: Likewise. * sysdeps/standalone/read.c: Likewise. * sysdeps/standalone/write.c: Likewise. * sysdeps/stub/__longjmp.c: Likewise. * sysdeps/stub/accept.c: Likewise. * sysdeps/stub/access.c: Likewise. * sysdeps/stub/acct.c: Likewise. * sysdeps/stub/adjtime.c: Likewise. * sysdeps/stub/alarm.c: Likewise. * sysdeps/stub/bind.c: Likewise. * sysdeps/stub/brk.c: Likewise. * sysdeps/stub/chdir.c: Likewise. * sysdeps/stub/chflags.c: Likewise. * sysdeps/stub/chmod.c: Likewise. * sysdeps/stub/chown.c: Likewise. * sysdeps/stub/chroot.c: Likewise. * sysdeps/stub/clock.c: Likewise. * sysdeps/stub/close.c: Likewise. * sysdeps/stub/closedir.c: Likewise. * sysdeps/stub/connect.c: Likewise. * sysdeps/stub/ctermid.c: Likewise. * sysdeps/stub/cuserid.c: Likewise. * sysdeps/stub/dirfd.c: Likewise. * sysdeps/stub/dup.c: Likewise. * sysdeps/stub/dup2.c: Likewise. * sysdeps/stub/euidaccess.c: Likewise. * sysdeps/stub/execve.c: Likewise. * sysdeps/stub/fchdir.c: Likewise. * sysdeps/stub/fchflags.c: Likewise. * sysdeps/stub/fchmod.c: Likewise. * sysdeps/stub/fchown.c: Likewise. * sysdeps/stub/fcntl.c: Likewise. * sysdeps/stub/fdopen.c: Likewise. * sysdeps/stub/fexecve.c: Likewise. * sysdeps/stub/flock.c: Likewise. * sysdeps/stub/fork.c: Likewise. * sysdeps/stub/fpathconf.c: Likewise. * sysdeps/stub/fstatfs.c: Likewise. * sysdeps/stub/fsync.c: Likewise. * sysdeps/stub/ftruncate.c: Likewise. * sysdeps/stub/fxstat.c: Likewise. * sysdeps/stub/getcwd.c: Likewise. * sysdeps/stub/getdents.c: Likewise. * sysdeps/stub/getdomain.c: Likewise. * sysdeps/stub/getdtsz.c: Likewise. * sysdeps/stub/getegid.c: Likewise. * sysdeps/stub/getenv.c: Likewise. * sysdeps/stub/geteuid.c: Likewise. * sysdeps/stub/getgid.c: Likewise. * sysdeps/stub/getgroups.c: Likewise. * sysdeps/stub/gethostid.c: Likewise. * sysdeps/stub/gethostname.c: Likewise. * sysdeps/stub/getitimer.c: Likewise. * sysdeps/stub/getlogin.c: Likewise. * sysdeps/stub/getlogin_r.c: Likewise. * sysdeps/stub/getpagesize.c: Likewise. * sysdeps/stub/getpeername.c: Likewise. * sysdeps/stub/getpid.c: Likewise. * sysdeps/stub/getppid.c: Likewise. * sysdeps/stub/getpriority.c: Likewise. * sysdeps/stub/getrlimit.c: Likewise. * sysdeps/stub/getrusage.c: Likewise. * sysdeps/stub/getsid.c: Likewise. * sysdeps/stub/getsockname.c: Likewise. * sysdeps/stub/getsockopt.c: Likewise. * sysdeps/stub/getsysstats.c: Likewise. * sysdeps/stub/gettimeofday.c: Likewise. * sysdeps/stub/getuid.c: Likewise. * sysdeps/stub/gtty.c: Likewise. * sysdeps/stub/ioctl.c: Likewise. * sysdeps/stub/isatty.c: Likewise. * sysdeps/stub/isfdtype.c: Likewise. * sysdeps/stub/kill.c: Likewise. * sysdeps/stub/killpg.c: Likewise. * sysdeps/stub/link.c: Likewise. * sysdeps/stub/listen.c: Likewise. * sysdeps/stub/lseek.c: Likewise. * sysdeps/stub/lxstat.c: Likewise. * sysdeps/stub/madvice.c: Likewise. * sysdeps/stub/mkdir.c: Likewise. * sysdeps/stub/mkfifo.c: Likewise. * sysdeps/stub/mkstemp.c: Likewise. * sysdeps/stub/mktemp.c: Likewise. * sysdeps/stub/mmap.c: Likewise. * sysdeps/stub/morecore.c: Likewise. * sysdeps/stub/mprotect.c: Likewise. * sysdeps/stub/msgctl.c: Likewise. * sysdeps/stub/msgget.c: Likewise. * sysdeps/stub/msgrcv.c: Likewise. * sysdeps/stub/msgsnd.c: Likewise. * sysdeps/stub/msync.c: Likewise. * sysdeps/stub/munmap.c: Likewise. * sysdeps/stub/nanosleep.c: Likewise. * sysdeps/stub/nice.c: Likewise. * sysdeps/stub/nlist.c: Likewise. * sysdeps/stub/open.c: Likewise. * sysdeps/stub/opendir.c: Likewise. * sysdeps/stub/pathconf.c: Likewise. * sysdeps/stub/pause.c: Likewise. * sysdeps/stub/pipe.c: Likewise. * sysdeps/stub/pipestream.c: Likewise. * sysdeps/stub/poll.c: Likewise. * sysdeps/stub/profil.c: Likewise. * sysdeps/stub/ptrace.c: Likewise. * sysdeps/stub/putenv.c: Likewise. * sysdeps/stub/raise.c: Likewise. * sysdeps/stub/read.c: Likewise. * sysdeps/stub/readdir.c: Likewise. * sysdeps/stub/readlink.c: Likewise. * sysdeps/stub/readv.c: Likewise. * sysdeps/stub/reboot.c: Likewise. * sysdeps/stub/recv.c: Likewise. * sysdeps/stub/recvfrom.c: Likewise. * sysdeps/stub/recvmsg.c: Likewise. * sysdeps/stub/remove.c: Likewise. * sysdeps/stub/rename.c: Likewise. * sysdeps/stub/revoke.c: Likewise. * sysdeps/stub/rewinddir.c: Likewise. * sysdeps/stub/rmdir.c: Likewise. * sysdeps/stub/sbrk.c: Likewise. * sysdeps/stub/sched_getp.c: Likewise. * sysdeps/stub/sched_gets.c: Likewise. * sysdeps/stub/sched_primax.c: Likewise. * sysdeps/stub/sched_primin.c: Likewise. * sysdeps/stub/sched_rr_gi.c: Likewise. * sysdeps/stub/sched_setp.c: Likewise. * sysdeps/stub/sched_sets.c: Likewise. * sysdeps/stub/sched_yield.c: Likewise. * sysdeps/stub/seekdir.c: Likewise. * sysdeps/stub/select.c: Likewise. * sysdeps/stub/semctl.c: Likewise. * sysdeps/stub/semget.c: Likewise. * sysdeps/stub/semop.c: Likewise. * sysdeps/stub/send.c: Likewise. * sysdeps/stub/sendmsg.c: Likewise. * sysdeps/stub/sendto.c: Likewise. * sysdeps/stub/setdomain.c: Likewise. * sysdeps/stub/setegid.c: Likewise. * sysdeps/stub/setenv.c: Likewise. * sysdeps/stub/seteuid.c: Likewise. * sysdeps/stub/setgid.c: Likewise. * sysdeps/stub/setgroups.c: Likewise. * sysdeps/stub/sethostid.c: Likewise. * sysdeps/stub/sethostname.c: Likewise. * sysdeps/stub/setitimer.c: Likewise. * sysdeps/stub/setjmp.c: Likewise. * sysdeps/stub/setlogin.c: Likewise. * sysdeps/stub/setpgid.c: Likewise. * sysdeps/stub/setpriority.c: Likewise. * sysdeps/stub/setregid.c: Likewise. * sysdeps/stub/setreuid.c: Likewise. * sysdeps/stub/setrlimit.c: Likewise. * sysdeps/stub/setsid.c: Likewise. * sysdeps/stub/setsockopt.c: Likewise. * sysdeps/stub/settimeofday.c: Likewise. * sysdeps/stub/setuid.c: Likewise. * sysdeps/stub/shmat.c: Likewise. * sysdeps/stub/shmctl.c: Likewise. * sysdeps/stub/shmdt.c: Likewise. * sysdeps/stub/shmget.c: Likewise. * sysdeps/stub/shutdown.c: Likewise. * sysdeps/stub/sigaction.c: Likewise. * sysdeps/stub/sigaltstack.c: Likewise. * sysdeps/stub/sigblock.c: Likewise. * sysdeps/stub/sigintr.c: Likewise. * sysdeps/stub/signal.c: Likewise. * sysdeps/stub/sigpause.c: Likewise. * sysdeps/stub/sigpending.c: Likewise. * sysdeps/stub/sigprocmask.c: Likewise. * sysdeps/stub/sigreturn.c: Likewise. * sysdeps/stub/sigsetmask.c: Likewise. * sysdeps/stub/sigstack.c: Likewise. * sysdeps/stub/sigsuspend.c: Likewise. * sysdeps/stub/sigvec.c: Likewise. * sysdeps/stub/sleep.c: Likewise. * sysdeps/stub/socket.c: Likewise. * sysdeps/stub/socketpair.c: Likewise. * sysdeps/stub/sstk.c: Likewise. * sysdeps/stub/statfs.c: Likewise. * sysdeps/stub/stime.c: Likewise. * sysdeps/stub/stty.c: Likewise. * sysdeps/stub/swapoff.c: Likewise. * sysdeps/stub/swapon.c: Likewise. * sysdeps/stub/symlink.c: Likewise. * sysdeps/stub/sync.c: Likewise. * sysdeps/stub/syscall.c: Likewise. * sysdeps/stub/sysconf.c: Likewise. * sysdeps/stub/sysd-stdio.c: Likewise. * sysdeps/stub/system.c: Likewise. * sysdeps/stub/tcdrain.c: Likewise. * sysdeps/stub/tcflow.c: Likewise. * sysdeps/stub/tcflush.c: Likewise. * sysdeps/stub/tcgetattr.c: Likewise. * sysdeps/stub/tcgetpgrp.c: Likewise. * sysdeps/stub/tcsendbrk.c: Likewise. * sysdeps/stub/tcsetattr.c: Likewise. * sysdeps/stub/tcsetpgrp.c: Likewise. * sysdeps/stub/telldir.c: Likewise. * sysdeps/stub/tempname.c: Likewise. * sysdeps/stub/time.c: Likewise. * sysdeps/stub/times.c: Likewise. * sysdeps/stub/truncate.c: Likewise. * sysdeps/stub/ttyname.c: Likewise. * sysdeps/stub/ttyname_r.c: Likewise. * sysdeps/stub/ualarm.c: Likewise. * sysdeps/stub/ulimit.c: Likewise. * sysdeps/stub/umask.c: Likewise. * sysdeps/stub/unlink.c: Likewise. * sysdeps/stub/usleep.c: Likewise. * sysdeps/stub/ustat.c: Likewise. * sysdeps/stub/utime.c: Likewise. * sysdeps/stub/utimes.c: Likewise. * sysdeps/stub/vhangup.c: Likewise. * sysdeps/stub/wait.c: Likewise. * sysdeps/stub/wait3.c: Likewise. * sysdeps/stub/wait4.c: Likewise. * sysdeps/stub/waitpid.c: Likewise. * sysdeps/stub/write.c: Likewise. * sysdeps/stub/writev.c: Likewise. * sysdeps/stub/xmknod.c: Likewise. * sysdeps/stub/xstat.c: Likewise. * sysdeps/unix/closedir.c: Likewise. * sysdeps/unix/fxstat.c: Likewise. * sysdeps/unix/getlogin.c: Likewise. * sysdeps/unix/getlogin_r.c: Likewise. * sysdeps/unix/mkdir.c: Likewise. * sysdeps/unix/nice.c: Likewise. * sysdeps/unix/nlist.c: Likewise. * sysdeps/unix/opendir.c: Likewise. * sysdeps/unix/readdir.c: Likewise. * sysdeps/unix/rmdir.c: Likewise. * sysdeps/unix/stime.c: Likewise. * sysdeps/unix/xmknod.c: Likewise. * sysdeps/unix/xstat.c: Likewise. * sysdeps/unix/bsd/isatty.c: Likewise. * sysdeps/unix/bsd/setegid.c: Likewise. * sysdeps/unix/bsd/seteuid.c: Likewise. * sysdeps/unix/bsd/setsid.c: Likewise. * sysdeps/unix/bsd/sigaction.c: Likewise. * sysdeps/unix/bsd/sigprocmask.c: Likewise. * sysdeps/unix/bsd/sigsuspend.c: Likewise. * sysdeps/unix/bsd/tcflow.c: Likewise. * sysdeps/unix/bsd/tcflush.c: Likewise. * sysdeps/unix/bsd/tcgetattr.c: Likewise. * sysdeps/unix/bsd/tcsetattr.c: Likewise. * sysdeps/unix/bsd/times.c: Likewise. * sysdeps/unix/bsd/ulimit.c: Likewise. * sysdeps/unix/common/lxstat.c: Likewise. * sysdeps/unix/common/tcsendbrk.c: Likewise. * sysdeps/unix/sysv/setrlimit.c: Likewise. * sysdeps/unix/sysv/settimeofday.c: Likewise. * sysdeps/unix/sysv/sigaction.c: Likewise. * sysdeps/unix/sysv/tcflow.c: Likewise. * sysdeps/unix/sysv/tcflush.c: Likewise. * sysdeps/unix/sysv/tcgetattr.c: Likewise. * sysdeps/unix/sysv/tcsendbrk.c: Likewise. * sysdeps/unix/sysv/tcsetattr.c: Likewise. * sysdeps/unix/bsd/ultrix4/sysconf.c: Likewise. * sysdeps/unix/sysv/irix4/getpriority.c: Likewise. * sysdeps/unix/sysv/irix4/setpriority.c: Likewise. * sysdeps/unix/sysv/linux/adjtime.c: Likewise. * sysdeps/unix/sysv/linux/gethostid.c: Likewise. * sysdeps/unix/sysv/linux/gethostname.c: Likewise. * sysdeps/unix/sysv/linux/getsysstats.c: Likewise. * sysdeps/unix/sysv/linux/ptrace.c: Likewise. * sysdeps/unix/sysv/linux/speed.c: Likewise. * sysdeps/unix/sysv/linux/ulimit.c: Likewise. * sysdeps/unix/sysv/sysv4/sigaction.c: Likewise. * sysdeps/unix/sysv/sysv4/sysconf.c: Likewise. * sysdeps/unix/bsd/sun/m68k/sigtramp.c: Likewise. * sysdeps/unix/bsd/sun/sparc/sigtramp.c: Likewise. * sysdeps/unix/bsd/sun/sunos4/speed.c: Likewise. * sysdeps/unix/bsd/sun/sunos4/tcsetattr.c: Likewise. * sysdeps/unix/sysv/linux/alpha/ioperm.c: Likewise. * sysdeps/unix/sysv/linux/i386/brk.c: Likewise. * sysdeps/unix/sysv/linux/i386/sigaction.c: Likewise. * sysdeps/unix/sysv/linux/m68k/brk.c: Likewise. * sunrpc/clnt_tcp.c: Protect declaration of errno by #ifndef. * sunrpc/clnt_udp.c: Likewise. * sunrpc/bindrsvprt.c: Likewise. * sunrpc/pm_getmaps.c: Likewise. * sunrpc/pmap_rmt.c: Likewise. * sunrpc/svc.c: Likewise. * sunrpc/svc_run.c: Likewise. * sunrpc/svc_tcp.c: Likewise. * sunrpc/svc_udp.c: Likewise. * sysdeps/generic/strtok.c: Don't check argument, just crash. * sysdeps/generic/strtok_r.c: Likewise. * sysdeps/stub/start.c: Make __errno a strong alias of errno. * sysdeps/unix/start.c: Likewise. De-ANSI-fy. * sysdeps/unix/sparc/start.c: Likewise. * sysdeps/standalone/m68k/m68020/start.S: Likewise. * sysdeps/unix/sysv/irix4/start.c: Likewise. * sysdeps/unix/bsd/ultrix4/mips/start.S: Likewise. * sysdeps/unix/sysv/linux/i386/sysdep.S: Likewise. * sysdeps/unix/sysv/linux/m68k/sysdep.S: Likewise. Mon Sep 23 17:54:57 1996 Ulrich Drepper <drepper@cygnus.com> * catgets/gencat.c (main): Put package name in --version message in parantheses. Reported by Jim Meyering. * db/makedb.c: Likewise. * locale/programs/locale.c: Likewise. * locale/programs/localedef.c: Likewise. * sysdeps/i386/fpu/__math.h (tan): Make sure gcc knows we use two registers. Patch by John Bowman. Sat Sep 21 15:08:25 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/mach/libc-lock.h: Fix comment. * sysdeps/stubs/libc-lock.h: Likewise. Sat Sep 21 13:50:40 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * libio/genops.c (_IO_init) [_IO_MTSAFE_IO]: Dereference pointer to lock when passing it to __libc_lock_init macro. (_IO_default_finish) [_IO_MTSAFE_IO]: Dereference pointer to lock when passing it to __libc_lock_fini macro. Sat Sep 21 14:35:40 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/unix/sysv/linux/m68k/sysdep.h (SYSCALL_ERROR_HANDLER) [_LIBC_REENTRANT]: Add missing semicolon. * sysdeps/unix/sysv/linux/m68k/sysdep.S: Move inclusion of sysdep.h to the top outside of #ifndef PIC. Don't include errnos.h. Use the ENTRY macro. Sat Sep 21 14:33:41 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * libio/Makefile: Make `all' the default target. * po/Makefile: Likewise. Mon Sep 23 15:49:47 1996 Ulrich Drepper <drepper@cygnus.com> * stdlib/test-canon.c: Correct patch from Thu Sep 12 23:01:16 1996. I applied it incorrectly. * sysdeps/m68k/fpu/s_scalbn.c: Likewise. * sysdeps/m68k/fpu/s_scalbnf.c: Likewise. * sysdeps/m68k/fpu/s_scalbnl.c: Likewise. Mon Sep 23 03:00:10 1996 Ulrich Drepper <drepper@cygnus.com> * shadow/sgetspent_r.c (LINE_PARSER): Accept empty 9th field. Patch by NIIBE Yutaka <gniibe@mri.co.jp>. * shadow/sgetspent_r.c (LINE_PARSER): Don't accept any chars after 9th field. * sysdeps/unix/sysv/linux/Makefile [$(subdir)==misc] (sysdep_headers): Add sys/debugreg.h, sys/kd.h, sys/soundcard.h, and sys/vt.h. * sysdeps/unix/sysv/linux/sys/debugreg.h: New file. * sysdeps/unix/sysv/linux/sys/kd.h: New file. * sysdeps/unix/sysv/linux/sys/soundcard.h: New file. * sysdeps/unix/sysv/linux/sys/vt.h: New file. Reported by NIIBE Yutaka <gniibe@mri.co.jp>.
1563 lines
50 KiB
C
1563 lines
50 KiB
C
/* Copyright (C) 1991, 92, 93, 94, 95, 96 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 <libc-lock.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) \
|
||
{ if (__printf_pad (s, Padchar, width) == -1) \
|
||
return -1; else done += width; }
|
||
# 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) \
|
||
{ if (__wprintf_pad (s, Padchar, width) == -1) \
|
||
return -1; else done += width; }
|
||
# 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
|
||
# 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 || 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 || 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)
|
||
#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 (PUT (s, String, Len) != 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
|
||
|
||
extern void __flockfile (FILE *);
|
||
weak_extern (__flockfile);
|
||
extern void __funlockfile (FILE *);
|
||
|
||
/* 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));
|
||
|
||
/* 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));
|
||
|
||
|
||
/* 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;
|
||
|
||
|
||
/* 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, 0, 0, 0,
|
||
0, /* 'E' */ 19, 0, /* 'G' */ 19,
|
||
0, 0, 0, 0,
|
||
/* 'L' */ 12, 0, 0, 0,
|
||
0, 0, 0, 0,
|
||
0, 0, 0, 0,
|
||
/* 'X' */ 18, 0, /* 'Z' */ 13, 0,
|
||
0, 0, 0, 0,
|
||
0, 0, 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[25] = \
|
||
{ \
|
||
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' */ \
|
||
REF (form_pointer), /* for 'p' */ \
|
||
REF (form_number), /* for 'n' */ \
|
||
REF (form_strerror) /* for 'm' */ \
|
||
}; \
|
||
/* Step 1: after processing width. */ \
|
||
static const void *step1_jumps[25] = \
|
||
{ \
|
||
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' */ \
|
||
REF (form_pointer), /* for 'p' */ \
|
||
REF (form_number), /* for 'n' */ \
|
||
REF (form_strerror) /* for 'm' */ \
|
||
}; \
|
||
/* Step 2: after processing precision. */ \
|
||
static const void *step2_jumps[25] = \
|
||
{ \
|
||
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' */ \
|
||
REF (form_pointer), /* for 'p' */ \
|
||
REF (form_number), /* for 'n' */ \
|
||
REF (form_strerror) /* for 'm' */ \
|
||
}; \
|
||
/* Step 3: after processing first 'l' modifier. */ \
|
||
static const void *step3_jumps[25] = \
|
||
{ \
|
||
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' */ \
|
||
REF (form_pointer), /* for 'p' */ \
|
||
REF (form_number), /* for 'n' */ \
|
||
REF (form_strerror) /* for 'm' */ \
|
||
}
|
||
|
||
#define STEP4_TABLE \
|
||
/* Step 4: processing format specifier. */ \
|
||
static const void *step4_jumps[25] = \
|
||
{ \
|
||
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' */ \
|
||
REF (form_pointer), /* for 'p' */ \
|
||
REF (form_number), /* for 'n' */ \
|
||
REF (form_strerror) /* for 'm' */ \
|
||
}
|
||
|
||
|
||
#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_character): \
|
||
/* Character. */ \
|
||
--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_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) \
|
||
{ \
|
||
if (prec != -1) \
|
||
{ \
|
||
/* Search for the end of the string, but don't search past \
|
||
the length specified by the precision. */ \
|
||
const char *end = memchr (string, '\0', prec); \
|
||
if (end) \
|
||
len = end - string; \
|
||
else \
|
||
len = 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 (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;
|
||
ap_save = ap;
|
||
nspecs_done = 0;
|
||
|
||
/* Find the first format specifier. */
|
||
f = lead_str_end = find_spec (format, &mbstate);
|
||
|
||
/* Lock stream. */
|
||
__libc_cleanup_region_start ((void (*) (void *)) &__funlockfile, s);
|
||
|
||
if (__flockfile != NULL)
|
||
__flockfile (s);
|
||
|
||
/* 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;
|
||
}
|
||
|
||
/* 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 extendable. */
|
||
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. */
|
||
int 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, ap = ap_save; cnt < nargs; ++cnt)
|
||
switch (args_type[cnt])
|
||
{
|
||
#define T(tag, mem, type) \
|
||
case tag: \
|
||
args_value[cnt].mem = va_arg (ap, type); \
|
||
break
|
||
|
||
T (PA_CHAR, pa_char, int); /* Promoted. */
|
||
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_POINTER, pa_pointer, void *);
|
||
#undef T
|
||
default:
|
||
if ((args_type[cnt] & PA_FLAG_PTR) != 0)
|
||
args_value[cnt].pa_pointer = va_arg (ap, void *);
|
||
else
|
||
args_value[cnt].pa_long_double = 0.0;
|
||
break;
|
||
}
|
||
|
||
/* Now walk through all format specifiers and process them. */
|
||
for (; 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 occured 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 *
|
||
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 || *grouping < 0)
|
||
{
|
||
/* 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
|
||
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;
|
||
#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 (_IO_sputn (s, hp->_IO_write_base, to_flush) != to_flush)
|
||
return -1;
|
||
}
|
||
|
||
return result;
|
||
}
|
||
|
||
#else /* !USE_IN_LIBIO */
|
||
|
||
static int
|
||
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 */
|