/* 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 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
# define _(Text) Text
#endif
+#include "error.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
-extern char *program_name;
-
/* 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. */
# define ARGMATCH_DIE exit (EXIT_FAILURE)
#endif
+#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;
+
\f
/* If ARG is an unambiguous match for an element of the
null-terminated array ARGLIST, return the index in ARGLIST
void
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"));
-
- fprintf (stderr, format, program_name, quotearg (value), context);
+ 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_n_style (0, ARGMATCH_QUOTING_STYLE, value),
+ quote_n (1, context));
}
/* List the valid arguments for argmatch.