1997-02-15 04:31:36 +00:00
|
|
|
|
/* 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
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#if _LIBC - 0
|
|
|
|
|
#include <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, "Give this help list", -1},
|
|
|
|
|
{"usage", OPT_USAGE, 0, 0, "Give a short usage message"},
|
|
|
|
|
{"program-name",OPT_PROGNAME,"NAME", OPTION_HIDDEN, "Set the program name"},
|
|
|
|
|
{"HANG", OPT_HANG, "SECS", OPTION_ARG_OPTIONAL | OPTION_HIDDEN,
|
|
|
|
|
"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. */
|
update from main archive 970221
1997-02-22 00:17 Ulrich Drepper <drepper@cygnus.com>
* catgets/gencat.c: Change to use argp.
* db/makedb: Likewise.
* locale/programs/localedef.c: Likewise.
* locale/programs/locale.c: Little adjustment for better usage of
argp.
1997-02-20 20:07 Greg McGary <gkm@eng.ascend.com>
* Makeconfig: Add rules for libc with bounded pointers.
* Makerules: Likewise.
* config.make.in: Likewise.
* configure.in: Likewise.
1997-02-21 10:41 Miles Bader <miles@gnu.ai.mit.edu>
* argp.h (OPTION_NO_USAGE): New macro.
* argp-help.c (usage_long_opt, usage_argful_short_opt,
add_argless_short_opt): Implement OPTION_NO_USAGE.
1997-02-20 16:41 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* malloc/obstack.h: Fix typo.
1997-02-20 15:56 Miles Bader <miles@gnu.ai.mit.edu>
* argp-fmtstream.c (__argp_fmtstream_update): Account for case
where NEXTLINE points one past the end of the active buffer.
* argp-help.c <stddef.h>: New include.
(__argp_failure): Only exit if STATE says it's ok.
(print_header, hol_entry_help): Use UPARAMS fields rather than
constants.
(_help): Call fill_in_uparams if necessary.
(struct hol_help_state): New type.
(struct pentry_state): Add hhstate field. Remove prev_entry &
sep_groups fields.
(hol_entry_help): Add HHSTATE parameter. Remove prev_entry &
sep_groups parameters.
Suppress duplicate arguments if requested, and note the fact.
(print_header, comma): Use PEST->hhstate fields.
(hol_help): Add HHSTATE variable & pass to hol_entry_help.
Remove LAST_ENTRY & SEP_GROUPS variables.
If any suplicate arguments were suppressed, print explanatory note.
(filter_doc): Replace PEST parameter with STATE.
(struct uparams): New type.
(uparams): New variable.
(struct uparam_name): New type.
(uparam_names): New variable.
(fill_in_uparams): New function.
(__argp_failure, __argp_error, __argp_state_help): Make STATE
parameter const.
* argp.h (argp_state_help, __argp_state_help, argp_usage,
__argp_usage, argp_error, __argp_error, argp_failure,
__argp_failure): Make STATE parameter const.
(ARGP_KEY_HELP_DUP_ARGS_NOTE): New macro.
* argp.h (argp_program_bug_address): Make const.
1997-02-20 19:20 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/unix/mman/syscalls.list: Explain msync interface.
1997-02-19 01:37 Erik Troan <ewt@redhat.com>
* shadow/sgetspent_r.c: Accept empty third, fourth and fifth fields.
1997-02-20 14:44 Andreas Jaeger <aj@arthur.pfalz.de>
* stdio-common/test-fseek.c: Remove temporary file, add
copyright.
1997-02-20 17:51 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/generic/netinet/in.h: Protect contents using
__BEGIN/END_DECLS. Reported by a sun <asun@zoology.washington.edu>.
* inet/net/ethernet.h: Move to sysdeps/unix/sysv/linux/net.
* inet/Makefile (headers): Remove net/ethernet.h.
* sysdeps/unix/sysv/linux/Makefile: Install net/ethernet.h.
* sysdeps/unix/sysv/linux/Dist: Distribute net/ethernet.h.
1997-02-20 15:23 Thorsten Kukuk <kukuk@weber.uni-paderborn.de>
* nss/nsswitch.c (__nss_configure_lookup): Use correct test when
searching in sorted array.
1997-02-20 01:24 Philip Blundell <pjb27@cam.ac.uk>
* inet/getnameinfo.c: Change to use reentrant getXXbyYY functions
and protect modification of global data.
1997-02-19 18:48 Miles Bader <miles@gnu.ai.mit.edu>
* argp-parse.c (argp_default_parser): Set STATE->name for OPT_PROGNAME.
(parser_init): Use the basename for PARSER->state.name.
* argp-help.c (__argp_error, __argp_failure, __argp_state_help):
Use PROGRAM_INVOCATION_SHORT_NAME instead of PROGRAM_INVOCATION_NAME.
* argp-parse.c (parser_init): Set PARSER->state.flags.
Make check whether PARSER has the prog name in argv[0] at the
proper place.
1997-02-19 23:34 Ulrich Drepper <drepper@cygnus.com>
* locale/programs/ld-time.c (time_finish): t_fmt_ampm is optional.
Use default value instead of printing a warning.
* nss/XXX-lookup.c: Add misssing explanation.
1997-02-19 19:14 Andreas Jaeger <aj@arthur.pfalz.de>
* inet/in6_addr.c: Add missing braces.
* inet/getnameinfo.c: Include <arpa/inet.h>.
* sysdeps/posix/getaddrinfo.c: Include <arpa/inet.h>.
1997-02-19 11:46 Ulrich Drepper <drepper@cygnus.com>
* string/strxfrm.c (STRCOLL): Correct handling of `position'
levels with no non-IGNOREd element and handling of NUL byte.
* string/strcoll.c (STRXFRM): Likewise.
* locale/weight.h: Likewise.
* shadow/sgetspent_r.c (LINE_PARSER): Add missing ')'.
1997-02-22 01:20:46 +00:00
|
|
|
|
program_invocation_name = arg;
|
1997-02-15 04:31:36 +00:00
|
|
|
|
|
|
|
|
|
/* [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 from main archive 970221
1997-02-22 00:17 Ulrich Drepper <drepper@cygnus.com>
* catgets/gencat.c: Change to use argp.
* db/makedb: Likewise.
* locale/programs/localedef.c: Likewise.
* locale/programs/locale.c: Little adjustment for better usage of
argp.
1997-02-20 20:07 Greg McGary <gkm@eng.ascend.com>
* Makeconfig: Add rules for libc with bounded pointers.
* Makerules: Likewise.
* config.make.in: Likewise.
* configure.in: Likewise.
1997-02-21 10:41 Miles Bader <miles@gnu.ai.mit.edu>
* argp.h (OPTION_NO_USAGE): New macro.
* argp-help.c (usage_long_opt, usage_argful_short_opt,
add_argless_short_opt): Implement OPTION_NO_USAGE.
1997-02-20 16:41 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* malloc/obstack.h: Fix typo.
1997-02-20 15:56 Miles Bader <miles@gnu.ai.mit.edu>
* argp-fmtstream.c (__argp_fmtstream_update): Account for case
where NEXTLINE points one past the end of the active buffer.
* argp-help.c <stddef.h>: New include.
(__argp_failure): Only exit if STATE says it's ok.
(print_header, hol_entry_help): Use UPARAMS fields rather than
constants.
(_help): Call fill_in_uparams if necessary.
(struct hol_help_state): New type.
(struct pentry_state): Add hhstate field. Remove prev_entry &
sep_groups fields.
(hol_entry_help): Add HHSTATE parameter. Remove prev_entry &
sep_groups parameters.
Suppress duplicate arguments if requested, and note the fact.
(print_header, comma): Use PEST->hhstate fields.
(hol_help): Add HHSTATE variable & pass to hol_entry_help.
Remove LAST_ENTRY & SEP_GROUPS variables.
If any suplicate arguments were suppressed, print explanatory note.
(filter_doc): Replace PEST parameter with STATE.
(struct uparams): New type.
(uparams): New variable.
(struct uparam_name): New type.
(uparam_names): New variable.
(fill_in_uparams): New function.
(__argp_failure, __argp_error, __argp_state_help): Make STATE
parameter const.
* argp.h (argp_state_help, __argp_state_help, argp_usage,
__argp_usage, argp_error, __argp_error, argp_failure,
__argp_failure): Make STATE parameter const.
(ARGP_KEY_HELP_DUP_ARGS_NOTE): New macro.
* argp.h (argp_program_bug_address): Make const.
1997-02-20 19:20 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/unix/mman/syscalls.list: Explain msync interface.
1997-02-19 01:37 Erik Troan <ewt@redhat.com>
* shadow/sgetspent_r.c: Accept empty third, fourth and fifth fields.
1997-02-20 14:44 Andreas Jaeger <aj@arthur.pfalz.de>
* stdio-common/test-fseek.c: Remove temporary file, add
copyright.
1997-02-20 17:51 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/generic/netinet/in.h: Protect contents using
__BEGIN/END_DECLS. Reported by a sun <asun@zoology.washington.edu>.
* inet/net/ethernet.h: Move to sysdeps/unix/sysv/linux/net.
* inet/Makefile (headers): Remove net/ethernet.h.
* sysdeps/unix/sysv/linux/Makefile: Install net/ethernet.h.
* sysdeps/unix/sysv/linux/Dist: Distribute net/ethernet.h.
1997-02-20 15:23 Thorsten Kukuk <kukuk@weber.uni-paderborn.de>
* nss/nsswitch.c (__nss_configure_lookup): Use correct test when
searching in sorted array.
1997-02-20 01:24 Philip Blundell <pjb27@cam.ac.uk>
* inet/getnameinfo.c: Change to use reentrant getXXbyYY functions
and protect modification of global data.
1997-02-19 18:48 Miles Bader <miles@gnu.ai.mit.edu>
* argp-parse.c (argp_default_parser): Set STATE->name for OPT_PROGNAME.
(parser_init): Use the basename for PARSER->state.name.
* argp-help.c (__argp_error, __argp_failure, __argp_state_help):
Use PROGRAM_INVOCATION_SHORT_NAME instead of PROGRAM_INVOCATION_NAME.
* argp-parse.c (parser_init): Set PARSER->state.flags.
Make check whether PARSER has the prog name in argv[0] at the
proper place.
1997-02-19 23:34 Ulrich Drepper <drepper@cygnus.com>
* locale/programs/ld-time.c (time_finish): t_fmt_ampm is optional.
Use default value instead of printing a warning.
* nss/XXX-lookup.c: Add misssing explanation.
1997-02-19 19:14 Andreas Jaeger <aj@arthur.pfalz.de>
* inet/in6_addr.c: Add missing braces.
* inet/getnameinfo.c: Include <arpa/inet.h>.
* sysdeps/posix/getaddrinfo.c: Include <arpa/inet.h>.
1997-02-19 11:46 Ulrich Drepper <drepper@cygnus.com>
* string/strxfrm.c (STRCOLL): Correct handling of `position'
levels with no non-IGNOREd element and handling of NUL byte.
* string/strcoll.c (STRXFRM): Likewise.
* locale/weight.h: Likewise.
* shadow/sgetspent_r.c (LINE_PARSER): Add missing ')'.
1997-02-22 01:20:46 +00:00
|
|
|
|
/* Update what we use for messages. */
|
|
|
|
|
state->name = program_invocation_short_name;
|
|
|
|
|
|
1997-02-15 04:31:36 +00:00
|
|
|
|
if ((state->flags & (ARGP_PARSE_ARGV0 | ARGP_NO_ERRS))
|
|
|
|
|
== ARGP_PARSE_ARGV0)
|
1997-02-19 04:43:53 +00:00
|
|
|
|
/* Update what getopt uses too. */
|
update from main archive 970221
1997-02-22 00:17 Ulrich Drepper <drepper@cygnus.com>
* catgets/gencat.c: Change to use argp.
* db/makedb: Likewise.
* locale/programs/localedef.c: Likewise.
* locale/programs/locale.c: Little adjustment for better usage of
argp.
1997-02-20 20:07 Greg McGary <gkm@eng.ascend.com>
* Makeconfig: Add rules for libc with bounded pointers.
* Makerules: Likewise.
* config.make.in: Likewise.
* configure.in: Likewise.
1997-02-21 10:41 Miles Bader <miles@gnu.ai.mit.edu>
* argp.h (OPTION_NO_USAGE): New macro.
* argp-help.c (usage_long_opt, usage_argful_short_opt,
add_argless_short_opt): Implement OPTION_NO_USAGE.
1997-02-20 16:41 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* malloc/obstack.h: Fix typo.
1997-02-20 15:56 Miles Bader <miles@gnu.ai.mit.edu>
* argp-fmtstream.c (__argp_fmtstream_update): Account for case
where NEXTLINE points one past the end of the active buffer.
* argp-help.c <stddef.h>: New include.
(__argp_failure): Only exit if STATE says it's ok.
(print_header, hol_entry_help): Use UPARAMS fields rather than
constants.
(_help): Call fill_in_uparams if necessary.
(struct hol_help_state): New type.
(struct pentry_state): Add hhstate field. Remove prev_entry &
sep_groups fields.
(hol_entry_help): Add HHSTATE parameter. Remove prev_entry &
sep_groups parameters.
Suppress duplicate arguments if requested, and note the fact.
(print_header, comma): Use PEST->hhstate fields.
(hol_help): Add HHSTATE variable & pass to hol_entry_help.
Remove LAST_ENTRY & SEP_GROUPS variables.
If any suplicate arguments were suppressed, print explanatory note.
(filter_doc): Replace PEST parameter with STATE.
(struct uparams): New type.
(uparams): New variable.
(struct uparam_name): New type.
(uparam_names): New variable.
(fill_in_uparams): New function.
(__argp_failure, __argp_error, __argp_state_help): Make STATE
parameter const.
* argp.h (argp_state_help, __argp_state_help, argp_usage,
__argp_usage, argp_error, __argp_error, argp_failure,
__argp_failure): Make STATE parameter const.
(ARGP_KEY_HELP_DUP_ARGS_NOTE): New macro.
* argp.h (argp_program_bug_address): Make const.
1997-02-20 19:20 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/unix/mman/syscalls.list: Explain msync interface.
1997-02-19 01:37 Erik Troan <ewt@redhat.com>
* shadow/sgetspent_r.c: Accept empty third, fourth and fifth fields.
1997-02-20 14:44 Andreas Jaeger <aj@arthur.pfalz.de>
* stdio-common/test-fseek.c: Remove temporary file, add
copyright.
1997-02-20 17:51 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/generic/netinet/in.h: Protect contents using
__BEGIN/END_DECLS. Reported by a sun <asun@zoology.washington.edu>.
* inet/net/ethernet.h: Move to sysdeps/unix/sysv/linux/net.
* inet/Makefile (headers): Remove net/ethernet.h.
* sysdeps/unix/sysv/linux/Makefile: Install net/ethernet.h.
* sysdeps/unix/sysv/linux/Dist: Distribute net/ethernet.h.
1997-02-20 15:23 Thorsten Kukuk <kukuk@weber.uni-paderborn.de>
* nss/nsswitch.c (__nss_configure_lookup): Use correct test when
searching in sorted array.
1997-02-20 01:24 Philip Blundell <pjb27@cam.ac.uk>
* inet/getnameinfo.c: Change to use reentrant getXXbyYY functions
and protect modification of global data.
1997-02-19 18:48 Miles Bader <miles@gnu.ai.mit.edu>
* argp-parse.c (argp_default_parser): Set STATE->name for OPT_PROGNAME.
(parser_init): Use the basename for PARSER->state.name.
* argp-help.c (__argp_error, __argp_failure, __argp_state_help):
Use PROGRAM_INVOCATION_SHORT_NAME instead of PROGRAM_INVOCATION_NAME.
* argp-parse.c (parser_init): Set PARSER->state.flags.
Make check whether PARSER has the prog name in argv[0] at the
proper place.
1997-02-19 23:34 Ulrich Drepper <drepper@cygnus.com>
* locale/programs/ld-time.c (time_finish): t_fmt_ampm is optional.
Use default value instead of printing a warning.
* nss/XXX-lookup.c: Add misssing explanation.
1997-02-19 19:14 Andreas Jaeger <aj@arthur.pfalz.de>
* inet/in6_addr.c: Add missing braces.
* inet/getnameinfo.c: Include <arpa/inet.h>.
* sysdeps/posix/getaddrinfo.c: Include <arpa/inet.h>.
1997-02-19 11:46 Ulrich Drepper <drepper@cygnus.com>
* string/strxfrm.c (STRCOLL): Correct handling of `position'
levels with no non-IGNOREd element and handling of NUL byte.
* string/strcoll.c (STRXFRM): Likewise.
* locale/weight.h: Likewise.
* shadow/sgetspent_r.c (LINE_PARSER): Add missing ')'.
1997-02-22 01:20:46 +00:00
|
|
|
|
state->argv[0] = program_invocation_name;
|
1997-02-15 04:31:36 +00:00
|
|
|
|
|
|
|
|
|
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, "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, _("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;
|
|
|
|
|
|
1997-02-19 04:43:53 +00:00
|
|
|
|
/* Which argp this group is from. */
|
|
|
|
|
const struct argp *argp;
|
|
|
|
|
|
1997-02-15 04:31:36 +00:00
|
|
|
|
/* 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;
|
1997-02-19 04:43:53 +00:00
|
|
|
|
group->argp = argp;
|
1997-02-15 04:31:36 +00:00
|
|
|
|
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.argp = parser->argp;
|
|
|
|
|
parser->state.argc = argc;
|
|
|
|
|
parser->state.argv = argv;
|
update from main archive 970221
1997-02-22 00:17 Ulrich Drepper <drepper@cygnus.com>
* catgets/gencat.c: Change to use argp.
* db/makedb: Likewise.
* locale/programs/localedef.c: Likewise.
* locale/programs/locale.c: Little adjustment for better usage of
argp.
1997-02-20 20:07 Greg McGary <gkm@eng.ascend.com>
* Makeconfig: Add rules for libc with bounded pointers.
* Makerules: Likewise.
* config.make.in: Likewise.
* configure.in: Likewise.
1997-02-21 10:41 Miles Bader <miles@gnu.ai.mit.edu>
* argp.h (OPTION_NO_USAGE): New macro.
* argp-help.c (usage_long_opt, usage_argful_short_opt,
add_argless_short_opt): Implement OPTION_NO_USAGE.
1997-02-20 16:41 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* malloc/obstack.h: Fix typo.
1997-02-20 15:56 Miles Bader <miles@gnu.ai.mit.edu>
* argp-fmtstream.c (__argp_fmtstream_update): Account for case
where NEXTLINE points one past the end of the active buffer.
* argp-help.c <stddef.h>: New include.
(__argp_failure): Only exit if STATE says it's ok.
(print_header, hol_entry_help): Use UPARAMS fields rather than
constants.
(_help): Call fill_in_uparams if necessary.
(struct hol_help_state): New type.
(struct pentry_state): Add hhstate field. Remove prev_entry &
sep_groups fields.
(hol_entry_help): Add HHSTATE parameter. Remove prev_entry &
sep_groups parameters.
Suppress duplicate arguments if requested, and note the fact.
(print_header, comma): Use PEST->hhstate fields.
(hol_help): Add HHSTATE variable & pass to hol_entry_help.
Remove LAST_ENTRY & SEP_GROUPS variables.
If any suplicate arguments were suppressed, print explanatory note.
(filter_doc): Replace PEST parameter with STATE.
(struct uparams): New type.
(uparams): New variable.
(struct uparam_name): New type.
(uparam_names): New variable.
(fill_in_uparams): New function.
(__argp_failure, __argp_error, __argp_state_help): Make STATE
parameter const.
* argp.h (argp_state_help, __argp_state_help, argp_usage,
__argp_usage, argp_error, __argp_error, argp_failure,
__argp_failure): Make STATE parameter const.
(ARGP_KEY_HELP_DUP_ARGS_NOTE): New macro.
* argp.h (argp_program_bug_address): Make const.
1997-02-20 19:20 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/unix/mman/syscalls.list: Explain msync interface.
1997-02-19 01:37 Erik Troan <ewt@redhat.com>
* shadow/sgetspent_r.c: Accept empty third, fourth and fifth fields.
1997-02-20 14:44 Andreas Jaeger <aj@arthur.pfalz.de>
* stdio-common/test-fseek.c: Remove temporary file, add
copyright.
1997-02-20 17:51 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/generic/netinet/in.h: Protect contents using
__BEGIN/END_DECLS. Reported by a sun <asun@zoology.washington.edu>.
* inet/net/ethernet.h: Move to sysdeps/unix/sysv/linux/net.
* inet/Makefile (headers): Remove net/ethernet.h.
* sysdeps/unix/sysv/linux/Makefile: Install net/ethernet.h.
* sysdeps/unix/sysv/linux/Dist: Distribute net/ethernet.h.
1997-02-20 15:23 Thorsten Kukuk <kukuk@weber.uni-paderborn.de>
* nss/nsswitch.c (__nss_configure_lookup): Use correct test when
searching in sorted array.
1997-02-20 01:24 Philip Blundell <pjb27@cam.ac.uk>
* inet/getnameinfo.c: Change to use reentrant getXXbyYY functions
and protect modification of global data.
1997-02-19 18:48 Miles Bader <miles@gnu.ai.mit.edu>
* argp-parse.c (argp_default_parser): Set STATE->name for OPT_PROGNAME.
(parser_init): Use the basename for PARSER->state.name.
* argp-help.c (__argp_error, __argp_failure, __argp_state_help):
Use PROGRAM_INVOCATION_SHORT_NAME instead of PROGRAM_INVOCATION_NAME.
* argp-parse.c (parser_init): Set PARSER->state.flags.
Make check whether PARSER has the prog name in argv[0] at the
proper place.
1997-02-19 23:34 Ulrich Drepper <drepper@cygnus.com>
* locale/programs/ld-time.c (time_finish): t_fmt_ampm is optional.
Use default value instead of printing a warning.
* nss/XXX-lookup.c: Add misssing explanation.
1997-02-19 19:14 Andreas Jaeger <aj@arthur.pfalz.de>
* inet/in6_addr.c: Add missing braces.
* inet/getnameinfo.c: Include <arpa/inet.h>.
* sysdeps/posix/getaddrinfo.c: Include <arpa/inet.h>.
1997-02-19 11:46 Ulrich Drepper <drepper@cygnus.com>
* string/strxfrm.c (STRCOLL): Correct handling of `position'
levels with no non-IGNOREd element and handling of NUL byte.
* string/strcoll.c (STRXFRM): Likewise.
* locale/weight.h: Likewise.
* shadow/sgetspent_r.c (LINE_PARSER): Add missing ')'.
1997-02-22 01:20:46 +00:00
|
|
|
|
parser->state.flags = flags;
|
1997-02-15 04:31:36 +00:00
|
|
|
|
parser->state.err_stream = stderr;
|
|
|
|
|
parser->state.out_stream = stdout;
|
|
|
|
|
parser->state.next = 0; /* Tell getopt to initialize. */
|
1997-02-19 04:43:53 +00:00
|
|
|
|
parser->state.pstate = parser;
|
1997-02-15 04:31:36 +00:00
|
|
|
|
|
update from main archive 970221
1997-02-22 00:17 Ulrich Drepper <drepper@cygnus.com>
* catgets/gencat.c: Change to use argp.
* db/makedb: Likewise.
* locale/programs/localedef.c: Likewise.
* locale/programs/locale.c: Little adjustment for better usage of
argp.
1997-02-20 20:07 Greg McGary <gkm@eng.ascend.com>
* Makeconfig: Add rules for libc with bounded pointers.
* Makerules: Likewise.
* config.make.in: Likewise.
* configure.in: Likewise.
1997-02-21 10:41 Miles Bader <miles@gnu.ai.mit.edu>
* argp.h (OPTION_NO_USAGE): New macro.
* argp-help.c (usage_long_opt, usage_argful_short_opt,
add_argless_short_opt): Implement OPTION_NO_USAGE.
1997-02-20 16:41 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* malloc/obstack.h: Fix typo.
1997-02-20 15:56 Miles Bader <miles@gnu.ai.mit.edu>
* argp-fmtstream.c (__argp_fmtstream_update): Account for case
where NEXTLINE points one past the end of the active buffer.
* argp-help.c <stddef.h>: New include.
(__argp_failure): Only exit if STATE says it's ok.
(print_header, hol_entry_help): Use UPARAMS fields rather than
constants.
(_help): Call fill_in_uparams if necessary.
(struct hol_help_state): New type.
(struct pentry_state): Add hhstate field. Remove prev_entry &
sep_groups fields.
(hol_entry_help): Add HHSTATE parameter. Remove prev_entry &
sep_groups parameters.
Suppress duplicate arguments if requested, and note the fact.
(print_header, comma): Use PEST->hhstate fields.
(hol_help): Add HHSTATE variable & pass to hol_entry_help.
Remove LAST_ENTRY & SEP_GROUPS variables.
If any suplicate arguments were suppressed, print explanatory note.
(filter_doc): Replace PEST parameter with STATE.
(struct uparams): New type.
(uparams): New variable.
(struct uparam_name): New type.
(uparam_names): New variable.
(fill_in_uparams): New function.
(__argp_failure, __argp_error, __argp_state_help): Make STATE
parameter const.
* argp.h (argp_state_help, __argp_state_help, argp_usage,
__argp_usage, argp_error, __argp_error, argp_failure,
__argp_failure): Make STATE parameter const.
(ARGP_KEY_HELP_DUP_ARGS_NOTE): New macro.
* argp.h (argp_program_bug_address): Make const.
1997-02-20 19:20 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/unix/mman/syscalls.list: Explain msync interface.
1997-02-19 01:37 Erik Troan <ewt@redhat.com>
* shadow/sgetspent_r.c: Accept empty third, fourth and fifth fields.
1997-02-20 14:44 Andreas Jaeger <aj@arthur.pfalz.de>
* stdio-common/test-fseek.c: Remove temporary file, add
copyright.
1997-02-20 17:51 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/generic/netinet/in.h: Protect contents using
__BEGIN/END_DECLS. Reported by a sun <asun@zoology.washington.edu>.
* inet/net/ethernet.h: Move to sysdeps/unix/sysv/linux/net.
* inet/Makefile (headers): Remove net/ethernet.h.
* sysdeps/unix/sysv/linux/Makefile: Install net/ethernet.h.
* sysdeps/unix/sysv/linux/Dist: Distribute net/ethernet.h.
1997-02-20 15:23 Thorsten Kukuk <kukuk@weber.uni-paderborn.de>
* nss/nsswitch.c (__nss_configure_lookup): Use correct test when
searching in sorted array.
1997-02-20 01:24 Philip Blundell <pjb27@cam.ac.uk>
* inet/getnameinfo.c: Change to use reentrant getXXbyYY functions
and protect modification of global data.
1997-02-19 18:48 Miles Bader <miles@gnu.ai.mit.edu>
* argp-parse.c (argp_default_parser): Set STATE->name for OPT_PROGNAME.
(parser_init): Use the basename for PARSER->state.name.
* argp-help.c (__argp_error, __argp_failure, __argp_state_help):
Use PROGRAM_INVOCATION_SHORT_NAME instead of PROGRAM_INVOCATION_NAME.
* argp-parse.c (parser_init): Set PARSER->state.flags.
Make check whether PARSER has the prog name in argv[0] at the
proper place.
1997-02-19 23:34 Ulrich Drepper <drepper@cygnus.com>
* locale/programs/ld-time.c (time_finish): t_fmt_ampm is optional.
Use default value instead of printing a warning.
* nss/XXX-lookup.c: Add misssing explanation.
1997-02-19 19:14 Andreas Jaeger <aj@arthur.pfalz.de>
* inet/in6_addr.c: Add missing braces.
* inet/getnameinfo.c: Include <arpa/inet.h>.
* sysdeps/posix/getaddrinfo.c: Include <arpa/inet.h>.
1997-02-19 11:46 Ulrich Drepper <drepper@cygnus.com>
* string/strxfrm.c (STRCOLL): Correct handling of `position'
levels with no non-IGNOREd element and handling of NUL byte.
* string/strcoll.c (STRXFRM): Likewise.
* locale/weight.h: Likewise.
* shadow/sgetspent_r.c (LINE_PARSER): Add missing ')'.
1997-02-22 01:20:46 +00:00
|
|
|
|
parser->try_getopt = 1;
|
|
|
|
|
|
1997-02-15 04:31:36 +00:00
|
|
|
|
/* 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];
|
|
|
|
|
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. */
|
|
|
|
|
|
update from main archive 970221
1997-02-22 00:17 Ulrich Drepper <drepper@cygnus.com>
* catgets/gencat.c: Change to use argp.
* db/makedb: Likewise.
* locale/programs/localedef.c: Likewise.
* locale/programs/locale.c: Little adjustment for better usage of
argp.
1997-02-20 20:07 Greg McGary <gkm@eng.ascend.com>
* Makeconfig: Add rules for libc with bounded pointers.
* Makerules: Likewise.
* config.make.in: Likewise.
* configure.in: Likewise.
1997-02-21 10:41 Miles Bader <miles@gnu.ai.mit.edu>
* argp.h (OPTION_NO_USAGE): New macro.
* argp-help.c (usage_long_opt, usage_argful_short_opt,
add_argless_short_opt): Implement OPTION_NO_USAGE.
1997-02-20 16:41 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* malloc/obstack.h: Fix typo.
1997-02-20 15:56 Miles Bader <miles@gnu.ai.mit.edu>
* argp-fmtstream.c (__argp_fmtstream_update): Account for case
where NEXTLINE points one past the end of the active buffer.
* argp-help.c <stddef.h>: New include.
(__argp_failure): Only exit if STATE says it's ok.
(print_header, hol_entry_help): Use UPARAMS fields rather than
constants.
(_help): Call fill_in_uparams if necessary.
(struct hol_help_state): New type.
(struct pentry_state): Add hhstate field. Remove prev_entry &
sep_groups fields.
(hol_entry_help): Add HHSTATE parameter. Remove prev_entry &
sep_groups parameters.
Suppress duplicate arguments if requested, and note the fact.
(print_header, comma): Use PEST->hhstate fields.
(hol_help): Add HHSTATE variable & pass to hol_entry_help.
Remove LAST_ENTRY & SEP_GROUPS variables.
If any suplicate arguments were suppressed, print explanatory note.
(filter_doc): Replace PEST parameter with STATE.
(struct uparams): New type.
(uparams): New variable.
(struct uparam_name): New type.
(uparam_names): New variable.
(fill_in_uparams): New function.
(__argp_failure, __argp_error, __argp_state_help): Make STATE
parameter const.
* argp.h (argp_state_help, __argp_state_help, argp_usage,
__argp_usage, argp_error, __argp_error, argp_failure,
__argp_failure): Make STATE parameter const.
(ARGP_KEY_HELP_DUP_ARGS_NOTE): New macro.
* argp.h (argp_program_bug_address): Make const.
1997-02-20 19:20 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/unix/mman/syscalls.list: Explain msync interface.
1997-02-19 01:37 Erik Troan <ewt@redhat.com>
* shadow/sgetspent_r.c: Accept empty third, fourth and fifth fields.
1997-02-20 14:44 Andreas Jaeger <aj@arthur.pfalz.de>
* stdio-common/test-fseek.c: Remove temporary file, add
copyright.
1997-02-20 17:51 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/generic/netinet/in.h: Protect contents using
__BEGIN/END_DECLS. Reported by a sun <asun@zoology.washington.edu>.
* inet/net/ethernet.h: Move to sysdeps/unix/sysv/linux/net.
* inet/Makefile (headers): Remove net/ethernet.h.
* sysdeps/unix/sysv/linux/Makefile: Install net/ethernet.h.
* sysdeps/unix/sysv/linux/Dist: Distribute net/ethernet.h.
1997-02-20 15:23 Thorsten Kukuk <kukuk@weber.uni-paderborn.de>
* nss/nsswitch.c (__nss_configure_lookup): Use correct test when
searching in sorted array.
1997-02-20 01:24 Philip Blundell <pjb27@cam.ac.uk>
* inet/getnameinfo.c: Change to use reentrant getXXbyYY functions
and protect modification of global data.
1997-02-19 18:48 Miles Bader <miles@gnu.ai.mit.edu>
* argp-parse.c (argp_default_parser): Set STATE->name for OPT_PROGNAME.
(parser_init): Use the basename for PARSER->state.name.
* argp-help.c (__argp_error, __argp_failure, __argp_state_help):
Use PROGRAM_INVOCATION_SHORT_NAME instead of PROGRAM_INVOCATION_NAME.
* argp-parse.c (parser_init): Set PARSER->state.flags.
Make check whether PARSER has the prog name in argv[0] at the
proper place.
1997-02-19 23:34 Ulrich Drepper <drepper@cygnus.com>
* locale/programs/ld-time.c (time_finish): t_fmt_ampm is optional.
Use default value instead of printing a warning.
* nss/XXX-lookup.c: Add misssing explanation.
1997-02-19 19:14 Andreas Jaeger <aj@arthur.pfalz.de>
* inet/in6_addr.c: Add missing braces.
* inet/getnameinfo.c: Include <arpa/inet.h>.
* sysdeps/posix/getaddrinfo.c: Include <arpa/inet.h>.
1997-02-19 11:46 Ulrich Drepper <drepper@cygnus.com>
* string/strxfrm.c (STRCOLL): Correct handling of `position'
levels with no non-IGNOREd element and handling of NUL byte.
* string/strcoll.c (STRXFRM): Likewise.
* locale/weight.h: Likewise.
* shadow/sgetspent_r.c (LINE_PARSER): Add missing ')'.
1997-02-22 01:20:46 +00:00
|
|
|
|
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;
|
|
|
|
|
|
1997-02-15 04:31:36 +00:00
|
|
|
|
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. */
|
update from main archive 970304
1997-03-04 04:31 Ulrich Drepper <drepper@cygnus.com>
* Makerules: Add rules to handle versioning.
* config.h.in (DO_VERSIONING): New macro.
* config.make.in (versioning): New variable.
* configure.in: Add checks for .symver directive in gas and
--version-script option to ld. Define DO_VERSIONING and
versioning if appropriate.
* math/Makefile (routines): Add s_signbit, s_fpclassify, s_fmax,
s_fmin, and s_fdim.
* math/math.h: Define ISO C 9X constants, macros and functions.
* math/mathcalls.h: Likewise.
* sysdeps/libm-ieee754/s_fdim.c: New file.
* sysdeps/libm-ieee754/s_fdimf.c: New file.
* sysdeps/libm-ieee754/s_fdiml.c: New file.
* sysdeps/libm-ieee754/s_fmax.c: New file.
* sysdeps/libm-ieee754/s_fmaxf.c: New file.
* sysdeps/libm-ieee754/s_fmaxl.c: New file.
* sysdeps/libm-ieee754/s_fmin.c: New file.
* sysdeps/libm-ieee754/s_fminf.c: New file.
* sysdeps/libm-ieee754/s_fminl.c: New file.
* sysdeps/libm-ieee754/s_fpclassify.c: New file.
* sysdeps/libm-ieee754/s_fpclassifyf.c: New file.
* sysdeps/libm-ieee754/s_fpclassifyl.c: New file.
* sysdeps/libm-ieee754/s_signbit.c: New file.
* sysdeps/libm-ieee754/s_signbitf.c: New file.
* sysdeps/libm-ieee754/s_signbitl.c: New file.
* stdio-common/printf_fphex.c: Correct printing of decimal point
character.
Simplify conversion of mantissa to string.
* stdio-common/vfscanf.c: Handle %A format.
Optimize termination of floating-point scanning.
* stdio-common/tstscanf.c (main): Add new test to scanf to test
scanning float values with given width.
* stdlib/strtod.c: Add handling of floating-point numbers in
hexadecimal notation.
* stdlib/stdlib.h: Use __USE_ISOC9X feature macro for new long long
functions.
Pretty print #if directives.
* string/string.h: Pretty print #if directives.
* sysdeps/ieee754/dbl2mpn.c: Update copyright.
* sysdeps/ieee754/ldbl2mpn.c: Likewise.
* sysdeps/ieee754/mpn2dbl.c: Likewise.
* sysdeps/ieee754/mpn2flt.c: Likewise.
* sysdeps/ieee754/mpn2ldbl.c: Likewise.
* sysdeps/unix/sysv/linux/poll.c: Implement poll function by
falling back to select-based implementation if syscall isn't
available.
* sysdeps/unix/sysv/linux/syscalls.list: Add s_poll.
* time/leapseconds: Update from tzdata1997b.
* time/zic.c: Update from tzcode1997b.
1997-03-01 15:08 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* time/Makefile $(tzfiles:%=$(objpfx)z.%): Remove unneeded
depedencies between installed $(tzlinks) and $(tzbases) files.
1997-03-01 14:27 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* math/math.h: Make compatible with traditional preprocessor;
requires carefull placement of whitespace in macro arguments.
Use __CONCAT instead of ##.
Declare long double functions only if __STDC__ or __GNUC__.
* math/mathcall.h: Avoid whitespace before argument of macro call
that is used as function name.
* sysdeps/m68k/fpu/__math.h: Use __CONCAT instead of ##.
(__m81_u, __m81_inline): Depend on __LIBC_M81_MATH_INLINES instead
of __NO_M81_MATH_INLINES.
[!__LIBC_M81_MATH_INLINES]: Don't define internal functions
starting with __ieee754.
[!__NO_MATH_INLINES && __OPTIMIZE__]: Define user visible
functions as inlines.
(__m81_defun): Put __attribute__ between return type and function
name.
* math/math.h: Include <__math.h> also if __LIBC_M81_MATH_INLINES
is defined.
* sysdeps/m68k/fpu/e_acos.c: Define __LIBC_M81_MATH_INLINES
instead of __NO_M81_MATH_INLINES.
* sysdeps/m68k/fpu/e_fmod.c: Likewise.
* sysdeps/m68k/fpu/k_cos.c: Likewise.
* sysdeps/m68k/fpu/k_sin.c: Likewise.
* sysdeps/m68k/fpu/k_tan.c: Likewise.
* sysdeps/m68k/fpu/s_atan.c: Likewise. De-ANSI-declify.
* sysdeps/m68k/fpu/s_frexp.c: Likewise.
* sysdeps/m68k/fpu/s_ilogb.c: Likewise.
* sysdeps/m68k/fpu/s_isinf.c: Likewise.
* sysdeps/m68k/fpu/s_modf.c: Likewise.
* sysdeps/m68k/fpu/s_scalbn.c: Likewise.
1997-02-27 21:51 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* Makefile (tests): Cope with $PATH not including the current
directory.
1997-02-27 18:04 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sysdeps/unix/Makefile ($(common-objpfx)mk-local_lim): Use
$(common-objdir-compile).
($(common-objpfx)make-ioctls): Likewise.
(mk-local_lim-CFLAGS): Set this instead of local_lim-CFLAGS.
($(common-objpfx)sys/param.h): Use $(make-target-directory).
($(addprefix $(common-objpfx),$(sys/param.h-includes))):
Likewise.
($(common-objpfx)sys/syscall.h): Likewise.
($(common-objpfx)local_lim.h): Let make deal with command
failure.
($(common-objpfx)param.h.dep): Use temporary file and update
target atomically.
($(common-objpfx)errnos): Avoid the Useless Use of cat Award.
(include $(common-objpfx)param.h.dep): Ignore error.
* sysdeps/posix/Makefile ($(common-objpfx)mk-stdiolim): Use
$(common-objdir-compile).
(mk-stdiolim-CFLAGS): Renamed from cded-objdir-includes, use
$(shell pwd) instead of $$cwd.
* sysdeps/generic/Makefile ($(common-objpfx)det_endian): Use
$(common-objdir-compile).
($(objpfx)make_siglist): Use $(native-compile).
(make_siglist-CFLAGS): New variable.
* Makerules (ALL_BUILD_CFLAGS): Renamed from BUILD_CFLAGS, leaving
the old name for the user to pass additional flags to the host
compiler. Fix reference to config header.
(native-compile, common-objdir-compile): Rewritten to make more
generally usable.
* sysdeps/unix/sysv/sysv4/solaris2/Makefile: Set ALL_BUILD_CFLAGS
instead of BUILD_CFLAGS.
* sysvips/sys/ipc.h: Warn if needed feature select macro are not
defined.
1997-02-27 17:11 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sunrpc/Makefile ($(objpfx)rpc-proto.d, $(objpfx)rpc-proto.c):
New rules to generate dependencies for the RPC service objects.
1997-02-27 16:26 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* argp/argp-parse.c (parser_finalize): Always set *END_INDEX if
supplied.
1997-02-28 03:27 Ulrich Drepper <drepper@cygnus.com>
* stdlib/strtod.c (STRTOF): Make sure return value is large enough
so that clearing second word is necessary.
* sysdeps/unix/sysv/linux/netinet/in_systm.h: Don't use kernel
header since it is wrong for 64 bit systems.
Patch by a sun <asun@zoology.washington.edu>.
1997-02-27 10:34:11 Richard Henderson <rth@tamu.edu>
* sysdeps/unix/sysv/linux/alpha/brk.S: Support both the Linux/i386
and OSF/1 style brk syscalls. We may want to change Linux/Alpha
for the benefit of running foreign binaries.
1997-03-01 20:21 Miles Bader <miles@gnu.ai.mit.edu>
1997-02-25 19:42 Miles Bader <miles@gnu.ai.mit.edu>
1997-03-04 05:53:28 +00:00
|
|
|
|
|
|
|
|
|
/* Tell the user that all arguments are parsed. */
|
|
|
|
|
if (end_index)
|
|
|
|
|
*end_index = parser->state.next;
|
1997-02-15 04:31:36 +00:00
|
|
|
|
}
|
|
|
|
|
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. We only call the
|
|
|
|
|
parsers once more, 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
|
|
|
|
|
/* Do final cleanup, including propagating 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. */
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
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. */
|
|
|
|
|
static error_t
|
|
|
|
|
parser_parse_arg (struct parser *parser, char *val)
|
|
|
|
|
{
|
|
|
|
|
int index = parser->state.next;
|
|
|
|
|
error_t err = EBADKEY;
|
|
|
|
|
struct group *group;
|
|
|
|
|
|
|
|
|
|
for (group = parser->groups
|
|
|
|
|
; group < parser->egroup && err == EBADKEY
|
|
|
|
|
; group++)
|
|
|
|
|
err = group_parse (group, &parser->state, ARGP_KEY_ARG, val);
|
|
|
|
|
|
|
|
|
|
if (!err)
|
|
|
|
|
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++;
|
|
|
|
|
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;
|
|
|
|
|
|
|
|
|
|
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)
|
|
|
|
|
return group_parse (group, &parser->state, opt, optarg);
|
|
|
|
|
|
|
|
|
|
return EBADKEY; /* until otherwise asserted */
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
/* A long option. We use shifts instead of masking for extracting
|
|
|
|
|
the user value in order to preserve the sign. */
|
|
|
|
|
return
|
|
|
|
|
group_parse (&parser->groups[group_key - 1], &parser->state,
|
|
|
|
|
(opt << GROUP_BITS) >> GROUP_BITS, optarg);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* 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. */
|
|
|
|
|
err =
|
|
|
|
|
parser_parse_arg (parser, parser->state.argv[parser->state.next++]);
|
|
|
|
|
else 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);
|
|
|
|
|
parser->state.next--; /* Put back the unused argument. */
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
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
|
1997-02-19 04:43:53 +00:00
|
|
|
|
|
|
|
|
|
/* 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
|