X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fargmatch.c;h=f08fba35e91386f8a777d5b4d15199aaaef5df37;hb=e29fbaee8afd6fd9b6c0291562740807ca11a0c6;hp=ed18c1834a4e01750a3f9d258ead0954a11ca7ac;hpb=5318db515c3f0a4b8cada6b67635bcd39bfcafa4;p=gnulib.git

diff --git a/lib/argmatch.c b/lib/argmatch.c
index ed18c1834..f08fba35e 100644
--- a/lib/argmatch.c
+++ b/lib/argmatch.c
@@ -36,18 +36,44 @@
 # define _(Text) Text
 #endif
 
+#include "error.h"
 #include "quotearg.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
 #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.  */
+#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)
+#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;
 
+
 /* 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
@@ -122,12 +148,12 @@ argcasematch (const char *arg, const char *const *arglist,
 }
 
 /* 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;
@@ -138,10 +164,10 @@ argmatch_invalid (const char *kind, const char *value, int problem)
   set_quoting_style (NULL, ARGMATCH_QUOTING_STYLE);
 
   format = (problem == -1
-	    ? _("%s: invalid argument `%s' for `%s'\n")
-	    : _("%s: ambiguous argument `%s' for `%s'\n"));
+	    ? _("invalid argument `%s' for `%s'")
+	    : _("ambiguous argument `%s' for `%s'"));
 
-  fprintf (stderr, format, program_name, quotearg (value), kind);
+  error (0, 0, format, quotearg (value), context);
 
   set_quoting_style (NULL, saved_quoting_style);
 }
@@ -174,6 +200,34 @@ 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,
+		      int case_sensitive,
+		      argmatch_exit_fn exit_fn)
+{
+  int res = __argmatch_internal (arg, arglist,
+				 vallist, valsize,
+				 case_sensitive);
+  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,7 +247,7 @@ argmatch_to_argument (const char *value,
 /*
  * Based on "getversion.c" by David MacKenzie <djm@gnu.ai.mit.edu>
  */
-char *rogram_name;
+char *program_name;
 extern const char *getenv ();
 
 /* When to make backup files.  */