mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-10 15:20:10 +00:00
5107cf1d7d
1997-06-21 02:48 Ulrich Drepper <drepper@cygnus.com> * config.h.in: Add DO_STATIC_NSS. * config.make.in: Add build-static-nss. * elf/eval.c: Use __getdelim instead of __getline. * locale/programs/locale.c: Correct comment. * manual/libc.texinfo: Update copyright and date. Remove A4 option. * sysdeps/libm-ieee754/k_standard.c: Always return HUGE_VAL for gamma overflow. * sysdeps/libm-ieee754/w_gamma.c: Handle SVID and ISO C behaviour. * sysdeps/libm-ieee754/w_gammaf.c: Likewise. * sysdeps/libm-ieee754/w_gammalp.c: Likewise. * po/ko.po: Update. 1997-06-13 10:06 Richard Henderson <rth@tamu.edu> The Great Bit File Move: * configure.in (AC_INIT): Look in include/ for features.h. (sysnames): Add include as the final search directory. (AC_OUTPUT): Create a bits directory in the build directory. * Makeconfig (CPPFLAGS): Look in include/ for libc-symbols.h. * Makefile: Make sure the target directory exists when installing <gnu/stubs.h> and <gnu/lib-names.h>. * csu/Makefile: Use $(compile.S) and $(compile.c) instead of invoking $(CC) directly, as the former have the full include path. * ansidecl.h: Removed. * aliases.h: Moved to include/. * alloca.h: Likewise. * argp.h: Likewise. * argz.h: Likewise. * arpa/ftp.h: Likewise. * arpa/inet.h: Likewise. * arpa/nameser.h: Likewise. * arpa/telnet.h: Likewise. * arpa/tftp.h: Likewise. * assert.h: Likewise. * ctype.h: Likewise. * db.h: Likewise. * dirent.h: Likewise. * dlfcn.h: Likewise. * elf.h: Likewise. * endian.h: Likewise. * envz.h: Likewise. * err.h: Likewise. * errno.h: Likewise. * error.h: Likewise. * fcntl.h: Likewise. * features.h: Likewise. * fnmatch.h: Likewise. * ftw.h: Likewise. * getopt.h: Likewise. * glob.h: Likewise. * gnu-versions.h: Likewise. * grp.h: Likewise. * langinfo.h: Likewise. * libc-symbols.h: Likewise. * libgen.h: Likewise. * libintl.h: Likewise. * limits.h: Likewise. * linewrap.h: Likewise. * link.h: Likewise. * locale.h: Likewise. * malloc.h: Likewise. * math.h: Likewise. * mathcalls.h: Likewise. * mcheck.h: Likewise. * memory.h: Likewise. * netdb.h: Likewise. * netgroup.h: Likewise. * netinet/ether.h: Likewise. * netinet/in.h: Likewise. * nlist.h: Likewise. * nss.h: Likewise. * nsswitch.h: Likewise. * obstack.h: Likewise. * poll.h: Likewise. * posix1_lim.h: Likewise. * posix2_lim.h: Likewise. * printf.h: Likewise. * protocols/routed.h: Likewise. * protocols/rwhod.h: Likewise. * protocols/talkd.h: Likewise. * protocols/timed.h: Likewise. * pwd.h: Likewise. * regex.h: Likewise. * resolv.h: Likewise. * rpc/auth_unix.h: Likewise. * rpc/clnt.h: Likewise. * rpc/netdb.h: Likewise. * rpc/pmap_clnt.h: Likewise. * rpc/pmap_prot.h: Likewise. * rpc/pmap_rmt.h: Likewise. * rpc/rpc.h: Likewise. * rpc/rpc_msg.h: Likewise. * rpc/svc.h: Likewise. * rpc/svc_auth.h: Likewise. * rpc/types.h: Likewise. * rpc/xdr.h: Likewise. * sched.h: Likewise. * search.h: Likewise. * set-hooks.h: Likewise. * setjmp.h: Likewise. * sgtty.h: Likewise. * shadow.h: Likewise. * signal.h: Likewise. * stab.def: Likewise. * stab.h: Likewise. * stdio.h: Likewise. * stdlib.h: Likewise. * string.h: Likewise. * strings.h: Likewise. * sys/bitypes.h: Likewise. * sys/cdefs.h: Likewise. * sys/dir.h: Likewise. * sys/errno.h: Likewise. * sys/fcntl.h: Likewise. * sys/file.h: Likewise. * sys/gmon.h: Likewise. * sys/ioctl.h: Likewise. * sys/ipc.h: Likewise. * sys/msg.h: Likewise. * sys/poll.h: Likewise. * sys/queue.h: Likewise. * sys/resource.h: Likewise. * sys/select.h: Likewise. * sys/sem.h: Likewise. * sys/shm.h: Likewise. * sys/signal.h: Likewise. * sys/socket.h: Likewise. * sys/stat.h: Likewise. * sys/statfs.h: Likewise. * sys/syslog.h: Likewise. * sys/termios.h: Likewise. * sys/time.h: Likewise. * sys/timeb.h: Likewise. * sys/times.h: Likewise. * sys/types.h: Likewise. * sys/uio.h: Likewise. * sys/un.h: Likewise. * sys/unistd.h: Likewise. * sys/utsname.h: Likewise. * sys/vlimit.h: Likewise. * sys/vtimes.h: Likewise. * sys/wait.h: Likewise. * syscall.h: Likewise. * syslog.h: Likewise. * tar.h: Likewise. * termios.h: Likewise. * time.h: Likewise. * ttyent.h: Likewise. * unistd.h: Likewise. * utime.h: Likewise. * utmp.h: Likewise. * values.h: Likewise. * wchar.h: Likewise. * wctype.h: Likewise. * wordexp.h: Likewise. * xlocale.h: Likewise. * xopen_lim.h: Likewise. * linuxthreads/sysdeps/alpha/semaphorebits.h: -> .../bits/semaphore.h. * linuxthreads/sysdeps/powerpc/semaphorebits.h: Likewise. * linuxthreads/sysdeps/pthread/cmpxchg/semaphorebits.h: Likewise. * linuxthreads/sysdeps/pthread/no-cmpxchg/semaphorebits.h: Likewise. * linuxthreads/sysdeps/pthread/libc-lock.h: -> bits/ * sysdeps/mach/libc-lock.h: Likewise. * sysdeps/stub/libc-lock.h: Likewise. * linuxthreads/sysdeps/pthread/stdio-lock.h: Likewise. * linuxthreads/sysdeps/unix/sysv/linux/local_lim.h: Likewise. * sysdeps/mach/hurd/local_lim.h: Likewise. * sysdeps/stub/local_lim.h: Likewise. * sysdeps/unix/sysv/linux/local_lim.h: Likewise. * sysdeps/unix/sysv/local_lim.h: Likewise. * sysdeps/unix/sysv/sco3.2/local_lim.h: Likewise. * linuxthreads/sysdeps/unix/sysv/linux/posix_opt.h: Likewise. * sysdeps/mach/hurd/posix_opt.h: Likewise. * sysdeps/stub/posix_opt.h: Likewise. * sysdeps/unix/bsd/posix_opt.h: Likewise. * sysdeps/unix/bsd/ultrix4/posix_opt.h: Likewise. * sysdeps/unix/sysv/linux/posix_opt.h: Likewise. * math/cmathcalls.h: -> bits/ * math/mathcalls.h: Likewise. * misc/stab.def: -> bits/ * posix/posix1_lim.h: -> bits/ * posix/posix2_lim.h: Likewise. * sysdeps/alpha/__math.h: -> .../fpu/bits/mathinline.h * sysdeps/i386/fpu/__math.h: Likewise. * sysdeps/m68k/fpu/__math.h: Likewise. * sysdeps/m68k/fpu/switch/__math.h: Likewise. * sysdeps/powerpc/__math.h: Likewise. * sysdeps/stub/__math.h: Likewise. * sysdeps/alpha/bytesex.h: -> .../bits/endian.h * sysdeps/arm/bytesex.h: Likewise. * sysdeps/i386/bytesex.h: Likewise. * sysdeps/m68k/bytesex.h: Likewise. * sysdeps/mips/bytesex.h: Likewise. * sysdeps/mips/dec/bytesex.h: Likewise. * sysdeps/mips/mipsel/bytesex.h: Likewise. * sysdeps/mips/p40/bytesex.h: Likewise. * sysdeps/sparc/bytesex.h: Likewise. * sysdeps/stub/bytesex.h: Likewise. * sysdeps/alpha/fpu/fenvbits.h: -> .../bits/fenv.h * sysdeps/i386/fpu/fenvbits.h: Likewise. * sysdeps/m68k/fpu/fenvbits.h: Likewise. * sysdeps/powerpc/fenvbits.h: Likewise. * sysdeps/stub/fenvbits.h: Likewise. * sysdeps/alpha/jmp_buf.h: -> .../bits/setenv.h * sysdeps/arm/jmp_buf.h: Likewise. * sysdeps/i386/jmp_buf.h: Likewise. * sysdeps/m68k/jmp_buf.h: Likewise. * sysdeps/mips/jmp_buf.h: Likewise. * sysdeps/sparc/jmp_buf.h: Likewise. * sysdeps/powerpc/jmp_buf.h: Likewise. * sysdeps/stub/jmp_buf.h: Likewise. * sysdeps/vax/jmp_buf.h: Likewise. * sysdeps/generic/confname.h: -> bits/ * sysdeps/unix/sysv/irix4/confname.h: Likewise. * sysdeps/unix/sysv/sco3.2.4/confname.h: Likewise. * sysdeps/generic/gnu/types.h: -> ../bits/types.h * sysdeps/unix/sysv/linux/alpha/gnu/types.h: Likewise. * sysdeps/unix/sysv/linux/gnu/types.h: Likewise. * sysdeps/generic/ioctl-types.h: -> bits/ * sysdeps/unix/sysv/linux/ioctl-types.h: Likewise. * sysdeps/unix/sysv/linux/powerpc/ioctl-types.h: Likewise. * sysdeps/generic/iovec.h: -> .../bits/uio.h * sysdeps/unix/sysv/linux/iovec.h: Likewise. * sysdeps/generic/mathbits.h: -> .../bits/mathdef.h * sysdeps/i386/fpu/mathbits.h: Likewise. * sysdeps/m68k/fpu/mathbits.h: Likewise. * sysdeps/powerpc/mathbits.h: Likewise. * sysdeps/generic/resourcebits.h: -> .../bits/resource.h * sysdeps/unix/bsd/sun/sunos4/resourcebits.h: Likewise. * sysdeps/unix/sysv/linux/resourcebits.h: Likewise. * sysdeps/generic/schedbits.h: -> .../bits/sched.h * sysdeps/unix/sysv/linux/schedbits.h: Likewise. * sysdeps/generic/selectbits.h: -> .../bits/select.h * sysdeps/i386/selectbits.h: Likewise. * sysdeps/generic/sigaction.h: -> bits/ * sysdeps/unix/bsd/osf/sigaction.h: Likewise. * sysdeps/unix/sysv/linux/alpha/sigaction.h: Likewise. * sysdeps/unix/sysv/linux/sigaction.h: Likewise. * sysdeps/unix/sysv/linux/sparc/sigaction.h: Likewise. * sysdeps/unix/sysv/minix/sigaction.h: Likewise. * sysdeps/unix/sysv/sco3.2.4/sigaction.h: Likewise. * sysdeps/unix/sysv/sysv4/sigaction.h: Likewise. * sysdeps/generic/sigset.h: -> bits/ * sysdeps/unix/sysv/linux/sigset.h: Likewise. * sysdeps/unix/sysv/sysv4/sigset.h: Likewise. * sysdeps/generic/sockaddrcom.h: -> .../bits/sockaddr.h * sysdeps/unix/bsd/bsd4.4/sockaddrcom.h: Likewise. * sysdeps/generic/socketbits.h: -> .../bits/socket.h * sysdeps/unix/sysv/linux/socketbits.h: Likewise. * sysdeps/generic/statfsbuf.h: -> .../bits/statfs.h * sysdeps/unix/sysv/linux/statfsbuf.h: Likewise. * sysdeps/generic/termbits.h: -> .../bits/termios.h * sysdeps/unix/bsd/sun/sunos4/termbits.h: Likewise. * sysdeps/unix/sysv/linux/alpha/termbits.h: Likewise. * sysdeps/unix/sysv/linux/powerpc/termbits.h: Likewise. * sysdeps/unix/sysv/linux/sparc/termbits.h: Likewise. * sysdeps/unix/sysv/linux/termbits.h: Likewise. * sysdeps/generic/ustatbits.h: -> .../bits/ustat.h * sysdeps/unix/sysv/linux/ustatbits.h: Likewise. * sysdeps/generic/utmpbits.h: -> .../bits/utmp.h * sysdeps/gnu/utmpbits.h: Likewise. * sysdeps/unix/sysv/utmpbits.h: Likewise. * sysdeps/generic/utsnamelen.h: -> .../bits/utsname.h * sysdeps/unix/bsd/sun/sunos4/utsnamelen.h: Likewise. * sysdeps/unix/bsd/ultrix4/utsnamelen.h: Likewise. * sysdeps/unix/sysv/linux/utsnamelen.h: Likewise. * sysdeps/unix/sysv/sysv4/utsnamelen.h: Likewise. * sysdeps/unix/sysv/utsnamelen.h: Likewise. * sysdeps/generic/waitstatus.h: -> bits/ * sysdeps/i386/huge_val.h: -> bits/ * sysdeps/ieee754/huge_val.h: Likewise. * sysdeps/m68k/huge_val.h: Likewise. * sysdeps/stub/huge_val.h: Likewise. * sysdeps/vax/huge_val.h: Likewise. * sysdeps/ieee754/nan.h: Likewise. * sysdeps/stub/nan.h: Likewise. * sysdeps/mach/hurd/alpha/sigcontext.h: -> bits/ * sysdeps/mach/hurd/hppa/sigcontext.h: Likewise. * sysdeps/mach/hurd/i386/sigcontext.h: Likewise. * sysdeps/mach/hurd/mips/sigcontext.h: Likewise. * sysdeps/stub/sigcontext.h: Likewise. * sysdeps/unix/bsd/sun/m68k/sigcontext.h: Likewise. * sysdeps/unix/bsd/sun/sparc/sigcontext.h: Likewise. * sysdeps/unix/bsd/ultrix4/mips/sigcontext.h: Likewise. * sysdeps/unix/sysv/linux/sigcontext.h: Likewise. * sysdeps/mach/hurd/errnos.h: -> .../bits/errno.h * sysdeps/standalone/arm/errnos.h: Likewise. * sysdeps/stub/errnos.h: Likewise. * sysdeps/unix/bsd/bsd4.4/errnos.h: Likewise. * sysdeps/unix/sysv/linux/errnos.h: Likewise. * sysdeps/mach/hurd/fcntlbits.h: -> .../bits/fcntl.h * sysdeps/stub/fcntlbits.h: Likewise. * sysdeps/unix/bsd/bsd4.4/fcntlbits.h: Likewise. * sysdeps/unix/bsd/fcntlbits.h: Likewise. * sysdeps/unix/bsd/sun/sunos4/fcntlbits.h: Likewise. * sysdeps/unix/bsd/ultrix4/fcntlbits.h: Likewise. * sysdeps/unix/common/fcntlbits.h: Likewise. * sysdeps/unix/sysv/fcntlbits.h: Likewise. * sysdeps/unix/sysv/irix4/fcntlbits.h: Likewise. * sysdeps/unix/sysv/linux/alpha/fcntlbits.h: Likewise. * sysdeps/unix/sysv/linux/fcntlbits.h: Likewise. * sysdeps/unix/sysv/linux/sparc/fcntlbits.h: Likewise. * sysdeps/mach/hurd/ioctls.h: -> bits/ * sysdeps/stub/ioctls.h: Likewise. * sysdeps/unix/bsd/bsd4.4/ioctls.h: Likewise. * sysdeps/unix/sysv/linux/alpha/ioctls.h: Likewise. * sysdeps/unix/sysv/linux/ioctls.h: Likewise. * sysdeps/unix/sysv/linux/sparc/ioctls.h: Likewise. * sysdeps/mach/hurd/statbuf.h: -> .../bits/stat.h * sysdeps/stub/statbuf.h: Likewise. * sysdeps/unix/bsd/osf/alpha/statbuf.h: Likewise. * sysdeps/unix/bsd/statbuf.h: Likewise. * sysdeps/unix/sysv/irix4/statbuf.h: Likewise. * sysdeps/unix/sysv/linux/alpha/statbuf.h: Likewise. * sysdeps/unix/sysv/linux/statbuf.h: Likewise. * sysdeps/unix/sysv/statbuf.h: Likewise. * sysdeps/unix/sysv/sysv4/i386/statbuf.h: Likewise. * sysdeps/unix/sysv/sysv4/solaris2/statbuf.h: Likewise. * sysdeps/standalone/stdio_lim.h: -> bits/ * sysdeps/stub/stdio_lim.h: Likewise. * sysdeps/stub/direntry.h: -> ../bits/dirent.h * sysdeps/unix/bsd/bsd4.4/direntry.h: Likewise. * sysdeps/unix/bsd/direntry.h: Likewise. * sysdeps/unix/common/direntry.h: Likewise. * sysdeps/unix/sysv/direntry.h: Likewise. * sysdeps/unix/sysv/linux/direntry.h: Likewise. * sysdeps/stub/elfclass.h: -> bits/ * sysdeps/wordsize-32/elfclass.h: Likewise. * sysdeps/wordsize-64/elfclass.h: Likewise. * sysdeps/stub/signum.h: -> bits/ * sysdeps/unix/bsd/signum.h: Likewise. * sysdeps/unix/bsd/sun/signum.h: Likewise. * sysdeps/unix/sysv/irix4/signum.h: Likewise. * sysdeps/unix/sysv/linux/alpha/signum.h: Likewise. * sysdeps/unix/sysv/linux/signum.h: Likewise. * sysdeps/unix/sysv/linux/sparc/signum.h: Likewise. * sysdeps/unix/sysv/signum.h: Likewise. * sysdeps/unix/sysv/sysv4/signum.h: Likewise. * sysdeps/unix/sysv/sysv4/solaris2/signum.h: Likewise. * sysdeps/stub/sys/ipc_buf.h: -> .../bits/ipc.h * sysdeps/unix/sysv/linux/alpha/sys/ipc_buf.h: Likewise. * sysdeps/unix/sysv/linux/sys/ipc_buf.h: Likewise. * sysdeps/stub/sys/msq_buf.h: -> .../bits/msq.h * sysdeps/unix/sysv/linux/sys/msq_buf.h: Likewise. * sysdeps/stub/sys/sem_buf.h: -> .../bits/sem.h * sysdeps/unix/sysv/linux/sys/sem_buf.h: Likewise. * sysdeps/stub/sys/shm_buf.h: -> .../bits/shm.h * sysdeps/unix/sysv/linux/sys/shm_buf.h: Likewise. * sysdeps/stub/timebits.h: -> .../bits/time.h * sysdeps/unix/sysv/linux/alpha/timebits.h: Likewise. * sysdeps/unix/sysv/linux/timebits.h: Likewise. * sysdeps/stub/waitflags.h: -> bits/ * sysdeps/unix/bsd/waitflags.h: Likewise. * sysdeps/unix/sysv/linux/waitflags.h: Likewise. * sysdeps/unix/sysv/sysv4/waitflags.h: Likewise. * sysdeps/unix/sysv/linux/alpha/sys/kernel_termios.h: -> ../ * sysdeps/unix/sysv/linux/powerpc/sys/kernel_termios.h: Likewise. * sysdeps/unix/sysv/linux/sys/kernel_termios.h: Likewise. * sysdeps/unix/sysv/linux/sys/socketcall.h: -> ../ * argp/argp-fmtstream.h: Standardize the multiple-include protect. * argp/argp.h: Likewise. * catgets/nl_types.h: Likewise. * crypt/sysdeps/unix/crypt.h: Likewise. * ctype/ctype.h: Likewise. * db/db.h: Likewise. * db/mpool.h: Likewise. * db/ndbm.h: Likewise. * dirent/dirent.h: Likewise. * elf/dlfcn.h: Likewise. * elf/elf.h: Likewise. * elf/link.h: Likewise. * gmon/sys/gmon.h: Likewise. * gmon/sys/gmon_out.h: Likewise. * grp/grp.h: Likewise. * inet/aliases.h: Likewise. * inet/arpa/ftp.h: Likewise. * inet/arpa/inet.h: Likewise. * inet/arpa/telnet.h: Likewise. * inet/arpa/tftp.h: Likewise. * inet/netinet/ether.h: Likewise. * inet/netinet/icmp6.h: Likewise. * inet/netinet/in.h: Likewise. * inet/netinet/ip6.h: Likewise. * inet/protocols/routed.h: Likewise. * inet/protocols/rwhod.h: Likewise. * inet/protocols/talkd.h: Likewise. * inet/protocols/timed.h: Likewise. * intl/libintl.h: Likewise. * io/fcntl.h: Likewise. * io/fts.h: Likewise. * io/ftw.h: Likewise. * io/sys/poll.h: Likewise. * io/sys/stat.h: Likewise. * io/sys/statfs.h: Likewise. * io/utime.h: Likewise. * linuxthreads/semaphore.h: Likewise. * linuxthreads/sysdeps/pthread/pthread.h: Likewise. * locale/locale.h: Likewise. * login/pty.h: Likewise. * login/utmp.h: Likewise. * malloc/malloc.h: Likewise. * malloc/obstack.h: Likewise. * math/complex.h: Likewise. * math/fenv.h: Likewise. * math/math.h: Likewise. * md5-crypt/md5.h: Likewise. * misc/ar.h: Likewise. * misc/err.h: Likewise. * misc/error.h: Likewise. * misc/fstab.h: Likewise. * misc/libgen.h: Likewise. * misc/nlist.h: Likewise. * misc/sys/cdefs.h: Likewise. * misc/sys/file.h: Likewise. * misc/sys/ioctl.h: Likewise. * misc/sys/queue.h: Likewise. * misc/sys/select.h: Likewise. * misc/sys/syslog.h: Likewise. * misc/sys/uio.h: Likewise. * misc/sysexits.h: Likewise. * misc/ttyent.h: Likewise. * nss/nss.h: Likewise. * posix/fnmatch.h: Likewise. * posix/getopt.h: Likewise. * posix/glob.h: Likewise. * posix/regex.h: Likewise. * posix/sys/times.h: Likewise. * posix/sys/types.h: Likewise. * posix/sys/utsname.h: Likewise. * posix/sys/wait.h: Likewise. * posix/tar.h: Likewise. * posix/unistd.h: Likewise. * posix/wordexp.h: Likewise. * pwd/pwd.h: Likewise. * resolv/arpa/nameser.h: Likewise. * resolv/netdb.h: Likewise. * resolv/resolv.h: Likewise. * resource/sys/resource.h: Likewise. * resource/sys/vlimit.h: Likewise. * resource/sys/vtimes.h: Likewise. * setjmp/setjmp.h: Likewise. * shadow/shadow.h: Likewise. * socket/sys/socket.h: Likewise. * socket/sys/un.h: Likewise. * stdlib/exit.h: Likewise. * stdlib/fmtmsg.h: Likewise. * stdlib/monetary.h: Likewise. * stdlib/stdlib.h: Likewise. * string/argz.h: Likewise. * string/envz.h: Likewise. * string/memory.h: Likewise. * string/string.h: Likewise. * string/strings.h: Likewise. * sunrpc/rpc/rpc.h: Likewise. * sunrpc/rpc/svc.h: Likewise. * sunrpc/rpc/types.h: Likewise. * sunrpc/rpc/xdr.h: Likewise. * termios/sys/ttychars.h: Likewise. * termios/termios.h: Likewise. * argp/argp-parse.c: <foo.h> -> <bits/foo.h>. * crypt/sysdeps/unix/crypt_util.c: Likewise. * dirent/dirent.h: Likewise. * elf/link.h: Likewise. * grp/fgetgrent.c: Likewise. * grp/grp.h: Likewise. * hurd/hurd/ioctl.h: Likewise. * inet/getnameinfo.c: Likewise. * inet/getnetgrent_r.c: Likewise. * inet/inet_ntoa.c: Likewise. * inet/netinet/in.h: Likewise. * io/fcntl.h: Likewise. * io/ftw.h: Likewise. * io/sys/stat.h: Likewise. * io/sys/statfs.h: Likewise. * io/utime.h: Likewise. * libio/_G_config.h: Likewise. * libio/libio.h: Likewise. * libio/libioP.h: Likewise. * libio/stdio.h: Likewise. * linuxthreads/lockfile.c: Likewise. * linuxthreads/semaphore.h: Likewise. * locale/duplocale.c: Likewise. * locale/freelocale.c: Likewise. * locale/lc-time.c: Likewise. * locale/setlocale.c: Likewise. * login/getutent_r.c: Likewise. * login/getutid_r.c: Likewise. * login/getutline_r.c: Likewise. * login/lastlog.h: Likewise. * login/pty.h: Likewise. * login/utmp.h: Likewise. * login/utmpname.c: Likewise. * malloc/mtrace.c: Likewise. * malloc/thread-m.h: Likewise. * math/complex.h: Likewise. * math/fenv.h: Likewise. * math/libm-test.c: Likewise. * math/math.h: Likewise. * misc/sgtty.h: Likewise. * misc/stab.h: Likewise. * misc/sys/ioctl.h: Likewise. * misc/sys/select.h: Likewise. * misc/sys/uio.h: Likewise. * misc/sys/ustat.h: Likewise. * misc/syslog.c: Likewise. * nis/nss_compat/compat-grp.c: Likewise. * nis/nss_compat/compat-pwd.c: Likewise. * nis/nss_compat/compat-spwd.c: Likewise. * nis/nss_nis/nis-alias.c: Likewise. * nis/nss_nis/nis-ethers.c: Likewise. * nis/nss_nis/nis-grp.c: Likewise. * nis/nss_nis/nis-hosts.c: Likewise. * nis/nss_nis/nis-netgrp.c: Likewise. * nis/nss_nis/nis-network.c: Likewise. * nis/nss_nis/nis-proto.c: Likewise. * nis/nss_nis/nis-publickey.c: Likewise. * nis/nss_nis/nis-pwd.c: Likewise. * nis/nss_nis/nis-rpc.c: Likewise. * nis/nss_nis/nis-service.c: Likewise. * nis/nss_nis/nis-spwd.c: Likewise. * nss_nisplus/nisplus-alias.c: Likewise. * nis/nss_nisplus/nisplus-ethers.c: Likewise. * nis/nss_nisplus/nisplus-grp.c: Likewise. * nis/nss_nisplus/nisplus-hosts.c: Likewise. * nis/nss_nisplus/nisplus-netgrp.c: Likewise. * nis/nss_nisplus/nisplus-netgrp.c: Likewise. * nis/nss_nisplus/nisplus-proto.c: Likewise. * nis/nss_nisplus/nisplus-pwd.c: Likewise. * nis/nss_nisplus/nisplus-rpc.c: Likewise. * nis/nss_nisplus/nisplus-service.c: Likewise. * nis/nss_nisplus/nisplus-spwd.c: Likewise. * nis/ypclnt.c: Likewise. * nss/getXXbyYY.c: Likewise. * nss/getXXent.c: Likewise. * nss/getXXent_r.c: Likewise. * nss/nss_db/db-XXX.c: Likewise. * nss/nss_db/db-alias.c: Likewise. * nss/nss_db/db-netgrp.c: Likewise. * nss/nss_files/files-XXX.c: Likewise. * nss/nss_files/files-alias.c: Likewise. * nss/nsswitch.c: Likewise. * posix/sched.h: Likewise. * posix/sys/types.h: Likewise. * posix/sys/utsname.h: Likewise. * posix/sys/wait.h: Likewise. * posix/unistd.h: Likewise. * pwd/fgetpwent.c: Likewise. * pwd/pwd.h: Likewise. * resource/sys/resource.h: Likewise. * setjmp/setjmp.h: Likewise. * shadow/fgetspent.c: Likewise. * shadow/lckpwdf.c: Likewise. * shadow/sgetspent.c: Likewise. * signal/signal.h: Likewise. * signal/sigsetops.c: Likewise. * socket/sys/socket.h: Likewise. * socket/sys/un.h: Likewise. * stdio/stdio.h: Likewise. * stdio-common/vfprintf.c: Likewise. * stdio-common/vfscanf.c: Likewise. * stdlib/atexit.c: Likewise. * stdlib/fmtmsg.c: Likewise. * stdlib/random.c: Likewise. * string/endian.h: Likewise. * sysdeps/alpha/w_sqrt.S: Likewise. * sysdeps/arm/__longjmp.S: Likewise. * sysdeps/arm/setjmp.S: Likewise. * sysdeps/generic/abort.c: Likewise. * sysdeps/generic/netinet/ip.h: Likewise. * sysdeps/generic/setenv.c: Likewise. * generic/sys/mman.h: Likewise. * sysdeps/i386/__longjmp.S: Likewise. * sysdeps/i386/setjmp.S: Likewise. * sysdeps/mach/hurd/dirstream.h: Likewise. * sysdeps/mach/hurd/jmp-unwind.c: Likewise. * sysdeps/posix/mk-stdiolim.c: Likewise. * sysdeps/powerpc/__longjmp.S: Likewise. * sysdeps/powerpc/setjmp.S: Likewise. * sysdeps/sparc/__longjmp.S: Likewise. * sysdeps/sparc/setjmp.S: Likewise. * sysdeps/standalone/close.c: Likewise. * sysdeps/standalone/filedesc.h: Likewise. * sysdeps/standalone/open.c: Likewise. * sysdeps/unix/bsd/bsd4.4/tcsetattr.c: Likewise. * sysdeps/unix/bsd/m68k/sysdep.S: Likewise. * sysdeps/unix/bsd/osf/sys/mman.h: Likewise. * sysdeps/unix/bsd/sun/m68k/sethostid.S: Likewise. * sysdeps/unix/bsd/sun/sparc/sethostid.S: Likewise. * sysdeps/unix/bsd/sun/sunos4/sys/mman.h: Likewise. * sysdeps/unix/bsd/ultrix4/sys/mman.h: Likewise. * sysdeps/unix/bsd/vax/sysdep.S: Likewise. * sysdeps/unix/dirstream.h: Likewise. * sysdeps/unix/i386/sysdep.S: Likewise. * sysdeps/unix/mips/sysdep.S: Likewise. * sysdeps/unix/mk-local_lim.c: Likewise. * sysdeps/unix/sparc/sysdep.S: Likewise. * sysdeps/unix/sysv/irix4/sys/mman.h: Likewise. * sysdeps/unix/sysv/linux/alpha/brk.S: Likewise. * sysdeps/unix/sysv/linux/alpha/clone.S: Likewise. * sysdeps/unix/sysv/linux/arm/clone.S: Likewise. * sysdeps/unix/sysv/linux/i386/clone.S: Likewise. * sysdeps/unix/sysv/linux/m68k/clone.S: Likewise. * sysdeps/unix/sysv/linux/netinet/ip.h: Likewise. * sysdeps/unix/sysv/linux/netinet/tcp.h: Likewise. * sysdeps/unix/sysv/linux/powerpc/clone.S: Likewise. * sysdeps/unix/sysv/linux/sys/mman.h: Likewise. * sysdeps/unix/sysv/linux/sys/syscall.h: Likewise. * sysdeps/unix/sysv/linux/tcgetattr.c: Likewise. * sysdeps/unix/sysv/sco3.2.4/sysconf.S: Likewise. * sysdeps/unix/sysv/sysv4/i386/sysdep.h: Likewise. * sysdeps/unix/sysv/sysv4/solaris2/sparc/sysdep.S: Likewise. * sysvipc/sys/ipc.h: Likewise. * sysvipc/sys/msg.h: Likewise. * sysvipc/sys/sem.h: Likewise. * sysvipc/sys/shm.h: Likewise. * termios/termios.h: Likewise. * time/localtime.c: Likewise. * time/sys/time.h: Likewise. * time/time.h: Likewise. * time/tzset.c: Likewise. * sysdeps/unix/sysv/linux/arm/socket.S: socketcall.h change. * sysdeps/unix/sysv/linux/i386/socket.S: Likewise. * sysdeps/unix/sysv/linux/m68k/socket.S: Likewise. * sysdeps/unix/sysv/linux/powerpc/socket.S: Likewise. * sysdeps/unix/sysv/linux/sparc/socket.S: Likewise. * Makefile (headers): foo.h -> bits/foo.h. * dirent/Makefile: Likewise. * elf/Makefile: Likewise. * io/Makefile: Likewise. * linuxthreads/Makefile: Likewise. * linuxthreads/sysdeps/pthread/Makefile: Likewise. * login/Makefile: Likewise. * math/Makefile: Likewise. * misc/Makefile: Likewise. * posix/Makefile: Likewise. * resource/Makefile: Likewise. * setjmp/Makefile: Likewise. * signal/Makefile: Likewise. * socket/Makefile: Likewise. * stdio-common/Makefile: Likewise. * sysdeps/unix/sysv/linux/Makefile: Likewise. * sysvipc/Makefile: Likewise. * termios/Makefile: Likewise. * time/Makefile: Likewise. * sysdeps/generic/Makefile (make_siglist-CFLAGS): Likewise. * sysdeps/posix/Makefile: stdio_lim.h -> bits/stdio_lim.h * sysdeps/unix/Makefile: Likewise with local_lim.h, errnos.h, ioctls.h, termbits.h. * sysdeps/unix/sysv/linux/Dist: sys/kernel_termios.h -> kernel_termios.h, sys/socketcall.h -> socketcall.h * elf/elf.h: Use <inttypes.h> definitions instead of __attribute__ for getting the proper length on the ELF types to be friendly to non-gcc compilers. * posix/sys/types.h: Notice when int8_t and friends are defined and don't redefine them. * sysdeps/wordsize-32/inttypes.h: Likewise. * sysdeps/wordsize-64/inttypes.h: Likewise. * sysdeps/unix/sysv/linux/arm/profil-counter.h: Get sigcontext via <signal.h> instead. * sysdeps/unix/sysv/linux/i386/profil-counter.h: Likewise. * sysdeps/unix/sysv/linux/sparc/profil-counter.h: Likewise. 1997-06-20 17:59 Kazumoto Kojima <kkojima@kk.info.kanagawa-u.ac.jp> * hurd/intr-msg.c: More 64bit changes. * mach/msg-destroy.c: Likewise. * sysdeps/mach/hurd/ioctl.c: Likewise. * sysdeps/mach/hurd/ioctls.h: Likewise. * sysdeps/mach/hurd/select.c: Likewise. * sysdeps/mach/hurd/statbuf.h: Likewise. * sysdeps/mach/hurd/mips/dl-machine.c: Hurd/MIPS64 patches. * sysdeps/mach/hurd/mips/exc2signal.c: Likewise. * sysdeps/mach/hurd/mips/init-fault.c: Likewise. * sysdeps/mach/hurd/mips/init-first.c: Likewise. * sysdeps/mach/hurd/mips/intr-msg.h: Likewise. * sysdeps/mach/hurd/mips/longjmp-ctx.c: Likewise. * sysdeps/mach/hurd/mips/longjmp-ts.c: Likewise. * sysdeps/mach/hurd/mips/sigcontext.h: Likewise. * sysdeps/mach/hurd/mips/sigreturn.c: Likewise. * sysdeps/mach/hurd/mips/trampoline.c: Likewise. * sysdeps/mach/mips/cacheflush.c: Likewise. * sysdeps/mach/mips/machine-lock.h: Likewise. * sysdeps/mach/mips/machine-sp.h: Likewise. * sysdeps/mach/mips/syscall.S: Likewise. * sysdeps/mach/mips/sysdep.h: Likewise. * sysdeps/mach/mips/thread_state.h: Likewise. * sysdeps/mach/start.c: Likewise. * sysdeps/mips/dl-machine.h: MIPS changes. * sysdeps/mips/elf/start.S: Likewise. * sysdeps/mips/init-first.c: Likewise. * sysdeps/mips/fpu_control.h: Likewise. * sysdeps/mips/machine-gmon.h: Likewise. * sysdeps/mips/jmp_buf.h: Likewise. * sysdeps/mips/__longjmp.c: Likewise. * sysdeps/mips/bsd-_setjmp.S: Likewise. * sysdeps/mips/bsd-setjmp.S: Likewise. * sysdeps/mips/setjmp.S: Likewise. * sysdeps/mips/setjmp_aux.c: Likewise. * sysdeps/mips/mips64/gmp-mparam.h: Likewise. * sysdeps/mips/add_n.S: New file. * sysdeps/mips/addmul_1.S: Likewise. * sysdeps/mips/lshift.S: Likewise. * sysdeps/mips/mul_1.S: Likewise. * sysdeps/mips/rshift.S: Likewise. * sysdeps/mips/sub_n.S: Likewise. * sysdeps/mips/submul_1.S: Likewise. * sysdeps/mips/mips64/Implies: Likewise. * sysdeps/mips/mips64/add_n.S: Likewise. * sysdeps/mips/mips64/addmul_1.S: Likewise. * sysdeps/mips/mips64/lshift.S: Likewise. * sysdeps/mips/mips64/mul_1.S: Likewise. * sysdeps/mips/mips64/rshift.S: Likewise. * sysdeps/mips/mips64/sub_n.S: Likewise. * sysdeps/mips/mips64/submul_1.S: Likewise. * sysdeps/mips/add_n.S: Removed. * sysdeps/mips/addmul_1.S: Likewise. * sysdeps/mips/lshift.S: Likewise. * sysdeps/mips/mul_1.S: Likewise. * sysdeps/mips/rshift.S: Likewise. * sysdeps/mips/sub_n.S: Likewise. * sysdeps/mips/submul_1.S: Likewise. * nss/Makefile: Prepare for static NSS. * resolv/Makefile: Likewise. * nss/nsswitch.c: Add code for static NSS. * nss/function.def: Define functions for static NSS. 1997-06-19 11:10 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * libc.map: Add yet more symbols. 1997-06-19 20:33 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * elf/dl-lookup.c (_dl_lookup_versioned_symbol): Don't pass NULL as object name to _dl_signal_error. (do_lookup): Skip objects that could not be opened. * sysdeps/m68k/dl-machine.h (elf_machine_rela): Check that the symbol was found. * sysdeps/i386/dl-machine.h (elf_machine_rel): Likewise. * sysdeps/powerpc/dl-machine.h (elf_machine_rela): Likewise. 1997-06-20 03:13 Kazumoto Kojima <kkojima@kk.info.kanagawa-u.ac.jp> * ctype/ctype-info.c: Use int32_t where `int' with 4 bytes is assumed. * ctype/ctype.h: Likewise. * math/math_private.h: Likewise. * inet/netinet/in.h: Likewise. * wctype/wctype.h: Likewise. * nss/Makefile: Only inhibit nss_files and nss_db modules if static NSS modules are not enabled. * resolv/Makefile: Likewise for nss_dns. * nss/function.def: New file. List all available lookup functions for static NSS. * nss/nsswitch.c: Add code for static NSS. 1997-06-15 21:15 Andreas Jaeger <aj@arthur.rhein-neckar.de> * math/libm-test.c (gamma_test): Test for _SVID_ and for normal behaviour. 1997-06-15 20:32 Andreas Jaeger <aj@arthur.rhein-neckar.de> * math/libm.map: Add all necessary functions, correct existing entries. 1997-06-20 02:35 a sun <asun@zoology.washington.edu> * sysdeps/unix/sysv/linux/netipx/ipx.h: Don't use kernel header. 1997-06-19 18:43 Andreas Jaeger <aj@arthur.rhein-neckar.de> * nis/nss_nisplus/nisplus-spwd.c (_nss_nisplus_parse_spent): Compare pointer with NULL. * login/logout.c (logout): Compare pututline result with NULL. * inet/rcmd.c: Correct a few typos. Reported by Erik Troan.
1177 lines
28 KiB
C
1177 lines
28 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 "../locale/localeinfo.h"
|
|
#include <errno.h>
|
|
#include <limits.h>
|
|
#include <ctype.h>
|
|
#include <stdarg.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <wctype.h>
|
|
#include <bits/libc-lock.h>
|
|
|
|
#ifdef __GNUC__
|
|
#define HAVE_LONGLONG
|
|
#define LONGLONG long long
|
|
#else
|
|
#define LONGLONG long
|
|
#endif
|
|
|
|
/* Those are flags in the conversion format. */
|
|
# define LONG 0x001 /* l: long or double */
|
|
# define LONGDBL 0x002 /* L: long long or long double */
|
|
# define SHORT 0x004 /* h: short */
|
|
# define SUPPRESS 0x008 /* *: suppress assignment */
|
|
# define POINTER 0x010 /* weird %p pointer (`fake hex') */
|
|
# define NOSKIP 0x020 /* do not skip blanks */
|
|
# define WIDTH 0x040 /* width was given */
|
|
# define GROUP 0x080 /* ': group numbers */
|
|
# define MALLOC 0x100 /* a: malloc strings */
|
|
|
|
# define TYPEMOD (LONG|LONGDBL|SHORT)
|
|
|
|
|
|
#ifdef USE_IN_LIBIO
|
|
# include <libioP.h>
|
|
# include <libio.h>
|
|
|
|
# undef va_list
|
|
# define va_list _IO_va_list
|
|
# define ungetc(c, s) ((void) ((int) c != EOF && --read_in), \
|
|
_IO_ungetc (c, s))
|
|
# define inchar() ((c = _IO_getc_unlocked (s)), \
|
|
(void) (c != EOF && ++read_in), c)
|
|
# define encode_error() do { \
|
|
if (errp != NULL) *errp |= 4; \
|
|
_IO_funlockfile (s); \
|
|
__set_errno (EILSEQ); \
|
|
return done; \
|
|
} while (0)
|
|
# define conv_error() do { \
|
|
if (errp != NULL) *errp |= 2; \
|
|
_IO_funlockfile (s); \
|
|
return done; \
|
|
} while (0)
|
|
# define input_error() do { \
|
|
_IO_funlockfile (s); \
|
|
if (errp != NULL) *errp |= 1; \
|
|
return done ?: EOF; \
|
|
} while (0)
|
|
# define memory_error() do { \
|
|
_IO_funlockfile (s); \
|
|
__set_errno (ENOMEM); \
|
|
return EOF; \
|
|
} while (0)
|
|
# define ARGCHECK(s, format) \
|
|
do \
|
|
{ \
|
|
/* Check file argument for consistence. */ \
|
|
CHECK_FILE (s, EOF); \
|
|
if (s->_flags & _IO_NO_READS) \
|
|
{ \
|
|
__set_errno (EBADF); \
|
|
return EOF; \
|
|
} \
|
|
else if (format == NULL) \
|
|
{ \
|
|
MAYBE_SET_EINVAL; \
|
|
return EOF; \
|
|
} \
|
|
} while (0)
|
|
# define LOCK_STREAM(S) \
|
|
__libc_cleanup_region_start ((void (*) (void *)) &_IO_funlockfile, (S)); \
|
|
_IO_flockfile (S)
|
|
# define UNLOCK_STREAM __libc_cleanup_region_end (1)
|
|
#else
|
|
# define ungetc(c, s) ((void) (c != EOF && --read_in), ungetc (c, s))
|
|
# define inchar() ((c = getc (s)), (void) (c != EOF && ++read_in), c)
|
|
# define encode_error() do { \
|
|
funlockfile (s); \
|
|
__set_errno (EILSEQ); \
|
|
return done; \
|
|
} while (0)
|
|
# define conv_error() do { \
|
|
funlockfile (s); \
|
|
return done; \
|
|
} while (0)
|
|
# define input_error() do { \
|
|
funlockfile (s); \
|
|
return done ?: EOF; \
|
|
} while (0)
|
|
# define memory_error() do { \
|
|
funlockfile (s); \
|
|
__set_errno (ENOMEM); \
|
|
return EOF; \
|
|
} while (0)
|
|
# define ARGCHECK(s, format) \
|
|
do \
|
|
{ \
|
|
/* Check file argument for consistence. */ \
|
|
if (!__validfp (s) || !s->__mode.__read) \
|
|
{ \
|
|
__set_errno (EBADF); \
|
|
return EOF; \
|
|
} \
|
|
else if (format == NULL) \
|
|
{ \
|
|
__set_errno (EINVAL); \
|
|
return EOF; \
|
|
} \
|
|
} while (0)
|
|
#if 1
|
|
/* XXX For now !!! */
|
|
# define flockfile(S) /* nothing */
|
|
# define funlockfile(S) /* nothing */
|
|
# define LOCK_STREAM(S)
|
|
# define UNLOCK_STREAM
|
|
#else
|
|
# define LOCK_STREAM(S) \
|
|
__libc_cleanup_region_start (&__funlockfile, (S)); \
|
|
__flockfile (S)
|
|
# define UNLOCK_STREAM __libc_cleanup_region_end (1)
|
|
#endif
|
|
#endif
|
|
|
|
|
|
/* Read formatted input from S according to the format string
|
|
FORMAT, using the argument list in ARG.
|
|
Return the number of assignments made, or -1 for an input error. */
|
|
#ifdef USE_IN_LIBIO
|
|
int
|
|
_IO_vfscanf (s, format, argptr, errp)
|
|
_IO_FILE *s;
|
|
const char *format;
|
|
_IO_va_list argptr;
|
|
int *errp;
|
|
#else
|
|
int
|
|
__vfscanf (FILE *s, const char *format, va_list argptr)
|
|
#endif
|
|
{
|
|
va_list arg;
|
|
register const char *f = format;
|
|
register unsigned char fc; /* Current character of the format. */
|
|
register size_t done = 0; /* Assignments done. */
|
|
register size_t read_in = 0; /* Chars read in. */
|
|
register int c = 0; /* Last char read. */
|
|
register int width; /* Maximum field width. */
|
|
register int flags; /* Modifiers for current format element. */
|
|
|
|
/* Status for reading F-P nums. */
|
|
char got_dot, got_e, negative;
|
|
/* If a [...] is a [^...]. */
|
|
char not_in;
|
|
#define exp_char not_in
|
|
/* Base for integral numbers. */
|
|
int base;
|
|
/* Signedness for integral numbers. */
|
|
int number_signed;
|
|
#define is_hexa number_signed
|
|
/* Decimal point character. */
|
|
wchar_t decimal;
|
|
/* The thousands character of the current locale. */
|
|
wchar_t thousands;
|
|
/* Integral holding variables. */
|
|
union
|
|
{
|
|
long long int q;
|
|
unsigned long long int uq;
|
|
long int l;
|
|
unsigned long int ul;
|
|
} num;
|
|
/* Character-buffer pointer. */
|
|
char *str = NULL;
|
|
wchar_t *wstr = NULL;
|
|
char **strptr = NULL;
|
|
size_t strsize = 0;
|
|
/* We must not react on white spaces immediately because they can
|
|
possibly be matched even if in the input stream no character is
|
|
available anymore. */
|
|
int skip_space = 0;
|
|
/* Workspace. */
|
|
char *tw; /* Temporary pointer. */
|
|
char *wp = NULL; /* Workspace. */
|
|
size_t wpmax = 0; /* Maximal size of workspace. */
|
|
size_t wpsize; /* Currently used bytes in workspace. */
|
|
#define ADDW(Ch) \
|
|
do \
|
|
{ \
|
|
if (wpsize == wpmax) \
|
|
{ \
|
|
char *old = wp; \
|
|
wpmax = UCHAR_MAX > 2 * wpmax ? UCHAR_MAX : 2 * wpmax; \
|
|
wp = (char *) alloca (wpmax); \
|
|
if (old != NULL) \
|
|
memcpy (wp, old, wpsize); \
|
|
} \
|
|
wp[wpsize++] = (Ch); \
|
|
} \
|
|
while (0)
|
|
|
|
#ifdef __va_copy
|
|
__va_copy (arg, argptr);
|
|
#else
|
|
arg = (va_list) argptr;
|
|
#endif
|
|
|
|
ARGCHECK (s, format);
|
|
|
|
/* Figure out the decimal point character. */
|
|
if (mbtowc (&decimal, _NL_CURRENT (LC_NUMERIC, DECIMAL_POINT),
|
|
strlen (_NL_CURRENT (LC_NUMERIC, DECIMAL_POINT))) <= 0)
|
|
decimal = (wchar_t) *_NL_CURRENT (LC_NUMERIC, DECIMAL_POINT);
|
|
/* Figure out the thousands separator character. */
|
|
if (mbtowc (&thousands, _NL_CURRENT (LC_NUMERIC, THOUSANDS_SEP),
|
|
strlen (_NL_CURRENT (LC_NUMERIC, THOUSANDS_SEP))) <= 0)
|
|
thousands = (wchar_t) *_NL_CURRENT (LC_NUMERIC, THOUSANDS_SEP);
|
|
|
|
/* Lock the stream. */
|
|
LOCK_STREAM (s);
|
|
|
|
/* Run through the format string. */
|
|
while (*f != '\0')
|
|
{
|
|
unsigned int argpos;
|
|
/* Extract the next argument, which is of type TYPE.
|
|
For a %N$... spec, this is the Nth argument from the beginning;
|
|
otherwise it is the next argument after the state now in ARG. */
|
|
#ifdef __va_copy
|
|
# define ARG(type) (argpos == 0 ? va_arg (arg, type) : \
|
|
({ unsigned int pos = argpos; \
|
|
va_list arg; \
|
|
__va_copy (arg, argptr); \
|
|
while (--pos > 0) \
|
|
(void) va_arg (arg, void *); \
|
|
va_arg (arg, type); \
|
|
}))
|
|
#else
|
|
# if 0
|
|
/* XXX Possible optimization. */
|
|
# define ARG(type) (argpos == 0 ? va_arg (arg, type) : \
|
|
({ va_list arg = (va_list) argptr; \
|
|
arg = (va_list) ((char *) arg \
|
|
+ (argpos - 1) \
|
|
* __va_rounded_size (void *)); \
|
|
va_arg (arg, type); \
|
|
}))
|
|
# else
|
|
# define ARG(type) (argpos == 0 ? va_arg (arg, type) : \
|
|
({ unsigned int pos = argpos; \
|
|
va_list arg = (va_list) argptr; \
|
|
while (--pos > 0) \
|
|
(void) va_arg (arg, void *); \
|
|
va_arg (arg, type); \
|
|
}))
|
|
# endif
|
|
#endif
|
|
|
|
if (!isascii (*f))
|
|
{
|
|
/* Non-ASCII, may be a multibyte. */
|
|
int len = mblen (f, strlen (f));
|
|
if (len > 0)
|
|
{
|
|
do
|
|
{
|
|
c = inchar ();
|
|
if (c == EOF)
|
|
input_error ();
|
|
else if (c != *f++)
|
|
{
|
|
ungetc (c, s);
|
|
conv_error ();
|
|
}
|
|
}
|
|
while (--len > 0);
|
|
continue;
|
|
}
|
|
}
|
|
|
|
fc = *f++;
|
|
if (fc != '%')
|
|
{
|
|
/* Remember to skip spaces. */
|
|
if (isspace (fc))
|
|
{
|
|
skip_space = 1;
|
|
continue;
|
|
}
|
|
|
|
/* Read a character. */
|
|
c = inchar ();
|
|
|
|
/* Characters other than format specs must just match. */
|
|
if (c == EOF)
|
|
input_error ();
|
|
|
|
/* We saw white space char as the last character in the format
|
|
string. Now it's time to skip all leading white space. */
|
|
if (skip_space)
|
|
{
|
|
while (isspace (c))
|
|
if (inchar () == EOF && errno == EINTR)
|
|
conv_error ();
|
|
skip_space = 0;
|
|
}
|
|
|
|
if (c != fc)
|
|
{
|
|
ungetc (c, s);
|
|
conv_error ();
|
|
}
|
|
|
|
continue;
|
|
}
|
|
|
|
/* This is the start of the conversion string. */
|
|
flags = 0;
|
|
|
|
/* Initialize state of modifiers. */
|
|
argpos = 0;
|
|
|
|
/* Prepare temporary buffer. */
|
|
wpsize = 0;
|
|
|
|
/* Check for a positional parameter specification. */
|
|
if (isdigit (*f))
|
|
{
|
|
argpos = *f++ - '0';
|
|
while (isdigit (*f))
|
|
argpos = argpos * 10 + (*f++ - '0');
|
|
if (*f == '$')
|
|
++f;
|
|
else
|
|
{
|
|
/* Oops; that was actually the field width. */
|
|
width = argpos;
|
|
flags |= WIDTH;
|
|
argpos = 0;
|
|
goto got_width;
|
|
}
|
|
}
|
|
|
|
/* Check for the assignment-suppressing and the number grouping flag. */
|
|
while (*f == '*' || *f == '\'')
|
|
switch (*f++)
|
|
{
|
|
case '*':
|
|
flags |= SUPPRESS;
|
|
break;
|
|
case '\'':
|
|
flags |= GROUP;
|
|
break;
|
|
}
|
|
|
|
/* We have seen width. */
|
|
if (isdigit (*f))
|
|
flags |= WIDTH;
|
|
|
|
/* Find the maximum field width. */
|
|
width = 0;
|
|
while (isdigit (*f))
|
|
{
|
|
width *= 10;
|
|
width += *f++ - '0';
|
|
}
|
|
got_width:
|
|
if (width == 0)
|
|
width = -1;
|
|
|
|
/* Check for type modifiers. */
|
|
while (*f == 'h' || *f == 'l' || *f == 'L' || *f == 'a' || *f == 'q')
|
|
switch (*f++)
|
|
{
|
|
case 'h':
|
|
/* int's are short int's. */
|
|
if (flags & TYPEMOD)
|
|
/* Signal illegal format element. */
|
|
conv_error ();
|
|
flags |= SHORT;
|
|
break;
|
|
case 'l':
|
|
if (flags & (SHORT|LONGDBL))
|
|
conv_error ();
|
|
else if (flags & LONG)
|
|
{
|
|
/* A double `l' is equivalent to an `L'. */
|
|
flags &= ~LONG;
|
|
flags |= LONGDBL;
|
|
}
|
|
else
|
|
/* int's are long int's. */
|
|
flags |= LONG;
|
|
break;
|
|
case 'q':
|
|
case 'L':
|
|
/* double's are long double's, and int's are long long int's. */
|
|
if (flags & TYPEMOD)
|
|
/* Signal illegal format element. */
|
|
conv_error ();
|
|
flags |= LONGDBL;
|
|
break;
|
|
case 'a':
|
|
if (flags & TYPEMOD)
|
|
/* Signal illegal format element. */
|
|
conv_error ();
|
|
/* String conversions (%s, %[) take a `char **'
|
|
arg and fill it in with a malloc'd pointer. */
|
|
flags |= MALLOC;
|
|
break;
|
|
}
|
|
|
|
/* End of the format string? */
|
|
if (*f == '\0')
|
|
conv_error ();
|
|
|
|
/* We must take care for EINTR errors. */
|
|
if (c == EOF && errno == EINTR)
|
|
input_error ();
|
|
|
|
/* Find the conversion specifier. */
|
|
fc = *f++;
|
|
if (skip_space || (fc != '[' && fc != 'c' && fc != 'C' && fc != 'n'))
|
|
{
|
|
/* Eat whitespace. */
|
|
do
|
|
if (inchar () == EOF && errno == EINTR)
|
|
input_error ();
|
|
while (isspace (c));
|
|
ungetc (c, s);
|
|
skip_space = 0;
|
|
}
|
|
|
|
switch (fc)
|
|
{
|
|
case '%': /* Must match a literal '%'. */
|
|
c = inchar ();
|
|
if (c != fc)
|
|
{
|
|
ungetc (c, s);
|
|
conv_error ();
|
|
}
|
|
break;
|
|
|
|
case 'n': /* Answer number of assignments done. */
|
|
/* Corrigendum 1 to ISO C 1990 describes the allowed flags
|
|
with the 'n' conversion specifier. */
|
|
if (!(flags & SUPPRESS))
|
|
{
|
|
/* Don't count the read-ahead. */
|
|
if (flags & LONGDBL)
|
|
*ARG (long long int *) = read_in;
|
|
else if (flags & LONG)
|
|
*ARG (long int *) = read_in;
|
|
else if (flags & SHORT)
|
|
*ARG (short int *) = read_in;
|
|
else
|
|
*ARG (int *) = read_in;
|
|
|
|
#ifdef NO_BUG_IN_ISO_C_CORRIGENDUM_1
|
|
/* We have a severe problem here. The ISO C standard
|
|
contradicts itself in explaining the effect of the %n
|
|
format in `scanf'. While in ISO C:1990 and the ISO C
|
|
Amendement 1:1995 the result is described as
|
|
|
|
Execution of a %n directive does not effect the
|
|
assignment count returned at the completion of
|
|
execution of the f(w)scanf function.
|
|
|
|
in ISO C Corrigendum 1:1994 the following was added:
|
|
|
|
Subclause 7.9.6.2
|
|
Add the following fourth example:
|
|
In:
|
|
#include <stdio.h>
|
|
int d1, d2, n1, n2, i;
|
|
i = sscanf("123", "%d%n%n%d", &d1, &n1, &n2, &d2);
|
|
the value 123 is assigned to d1 and the value3 to n1.
|
|
Because %n can never get an input failure the value
|
|
of 3 is also assigned to n2. The value of d2 is not
|
|
affected. The value 3 is assigned to i.
|
|
|
|
We go for now with the historically correct code fro ISO C,
|
|
i.e., we don't count the %n assignments. When it ever
|
|
should proof to be wrong just remove the #ifdef above. */
|
|
++done;
|
|
#endif
|
|
}
|
|
break;
|
|
|
|
case 'c': /* Match characters. */
|
|
if ((flags & LONG) == 0)
|
|
{
|
|
if (!(flags & SUPPRESS))
|
|
{
|
|
str = ARG (char *);
|
|
if (str == NULL)
|
|
conv_error ();
|
|
}
|
|
|
|
c = inchar ();
|
|
if (c == EOF)
|
|
input_error ();
|
|
|
|
if (width == -1)
|
|
width = 1;
|
|
|
|
if (!(flags & SUPPRESS))
|
|
{
|
|
do
|
|
*str++ = c;
|
|
while (--width > 0 && inchar () != EOF);
|
|
}
|
|
else
|
|
while (--width > 0 && inchar () != EOF);
|
|
|
|
if (width > 0)
|
|
/* I.e., EOF was read. */
|
|
--read_in;
|
|
|
|
if (!(flags & SUPPRESS))
|
|
++done;
|
|
|
|
break;
|
|
}
|
|
/* FALLTHROUGH */
|
|
case 'C':
|
|
/* Get UTF-8 encoded wide character. Here we assume (as in
|
|
other parts of the libc) that we only have to handle
|
|
UTF-8. */
|
|
{
|
|
wint_t val;
|
|
size_t cnt = 0;
|
|
int first = 1;
|
|
|
|
if (!(flags & SUPPRESS))
|
|
{
|
|
wstr = ARG (wchar_t *);
|
|
if (str == NULL)
|
|
conv_error ();
|
|
}
|
|
|
|
do
|
|
{
|
|
#define NEXT_WIDE_CHAR(First) \
|
|
c = inchar (); \
|
|
if (c == EOF) \
|
|
/* EOF is only an error for the first character. */ \
|
|
if (First) \
|
|
input_error (); \
|
|
else \
|
|
{ \
|
|
--read_in; \
|
|
break; \
|
|
} \
|
|
val = c; \
|
|
if (val >= 0x80) \
|
|
{ \
|
|
if ((c & 0xc0) == 0x80 || (c & 0xfe) == 0xfe) \
|
|
encode_error (); \
|
|
if ((c & 0xe0) == 0xc0) \
|
|
{ \
|
|
/* We expect two bytes. */ \
|
|
cnt = 1; \
|
|
val &= 0x1f; \
|
|
} \
|
|
else if ((c & 0xf0) == 0xe0) \
|
|
{ \
|
|
/* We expect three bytes. */ \
|
|
cnt = 2; \
|
|
val &= 0x0f; \
|
|
} \
|
|
else if ((c & 0xf8) == 0xf0) \
|
|
{ \
|
|
/* We expect four bytes. */ \
|
|
cnt = 3; \
|
|
val &= 0x07; \
|
|
} \
|
|
else if ((c & 0xfc) == 0xf8) \
|
|
{ \
|
|
/* We expect five bytes. */ \
|
|
cnt = 4; \
|
|
val &= 0x03; \
|
|
} \
|
|
else \
|
|
{ \
|
|
/* We expect six bytes. */ \
|
|
cnt = 5; \
|
|
val &= 0x01; \
|
|
} \
|
|
\
|
|
do \
|
|
{ \
|
|
c = inchar (); \
|
|
if (c == EOF \
|
|
|| (c & 0xc0) == 0x80 || (c & 0xfe) == 0xfe) \
|
|
encode_error (); \
|
|
val <<= 6; \
|
|
val |= c & 0x3f; \
|
|
} \
|
|
while (--cnt > 0); \
|
|
} \
|
|
\
|
|
if (!(flags & SUPPRESS)) \
|
|
*wstr++ = val; \
|
|
first = 0
|
|
|
|
NEXT_WIDE_CHAR (first);
|
|
}
|
|
while (--width > 0);
|
|
|
|
if (width > 0)
|
|
/* I.e., EOF was read. */
|
|
--read_in;
|
|
|
|
if (!(flags & SUPPRESS))
|
|
++done;
|
|
}
|
|
break;
|
|
|
|
case 's': /* Read a string. */
|
|
if (flags & LONG)
|
|
/* We have to process a wide character string. */
|
|
goto wide_char_string;
|
|
|
|
#define STRING_ARG(Str, Type) \
|
|
if (!(flags & SUPPRESS)) \
|
|
{ \
|
|
if (flags & MALLOC) \
|
|
{ \
|
|
/* The string is to be stored in a malloc'd buffer. */ \
|
|
strptr = ARG (char **); \
|
|
if (strptr == NULL) \
|
|
conv_error (); \
|
|
/* Allocate an initial buffer. */ \
|
|
strsize = 100; \
|
|
*strptr = malloc (strsize * sizeof (Type)); \
|
|
Str = (Type *) *strptr; \
|
|
} \
|
|
else \
|
|
Str = ARG (Type *); \
|
|
if (Str == NULL) \
|
|
conv_error (); \
|
|
}
|
|
STRING_ARG (str, char);
|
|
|
|
c = inchar ();
|
|
if (c == EOF)
|
|
input_error ();
|
|
|
|
do
|
|
{
|
|
if (isspace (c))
|
|
{
|
|
ungetc (c, s);
|
|
break;
|
|
}
|
|
#define STRING_ADD_CHAR(Str, c, Type) \
|
|
if (!(flags & SUPPRESS)) \
|
|
{ \
|
|
*Str++ = c; \
|
|
if ((flags & MALLOC) && (char *) Str == *strptr + strsize) \
|
|
{ \
|
|
/* Enlarge the buffer. */ \
|
|
Str = realloc (*strptr, strsize * 2 * sizeof (Type)); \
|
|
if (Str == NULL) \
|
|
{ \
|
|
/* Can't allocate that much. Last-ditch effort. */\
|
|
Str = realloc (*strptr, \
|
|
(strsize + 1) * sizeof (Type)); \
|
|
if (Str == NULL) \
|
|
{ \
|
|
/* We lose. Oh well. \
|
|
Terminate the string and stop converting, \
|
|
so at least we don't skip any input. */ \
|
|
((Type *) (*strptr))[strsize] = '\0'; \
|
|
++done; \
|
|
conv_error (); \
|
|
} \
|
|
else \
|
|
{ \
|
|
*strptr = (char *) Str; \
|
|
Str = ((Type *) *strptr) + strsize; \
|
|
++strsize; \
|
|
} \
|
|
} \
|
|
else \
|
|
{ \
|
|
*strptr = (char *) Str; \
|
|
Str = ((Type *) *strptr) + strsize; \
|
|
strsize *= 2; \
|
|
} \
|
|
} \
|
|
}
|
|
STRING_ADD_CHAR (str, c, char);
|
|
} while ((width <= 0 || --width > 0) && inchar () != EOF);
|
|
|
|
if (!(flags & SUPPRESS))
|
|
{
|
|
*str = '\0';
|
|
++done;
|
|
}
|
|
break;
|
|
|
|
case 'S':
|
|
/* Wide character string. */
|
|
wide_char_string:
|
|
{
|
|
wint_t val;
|
|
int first = 1;
|
|
STRING_ARG (wstr, wchar_t);
|
|
|
|
do
|
|
{
|
|
size_t cnt = 0;
|
|
NEXT_WIDE_CHAR (first);
|
|
|
|
if (iswspace (val))
|
|
{
|
|
/* XXX We would have to push back the whole wide char
|
|
with possibly many bytes. But since scanf does
|
|
not make a difference for white space characters
|
|
we can simply push back a simple <SP> which is
|
|
guaranteed to be in the [:space:] class. */
|
|
ungetc (' ', s);
|
|
break;
|
|
}
|
|
|
|
STRING_ADD_CHAR (wstr, val, wchar_t);
|
|
first = 0;
|
|
}
|
|
while (width <= 0 || --width > 0);
|
|
|
|
if (!(flags & SUPPRESS))
|
|
{
|
|
*wstr = L'\0';
|
|
++done;
|
|
}
|
|
}
|
|
break;
|
|
|
|
case 'x': /* Hexadecimal integer. */
|
|
case 'X': /* Ditto. */
|
|
base = 16;
|
|
number_signed = 0;
|
|
goto number;
|
|
|
|
case 'o': /* Octal integer. */
|
|
base = 8;
|
|
number_signed = 0;
|
|
goto number;
|
|
|
|
case 'u': /* Unsigned decimal integer. */
|
|
base = 10;
|
|
number_signed = 0;
|
|
goto number;
|
|
|
|
case 'd': /* Signed decimal integer. */
|
|
base = 10;
|
|
number_signed = 1;
|
|
goto number;
|
|
|
|
case 'i': /* Generic number. */
|
|
base = 0;
|
|
number_signed = 1;
|
|
|
|
number:
|
|
c = inchar ();
|
|
if (c == EOF)
|
|
input_error ();
|
|
|
|
/* Check for a sign. */
|
|
if (c == '-' || c == '+')
|
|
{
|
|
ADDW (c);
|
|
if (width > 0)
|
|
--width;
|
|
c = inchar ();
|
|
}
|
|
|
|
/* Look for a leading indication of base. */
|
|
if (width != 0 && c == '0')
|
|
{
|
|
if (width > 0)
|
|
--width;
|
|
|
|
ADDW (c);
|
|
c = inchar ();
|
|
|
|
if (width != 0 && tolower (c) == 'x')
|
|
{
|
|
if (base == 0)
|
|
base = 16;
|
|
if (base == 16)
|
|
{
|
|
if (width > 0)
|
|
--width;
|
|
c = inchar ();
|
|
}
|
|
}
|
|
else if (base == 0)
|
|
base = 8;
|
|
}
|
|
|
|
if (base == 0)
|
|
base = 10;
|
|
|
|
/* Read the number into workspace. */
|
|
while (c != EOF && width != 0)
|
|
{
|
|
if (base == 16 ? !isxdigit (c) :
|
|
((!isdigit (c) || c - '0' >= base) &&
|
|
!((flags & GROUP) && base == 10 && c == thousands)))
|
|
break;
|
|
ADDW (c);
|
|
if (width > 0)
|
|
--width;
|
|
|
|
c = inchar ();
|
|
}
|
|
|
|
/* The just read character is not part of the number anymore. */
|
|
ungetc (c, s);
|
|
|
|
if (wpsize == 0 ||
|
|
(wpsize == 1 && (wp[0] == '+' || wp[0] == '-')))
|
|
/* There was no number. */
|
|
conv_error ();
|
|
|
|
/* Convert the number. */
|
|
ADDW ('\0');
|
|
if (flags & LONGDBL)
|
|
{
|
|
if (number_signed)
|
|
num.q = __strtoll_internal (wp, &tw, base, flags & GROUP);
|
|
else
|
|
num.uq = __strtoull_internal (wp, &tw, base, flags & GROUP);
|
|
}
|
|
else
|
|
{
|
|
if (number_signed)
|
|
num.l = __strtol_internal (wp, &tw, base, flags & GROUP);
|
|
else
|
|
num.ul = __strtoul_internal (wp, &tw, base, flags & GROUP);
|
|
}
|
|
if (wp == tw)
|
|
conv_error ();
|
|
|
|
if (!(flags & SUPPRESS))
|
|
{
|
|
if (! number_signed)
|
|
{
|
|
if (flags & LONGDBL)
|
|
*ARG (unsigned LONGLONG int *) = num.uq;
|
|
else if (flags & LONG)
|
|
*ARG (unsigned long int *) = num.ul;
|
|
else if (flags & SHORT)
|
|
*ARG (unsigned short int *)
|
|
= (unsigned short int) num.ul;
|
|
else
|
|
*ARG (unsigned int *) = (unsigned int) num.ul;
|
|
}
|
|
else
|
|
{
|
|
if (flags & LONGDBL)
|
|
*ARG (LONGLONG int *) = num.q;
|
|
else if (flags & LONG)
|
|
*ARG (long int *) = num.l;
|
|
else if (flags & SHORT)
|
|
*ARG (short int *) = (short int) num.l;
|
|
else
|
|
*ARG (int *) = (int) num.l;
|
|
}
|
|
++done;
|
|
}
|
|
break;
|
|
|
|
case 'e': /* Floating-point numbers. */
|
|
case 'E':
|
|
case 'f':
|
|
case 'g':
|
|
case 'G':
|
|
case 'A':
|
|
c = inchar ();
|
|
if (c == EOF)
|
|
input_error ();
|
|
|
|
/* Check for a sign. */
|
|
if (c == '-' || c == '+')
|
|
{
|
|
negative = c == '-';
|
|
if (inchar () == EOF)
|
|
/* EOF is only an input error before we read any chars. */
|
|
conv_error ();
|
|
if (width > 0)
|
|
--width;
|
|
}
|
|
else
|
|
negative = 0;
|
|
|
|
is_hexa = 0;
|
|
exp_char = 'e';
|
|
if (c == '0')
|
|
{
|
|
ADDW (c);
|
|
c = inchar ();
|
|
if (tolower (c) == 'x')
|
|
{
|
|
/* It is a number in hexadecimal format. */
|
|
ADDW (c);
|
|
|
|
is_hexa = 1;
|
|
exp_char = 'p';
|
|
|
|
/* Grouping is not allowed. */
|
|
flags &= ~GROUP;
|
|
c = inchar ();
|
|
}
|
|
}
|
|
|
|
got_dot = got_e = 0;
|
|
do
|
|
{
|
|
if (isdigit (c))
|
|
ADDW (c);
|
|
else if (!got_e && is_hexa && isxdigit (c))
|
|
ADDW (c);
|
|
else if (got_e && wp[wpsize - 1] == exp_char
|
|
&& (c == '-' || c == '+'))
|
|
ADDW (c);
|
|
else if (wpsize > 0 && !got_e && tolower (c) == exp_char)
|
|
{
|
|
ADDW (exp_char);
|
|
got_e = got_dot = 1;
|
|
}
|
|
else if (c == decimal && !got_dot)
|
|
{
|
|
ADDW (c);
|
|
got_dot = 1;
|
|
}
|
|
else if ((flags & GROUP) && c == thousands && !got_dot)
|
|
ADDW (c);
|
|
else
|
|
{
|
|
/* The last read character is not part of the number
|
|
anymore. */
|
|
ungetc (c, s);
|
|
break;
|
|
}
|
|
if (width > 0)
|
|
--width;
|
|
}
|
|
while (width != 0 && inchar () != EOF);
|
|
|
|
/* Have we read any character? If we try to read a number
|
|
in hexadecimal notation and we have read only the `0x'
|
|
prefix this is an error. */
|
|
if (wpsize == 0 || (is_hexa && wpsize == 2))
|
|
conv_error ();
|
|
|
|
/* Convert the number. */
|
|
ADDW ('\0');
|
|
if (flags & LONGDBL)
|
|
{
|
|
long double d = __strtold_internal (wp, &tw, flags & GROUP);
|
|
if (!(flags & SUPPRESS) && tw != wp)
|
|
*ARG (long double *) = negative ? -d : d;
|
|
}
|
|
else if (flags & LONG)
|
|
{
|
|
double d = __strtod_internal (wp, &tw, flags & GROUP);
|
|
if (!(flags & SUPPRESS) && tw != wp)
|
|
*ARG (double *) = negative ? -d : d;
|
|
}
|
|
else
|
|
{
|
|
float d = __strtof_internal (wp, &tw, flags & GROUP);
|
|
if (!(flags & SUPPRESS) && tw != wp)
|
|
*ARG (float *) = negative ? -d : d;
|
|
}
|
|
|
|
if (tw == wp)
|
|
conv_error ();
|
|
|
|
if (!(flags & SUPPRESS))
|
|
++done;
|
|
break;
|
|
|
|
case '[': /* Character class. */
|
|
if (flags & LONG)
|
|
{
|
|
STRING_ARG (wstr, wchar_t);
|
|
c = '\0'; /* This is to keep gcc quiet. */
|
|
}
|
|
else
|
|
{
|
|
STRING_ARG (str, char);
|
|
|
|
c = inchar ();
|
|
if (c == EOF)
|
|
input_error ();
|
|
}
|
|
|
|
if (*f == '^')
|
|
{
|
|
++f;
|
|
not_in = 1;
|
|
}
|
|
else
|
|
not_in = 0;
|
|
|
|
/* Fill WP with byte flags indexed by character.
|
|
We will use this flag map for matching input characters. */
|
|
if (wpmax < UCHAR_MAX)
|
|
{
|
|
wpmax = UCHAR_MAX;
|
|
wp = (char *) alloca (wpmax);
|
|
}
|
|
memset (wp, 0, UCHAR_MAX);
|
|
|
|
fc = *f;
|
|
if (fc == ']' || fc == '-')
|
|
{
|
|
/* If ] or - appears before any char in the set, it is not
|
|
the terminator or separator, but the first char in the
|
|
set. */
|
|
wp[fc] = 1;
|
|
++f;
|
|
}
|
|
|
|
while ((fc = *f++) != '\0' && fc != ']')
|
|
{
|
|
if (fc == '-' && *f != '\0' && *f != ']' &&
|
|
(unsigned char) f[-2] <= (unsigned char) *f)
|
|
{
|
|
/* Add all characters from the one before the '-'
|
|
up to (but not including) the next format char. */
|
|
for (fc = f[-2]; fc < *f; ++fc)
|
|
wp[fc] = 1;
|
|
}
|
|
else
|
|
/* Add the character to the flag map. */
|
|
wp[fc] = 1;
|
|
}
|
|
if (fc == '\0')
|
|
{
|
|
if (!(flags & LONG))
|
|
ungetc (c, s);
|
|
conv_error();
|
|
}
|
|
|
|
if (flags & LONG)
|
|
{
|
|
wint_t val;
|
|
int first = 1;
|
|
|
|
do
|
|
{
|
|
size_t cnt = 0;
|
|
NEXT_WIDE_CHAR (first);
|
|
if (val > 255 || wp[val] == not_in)
|
|
{
|
|
/* XXX We have a problem here. We read a wide
|
|
character and this possibly took several
|
|
bytes. But we can only push back one single
|
|
character. To be sure we don't create wrong
|
|
input we push it back only in case it is
|
|
representable within one byte. */
|
|
if (val < 0x80)
|
|
ungetc (val, s);
|
|
break;
|
|
}
|
|
STRING_ADD_CHAR (wstr, val, wchar_t);
|
|
if (width > 0)
|
|
--width;
|
|
first = 0;
|
|
}
|
|
while (width != 0);
|
|
|
|
if (first)
|
|
conv_error ();
|
|
|
|
if (!(flags & SUPPRESS))
|
|
{
|
|
*wstr = L'\0';
|
|
++done;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
num.ul = read_in - 1; /* -1 because we already read one char. */
|
|
do
|
|
{
|
|
if (wp[c] == not_in)
|
|
{
|
|
ungetc (c, s);
|
|
break;
|
|
}
|
|
STRING_ADD_CHAR (str, c, char);
|
|
if (width > 0)
|
|
--width;
|
|
}
|
|
while (width != 0 && inchar () != EOF);
|
|
|
|
if (read_in == num.ul)
|
|
conv_error ();
|
|
|
|
if (!(flags & SUPPRESS))
|
|
{
|
|
*str = '\0';
|
|
++done;
|
|
}
|
|
}
|
|
break;
|
|
|
|
case 'p': /* Generic pointer. */
|
|
base = 16;
|
|
/* A PTR must be the same size as a `long int'. */
|
|
flags &= ~(SHORT|LONGDBL);
|
|
flags |= LONG;
|
|
number_signed = 0;
|
|
goto number;
|
|
}
|
|
}
|
|
|
|
/* The last thing we saw int the format string was a white space.
|
|
Consume the last white spaces. */
|
|
if (skip_space)
|
|
{
|
|
do
|
|
c = inchar ();
|
|
while (isspace (c));
|
|
ungetc (c, s);
|
|
}
|
|
|
|
/* Unlock stream. */
|
|
UNLOCK_STREAM;
|
|
|
|
return done;
|
|
}
|
|
|
|
#ifdef USE_IN_LIBIO
|
|
int
|
|
__vfscanf (FILE *s, const char *format, va_list argptr)
|
|
{
|
|
return _IO_vfscanf (s, format, argptr, NULL);
|
|
}
|
|
#endif
|
|
|
|
weak_alias (__vfscanf, vfscanf)
|