X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fargmatch.c;h=964270650c2b72150ba8f1375c8857378dd5be16;hb=02461019940d8fa70f111461c823338a9d1284e4;hp=3a181fcca3fe31cd72a029598a637d11b9094b50;hpb=901de69fd577fcd742112056438148f5ffbdb64e;p=gnulib.git diff --git a/lib/argmatch.c b/lib/argmatch.c index 3a181fcca..964270650 100644 --- a/lib/argmatch.c +++ b/lib/argmatch.c @@ -1,5 +1,5 @@ /* argmatch.c -- find a match for a string in an array - Copyright (C) 1990, 1998 Free Software Foundation, Inc. + Copyright (C) 1990, 1998, 1999 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -28,35 +28,52 @@ #if HAVE_LOCALE_H # include #endif -#if !HAVE_SETLOCALE -# define setlocale(Category, Locale) /* empty */ -#endif #if ENABLE_NLS # include # define _(Text) gettext (Text) #else -# define bindtextdomain(Domain, Directory) /* empty */ -# define textdomain(Domain) /* empty */ # define _(Text) Text #endif -#ifndef EXIT_BADARG -# define EXIT_BADARG 1 +#include "error.h" +#include "quotearg.h" + +/* When reporting an invalid argument, show nonprinting characters + by using the quoting style ARGMATCH_QUOTING_STYLE. Do not use + literal_quoting_style. */ +#ifndef ARGMATCH_QUOTING_STYLE +# define ARGMATCH_QUOTING_STYLE locale_quoting_style #endif -#include "quotearg.h" +/* The following test is to work around the gross typo in + systems like Sony NEWS-OS Release 4.0C, whereby EXIT_FAILURE + is defined to 0, not 1. */ +#if !EXIT_FAILURE +# undef EXIT_FAILURE +# define EXIT_FAILURE 1 +#endif -/* When reporting a failing argument, make sure to show invisible - characters hidden using the quoting style - ARGMATCH_QUOTING_STYLE. literal_quoting_style is not good. */ +/* Non failing version of argmatch call this function after failing. */ +#ifndef ARGMATCH_DIE +# define ARGMATCH_DIE exit (EXIT_FAILURE) +#endif -#ifndef ARGMATCH_QUOTING_STYLE -# define ARGMATCH_QUOTING_STYLE c_quoting_style +#ifdef ARGMATCH_DIE_DECL +ARGMATCH_DIE_DECL; #endif -extern char *program_name; +static void +__argmatch_die (void) +{ + ARGMATCH_DIE; +} + +/* Used by XARGMATCH and XARGCASEMATCH. See description in argmatch.h. + Default to __argmatch_die, but allow caller to change this at run-time. */ +argmatch_exit_fn argmatch_die = __argmatch_die; + /* If ARG is an unambiguous match for an element of the null-terminated array ARGLIST, return the index in ARGLIST of the matched element, else -1 if it does not match any element @@ -131,31 +148,18 @@ argcasematch (const char *arg, const char *const *arglist, } /* Error reporting for argmatch. - KIND is a description of the type of entity that was being matched. + CONTEXT is a description of the type of entity that was being matched. VALUE is the invalid value that was given. PROBLEM is the return value from argmatch. */ void -argmatch_invalid (const char *kind, const char *value, int problem) +argmatch_invalid (const char *context, const char *value, int problem) { - enum quoting_style saved_quoting_style; - - /* Make sure to have a good quoting style to report errors. - literal is insane here. */ - saved_quoting_style = get_quoting_style (NULL); - set_quoting_style (NULL, ARGMATCH_QUOTING_STYLE); - - /* There is an error */ - fprintf (stderr, "%s: ", program_name); - if (problem == -1) - fprintf (stderr, _("invalid argument %s for `%s'"), - quotearg (value), kind); - else /* Assume -2. */ - fprintf (stderr, _("ambiguous argument %s for `%s'"), - quotearg (value), kind); - putc ('\n', stderr); + char const *format = (problem == -1 + ? _("invalid argument %s for `%s'") + : _("ambiguous argument %s for `%s'")); - set_quoting_style (NULL, saved_quoting_style); + error (0, 0, format, quotearg_style (ARGMATCH_QUOTING_STYLE, value), context); } /* List the valid arguments for argmatch. @@ -186,41 +190,38 @@ argmatch_valid (const char *const *arglist, putc ('\n', stderr); } -/* Call __argmatch_internal, but handle the error so that it never - returns. Errors are reported to the users with a list of valid - values. +/* Never failing versions of the previous functions. + + CONTEXT is the context for which argmatch is called (e.g., + "--version-control", or "$VERSION_CONTROL" etc.). Upon failure, + calls the (supposed never to return) function EXIT_FN. */ - KIND is a description of the type of entity that was being matched. - ARG, ARGLIST, and SENSITIVE are the same as in __argmatch_internal - VALIST, and VALSIZE are the same as in valid_args */ int -__xargmatch_internal (const char *kind, const char *arg, - const char *const *arglist, +__xargmatch_internal (const char *context, + const char *arg, const char *const *arglist, const char *vallist, size_t valsize, - int case_sensitive) + int case_sensitive, + argmatch_exit_fn exit_fn) { - int i; - - i = __argmatch_internal (arg, arglist, vallist, valsize, case_sensitive); - if (i >= 0) - { - /* Success */ - return i; - } - else - { - /* Failure */ - argmatch_invalid (kind, arg, i); - argmatch_valid (arglist, vallist, valsize); - exit (EXIT_BADARG); - } - return -1; /* To please some compilers */ + int res = __argmatch_internal (arg, arglist, + vallist, valsize, + case_sensitive); + if (res >= 0) + /* Success. */ + return res; + + /* We failed. Explain why. */ + argmatch_invalid (context, arg, res); + argmatch_valid (arglist, vallist, valsize); + (*exit_fn) (); + + return -1; /* To please the compilers. */ } /* Look for VALUE in VALLIST, an array of objects of size VALSIZE and return the first corresponding argument in ARGLIST */ const char * -argmatch_to_argument (char *value, +argmatch_to_argument (const char *value, const char *const *arglist, const char *vallist, size_t valsize) { @@ -236,7 +237,7 @@ argmatch_to_argument (char *value, /* * Based on "getversion.c" by David MacKenzie */ -char *rogram_name; +char *program_name; extern const char *getenv (); /* When to make backup files. */