X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fargmatch.c;h=210689ba3f5f1fa3dbe43f63a5a0888393043865;hb=10cf9b5e371bc4927b2b28354c19b62943dfe95e;hp=ba1da3fba64be92ba44a58e8f8bfb2e7deb511f5;hpb=d349992d82f97d614404565ff66e3f8a47b4a568;p=gnulib.git diff --git a/lib/argmatch.c b/lib/argmatch.c index ba1da3fba..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, 2000 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,26 +20,25 @@ /* Written by David MacKenzie Modified by Akim Demaille */ +#if HAVE_CONFIG_H +# include +#endif + +/* Specification. */ #include "argmatch.h" #include -#ifdef STDC_HEADERS -# include -#endif +#include +#include -#if HAVE_LOCALE_H -# include -#endif - -#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 an invalid argument, show nonprinting characters by using the quoting style ARGMATCH_QUOTING_STYLE. Do not use @@ -46,17 +47,10 @@ # define ARGMATCH_QUOTING_STYLE locale_quoting_style #endif -/* 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 - /* Non failing version of argmatch call this function after failing. */ #ifndef ARGMATCH_DIE -# define ARGMATCH_DIE exit (EXIT_FAILURE) +# include "exitfail.h" +# define ARGMATCH_DIE exit (exit_failure) #endif #ifdef ARGMATCH_DIE_DECL @@ -78,7 +72,6 @@ argmatch_exit_fn argmatch_die = __argmatch_die; 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 @@ -86,10 +79,9 @@ argmatch_exit_fn argmatch_die = __argmatch_die; "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. */ @@ -101,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. */ @@ -131,22 +121,6 @@ __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. CONTEXT is a description of the type of entity that was being matched. VALUE is the invalid value that was given. @@ -156,10 +130,11 @@ void argmatch_invalid (const char *context, const char *value, int problem) { char const *format = (problem == -1 - ? _("invalid argument %s for `%s'") - : _("ambiguous argument %s for `%s'")); + ? _("invalid argument %s for %s") + : _("ambiguous argument %s for %s")); - error (0, 0, format, quotearg_style (ARGMATCH_QUOTING_STYLE, value), context); + error (0, 0, format, quotearg_n_style (0, ARGMATCH_QUOTING_STYLE, value), + quote_n (1, context)); } /* List the valid arguments for argmatch. @@ -200,12 +175,9 @@ int __xargmatch_internal (const char *context, const char *arg, const char *const *arglist, const char *vallist, size_t valsize, - int case_sensitive, argmatch_exit_fn exit_fn) { - int res = __argmatch_internal (arg, arglist, - vallist, valsize, - case_sensitive); + int res = argmatch (arg, arglist, vallist, valsize); if (res >= 0) /* Success. */ return res; @@ -238,7 +210,6 @@ argmatch_to_argument (const char *value, * Based on "getversion.c" by David MacKenzie */ char *program_name; -extern const char *getenv (); /* When to make backup files. */ enum backup_type @@ -291,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));