gdb/mi: add regexp filtering to -file-list-exec-source-files

[thirdparty/binutils-gdb.git] / gdb / mi / mi-cmd-file.c

diff --git a/gdb/mi/mi-cmd-file.c b/gdb/mi/mi-cmd-file.c
index 430449c919e1d251f23bb38f59189b413dff4cab..684f7eb3f0c6703bc06da6107f3846ca7d297152 100644 (file)
--- a/gdb/mi/mi-cmd-file.c
+++ b/gdb/mi/mi-cmd-file.c
@@ -62,54 +62,64 @@ mi_cmd_file_list_exec_source_file (const char *command, char **argv, int argc)
                       COMPUNIT_MACRO_TABLE (SYMTAB_COMPUNIT (st.symtab)) != NULL);
 }
 
-/* A callback for map_partial_symbol_filenames.  */
-
-static void
-print_partial_file_name (const char *filename, const char *fullname)
-{
-  struct ui_out *uiout = current_uiout;
-
-  uiout->begin (ui_out_type_tuple, NULL);
-
-  uiout->field_string ("file", filename);
-
-  if (fullname)
-    uiout->field_string ("fullname", fullname);
-
-  uiout->end (ui_out_type_tuple);
-}
+/* Implement -file-list-exec-source-files command.  */
 
 void
 mi_cmd_file_list_exec_source_files (const char *command, char **argv, int argc)
 {
-  struct ui_out *uiout = current_uiout;
-
-  if (!mi_valid_noargs ("-file-list-exec-source-files", argc, argv))
-    error (_("-file-list-exec-source-files: Usage: No args"));
-
-  /* Print the table header.  */
-  uiout->begin (ui_out_type_list, "files");
-
-  /* Look at all of the file symtabs.  */
-  for (objfile *objfile : current_program_space->objfiles ())
+  enum opt
+    {
+      MATCH_BASENAME_OPT,
+      MATCH_DIRNAME_OPT
+    };
+  static const struct mi_opt opts[] =
+  {
+    {"-basename", MATCH_BASENAME_OPT, 0},
+    {"-dirname", MATCH_DIRNAME_OPT, 0},
+    { 0, 0, 0 }
+  };
+
+  /* Parse arguments.  */
+  int oind = 0;
+  char *oarg;
+
+  bool match_on_basename = false;
+  bool match_on_dirname = false;
+
+  while (1)
     {
-      for (compunit_symtab *cu : objfile->compunits ())
+      int opt = mi_getopt ("-file-list-exec-source-files", argc, argv,
+                          opts, &oind, &oarg);
+      if (opt < 0)
+       break;
+      switch ((enum opt) opt)
        {
-         for (symtab *s : compunit_filetabs (cu))
-           {
-             uiout->begin (ui_out_type_tuple, NULL);
-
-             uiout->field_string ("file", symtab_to_filename_for_display (s));
-             uiout->field_string ("fullname", symtab_to_fullname (s));
-
-             uiout->end (ui_out_type_tuple);
-           }
+       case MATCH_BASENAME_OPT:
+         match_on_basename = true;
+         break;
+       case MATCH_DIRNAME_OPT:
+         match_on_dirname = true;
+         break;
        }
     }
 
-  map_symbol_filenames (print_partial_file_name, true /*need_fullname*/);
+  if ((argc - oind > 1) || (match_on_basename && match_on_dirname))
+    error (_("-file-list-exec-source-files: Usage: [--basename | --dirname] [--] REGEXP"));
+
+  const char *regexp = nullptr;
+  if (argc - oind == 1)
+    regexp = argv[oind];
+
+  info_sources_filter::match_on match_type;
+  if (match_on_dirname)
+    match_type = info_sources_filter::match_on::DIRNAME;
+  else if (match_on_basename)
+    match_type = info_sources_filter::match_on::BASENAME;
+  else
+    match_type = info_sources_filter::match_on::FULLNAME;
 
-  uiout->end (ui_out_type_list);
+  info_sources_filter filter (match_type, regexp);
+  info_sources_worker (current_uiout, filter);
 }
 
 /* See mi-cmds.h.  */