Merge async and sync code paths some more

[deliverable/binutils-gdb.git] / gdb / mi / mi-getopt.c

diff --git a/gdb/mi/mi-getopt.c b/gdb/mi/mi-getopt.c
index 052a84adafb50960042f919e76019d80ba080808..0a07a39e0a6e1033f295d198de9739fb3119e9af 100644 (file)
--- a/gdb/mi/mi-getopt.c
+++ b/gdb/mi/mi-getopt.c
@@ -1,12 +1,12 @@
 /* MI Command Set - MI Option Parser.
-   Copyright 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 2000-2015 Free Software Foundation, Inc.
    Contributed by Cygnus Solutions (a Red Hat company).
 
    This file is part of GDB.
 
    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 of the License, or
+   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,
@@ -15,77 +15,97 @@
    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., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
 #include "mi-getopt.h"
-#include "gdb_string.h"
+/* See comments about mi_getopt and mi_getopt_silent in mi-getopt.h.
+   When there is an unknown option, if ERROR_ON_UNKNOWN is true,
+   throw an error, otherwise return -1.  */
 
-int
-mi_getopt (const char *prefix,
-          int argc, char **argv,
-          struct mi_opt *opts,
-          int *optind, char **optarg)
+static int
+mi_getopt_1 (const char *prefix, int argc, char **argv,
+            const struct mi_opt *opts, int *oind, char **oarg,
+            int error_on_unknown)
 {
   char *arg;
-  struct mi_opt *opt;
-  /* We assume that argv/argc are ok. */
-  if (*optind > argc || *optind < 0)
+  const struct mi_opt *opt;
+
+  /* We assume that argv/argc are ok.  */
+  if (*oind > argc || *oind < 0)
     internal_error (__FILE__, __LINE__,
-                   _("mi_getopt_long: optind out of bounds"));
-  if (*optind == argc)
+                   _("mi_getopt_long: oind out of bounds"));
+  if (*oind == argc)
     return -1;
-  arg = argv[*optind];
+  arg = argv[*oind];
   /* ``--''? */
   if (strcmp (arg, "--") == 0)
     {
-      *optind += 1;
-      *optarg = NULL;
+      *oind += 1;
+      *oarg = NULL;
       return -1;
     }
-  /* End of option list. */
+  /* End of option list.  */
   if (arg[0] != '-')
     {
-      *optarg = NULL;
+      *oarg = NULL;
       return -1;
     }
-  /* Look the option up. */
+  /* Look the option up.  */
   for (opt = opts; opt->name != NULL; opt++)
     {
       if (strcmp (opt->name, arg + 1) != 0)
        continue;
       if (opt->arg_p)
        {
-         /* A non-simple optarg option. */
-         if (argc < *optind + 2)
+         /* A non-simple oarg option.  */
+         if (argc < *oind + 2)
            error (_("%s: Option %s requires an argument"), prefix, arg);
-         *optarg = argv[(*optind) + 1];
-         *optind = (*optind) + 2;
+         *oarg = argv[(*oind) + 1];
+         *oind = (*oind) + 2;
          return opt->index;
        }
       else
        {
-         *optarg = NULL;
-         *optind = (*optind) + 1;
+         *oarg = NULL;
+         *oind = (*oind) + 1;
          return opt->index;
        }
     }
-  error (_("%s: Unknown option ``%s''"), prefix, arg + 1);
+
+  if (error_on_unknown)
+    error (_("%s: Unknown option ``%s''"), prefix, arg + 1);
+  else
+    return -1;
+}
+
+int
+mi_getopt (const char *prefix,
+          int argc, char **argv,
+          const struct mi_opt *opts,
+          int *oind, char **oarg)
+{
+  return mi_getopt_1 (prefix, argc, argv, opts, oind, oarg, 1);
+}
+
+int
+mi_getopt_allow_unknown (const char *prefix, int argc, char **argv,
+                        const struct mi_opt *opts, int *oind, char **oarg)
+{
+  return mi_getopt_1 (prefix, argc, argv, opts, oind, oarg, 0);
 }
 
 int 
 mi_valid_noargs (const char *prefix, int argc, char **argv) 
 {
-  int optind = 0;
-  char *optarg;
-  static struct mi_opt opts[] =
-  {
-    0
-  };
+  int oind = 0;
+  char *oarg;
+  static const struct mi_opt opts[] =
+    {
+      { 0, 0, 0 }
+    };
 
-  if (mi_getopt (prefix, argc, argv, opts, &optind, &optarg) == -1)
+  if (mi_getopt (prefix, argc, argv, opts, &oind, &oarg) == -1)
     return 1;
   else
     return 0;