X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fargmatch.c;h=210689ba3f5f1fa3dbe43f63a5a0888393043865;hb=10cf9b5e371bc4927b2b28354c19b62943dfe95e;hp=ed18c1834a4e01750a3f9d258ead0954a11ca7ac;hpb=5318db515c3f0a4b8cada6b67635bcd39bfcafa4;p=gnulib.git diff --git a/lib/argmatch.c b/lib/argmatch.c index ed18c1834..210689ba3 100644 --- a/lib/argmatch.c +++ b/lib/argmatch.c @@ -1,5 +1,7 @@ /* argmatch.c -- find a match for a string in an array - Copyright (C) 1990, 1998, 1999 Free Software Foundation, Inc. + + Copyright (C) 1990, 1998, 1999, 2001, 2002, 2003, 2004 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 @@ -18,41 +20,58 @@ /* Written by David MacKenzie Modified by Akim Demaille */ +#if HAVE_CONFIG_H +# include +#endif + +/* Specification. */ #include "argmatch.h" #include -#ifdef STDC_HEADERS -# include -#endif - -#if HAVE_LOCALE_H -# include -#endif +#include +#include -#if ENABLE_NLS -# include -# define _(Text) gettext (Text) -#else -# define _(Text) Text -#endif +#include "gettext.h" +#define _(msgid) gettext (msgid) +#include "error.h" +#include "exit.h" #include "quotearg.h" +#include "quote.h" +#include "unlocked-io.h" -/* 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. */ - +/* 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 escape_quoting_style +# define ARGMATCH_QUOTING_STYLE locale_quoting_style +#endif + +/* Non failing version of argmatch call this function after failing. */ +#ifndef ARGMATCH_DIE +# include "exitfail.h" +# define ARGMATCH_DIE exit (exit_failure) #endif -extern char *program_name; +#ifdef ARGMATCH_DIE_DECL +ARGMATCH_DIE_DECL; +#endif + +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 or -2 if it is ambiguous (is a prefix of more than one element). - If SENSITIVE, comparison is case sensitive. If VALLIST is none null, use it to resolve ambiguities limited to synonyms, i.e., for @@ -60,10 +79,9 @@ extern char *program_name; "no", "nope" -> 1 "y" is a valid argument, for `0', and "n" for `1'. */ -static int -__argmatch_internal (const char *arg, const char *const *arglist, - const char *vallist, size_t valsize, - int case_sensitive) +int +argmatch (const char *arg, const char *const *arglist, + const char *vallist, size_t valsize) { int i; /* Temporary index in ARGLIST. */ size_t arglen; /* Length of ARG. */ @@ -75,9 +93,7 @@ __argmatch_internal (const char *arg, const char *const *arglist, /* Test all elements for either exact match or abbreviated matches. */ for (i = 0; arglist[i]; i++) { - if (case_sensitive - ? !strncmp (arglist[i], arg, arglen) - : !strncasecmp (arglist[i], arg, arglen)) + if (!strncmp (arglist[i], arg, arglen)) { if (strlen (arglist[i]) == arglen) /* Exact match found. */ @@ -105,45 +121,20 @@ __argmatch_internal (const char *arg, const char *const *arglist, return matchind; } -/* argmatch - case sensitive version */ -int -argmatch (const char *arg, const char *const *arglist, - const char *vallist, size_t valsize) -{ - return __argmatch_internal (arg, arglist, vallist, valsize, 1); -} - -/* argcasematch - case insensitive version */ -int -argcasematch (const char *arg, const char *const *arglist, - const char *vallist, size_t valsize) -{ - return __argmatch_internal (arg, arglist, vallist, valsize, 0); -} - /* 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; - char const *format; - - /* 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); - - format = (problem == -1 - ? _("%s: invalid argument `%s' for `%s'\n") - : _("%s: ambiguous argument `%s' for `%s'\n")); + char const *format = (problem == -1 + ? _("invalid argument %s for %s") + : _("ambiguous argument %s for %s")); - fprintf (stderr, format, program_name, quotearg (value), kind); - - set_quoting_style (NULL, saved_quoting_style); + error (0, 0, format, quotearg_n_style (0, ARGMATCH_QUOTING_STYLE, value), + quote_n (1, context)); } /* List the valid arguments for argmatch. @@ -174,6 +165,31 @@ argmatch_valid (const char *const *arglist, putc ('\n', stderr); } +/* 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. */ + +int +__xargmatch_internal (const char *context, + const char *arg, const char *const *arglist, + const char *vallist, size_t valsize, + argmatch_exit_fn exit_fn) +{ + int res = argmatch (arg, arglist, vallist, valsize); + 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 * @@ -193,8 +209,7 @@ argmatch_to_argument (const char *value, /* * Based on "getversion.c" by David MacKenzie */ -char *rogram_name; -extern const char *getenv (); +char *program_name; /* When to make backup files. */ enum backup_type @@ -247,12 +262,12 @@ main (int argc, const char *const *argv) } if ((cp = getenv ("VERSION_CONTROL"))) - backup_type = XARGCASEMATCH ("$VERSION_CONTROL", cp, - backup_args, backup_vals); + backup_type = XARGMATCH ("$VERSION_CONTROL", cp, + backup_args, backup_vals); if (argc == 2) - backup_type = XARGCASEMATCH (program_name, argv[1], - backup_args, backup_vals); + backup_type = XARGMATCH (program_name, argv[1], + backup_args, backup_vals); printf ("The version control is `%s'\n", ARGMATCH_TO_ARGUMENT (backup_type, backup_args, backup_vals));