Merge GDB 7.5.1

gdb/osdata.c

 /* Routines for handling XML generic OS data provided by target.
 
    Copyright (C) 2008-2012 Free Software Foundation, Inc.
 
    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 3 of the License, or
    (at your option) any later version.
@@ skipping 270 matching lines @@
   for (ix_cols = 0;
        VEC_iterate (osdata_column_s, item->columns,
                     ix_cols, col);
        ix_cols++)
     if (strcmp (col->name, name) == 0)
       return col->value;
 
   return NULL;
 }
 
-static void
+void
 info_osdata_command (char *type, int from_tty)
 {
   struct ui_out *uiout = current_uiout;
   struct osdata *osdata = NULL;
   struct osdata_item *last = NULL;
   struct cleanup *old_chain;
   int ncols = 0;
   int nrows;
+  int col_to_skip = -1;
 
   osdata = get_osdata (type);
   old_chain = make_cleanup_osdata_free (osdata);
 
   nrows = VEC_length (osdata_item_s, osdata->items);
 
   if (!type && nrows == 0)
     error (_("Available types of OS data not reported."));
   
   if (!VEC_empty (osdata_item_s, osdata->items))
     {
       last = VEC_last (osdata_item_s, osdata->items);
       if (last->columns)
         ncols = VEC_length (osdata_column_s, last->columns);
+
+      /* As a special case, scan the listing of available data types
+         for a column named "Title", and only include it with MI
+         output; this column's normal use is for titles for interface
+         elements like menus, and it clutters up CLI output.  */
+      if (!type && !ui_out_is_mi_like_p (uiout))
+        {
+          struct osdata_column *col;
+          int ix;
+
+          for (ix = 0;
+               VEC_iterate (osdata_column_s, last->columns, ix, col);
+               ix++)
+            {
+              if (strcmp (col->name, "Title") == 0)
+                col_to_skip = ix;
+            }
+          /* Be sure to reduce the total column count, otherwise
+             internal errors ensue.  */
+          if (col_to_skip >= 0)
+            --ncols;
+        }
     }
 
   make_cleanup_ui_out_table_begin_end (uiout, ncols, nrows,
                                        "OSDataTable");
 
   /* With no columns/items, we just output an empty table, but we
      still output the table.  This matters for MI.  */
   if (ncols == 0)
     {
       do_cleanups (old_chain);
       return;
     }
 
   if (last && last->columns)
     {
       struct osdata_column *col;
       int ix;
 
       for (ix = 0;
           VEC_iterate (osdata_column_s, last->columns,
                        ix, col);
           ix++)
         {
           char col_name[32];
-          
+
+          if (ix == col_to_skip)
+            continue;
+
           snprintf (col_name, 32, "col%d", ix);
           ui_out_table_header (uiout, 10, ui_left,
                                col_name, col->name);
         }
     }
 
   ui_out_table_body (uiout);
 
   if (nrows != 0)
     {
       struct osdata_item *item;
       int ix_items;
 
       for (ix_items = 0;
           VEC_iterate (osdata_item_s, osdata->items,
                        ix_items, item);
           ix_items++)
        {
          struct cleanup *old_chain;
-         struct ui_stream *stb;
          int ix_cols;
          struct osdata_column *col;
 
-         stb = ui_out_stream_new (uiout);
-         old_chain = make_cleanup_ui_out_stream_delete (stb);
-         make_cleanup_ui_out_tuple_begin_end (uiout, "item");
+         old_chain = make_cleanup_ui_out_tuple_begin_end (uiout, "item");
 
          for (ix_cols = 0;
               VEC_iterate (osdata_column_s, item->columns,
                            ix_cols, col);
               ix_cols++)
            {
              char col_name[32];
-             
+
+             if (ix_cols == col_to_skip)
+               continue;
+
              snprintf (col_name, 32, "col%d", ix_cols);
              ui_out_field_string (uiout, col_name, col->value);
            }
          
          do_cleanups (old_chain);
 
          ui_out_text (uiout, "\n");
        }
     }
 
   do_cleanups (old_chain);
 }
 
 extern initialize_file_ftype _initialize_osdata; /* -Wmissing-prototypes */
 
 void
 _initialize_osdata (void)
 {
   add_info ("os", info_osdata_command,
            _("Show OS data ARG."));
 }