X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fargmatch.c;h=9125e2af048eee7851e28f47090054fa445f4471;hb=5191b3546cfb6c163228c23f214e325ddf60d46f;hp=36d5845acb7812c55a908234d0a76361ad7a1922;hpb=222b0486b7db1b09293e05512873d633440efcb3;p=gnulib.git
diff --git a/lib/argmatch.c b/lib/argmatch.c
index 36d5845ac..9125e2af0 100644
--- a/lib/argmatch.c
+++ b/lib/argmatch.c
@@ -1,12 +1,12 @@
/* argmatch.c -- find a match for a string in an array
- Copyright (C) 1990, 1998, 1999, 2001, 2002, 2003, 2004, 2005 Free
- Software Foundation, Inc.
+ Copyright (C) 1990, 1998-1999, 2001-2007, 2009-2013 Free Software
+ Foundation, Inc.
- This program is free software; you can redistribute it and/or modify
+ 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
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,15 +14,12 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+ along with this program. If not, see . */
/* Written by David MacKenzie
Modified by Akim Demaille */
-#ifdef HAVE_CONFIG_H
-# include
-#endif
+#include
/* Specification. */
#include "argmatch.h"
@@ -36,7 +33,6 @@
#define _(msgid) gettext (msgid)
#include "error.h"
-#include "exit.h"
#include "quotearg.h"
#include "quote.h"
@@ -81,16 +77,16 @@ argmatch_exit_fn argmatch_die = __argmatch_die;
synonyms, i.e., for
"yes", "yop" -> 0
"no", "nope" -> 1
- "y" is a valid argument, for `0', and "n" for `1'. */
+ "y" is a valid argument, for 0, and "n" for 1. */
ptrdiff_t
argmatch (const char *arg, const char *const *arglist,
- const char *vallist, size_t valsize)
+ const char *vallist, size_t valsize)
{
- size_t i; /* Temporary index in ARGLIST. */
- size_t arglen; /* Length of ARG. */
- ptrdiff_t matchind = -1; /* Index of first nonexact match. */
- bool ambiguous = false; /* If true, multiple nonexact match(es). */
+ size_t i; /* Temporary index in ARGLIST. */
+ size_t arglen; /* Length of ARG. */
+ ptrdiff_t matchind = -1; /* Index of first nonexact match. */
+ bool ambiguous = false; /* If true, multiple nonexact match(es). */
arglen = strlen (arg);
@@ -98,26 +94,26 @@ argmatch (const char *arg, const char *const *arglist,
for (i = 0; arglist[i]; i++)
{
if (!strncmp (arglist[i], arg, arglen))
- {
- if (strlen (arglist[i]) == arglen)
- /* Exact match found. */
- return i;
- else if (matchind == -1)
- /* First nonexact match found. */
- matchind = i;
- else
- {
- /* Second nonexact match found. */
- if (vallist == NULL
- || memcmp (vallist + valsize * matchind,
- vallist + valsize * i, valsize))
- {
- /* There is a real ambiguity, or we could not
- disambiguate. */
- ambiguous = true;
- }
- }
- }
+ {
+ if (strlen (arglist[i]) == arglen)
+ /* Exact match found. */
+ return i;
+ else if (matchind == -1)
+ /* First nonexact match found. */
+ matchind = i;
+ else
+ {
+ /* Second nonexact match found. */
+ if (vallist == NULL
+ || memcmp (vallist + valsize * matchind,
+ vallist + valsize * i, valsize))
+ {
+ /* There is a real ambiguity, or we could not
+ disambiguate. */
+ ambiguous = true;
+ }
+ }
+ }
}
if (ambiguous)
return -2;
@@ -134,11 +130,11 @@ void
argmatch_invalid (const char *context, const char *value, ptrdiff_t 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_n_style (0, ARGMATCH_QUOTING_STYLE, value),
- quote_n (1, context));
+ quote_n (1, context));
}
/* List the valid arguments for argmatch.
@@ -147,24 +143,24 @@ argmatch_invalid (const char *context, const char *value, ptrdiff_t problem)
VALSIZE is the size of the elements of VALLIST */
void
argmatch_valid (const char *const *arglist,
- const char *vallist, size_t valsize)
+ const char *vallist, size_t valsize)
{
size_t i;
const char *last_val = NULL;
/* We try to put synonyms on the same line. The assumption is that
synonyms follow each other */
- fprintf (stderr, _("Valid arguments are:"));
+ fputs (_("Valid arguments are:"), stderr);
for (i = 0; arglist[i]; i++)
if ((i == 0)
- || memcmp (last_val, vallist + valsize * i, valsize))
+ || memcmp (last_val, vallist + valsize * i, valsize))
{
- fprintf (stderr, "\n - `%s'", arglist[i]);
- last_val = vallist + valsize * i;
+ fprintf (stderr, "\n - %s", quote (arglist[i]));
+ last_val = vallist + valsize * i;
}
else
{
- fprintf (stderr, ", `%s'", arglist[i]);
+ fprintf (stderr, ", %s", quote (arglist[i]));
}
putc ('\n', stderr);
}
@@ -177,9 +173,9 @@ argmatch_valid (const char *const *arglist,
ptrdiff_t
__xargmatch_internal (const char *context,
- const char *arg, const char *const *arglist,
- const char *vallist, size_t valsize,
- argmatch_exit_fn exit_fn)
+ const char *arg, const char *const *arglist,
+ const char *vallist, size_t valsize,
+ argmatch_exit_fn exit_fn)
{
ptrdiff_t res = argmatch (arg, arglist, vallist, valsize);
if (res >= 0)
@@ -198,8 +194,8 @@ __xargmatch_internal (const char *context,
return the first corresponding argument in ARGLIST */
const char *
argmatch_to_argument (const char *value,
- const char *const *arglist,
- const char *vallist, size_t valsize)
+ const char *const *arglist,
+ const char *vallist, size_t valsize)
{
size_t i;
@@ -267,14 +263,14 @@ main (int argc, const char *const *argv)
if ((cp = getenv ("VERSION_CONTROL")))
backup_type = XARGMATCH ("$VERSION_CONTROL", cp,
- backup_args, backup_vals);
+ backup_args, backup_vals);
if (argc == 2)
backup_type = XARGMATCH (program_name, argv[1],
- backup_args, backup_vals);
+ backup_args, backup_vals);
- printf ("The version control is `%s'\n",
- ARGMATCH_TO_ARGUMENT (backup_type, backup_args, backup_vals));
+ printf ("The version control is '%s'\n",
+ ARGMATCH_TO_ARGUMENT (backup_type, backup_args, backup_vals));
return 0;
}