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.
953 lines
29 KiB
C
953 lines
29 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. */
|
||
|
||
#ifdef HAVE_CONFIG_H
|
||
#include <config.h>
|
||
#endif
|
||
|
||
#include <stdlib.h>
|
||
#include <string.h>
|
||
#include <unistd.h>
|
||
#include <limits.h>
|
||
#include <getopt.h>
|
||
|
||
#ifndef _
|
||
/* This is for other GNU distributions with internationalized messages.
|
||
When compiling libc, the _ macro is predefined. */
|
||
#ifdef HAVE_LIBINTL_H
|
||
# include <libintl.h>
|
||
# define _(msgid) gettext (msgid)
|
||
#else
|
||
# define _(msgid) (msgid)
|
||
# define gettext(msgid) (msgid)
|
||
#endif
|
||
#define N_(msgid) (msgid)
|
||
#endif
|
||
|
||
#if _LIBC - 0
|
||
#include <bits/libc-lock.h>
|
||
#else
|
||
#ifdef HAVE_CTHREADS_H
|
||
#include <cthreads.h>
|
||
#endif
|
||
#endif /* _LIBC */
|
||
|
||
#include "argp.h"
|
||
#include "argp-namefrob.h"
|
||
|
||
/* Getopt return values. */
|
||
#define KEY_END (-1) /* The end of the options. */
|
||
#define KEY_ARG 1 /* A non-option argument. */
|
||
#define KEY_ERR '?' /* An error parsing the options. */
|
||
|
||
/* The meta-argument used to prevent any further arguments being interpreted
|
||
as options. */
|
||
#define QUOTE "--"
|
||
|
||
/* The number of bits we steal in a long-option value for our own use. */
|
||
#define GROUP_BITS CHAR_BIT
|
||
|
||
/* The number of bits available for the user value. */
|
||
#define USER_BITS ((sizeof ((struct option *)0)->val * CHAR_BIT) - GROUP_BITS)
|
||
#define USER_MASK ((1 << USER_BITS) - 1)
|
||
|
||
/* EZ alias for ARGP_ERR_UNKNOWN. */
|
||
#define EBADKEY ARGP_ERR_UNKNOWN
|
||
|
||
/* Default options. */
|
||
|
||
/* When argp is given the --HANG switch, _ARGP_HANG is set and argp will sleep
|
||
for one second intervals, decrementing _ARGP_HANG until it's zero. Thus
|
||
you can force the program to continue by attaching a debugger and setting
|
||
it to 0 yourself. */
|
||
volatile int _argp_hang = 0;
|
||
|
||
#define OPT_PROGNAME -2
|
||
#define OPT_USAGE -3
|
||
#define OPT_HANG -4
|
||
|
||
static const struct argp_option argp_default_options[] =
|
||
{
|
||
{"help", '?', 0, 0, N_("Give this help list"), -1},
|
||
{"usage", OPT_USAGE, 0, 0, N_("Give a short usage message")},
|
||
{"program-name",OPT_PROGNAME,"NAME", OPTION_HIDDEN, N_("Set the program name")},
|
||
{"HANG", OPT_HANG, "SECS", OPTION_ARG_OPTIONAL | OPTION_HIDDEN,
|
||
N_("Hang for SECS seconds (default 3600)")},
|
||
{0, 0}
|
||
};
|
||
|
||
static error_t
|
||
argp_default_parser (int key, char *arg, struct argp_state *state)
|
||
{
|
||
switch (key)
|
||
{
|
||
case '?':
|
||
__argp_state_help (state, state->out_stream, ARGP_HELP_STD_HELP);
|
||
break;
|
||
case OPT_USAGE:
|
||
__argp_state_help (state, state->out_stream,
|
||
ARGP_HELP_USAGE | ARGP_HELP_EXIT_OK);
|
||
break;
|
||
|
||
case OPT_PROGNAME: /* Set the program name. */
|
||
program_invocation_name = arg;
|
||
|
||
/* [Note that some systems only have PROGRAM_INVOCATION_SHORT_NAME (aka
|
||
__PROGNAME), in which case, PROGRAM_INVOCATION_NAME is just defined
|
||
to be that, so we have to be a bit careful here.] */
|
||
arg = strrchr (arg, '/');
|
||
if (arg)
|
||
program_invocation_short_name = arg + 1;
|
||
else
|
||
program_invocation_short_name = program_invocation_name;
|
||
|
||
/* Update what we use for messages. */
|
||
state->name = program_invocation_short_name;
|
||
|
||
if ((state->flags & (ARGP_PARSE_ARGV0 | ARGP_NO_ERRS))
|
||
== ARGP_PARSE_ARGV0)
|
||
/* Update what getopt uses too. */
|
||
state->argv[0] = program_invocation_name;
|
||
|
||
break;
|
||
|
||
case OPT_HANG:
|
||
_argp_hang = atoi (arg ? arg : "3600");
|
||
while (_argp_hang-- > 0)
|
||
__sleep (1);
|
||
break;
|
||
|
||
default:
|
||
return EBADKEY;
|
||
}
|
||
return 0;
|
||
}
|
||
|
||
static const struct argp argp_default_argp =
|
||
{argp_default_options, &argp_default_parser};
|
||
|
||
|
||
static const struct argp_option argp_version_options[] =
|
||
{
|
||
{"version", 'V', 0, 0, N_("Print program version"), -1},
|
||
{0, 0}
|
||
};
|
||
|
||
static error_t
|
||
argp_version_parser (int key, char *arg, struct argp_state *state)
|
||
{
|
||
switch (key)
|
||
{
|
||
case 'V':
|
||
if (argp_program_version_hook)
|
||
(*argp_program_version_hook) (state->out_stream, state);
|
||
else if (argp_program_version)
|
||
fprintf (state->out_stream, "%s\n", argp_program_version);
|
||
else
|
||
__argp_error (state, _("(PROGRAM ERROR) No version known!?"));
|
||
if (! (state->flags & ARGP_NO_EXIT))
|
||
exit (0);
|
||
break;
|
||
default:
|
||
return EBADKEY;
|
||
}
|
||
return 0;
|
||
}
|
||
|
||
static const struct argp argp_version_argp =
|
||
{argp_version_options, &argp_version_parser};
|
||
|
||
/* Returns the offset into the getopt long options array LONG_OPTIONS of a
|
||
long option with called NAME, or -1 if none is found. Passing NULL as
|
||
NAME will return the number of options. */
|
||
static int
|
||
find_long_option (struct option *long_options, const char *name)
|
||
{
|
||
struct option *l = long_options;
|
||
while (l->name != NULL)
|
||
if (name != NULL && strcmp (l->name, name) == 0)
|
||
return l - long_options;
|
||
else
|
||
l++;
|
||
if (name == NULL)
|
||
return l - long_options;
|
||
else
|
||
return -1;
|
||
}
|
||
|
||
/* If we can, we regulate access to getopt, which is non-reentrant, with a
|
||
mutex. Since the case we're trying to guard against is two different
|
||
threads interfering, and it's possible that someone might want to call
|
||
argp_parse recursively (they're careful), we use a recursive lock if
|
||
possible. */
|
||
|
||
#if _LIBC - 0
|
||
|
||
__libc_lock_define_initialized_recursive (static, getopt_lock)
|
||
#define LOCK_GETOPT __libc_lock_lock_recursive (getopt_lock)
|
||
#define UNLOCK_GETOPT __libc_lock_unlock_recursive (getopt_lock)
|
||
|
||
#else /* !_LIBC */
|
||
#ifdef HAVE_CTHREADS_H
|
||
|
||
static struct mutex getopt_lock = MUTEX_INITIALIZER;
|
||
#define LOCK_GETOPT mutex_lock (&getopt_lock)
|
||
#define UNLOCK_GETOPT mutex_unlock (&getopt_lock)
|
||
|
||
#else /* !HAVE_CTHREADS_H */
|
||
|
||
#define LOCK_GETOPT (void)0
|
||
#define UNLOCK_GETOPT (void)0
|
||
|
||
#endif /* HAVE_CTHREADS_H */
|
||
#endif /* _LIBC */
|
||
|
||
/* This hack to allow programs that know what's going on to call argp
|
||
recursively. If someday argp is changed not to use the non-reentrant
|
||
getopt interface, we can get rid of this shit. XXX */
|
||
void
|
||
_argp_unlock_xxx (void)
|
||
{
|
||
UNLOCK_GETOPT;
|
||
}
|
||
|
||
/* The state of a `group' during parsing. Each group corresponds to a
|
||
particular argp structure from the tree of such descending from the top
|
||
level argp passed to argp_parse. */
|
||
struct group
|
||
{
|
||
/* This group's parsing function. */
|
||
argp_parser_t parser;
|
||
|
||
/* Which argp this group is from. */
|
||
const struct argp *argp;
|
||
|
||
/* Points to the point in SHORT_OPTS corresponding to the end of the short
|
||
options for this group. We use it to determine from which group a
|
||
particular short options is from. */
|
||
char *short_end;
|
||
|
||
/* The number of non-option args sucessfully handled by this parser. */
|
||
unsigned args_processed;
|
||
|
||
/* This group's parser's parent's group. */
|
||
struct group *parent;
|
||
unsigned parent_index; /* And the our position in the parent. */
|
||
|
||
/* These fields are swapped into and out of the state structure when
|
||
calling this group's parser. */
|
||
void *input, **child_inputs;
|
||
void *hook;
|
||
};
|
||
|
||
/* Call GROUP's parser with KEY and ARG, swapping any group-specific info
|
||
from STATE before calling, and back into state afterwards. If GROUP has
|
||
no parser, EBADKEY is returned. */
|
||
static error_t
|
||
group_parse (struct group *group, struct argp_state *state, int key, char *arg)
|
||
{
|
||
if (group->parser)
|
||
{
|
||
error_t err;
|
||
state->hook = group->hook;
|
||
state->input = group->input;
|
||
state->child_inputs = group->child_inputs;
|
||
state->arg_num = group->args_processed;
|
||
err = (*group->parser)(key, arg, state);
|
||
group->hook = state->hook;
|
||
return err;
|
||
}
|
||
else
|
||
return EBADKEY;
|
||
}
|
||
|
||
struct parser
|
||
{
|
||
const struct argp *argp;
|
||
|
||
/* SHORT_OPTS is the getopt short options string for the union of all the
|
||
groups of options. */
|
||
char *short_opts;
|
||
/* LONG_OPTS is the array of getop long option structures for the union of
|
||
all the groups of options. */
|
||
struct option *long_opts;
|
||
|
||
/* States of the various parsing groups. */
|
||
struct group *groups;
|
||
/* The end of the GROUPS array. */
|
||
struct group *egroup;
|
||
/* An vector containing storage for the CHILD_INPUTS field in all groups. */
|
||
void **child_inputs;
|
||
|
||
/* True if we think using getopt is still useful; if false, then
|
||
remaining arguments are just passed verbatim with ARGP_KEY_ARG. This is
|
||
cleared whenever getopt returns KEY_END, but may be set again if the user
|
||
moves the next argument pointer backwards. */
|
||
int try_getopt;
|
||
|
||
/* State block supplied to parsing routines. */
|
||
struct argp_state state;
|
||
|
||
/* Memory used by this parser. */
|
||
void *storage;
|
||
};
|
||
|
||
/* The next usable entries in the various parser tables being filled in by
|
||
convert_options. */
|
||
struct parser_convert_state
|
||
{
|
||
struct parser *parser;
|
||
char *short_end;
|
||
struct option *long_end;
|
||
void **child_inputs_end;
|
||
};
|
||
|
||
/* Converts all options in ARGP (which is put in GROUP) and ancestors
|
||
into getopt options stored in SHORT_OPTS and LONG_OPTS; SHORT_END and
|
||
CVT->LONG_END are the points at which new options are added. Returns the
|
||
next unused group entry. CVT holds state used during the conversion. */
|
||
static struct group *
|
||
convert_options (const struct argp *argp,
|
||
struct group *parent, unsigned parent_index,
|
||
struct group *group, struct parser_convert_state *cvt)
|
||
{
|
||
/* REAL is the most recent non-alias value of OPT. */
|
||
const struct argp_option *real = argp->options;
|
||
const struct argp_child *children = argp->children;
|
||
|
||
if (real || argp->parser)
|
||
{
|
||
const struct argp_option *opt;
|
||
|
||
if (real)
|
||
for (opt = real; !__option_is_end (opt); opt++)
|
||
{
|
||
if (! (opt->flags & OPTION_ALIAS))
|
||
/* OPT isn't an alias, so we can use values from it. */
|
||
real = opt;
|
||
|
||
if (! (real->flags & OPTION_DOC))
|
||
/* A real option (not just documentation). */
|
||
{
|
||
if (__option_is_short (opt))
|
||
/* OPT can be used as a short option. */
|
||
{
|
||
*cvt->short_end++ = opt->key;
|
||
if (real->arg)
|
||
{
|
||
*cvt->short_end++ = ':';
|
||
if (real->flags & OPTION_ARG_OPTIONAL)
|
||
*cvt->short_end++ = ':';
|
||
}
|
||
*cvt->short_end = '\0'; /* keep 0 terminated */
|
||
}
|
||
|
||
if (opt->name
|
||
&& find_long_option (cvt->parser->long_opts, opt->name) < 0)
|
||
/* OPT can be used as a long option. */
|
||
{
|
||
cvt->long_end->name = opt->name;
|
||
cvt->long_end->has_arg =
|
||
(real->arg
|
||
? (real->flags & OPTION_ARG_OPTIONAL
|
||
? optional_argument
|
||
: required_argument)
|
||
: no_argument);
|
||
cvt->long_end->flag = 0;
|
||
/* we add a disambiguating code to all the user's
|
||
values (which is removed before we actually call
|
||
the function to parse the value); this means that
|
||
the user loses use of the high 8 bits in all his
|
||
values (the sign of the lower bits is preserved
|
||
however)... */
|
||
cvt->long_end->val =
|
||
((opt->key | real->key) & USER_MASK)
|
||
+ (((group - cvt->parser->groups) + 1) << USER_BITS);
|
||
|
||
/* Keep the LONG_OPTS list terminated. */
|
||
(++cvt->long_end)->name = NULL;
|
||
}
|
||
}
|
||
}
|
||
|
||
group->parser = argp->parser;
|
||
group->argp = argp;
|
||
group->short_end = cvt->short_end;
|
||
group->args_processed = 0;
|
||
group->parent = parent;
|
||
group->parent_index = parent_index;
|
||
group->input = 0;
|
||
group->hook = 0;
|
||
group->child_inputs = 0;
|
||
|
||
if (children)
|
||
/* Assign GROUP's CHILD_INPUTS field some space from
|
||
CVT->child_inputs_end.*/
|
||
{
|
||
unsigned num_children = 0;
|
||
while (children[num_children].argp)
|
||
num_children++;
|
||
group->child_inputs = cvt->child_inputs_end;
|
||
cvt->child_inputs_end += num_children;
|
||
}
|
||
|
||
parent = group++;
|
||
}
|
||
else
|
||
parent = 0;
|
||
|
||
if (children)
|
||
{
|
||
unsigned index = 0;
|
||
while (children->argp)
|
||
group =
|
||
convert_options (children++->argp, parent, index++, group, cvt);
|
||
}
|
||
|
||
return group;
|
||
}
|
||
|
||
/* Find the merged set of getopt options, with keys appropiately prefixed. */
|
||
static void
|
||
parser_convert (struct parser *parser, const struct argp *argp, int flags)
|
||
{
|
||
struct parser_convert_state cvt;
|
||
|
||
cvt.parser = parser;
|
||
cvt.short_end = parser->short_opts;
|
||
cvt.long_end = parser->long_opts;
|
||
cvt.child_inputs_end = parser->child_inputs;
|
||
|
||
if (flags & ARGP_IN_ORDER)
|
||
*cvt.short_end++ = '-';
|
||
else if (flags & ARGP_NO_ARGS)
|
||
*cvt.short_end++ = '+';
|
||
*cvt.short_end = '\0';
|
||
|
||
cvt.long_end->name = NULL;
|
||
|
||
parser->argp = argp;
|
||
|
||
if (argp)
|
||
parser->egroup = convert_options (argp, 0, 0, parser->groups, &cvt);
|
||
else
|
||
parser->egroup = parser->groups; /* No parsers at all! */
|
||
}
|
||
|
||
/* Lengths of various parser fields which we will allocated. */
|
||
struct parser_sizes
|
||
{
|
||
size_t short_len; /* Getopt short options string. */
|
||
size_t long_len; /* Getopt long options vector. */
|
||
size_t num_groups; /* Group structures we allocate. */
|
||
size_t num_child_inputs; /* Child input slots. */
|
||
};
|
||
|
||
/* For ARGP, increments the NUM_GROUPS field in SZS by the total number of
|
||
argp structures descended from it, and the SHORT_LEN & LONG_LEN fields by
|
||
the maximum lengths of the resulting merged getopt short options string and
|
||
long-options array, respectively. */
|
||
static void
|
||
calc_sizes (const struct argp *argp, struct parser_sizes *szs)
|
||
{
|
||
const struct argp_child *child = argp->children;
|
||
const struct argp_option *opt = argp->options;
|
||
|
||
if (opt || argp->parser)
|
||
{
|
||
szs->num_groups++;
|
||
if (opt)
|
||
{
|
||
int num_opts = 0;
|
||
while (!__option_is_end (opt++))
|
||
num_opts++;
|
||
szs->short_len += num_opts * 3; /* opt + up to 2 `:'s */
|
||
szs->long_len += num_opts;
|
||
}
|
||
}
|
||
|
||
if (child)
|
||
while (child->argp)
|
||
{
|
||
calc_sizes ((child++)->argp, szs);
|
||
szs->num_child_inputs++;
|
||
}
|
||
}
|
||
|
||
/* Initializes PARSER to parse ARGP in a manner described by FLAGS. */
|
||
static error_t
|
||
parser_init (struct parser *parser, const struct argp *argp,
|
||
int argc, char **argv, int flags, void *input)
|
||
{
|
||
error_t err = 0;
|
||
struct group *group;
|
||
struct parser_sizes szs;
|
||
|
||
szs.short_len = (flags & ARGP_NO_ARGS) ? 0 : 1;
|
||
szs.long_len = 0;
|
||
szs.num_groups = 0;
|
||
szs.num_child_inputs = 0;
|
||
|
||
if (argp)
|
||
calc_sizes (argp, &szs);
|
||
|
||
/* Lengths of the various bits of storage used by PARSER. */
|
||
#define GLEN (szs.num_groups + 1) * sizeof (struct group)
|
||
#define CLEN (szs.num_child_inputs * sizeof (void *))
|
||
#define LLEN ((szs.long_len + 1) * sizeof (struct option))
|
||
#define SLEN (szs.short_len + 1)
|
||
|
||
parser->storage = malloc (GLEN + CLEN + LLEN + SLEN);
|
||
if (! parser->storage)
|
||
return ENOMEM;
|
||
|
||
parser->groups = parser->storage;
|
||
parser->child_inputs = parser->storage + GLEN;
|
||
parser->long_opts = parser->storage + GLEN + CLEN;
|
||
parser->short_opts = parser->storage + GLEN + CLEN + LLEN;
|
||
|
||
memset (parser->child_inputs, 0, szs.num_child_inputs * sizeof (void *));
|
||
parser_convert (parser, argp, flags);
|
||
|
||
memset (&parser->state, 0, sizeof (struct argp_state));
|
||
parser->state.root_argp = parser->argp;
|
||
parser->state.argc = argc;
|
||
parser->state.argv = argv;
|
||
parser->state.flags = flags;
|
||
parser->state.err_stream = stderr;
|
||
parser->state.out_stream = stdout;
|
||
parser->state.next = 0; /* Tell getopt to initialize. */
|
||
parser->state.pstate = parser;
|
||
|
||
parser->try_getopt = 1;
|
||
|
||
/* Call each parser for the first time, giving it a chance to propagate
|
||
values to child parsers. */
|
||
if (parser->groups < parser->egroup)
|
||
parser->groups->input = input;
|
||
for (group = parser->groups;
|
||
group < parser->egroup && (!err || err == EBADKEY);
|
||
group++)
|
||
{
|
||
if (group->parent)
|
||
/* If a child parser, get the initial input value from the parent. */
|
||
group->input = group->parent->child_inputs[group->parent_index];
|
||
|
||
if (!group->parser
|
||
&& group->argp->children && group->argp->children->argp)
|
||
/* For the special case where no parsing function is supplied for an
|
||
argp, propagate its input to its first child, if any (this just
|
||
makes very simple wrapper argps more convenient). */
|
||
group->child_inputs[0] = group->input;
|
||
|
||
err = group_parse (group, &parser->state, ARGP_KEY_INIT, 0);
|
||
}
|
||
if (err == EBADKEY)
|
||
err = 0; /* Some parser didn't understand. */
|
||
|
||
if (err)
|
||
return err;
|
||
|
||
/* Getopt is (currently) non-reentrant. */
|
||
LOCK_GETOPT;
|
||
|
||
if (parser->state.flags & ARGP_NO_ERRS)
|
||
{
|
||
opterr = 0;
|
||
if (parser->state.flags & ARGP_PARSE_ARGV0)
|
||
/* getopt always skips ARGV[0], so we have to fake it out. As long
|
||
as OPTERR is 0, then it shouldn't actually try to access it. */
|
||
parser->state.argv--, parser->state.argc++;
|
||
}
|
||
else
|
||
opterr = 1; /* Print error messages. */
|
||
|
||
if (parser->state.argv == argv && argv[0])
|
||
/* There's an argv[0]; use it for messages. */
|
||
{
|
||
char *short_name = strrchr (argv[0], '/');
|
||
parser->state.name = short_name ? short_name + 1 : argv[0];
|
||
}
|
||
else
|
||
parser->state.name = program_invocation_short_name;
|
||
|
||
return 0;
|
||
}
|
||
|
||
/* Free any storage consumed by PARSER (but not PARSER itself). */
|
||
static error_t
|
||
parser_finalize (struct parser *parser,
|
||
error_t err, int arg_ebadkey, int *end_index)
|
||
{
|
||
struct group *group;
|
||
|
||
UNLOCK_GETOPT;
|
||
|
||
if (err == EBADKEY && arg_ebadkey)
|
||
/* Suppress errors generated by unparsed arguments. */
|
||
err = 0;
|
||
|
||
if (! err)
|
||
if (parser->state.next == parser->state.argc)
|
||
/* We successfully parsed all arguments! Call all the parsers again,
|
||
just a few more times... */
|
||
{
|
||
for (group = parser->groups;
|
||
group < parser->egroup && (!err || err==EBADKEY);
|
||
group++)
|
||
if (group->args_processed == 0)
|
||
err = group_parse (group, &parser->state, ARGP_KEY_NO_ARGS, 0);
|
||
for (group = parser->groups;
|
||
group < parser->egroup && (!err || err==EBADKEY);
|
||
group++)
|
||
err = group_parse (group, &parser->state, ARGP_KEY_END, 0);
|
||
|
||
if (err == EBADKEY)
|
||
err = 0; /* Some parser didn't understand. */
|
||
|
||
/* Tell the user that all arguments are parsed. */
|
||
if (end_index)
|
||
*end_index = parser->state.next;
|
||
}
|
||
else if (end_index)
|
||
/* Return any remaining arguments to the user. */
|
||
*end_index = parser->state.next;
|
||
else
|
||
/* No way to return the remaining arguments, they must be bogus. */
|
||
{
|
||
if (!(parser->state.flags & ARGP_NO_ERRS) && parser->state.err_stream)
|
||
fprintf (parser->state.err_stream,
|
||
_("%s: Too many arguments\n"), parser->state.name);
|
||
err = EBADKEY;
|
||
}
|
||
|
||
/* Okay, we're all done, with either an error or success; call the parsers
|
||
to indicate which one. */
|
||
|
||
if (err)
|
||
{
|
||
/* Maybe print an error message. */
|
||
if (err == EBADKEY)
|
||
/* An appropriate message describing what the error was should have
|
||
been printed earlier. */
|
||
__argp_state_help (&parser->state, parser->state.err_stream,
|
||
ARGP_HELP_STD_ERR);
|
||
|
||
/* Since we didn't exit, give each parser an error indication. */
|
||
for (group = parser->groups; group < parser->egroup; group++)
|
||
group_parse (group, &parser->state, ARGP_KEY_ERROR, 0);
|
||
}
|
||
else
|
||
/* Notify parsers of success, and propagate back values from parsers. */
|
||
{
|
||
/* We pass over the groups in reverse order so that child groups are
|
||
given a chance to do there processing before passing back a value to
|
||
the parent. */
|
||
for (group = parser->egroup - 1
|
||
; group >= parser->groups && (!err || err == EBADKEY)
|
||
; group--)
|
||
err = group_parse (group, &parser->state, ARGP_KEY_SUCCESS, 0);
|
||
if (err == EBADKEY)
|
||
err = 0; /* Some parser didn't understand. */
|
||
}
|
||
|
||
/* Call parsers once more, to do any final cleanup. Errors are ignored. */
|
||
for (group = parser->egroup - 1; group >= parser->groups; group--)
|
||
group_parse (group, &parser->state, ARGP_KEY_FINI, 0);
|
||
|
||
if (err == EBADKEY)
|
||
err = EINVAL;
|
||
|
||
free (parser->storage);
|
||
|
||
return err;
|
||
}
|
||
|
||
/* Call the user parsers to parse the non-option argument VAL, at the current
|
||
position, returning any error. The state NEXT pointer is assumed to have
|
||
been adjusted (by getopt) to point after this argument; this function will
|
||
adjust it correctly to reflect however many args actually end up being
|
||
consumed. */
|
||
static error_t
|
||
parser_parse_arg (struct parser *parser, char *val)
|
||
{
|
||
/* Save the starting value of NEXT, first adjusting it so that the arg
|
||
we're parsing is again the front of the arg vector. */
|
||
int index = --parser->state.next;
|
||
error_t err = EBADKEY;
|
||
struct group *group;
|
||
int key = 0; /* Which of ARGP_KEY_ARG[S] we used. */
|
||
|
||
/* Try to parse the argument in each parser. */
|
||
for (group = parser->groups
|
||
; group < parser->egroup && err == EBADKEY
|
||
; group++)
|
||
{
|
||
parser->state.next++; /* For ARGP_KEY_ARG, consume the arg. */
|
||
key = ARGP_KEY_ARG;
|
||
err = group_parse (group, &parser->state, key, val);
|
||
|
||
if (err == EBADKEY)
|
||
/* This parser doesn't like ARGP_KEY_ARG; try ARGP_KEY_ARGS instead. */
|
||
{
|
||
parser->state.next--; /* For ARGP_KEY_ARGS, put back the arg. */
|
||
key = ARGP_KEY_ARGS;
|
||
err = group_parse (group, &parser->state, key, 0);
|
||
}
|
||
}
|
||
|
||
if (! err)
|
||
{
|
||
if (key == ARGP_KEY_ARGS)
|
||
/* The default for ARGP_KEY_ARGS is to assume that if NEXT isn't
|
||
changed by the user, *all* arguments should be considered
|
||
consumed. */
|
||
parser->state.next = parser->state.argc;
|
||
|
||
if (parser->state.next > index)
|
||
/* Remember that we successfully processed a non-option
|
||
argument -- but only if the user hasn't gotten tricky and set
|
||
the clock back. */
|
||
(--group)->args_processed += (parser->state.next - index);
|
||
else
|
||
/* The user wants to reparse some args, give getopt another try. */
|
||
parser->try_getopt = 1;
|
||
}
|
||
|
||
return err;
|
||
}
|
||
|
||
/* Call the user parsers to parse the option OPT, with argument VAL, at the
|
||
current position, returning any error. */
|
||
static error_t
|
||
parser_parse_opt (struct parser *parser, int opt, char *val)
|
||
{
|
||
/* The group key encoded in the high bits; 0 for short opts or
|
||
group_number + 1 for long opts. */
|
||
int group_key = opt >> USER_BITS;
|
||
error_t err = EBADKEY;
|
||
|
||
if (group_key == 0)
|
||
/* A short option. By comparing OPT's position in SHORT_OPTS to the
|
||
various starting positions in each group's SHORT_END field, we can
|
||
determine which group OPT came from. */
|
||
{
|
||
struct group *group;
|
||
char *short_index = strchr (parser->short_opts, opt);
|
||
|
||
if (short_index)
|
||
for (group = parser->groups; group < parser->egroup; group++)
|
||
if (group->short_end > short_index)
|
||
{
|
||
err = group_parse (group, &parser->state, opt, optarg);
|
||
break;
|
||
}
|
||
}
|
||
else
|
||
/* A long option. We use shifts instead of masking for extracting
|
||
the user value in order to preserve the sign. */
|
||
err =
|
||
group_parse (&parser->groups[group_key - 1], &parser->state,
|
||
(opt << GROUP_BITS) >> GROUP_BITS, optarg);
|
||
|
||
if (err == EBADKEY)
|
||
/* At least currently, an option not recognized is an error in the
|
||
parser, because we pre-compute which parser is supposed to deal
|
||
with each option. */
|
||
{
|
||
static const char bad_key_err[] =
|
||
N_("(PROGRAM ERROR) Option should have been recognized!?");
|
||
if (group_key == 0)
|
||
__argp_error (&parser->state, "-%c: %s", opt, _(bad_key_err));
|
||
else
|
||
{
|
||
struct option *long_opt = parser->long_opts;
|
||
while (long_opt->val != opt && long_opt->name)
|
||
long_opt++;
|
||
__argp_error (&parser->state, "--%s: %s",
|
||
long_opt->name ? long_opt->name : "???",
|
||
_(bad_key_err));
|
||
}
|
||
}
|
||
|
||
return err;
|
||
}
|
||
|
||
/* Parse the next argument in PARSER (as indicated by PARSER->state.next).
|
||
Any error from the parsers is returned, and *ARGP_EBADKEY indicates
|
||
whether a value of EBADKEY is due to an unrecognized argument (which is
|
||
generally not fatal). */
|
||
static error_t
|
||
parser_parse_next (struct parser *parser, int *arg_ebadkey)
|
||
{
|
||
int opt;
|
||
error_t err = 0;
|
||
|
||
if (parser->state.quoted && parser->state.next < parser->state.quoted)
|
||
/* The next argument pointer has been moved to before the quoted
|
||
region, so pretend we never saw the quoting `--', and give getopt
|
||
another chance. If the user hasn't removed it, getopt will just
|
||
process it again. */
|
||
parser->state.quoted = 0;
|
||
|
||
if (parser->try_getopt && !parser->state.quoted)
|
||
/* Give getopt a chance to parse this. */
|
||
{
|
||
optind = parser->state.next; /* Put it back in OPTIND for getopt. */
|
||
optopt = KEY_END; /* Distinguish KEY_ERR from a real option. */
|
||
if (parser->state.flags & ARGP_LONG_ONLY)
|
||
opt = getopt_long_only (parser->state.argc, parser->state.argv,
|
||
parser->short_opts, parser->long_opts, 0);
|
||
else
|
||
opt = getopt_long (parser->state.argc, parser->state.argv,
|
||
parser->short_opts, parser->long_opts, 0);
|
||
parser->state.next = optind; /* And see what getopt did. */
|
||
|
||
if (opt == KEY_END)
|
||
/* Getopt says there are no more options, so stop using
|
||
getopt; we'll continue if necessary on our own. */
|
||
{
|
||
parser->try_getopt = 0;
|
||
if (parser->state.next > 1
|
||
&& strcmp (parser->state.argv[parser->state.next - 1], QUOTE)
|
||
== 0)
|
||
/* Not only is this the end of the options, but it's a
|
||
`quoted' region, which may have args that *look* like
|
||
options, so we definitely shouldn't try to use getopt past
|
||
here, whatever happens. */
|
||
parser->state.quoted = parser->state.next;
|
||
}
|
||
else if (opt == KEY_ERR && optopt != KEY_END)
|
||
/* KEY_ERR can have the same value as a valid user short
|
||
option, but in the case of a real error, getopt sets OPTOPT
|
||
to the offending character, which can never be KEY_END. */
|
||
{
|
||
*arg_ebadkey = 0;
|
||
return EBADKEY;
|
||
}
|
||
}
|
||
else
|
||
opt = KEY_END;
|
||
|
||
if (opt == KEY_END)
|
||
/* We're past what getopt considers the options. */
|
||
if (parser->state.next >= parser->state.argc
|
||
|| (parser->state.flags & ARGP_NO_ARGS))
|
||
/* Indicate that we're done. */
|
||
{
|
||
*arg_ebadkey = 1;
|
||
return EBADKEY;
|
||
}
|
||
else
|
||
/* A non-option arg; simulate what getopt might have done. */
|
||
{
|
||
opt = KEY_ARG;
|
||
optarg = parser->state.argv[parser->state.next++];
|
||
}
|
||
|
||
if (opt == KEY_ARG)
|
||
/* A non-option argument; try each parser in turn. */
|
||
err = parser_parse_arg (parser, optarg);
|
||
else
|
||
err = parser_parse_opt (parser, opt, optarg);
|
||
|
||
if (err == EBADKEY)
|
||
*arg_ebadkey = (opt == KEY_END || opt == KEY_ARG);
|
||
|
||
return err;
|
||
}
|
||
|
||
/* Parse the options strings in ARGC & ARGV according to the argp in ARGP.
|
||
FLAGS is one of the ARGP_ flags above. If END_INDEX is non-NULL, the
|
||
index in ARGV of the first unparsed option is returned in it. If an
|
||
unknown option is present, EINVAL is returned; if some parser routine
|
||
returned a non-zero value, it is returned; otherwise 0 is returned. */
|
||
error_t
|
||
__argp_parse (const struct argp *argp, int argc, char **argv, unsigned flags,
|
||
int *end_index, void *input)
|
||
{
|
||
error_t err;
|
||
struct parser parser;
|
||
|
||
/* If true, then err == EBADKEY is a result of a non-option argument failing
|
||
to be parsed (which in some cases isn't actually an error). */
|
||
int arg_ebadkey = 0;
|
||
|
||
if (! (flags & ARGP_NO_HELP))
|
||
/* Add our own options. */
|
||
{
|
||
struct argp_child *child = alloca (4 * sizeof (struct argp_child));
|
||
struct argp *top_argp = alloca (sizeof (struct argp));
|
||
|
||
/* TOP_ARGP has no options, it just serves to group the user & default
|
||
argps. */
|
||
memset (top_argp, 0, sizeof (*top_argp));
|
||
top_argp->children = child;
|
||
|
||
memset (child, 0, 4 * sizeof (struct argp_child));
|
||
|
||
if (argp)
|
||
(child++)->argp = argp;
|
||
(child++)->argp = &argp_default_argp;
|
||
if (argp_program_version || argp_program_version_hook)
|
||
(child++)->argp = &argp_version_argp;
|
||
child->argp = 0;
|
||
|
||
argp = top_argp;
|
||
}
|
||
|
||
/* Construct a parser for these arguments. */
|
||
err = parser_init (&parser, argp, argc, argv, flags, input);
|
||
|
||
if (! err)
|
||
/* Parse! */
|
||
{
|
||
while (! err)
|
||
err = parser_parse_next (&parser, &arg_ebadkey);
|
||
err = parser_finalize (&parser, err, arg_ebadkey, end_index);
|
||
}
|
||
|
||
return err;
|
||
}
|
||
#ifdef weak_alias
|
||
weak_alias (__argp_parse, argp_parse)
|
||
#endif
|
||
|
||
/* Return the input field for ARGP in the parser corresponding to STATE; used
|
||
by the help routines. */
|
||
void *
|
||
__argp_input (const struct argp *argp, const struct argp_state *state)
|
||
{
|
||
if (state)
|
||
{
|
||
struct group *group;
|
||
struct parser *parser = state->pstate;
|
||
|
||
for (group = parser->groups; group < parser->egroup; group++)
|
||
if (group->argp == argp)
|
||
return group->input;
|
||
}
|
||
|
||
return 0;
|
||
}
|
||
#ifdef weak_alias
|
||
weak_alias (__argp_input, _argp_input)
|
||
#endif
|