mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-23 17:53:37 +08: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.
562 lines
24 KiB
C
562 lines
24 KiB
C
/* Hierarchial argument parsing, layered over getopt.
|
||
Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
|
||
This file is part of the GNU C Library.
|
||
Written by Miles Bader <miles@gnu.ai.mit.edu>.
|
||
|
||
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. */
|
||
|
||
#ifndef _ARGP_H
|
||
#define _ARGP_H
|
||
|
||
#include <stdio.h>
|
||
#include <ctype.h>
|
||
#include <getopt.h>
|
||
|
||
#define __need_error_t
|
||
#include <errno.h>
|
||
|
||
#ifndef __const
|
||
#define __const const
|
||
#endif
|
||
|
||
#ifndef __error_t_defined
|
||
typedef int error_t;
|
||
#define __error_t_defined
|
||
#endif
|
||
|
||
#ifndef __P
|
||
# if (defined (__STDC__) && __STDC__) || defined (__cplusplus)
|
||
# define __P(args) args
|
||
# else
|
||
# define __P(args) ()
|
||
# endif
|
||
#endif
|
||
|
||
#ifdef __cplusplus
|
||
extern "C" {
|
||
#endif
|
||
|
||
/* A description of a particular option. A pointer to an array of
|
||
these is passed in the OPTIONS field of an argp structure. Each option
|
||
entry can correspond to one long option and/or one short option; more
|
||
names for the same option can be added by following an entry in an option
|
||
array with options having the OPTION_ALIAS flag set. */
|
||
struct argp_option
|
||
{
|
||
/* The long option name. For more than one name for the same option, you
|
||
can use following options with the OPTION_ALIAS flag set. */
|
||
__const char *name;
|
||
|
||
/* What key is returned for this option. If > 0 and printable, then it's
|
||
also accepted as a short option. */
|
||
int key;
|
||
|
||
/* If non-NULL, this is the name of the argument associated with this
|
||
option, which is required unless the OPTION_ARG_OPTIONAL flag is set. */
|
||
__const char *arg;
|
||
|
||
/* OPTION_ flags. */
|
||
int flags;
|
||
|
||
/* The doc string for this option. If both NAME and KEY are 0, This string
|
||
will be printed outdented from the normal option column, making it
|
||
useful as a group header (it will be the first thing printed in its
|
||
group); in this usage, it's conventional to end the string with a `:'. */
|
||
__const char *doc;
|
||
|
||
/* The group this option is in. In a long help message, options are sorted
|
||
alphabetically within each group, and the groups presented in the order
|
||
0, 1, 2, ..., n, -m, ..., -2, -1. Every entry in an options array with
|
||
if this field 0 will inherit the group number of the previous entry, or
|
||
zero if it's the first one, unless its a group header (NAME and KEY both
|
||
0), in which case, the previous entry + 1 is the default. Automagic
|
||
options such as --help are put into group -1. */
|
||
int group;
|
||
};
|
||
|
||
/* The argument associated with this option is optional. */
|
||
#define OPTION_ARG_OPTIONAL 0x1
|
||
|
||
/* This option isn't displayed in any help messages. */
|
||
#define OPTION_HIDDEN 0x2
|
||
|
||
/* This option is an alias for the closest previous non-alias option. This
|
||
means that it will be displayed in the same help entry, and will inherit
|
||
fields other than NAME and KEY from the aliased option. */
|
||
#define OPTION_ALIAS 0x4
|
||
|
||
/* This option isn't actually an option (and so should be ignored by the
|
||
actual option parser), but rather an arbitrary piece of documentation that
|
||
should be displayed in much the same manner as the options. If this flag
|
||
is set, then the option NAME field is displayed unmodified (e.g., no `--'
|
||
prefix is added) at the left-margin (where a *short* option would normally
|
||
be displayed), and the documentation string in the normal place. For
|
||
purposes of sorting, any leading whitespace and puncuation is ignored,
|
||
except that if the first non-whitespace character is not `-', this entry
|
||
is displayed after all options (and OPTION_DOC entries with a leading `-')
|
||
in the same group. */
|
||
#define OPTION_DOC 0x8
|
||
|
||
/* This option shouldn't be included in `long' usage messages (but is still
|
||
included in help messages). This is mainly intended for options that are
|
||
completely documented in an argp's ARGS_DOC field, in which case including
|
||
the option in the generic usage list would be redundant. For instance,
|
||
if ARGS_DOC is "FOO BAR\n-x BLAH", and the `-x' option's purpose is to
|
||
distinguish these two cases, -x should probably be marked
|
||
OPTION_NO_USAGE. */
|
||
#define OPTION_NO_USAGE 0x10
|
||
|
||
struct argp; /* fwd declare this type */
|
||
struct argp_state; /* " */
|
||
struct argp_child; /* " */
|
||
|
||
/* The type of a pointer to an argp parsing function. */
|
||
typedef error_t (*argp_parser_t)(int key, char *arg, struct argp_state *state);
|
||
|
||
/* What to return for unrecognized keys. For special ARGP_KEY_ keys, such
|
||
returns will simply be ignored. For user keys, this error will be turned
|
||
into EINVAL (if the call to argp_parse is such that errors are propagated
|
||
back to the user instead of exiting); returning EINVAL itself would result
|
||
in an immediate stop to parsing in *all* cases. */
|
||
#define ARGP_ERR_UNKNOWN E2BIG /* Hurd should never need E2BIG. XXX */
|
||
|
||
/* Special values for the KEY argument to an argument parsing function.
|
||
ARGP_ERR_UNKNOWN should be returned if they aren't understood.
|
||
|
||
The sequence of keys to a parsing function is either (where each
|
||
uppercased word should be prefixed by `ARGP_KEY_' and opt is a user key):
|
||
|
||
INIT opt... NO_ARGS END SUCCESS -- No non-option arguments at all
|
||
or INIT (opt | ARG)... END SUCCESS -- All non-option args parsed
|
||
or INIT (opt | ARG)... SUCCESS -- Some non-option arg unrecognized
|
||
|
||
The third case is where every parser returned ARGP_KEY_UNKNOWN for an
|
||
argument, in which case parsing stops at that argument (returning the
|
||
unparsed arguments to the caller of argp_parse if requested, or stopping
|
||
with an error message if not).
|
||
|
||
If an error occurs (either detected by argp, or because the parsing
|
||
function returned an error value), then the parser is called with
|
||
ARGP_KEY_ERROR, and no further calls are made. */
|
||
|
||
/* This is not an option at all, but rather a command line argument. If a
|
||
parser receiving this key returns success, the fact is recorded, and the
|
||
ARGP_KEY_NO_ARGS case won't be used. HOWEVER, if while processing the
|
||
argument, a parser function decrements the NEXT field of the state it's
|
||
passed, the option won't be considered processed; this is to allow you to
|
||
actually modify the argument (perhaps into an option), and have it
|
||
processed again. */
|
||
#define ARGP_KEY_ARG 0
|
||
/* There are remaining arguments not parsed by any parser, which may be found
|
||
starting at (STATE->argv + STATE->next). If success is returned, but
|
||
STATE->next left untouched, it's assumed that all arguments were consume,
|
||
otherwise, the parser should adjust STATE->next to reflect any arguments
|
||
consumed. */
|
||
#define ARGP_KEY_ARGS 0x1000006
|
||
/* There are no more command line arguments at all. */
|
||
#define ARGP_KEY_END 0x1000001
|
||
/* Because it's common to want to do some special processing if there aren't
|
||
any non-option args, user parsers are called with this key if they didn't
|
||
successfully process any non-option arguments. Called just before
|
||
ARGP_KEY_END (where more general validity checks on previously parsed
|
||
arguments can take place). */
|
||
#define ARGP_KEY_NO_ARGS 0x1000002
|
||
/* Passed in before any parsing is done. Afterwards, the values of each
|
||
element of the CHILD_INPUT field, if any, in the state structure is
|
||
copied to each child's state to be the initial value of the INPUT field. */
|
||
#define ARGP_KEY_INIT 0x1000003
|
||
/* Use after all other keys, including SUCCESS & END. */
|
||
#define ARGP_KEY_FINI 0x1000007
|
||
/* Passed in when parsing has successfully been completed (even if there are
|
||
still arguments remaining). */
|
||
#define ARGP_KEY_SUCCESS 0x1000004
|
||
/* Passed in if an error occurs. */
|
||
#define ARGP_KEY_ERROR 0x1000005
|
||
|
||
/* An argp structure contains a set of options declarations, a function to
|
||
deal with parsing one, documentation string, a possible vector of child
|
||
argp's, and perhaps a function to filter help output. When actually
|
||
parsing options, getopt is called with the union of all the argp
|
||
structures chained together through their CHILD pointers, with conflicts
|
||
being resolved in favor of the first occurance in the chain. */
|
||
struct argp
|
||
{
|
||
/* An array of argp_option structures, terminated by an entry with both
|
||
NAME and KEY having a value of 0. */
|
||
__const struct argp_option *options;
|
||
|
||
/* What to do with an option from this structure. KEY is the key
|
||
associated with the option, and ARG is any associated argument (NULL if
|
||
none was supplied). If KEY isn't understood, ARGP_ERR_UNKNOWN should be
|
||
returned. If a non-zero, non-ARGP_ERR_UNKNOWN value is returned, then
|
||
parsing is stopped immediately, and that value is returned from
|
||
argp_parse(). For special (non-user-supplied) values of KEY, see the
|
||
ARGP_KEY_ definitions below. */
|
||
argp_parser_t parser;
|
||
|
||
/* A string describing what other arguments are wanted by this program. It
|
||
is only used by argp_usage to print the `Usage:' message. If it
|
||
contains newlines, the strings separated by them are considered
|
||
alternative usage patterns, and printed on separate lines (lines after
|
||
the first are prefix by ` or: ' instead of `Usage:'). */
|
||
__const char *args_doc;
|
||
|
||
/* If non-NULL, a string containing extra text to be printed before and
|
||
after the options in a long help message (separated by a vertical tab
|
||
`\v' character). */
|
||
__const char *doc;
|
||
|
||
/* A vector of argp_children structures, terminated by a member with a 0
|
||
argp field, pointing to child argps should be parsed with this one. Any
|
||
conflicts are resolved in favor of this argp, or early argps in the
|
||
CHILDREN list. This field is useful if you use libraries that supply
|
||
their own argp structure, which you want to use in conjunction with your
|
||
own. */
|
||
__const struct argp_child *children;
|
||
|
||
/* If non-zero, this should be a function to filter the output of help
|
||
messages. KEY is either a key from an option, in which case TEXT is
|
||
that option's help text, or a special key from the ARGP_KEY_HELP_
|
||
defines, below, describing which other help text TEXT is. The function
|
||
should return either TEXT, if it should be used as-is, a replacement
|
||
string, which should be malloced, and will be freed by argp, or NULL,
|
||
meaning `print nothing'. The value for TEXT is *after* any translation
|
||
has been done, so if any of the replacement text also needs translation,
|
||
that should be done by the filter function. INPUT is either the input
|
||
supplied to argp_parse, or NULL, if argp_help was called directly. */
|
||
char *(*help_filter)(int __key, __const char *__text, void *__input);
|
||
};
|
||
|
||
/* Possible KEY arguments to a help filter function. */
|
||
#define ARGP_KEY_HELP_PRE_DOC 0x2000001 /* Help text preceeding options. */
|
||
#define ARGP_KEY_HELP_POST_DOC 0x2000002 /* Help text following options. */
|
||
#define ARGP_KEY_HELP_HEADER 0x2000003 /* Option header string. */
|
||
#define ARGP_KEY_HELP_EXTRA 0x2000004 /* After all other documentation;
|
||
TEXT is NULL for this key. */
|
||
/* Explanatory note emitted when duplicate option arguments have been
|
||
suppressed. */
|
||
#define ARGP_KEY_HELP_DUP_ARGS_NOTE 0x2000005
|
||
#define ARGP_KEY_HELP_ARGS_DOC 0x2000006 /* Argument doc string. */
|
||
|
||
/* When an argp has a non-zero CHILDREN field, it should point to a vector of
|
||
argp_child structures, each of which describes a subsidiary argp. */
|
||
struct argp_child
|
||
{
|
||
/* The child parser. */
|
||
__const struct argp *argp;
|
||
|
||
/* Flags for this child. */
|
||
int flags;
|
||
|
||
/* If non-zero, an optional header to be printed in help output before the
|
||
child options. As a side-effect, a non-zero value forces the child
|
||
options to be grouped together; to achieve this effect without actually
|
||
printing a header string, use a value of "". */
|
||
__const char *header;
|
||
|
||
/* Where to group the child options relative to the other (`consolidated')
|
||
options in the parent argp; the values are the same as the GROUP field
|
||
in argp_option structs, but all child-groupings follow parent options at
|
||
a particular group level. If both this field and HEADER are zero, then
|
||
they aren't grouped at all, but rather merged with the parent options
|
||
(merging the child's grouping levels with the parents). */
|
||
int group;
|
||
};
|
||
|
||
/* Parsing state. This is provided to parsing functions called by argp,
|
||
which may examine and, as noted, modify fields. */
|
||
struct argp_state
|
||
{
|
||
/* The top level ARGP being parsed. */
|
||
__const struct argp *root_argp;
|
||
|
||
/* The argument vector being parsed. May be modified. */
|
||
int argc;
|
||
char **argv;
|
||
|
||
/* The index in ARGV of the next arg that to be parsed. May be modified. */
|
||
int next;
|
||
|
||
/* The flags supplied to argp_parse. May be modified. */
|
||
unsigned flags;
|
||
|
||
/* While calling a parsing function with a key of ARGP_KEY_ARG, this is the
|
||
number of the current arg, starting at zero, and incremented after each
|
||
such call returns. At all other times, this is the number of such
|
||
arguments that have been processed. */
|
||
unsigned arg_num;
|
||
|
||
/* If non-zero, the index in ARGV of the first argument following a special
|
||
`--' argument (which prevents anything following being interpreted as an
|
||
option). Only set once argument parsing has proceeded past this point. */
|
||
int quoted;
|
||
|
||
/* An arbitrary pointer passed in from the user. */
|
||
void *input;
|
||
/* Values to pass to child parsers. This vector will be the same length as
|
||
the number of children for the current parser. */
|
||
void **child_inputs;
|
||
|
||
/* For the parser's use. Initialized to 0. */
|
||
void *hook;
|
||
|
||
/* The name used when printing messages. This is initialized to ARGV[0],
|
||
or PROGRAM_INVOCATION_NAME if that is unavailable. */
|
||
char *name;
|
||
|
||
/* Streams used when argp prints something. */
|
||
FILE *err_stream; /* For errors; initialized to stderr. */
|
||
FILE *out_stream; /* For information; initialized to stdout. */
|
||
|
||
void *pstate; /* Private, for use by argp. */
|
||
};
|
||
|
||
/* Flags for argp_parse (note that the defaults are those that are
|
||
convenient for program command line parsing): */
|
||
|
||
/* Don't ignore the first element of ARGV. Normally (and always unless
|
||
ARGP_NO_ERRS is set) the first element of the argument vector is
|
||
skipped for option parsing purposes, as it corresponds to the program name
|
||
in a command line. */
|
||
#define ARGP_PARSE_ARGV0 0x01
|
||
|
||
/* Don't print error messages for unknown options to stderr; unless this flag
|
||
is set, ARGP_PARSE_ARGV0 is ignored, as ARGV[0] is used as the program
|
||
name in the error messages. This flag implies ARGP_NO_EXIT (on the
|
||
assumption that silent exiting upon errors is bad behaviour). */
|
||
#define ARGP_NO_ERRS 0x02
|
||
|
||
/* Don't parse any non-option args. Normally non-option args are parsed by
|
||
calling the parse functions with a key of ARGP_KEY_ARG, and the actual arg
|
||
as the value. Since it's impossible to know which parse function wants to
|
||
handle it, each one is called in turn, until one returns 0 or an error
|
||
other than ARGP_ERR_UNKNOWN; if an argument is handled by no one, the
|
||
argp_parse returns prematurely (but with a return value of 0). If all
|
||
args have been parsed without error, all parsing functions are called one
|
||
last time with a key of ARGP_KEY_END. This flag needn't normally be set,
|
||
as the normal behavior is to stop parsing as soon as some argument can't
|
||
be handled. */
|
||
#define ARGP_NO_ARGS 0x04
|
||
|
||
/* Parse options and arguments in the same order they occur on the command
|
||
line -- normally they're rearranged so that all options come first. */
|
||
#define ARGP_IN_ORDER 0x08
|
||
|
||
/* Don't provide the standard long option --help, which causes usage and
|
||
option help information to be output to stdout, and exit (0) called. */
|
||
#define ARGP_NO_HELP 0x10
|
||
|
||
/* Don't exit on errors (they may still result in error messages). */
|
||
#define ARGP_NO_EXIT 0x20
|
||
|
||
/* Use the gnu getopt `long-only' rules for parsing arguments. */
|
||
#define ARGP_LONG_ONLY 0x40
|
||
|
||
/* Turns off any message-printing/exiting options. */
|
||
#define ARGP_SILENT (ARGP_NO_EXIT | ARGP_NO_ERRS | ARGP_NO_HELP)
|
||
|
||
/* Parse the options strings in ARGC & ARGV according to the options in ARGP.
|
||
FLAGS is one of the ARGP_ flags above. If ARG_INDEX is non-NULL, the
|
||
index in ARGV of the first unparsed option is returned in it. If an
|
||
unknown option is present, ARGP_ERR_UNKNOWN is returned; if some parser
|
||
routine returned a non-zero value, it is returned; otherwise 0 is
|
||
returned. This function may also call exit unless the ARGP_NO_HELP flag
|
||
is set. INPUT is a pointer to a value to be passed in to the parser. */
|
||
extern error_t argp_parse __P ((__const struct argp *__argp,
|
||
int __argc, char **__argv, unsigned __flags,
|
||
int *__arg_index, void *__input));
|
||
extern error_t __argp_parse __P ((__const struct argp *__argp,
|
||
int __argc, char **__argv, unsigned __flags,
|
||
int *__arg_index, void *__input));
|
||
|
||
/* Global variables. */
|
||
|
||
/* If defined or set by the user program to a non-zero value, then a default
|
||
option --version is added (unless the ARGP_NO_HELP flag is used), which
|
||
will print this string followed by a newline and exit (unless the
|
||
ARGP_NO_EXIT flag is used). Overridden by ARGP_PROGRAM_VERSION_HOOK. */
|
||
extern __const char *argp_program_version;
|
||
|
||
/* If defined or set by the user program to a non-zero value, then a default
|
||
option --version is added (unless the ARGP_NO_HELP flag is used), which
|
||
calls this function with a stream to print the version to and a pointer to
|
||
the current parsing state, and then exits (unless the ARGP_NO_EXIT flag is
|
||
used). This variable takes precedent over ARGP_PROGRAM_VERSION. */
|
||
extern void (*argp_program_version_hook) __P ((FILE *__stream,
|
||
struct argp_state *__state));
|
||
|
||
/* If defined or set by the user program, it should point to string that is
|
||
the bug-reporting address for the program. It will be printed by
|
||
argp_help if the ARGP_HELP_BUG_ADDR flag is set (as it is by various
|
||
standard help messages), embedded in a sentence that says something like
|
||
`Report bugs to ADDR.'. */
|
||
extern __const char *argp_program_bug_address;
|
||
|
||
/* The exit status that argp will use when exiting due to a parsing error.
|
||
If not defined or set by the user program, this defaults to EX_USAGE from
|
||
<sysexits.h>. */
|
||
extern error_t argp_err_exit_status;
|
||
|
||
/* Flags for argp_help. */
|
||
#define ARGP_HELP_USAGE 0x01 /* a Usage: message. */
|
||
#define ARGP_HELP_SHORT_USAGE 0x02 /* " but don't actually print options. */
|
||
#define ARGP_HELP_SEE 0x04 /* a `Try ... for more help' message. */
|
||
#define ARGP_HELP_LONG 0x08 /* a long help message. */
|
||
#define ARGP_HELP_PRE_DOC 0x10 /* doc string preceding long help. */
|
||
#define ARGP_HELP_POST_DOC 0x20 /* doc string following long help. */
|
||
#define ARGP_HELP_DOC (ARGP_HELP_PRE_DOC | ARGP_HELP_POST_DOC)
|
||
#define ARGP_HELP_BUG_ADDR 0x40 /* bug report address */
|
||
#define ARGP_HELP_LONG_ONLY 0x80 /* modify output appropriately to
|
||
reflect ARGP_LONG_ONLY mode. */
|
||
|
||
/* These ARGP_HELP flags are only understood by argp_state_help. */
|
||
#define ARGP_HELP_EXIT_ERR 0x100 /* Call exit(1) instead of returning. */
|
||
#define ARGP_HELP_EXIT_OK 0x200 /* Call exit(0) instead of returning. */
|
||
|
||
/* The standard thing to do after a program command line parsing error, if an
|
||
error message has already been printed. */
|
||
#define ARGP_HELP_STD_ERR \
|
||
(ARGP_HELP_SEE | ARGP_HELP_EXIT_ERR)
|
||
/* The standard thing to do after a program command line parsing error, if no
|
||
more specific error message has been printed. */
|
||
#define ARGP_HELP_STD_USAGE \
|
||
(ARGP_HELP_SHORT_USAGE | ARGP_HELP_SEE | ARGP_HELP_EXIT_ERR)
|
||
/* The standard thing to do in response to a --help option. */
|
||
#define ARGP_HELP_STD_HELP \
|
||
(ARGP_HELP_SHORT_USAGE | ARGP_HELP_LONG | ARGP_HELP_EXIT_OK \
|
||
| ARGP_HELP_DOC | ARGP_HELP_BUG_ADDR)
|
||
|
||
/* Output a usage message for ARGP to STREAM. FLAGS are from the set
|
||
ARGP_HELP_*. */
|
||
extern void argp_help __P ((__const struct argp *__argp, FILE *__stream,
|
||
unsigned __flags, char *__name));
|
||
extern void __argp_help __P ((__const struct argp *__argp, FILE *__stream,
|
||
unsigned __flags, char *__name));
|
||
|
||
/* The following routines are intended to be called from within an argp
|
||
parsing routine (thus taking an argp_state structure as the first
|
||
argument). They may or may not print an error message and exit, depending
|
||
on the flags in STATE -- in any case, the caller should be prepared for
|
||
them *not* to exit, and should return an appropiate error after calling
|
||
them. [argp_usage & argp_error should probably be called argp_state_...,
|
||
but they're used often enough that they should be short] */
|
||
|
||
/* Output, if appropriate, a usage message for STATE to STREAM. FLAGS are
|
||
from the set ARGP_HELP_*. */
|
||
extern void argp_state_help __P ((__const struct argp_state *__state,
|
||
FILE *__stream, unsigned __flags));
|
||
extern void __argp_state_help __P ((__const struct argp_state *__state,
|
||
FILE *__stream, unsigned __flags));
|
||
|
||
/* Possibly output the standard usage message for ARGP to stderr and exit. */
|
||
extern void argp_usage __P ((__const struct argp_state *__state));
|
||
extern void __argp_usage __P ((__const struct argp_state *__state));
|
||
|
||
/* If appropriate, print the printf string FMT and following args, preceded
|
||
by the program name and `:', to stderr, and followed by a `Try ... --help'
|
||
message, then exit (1). */
|
||
extern void argp_error __P ((__const struct argp_state *__state,
|
||
__const char *__fmt, ...))
|
||
__attribute__ ((__format__ (__printf__, 2, 3)));
|
||
extern void __argp_error __P ((__const struct argp_state *__state,
|
||
__const char *__fmt, ...))
|
||
__attribute__ ((__format__ (__printf__, 2, 3)));
|
||
|
||
/* Similar to the standard gnu error-reporting function error(), but will
|
||
respect the ARGP_NO_EXIT and ARGP_NO_ERRS flags in STATE, and will print
|
||
to STATE->err_stream. This is useful for argument parsing code that is
|
||
shared between program startup (when exiting is desired) and runtime
|
||
option parsing (when typically an error code is returned instead). The
|
||
difference between this function and argp_error is that the latter is for
|
||
*parsing errors*, and the former is for other problems that occur during
|
||
parsing but don't reflect a (syntactic) problem with the input. */
|
||
extern void argp_failure __P ((__const struct argp_state *__state,
|
||
int __status, int __errnum,
|
||
__const char *__fmt, ...))
|
||
__attribute__ ((__format__ (__printf__, 4, 5)));
|
||
extern void __argp_failure __P ((__const struct argp_state *__state,
|
||
int __status, int __errnum,
|
||
__const char *__fmt, ...))
|
||
__attribute__ ((__format__ (__printf__, 4, 5)));
|
||
|
||
/* Returns true if the option OPT is a valid short option. */
|
||
extern int _option_is_short __P ((__const struct argp_option *__opt));
|
||
extern int __option_is_short __P ((__const struct argp_option *__opt));
|
||
|
||
/* Returns true if the option OPT is in fact the last (unused) entry in an
|
||
options array. */
|
||
extern int _option_is_end __P ((__const struct argp_option *__opt));
|
||
extern int __option_is_end __P ((__const struct argp_option *__opt));
|
||
|
||
/* Return the input field for ARGP in the parser corresponding to STATE; used
|
||
by the help routines. */
|
||
extern void *_argp_input __P ((__const struct argp *argp,
|
||
__const struct argp_state *state));
|
||
extern void *__argp_input __P ((__const struct argp *argp,
|
||
__const struct argp_state *state));
|
||
|
||
#ifdef __OPTIMIZE__
|
||
|
||
#if !_LIBC
|
||
# define __argp_usage argp_usage
|
||
# define __argp_state_help argp_state_help
|
||
# define __option_is_short _option_is_short
|
||
# define __option_is_end _option_is_end
|
||
#endif
|
||
|
||
#ifndef ARGP_EI
|
||
# define ARGP_EI extern inline
|
||
#endif
|
||
|
||
ARGP_EI void
|
||
__argp_usage (__const struct argp_state *__state)
|
||
{
|
||
__argp_state_help (__state, stderr, ARGP_HELP_STD_USAGE);
|
||
}
|
||
|
||
ARGP_EI int
|
||
__option_is_short (__const struct argp_option *__opt)
|
||
{
|
||
if (__opt->flags & OPTION_DOC)
|
||
return 0;
|
||
else
|
||
{
|
||
int __key = __opt->key;
|
||
return __key > 0 && isprint (__key);
|
||
}
|
||
}
|
||
|
||
ARGP_EI int
|
||
__option_is_end (__const struct argp_option *__opt)
|
||
{
|
||
return !__opt->key && !__opt->name && !__opt->doc && !__opt->group;
|
||
}
|
||
|
||
#if !_LIBC
|
||
# undef __argp_usage
|
||
# undef __argp_state_help
|
||
# undef __option_is_short
|
||
# undef __option_is_end
|
||
#endif
|
||
#endif /* argp.h */
|
||
#endif /* __OPTIMIZE__ */
|
||
|
||
#ifdef __cplusplus
|
||
}
|
||
#endif
|
||
|
||
#endif /* __ARGP_H__ */
|