/* 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
#include "error.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
literal_quoting_style. */
#ifndef ARGMATCH_QUOTING_STYLE
-# define ARGMATCH_QUOTING_STYLE escape_quoting_style
+# define ARGMATCH_QUOTING_STYLE locale_quoting_style
#endif
/* The following test is to work around the gross typo in
void
argmatch_invalid (const char *context, const char *value, int problem)
{
- enum quoting_style saved_quoting_style;
- char const *format;
+ char const *format = (problem == -1
+ ? _("invalid argument %s for %s")
+ : _("ambiguous argument %s for %s"));
- /* 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
- ? _("invalid argument `%s' for `%s'")
- : _("ambiguous argument `%s' for `%s'"));
-
- error (0, 0, format, quotearg (value), context);
-
- 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.