X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fosdata.c;h=fd00b4e8ea84d06912b51a793870a181ec1d6af7;hb=9fb5010805bdfe0eb8fc5db01e7f4c93b04c8f29;hp=c3da23a7104ac472ad15b655873dc0f4497a3278;hpb=79a45e254f090b628473614054ed318d70409239;p=deliverable%2Fbinutils-gdb.git

diff --git a/gdb/osdata.c b/gdb/osdata.c
index c3da23a710..fd00b4e8ea 100644
--- a/gdb/osdata.c
+++ b/gdb/osdata.c
@@ -1,6 +1,6 @@
 /* Routines for handling XML generic OS data provided by target.
 
-   Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+   Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -22,7 +22,7 @@
 #include "vec.h"
 #include "xml-support.h"
 #include "osdata.h"
-#include "gdb_string.h"
+#include <string.h>
 #include "ui-out.h"
 #include "gdbcmd.h"
 
@@ -45,8 +45,6 @@ osdata_parse (const char *xml)
 
 #else /* HAVE_LIBEXPAT */
 
-#include "xml-support.h"
-
 /* Internal parsing data passed to all XML callbacks.  */
 struct osdata_parsing_data
   {
@@ -69,7 +67,7 @@ osdata_start_osdata (struct gdb_xml_parser *parser,
     gdb_xml_error (parser, _("Seen more than on osdata element"));
 
   type = xml_find_attribute (attributes, "type")->value;
-  osdata = XZALLOC (struct osdata);
+  osdata = XCNEW (struct osdata);
   osdata->type = xstrdup (type);
   data->osdata = osdata;
 }
@@ -288,33 +286,65 @@ get_osdata_column (struct osdata_item *item, const char *name)
   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;
+  struct osdata_item *last = NULL;
   struct cleanup *old_chain;
-  int ncols;
-  int nprocs;
+  int ncols = 0;
+  int nrows;
+  int col_to_skip = -1;
 
   osdata = get_osdata (type);
   old_chain = make_cleanup_osdata_free (osdata);
 
-  nprocs = VEC_length (osdata_item_s, osdata->items);
+  nrows = VEC_length (osdata_item_s, osdata->items);
 
-  if (!type && nprocs == 0)
+  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;
+	}
+    }
 
-  last = VEC_last (osdata_item_s, osdata->items);
-  if (last && last->columns)
-    ncols = VEC_length (osdata_column_s, last->columns);
-  else
-    ncols = 0;
-
-  make_cleanup_ui_out_table_begin_end (uiout, ncols, nprocs,
+  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;
@@ -324,13 +354,21 @@ info_osdata_command (char *type, int from_tty)
           VEC_iterate (osdata_column_s, last->columns,
                        ix, col);
           ix++)
-       ui_out_table_header (uiout, 10, ui_left,
-                            col->name, col->name);
+	{
+	  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 (nprocs != 0)
+  if (nrows != 0)
     {
       struct osdata_item *item;
       int ix_items;
@@ -341,20 +379,25 @@ info_osdata_command (char *type, int from_tty)
           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++)
-           ui_out_field_string (uiout, col->name, col->value);
+	   {
+	     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");