X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fcli-out.c;h=9f48a0aa3916161ad1132366428fad7fbc2b06ad;hb=7bfdd688ac9a8864f8be2a79e7297a501a349f85;hp=127f77d4b8cbcac2f1263879b2283f815d032ad1;hpb=fba45db2faf619e71856ee38ec63949c0ef6903e;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/cli-out.c b/gdb/cli-out.c index 127f77d4b8..9f48a0aa39 100644 --- a/gdb/cli-out.c +++ b/gdb/cli-out.c @@ -1,5 +1,7 @@ /* Output generating routines for GDB CLI. - Copyright 1999-2000 Free Software Foundation, Inc. + + Copyright 1999, 2000, 2002, 2003 Free Software Foundation, Inc. + Contributed by Cygnus Solutions. Written by Fernando Nasser for Cygnus. @@ -24,43 +26,46 @@ #include "ui-out.h" #include "cli-out.h" #include "gdb_string.h" - -/* Convenience macro for allocting typesafe memory. */ - -#ifndef XMALLOC -#define XMALLOC(TYPE) (TYPE*) xmalloc (sizeof (TYPE)) -#endif +#include "gdb_assert.h" struct ui_out_data { struct ui_file *stream; + struct ui_file *original_stream; + int suppress_output; }; +typedef struct ui_out_data cli_out_data; /* These are the CLI output functions */ -static void cli_table_begin (struct ui_out *uiout, int nbrofcols, char *tblid); +static void cli_table_begin (struct ui_out *uiout, int nbrofcols, + int nr_rows, const char *tblid); static void cli_table_body (struct ui_out *uiout); static void cli_table_end (struct ui_out *uiout); static void cli_table_header (struct ui_out *uiout, int width, - enum ui_align alig, char *colhdr); -static void cli_list_begin (struct ui_out *uiout, int list_flag, char *lstid); -static void cli_list_end (struct ui_out *uiout, int list_flag); + enum ui_align alig, const char *col_name, + const char *colhdr); +static void cli_begin (struct ui_out *uiout, enum ui_out_type type, + int level, const char *lstid); +static void cli_end (struct ui_out *uiout, enum ui_out_type type, int level); static void cli_field_int (struct ui_out *uiout, int fldno, int width, - enum ui_align alig, char *fldname, int value); + enum ui_align alig, const char *fldname, int value); static void cli_field_skip (struct ui_out *uiout, int fldno, int width, - enum ui_align alig, char *fldname); + enum ui_align alig, const char *fldname); static void cli_field_string (struct ui_out *uiout, int fldno, int width, - enum ui_align alig, char *fldname, + enum ui_align alig, const char *fldname, const char *string); static void cli_field_fmt (struct ui_out *uiout, int fldno, int width, enum ui_align align, - char *fldname, char *format, va_list args); + const char *fldname, const char *format, + va_list args); static void cli_spaces (struct ui_out *uiout, int numspaces); -static void cli_text (struct ui_out *uiout, char *string); -static void cli_message (struct ui_out *uiout, int verbosity, char *format, - va_list args); +static void cli_text (struct ui_out *uiout, const char *string); +static void cli_message (struct ui_out *uiout, int verbosity, + const char *format, va_list args); static void cli_wrap_hint (struct ui_out *uiout, char *identstring); static void cli_flush (struct ui_out *uiout); +static int cli_redirect (struct ui_out *uiout, struct ui_file *outstream); /* This is the CLI ui-out implementation functions vector */ @@ -73,8 +78,8 @@ static struct ui_out_impl cli_ui_out_impl = cli_table_body, cli_table_end, cli_table_header, - cli_list_begin, - cli_list_end, + cli_begin, + cli_end, cli_field_int, cli_field_skip, cli_field_string, @@ -83,7 +88,9 @@ static struct ui_out_impl cli_ui_out_impl = cli_text, cli_message, cli_wrap_hint, - cli_flush + cli_flush, + cli_redirect, + 0, /* Does not need MI hacks (i.e. needs CLI hacks). */ }; /* Prototypes for local functions */ @@ -92,8 +99,9 @@ extern void _initialize_cli_out (void); static void field_separator (void); -static void out_field_fmt (struct ui_out *uiout, int fldno, char *fldname, - char *format,...); +static void out_field_fmt (struct ui_out *uiout, int fldno, + const char *fldname, + const char *format,...); /* local variables */ @@ -102,8 +110,17 @@ static void out_field_fmt (struct ui_out *uiout, int fldno, char *fldname, /* Mark beginning of a table */ void -cli_table_begin (struct ui_out *uiout, int nbrofcols, char *tblid) +cli_table_begin (struct ui_out *uiout, int nbrofcols, + int nr_rows, + const char *tblid) { + cli_out_data *data = ui_out_data (uiout); + if (nr_rows == 0) + data->suppress_output = 1; + else + /* Only the table suppresses the output and, fortunately, a table + is not a recursive data structure. */ + gdb_assert (data->suppress_output == 0); } /* Mark beginning of a table body */ @@ -111,6 +128,9 @@ cli_table_begin (struct ui_out *uiout, int nbrofcols, char *tblid) void cli_table_body (struct ui_out *uiout) { + cli_out_data *data = ui_out_data (uiout); + if (data->suppress_output) + return; /* first, close the table header line */ cli_text (uiout, "\n"); } @@ -120,39 +140,60 @@ cli_table_body (struct ui_out *uiout) void cli_table_end (struct ui_out *uiout) { + cli_out_data *data = ui_out_data (uiout); + data->suppress_output = 0; } /* Specify table header */ void cli_table_header (struct ui_out *uiout, int width, enum ui_align alignment, - char *colhdr) + const char *col_name, + const char *colhdr) { + cli_out_data *data = ui_out_data (uiout); + if (data->suppress_output) + return; cli_field_string (uiout, 0, width, alignment, 0, colhdr); } /* Mark beginning of a list */ void -cli_list_begin (struct ui_out *uiout, int list_flag, char *lstid) +cli_begin (struct ui_out *uiout, + enum ui_out_type type, + int level, + const char *id) { + cli_out_data *data = ui_out_data (uiout); + if (data->suppress_output) + return; } /* Mark end of a list */ void -cli_list_end (struct ui_out *uiout, int list_flag) +cli_end (struct ui_out *uiout, + enum ui_out_type type, + int level) { + cli_out_data *data = ui_out_data (uiout); + if (data->suppress_output) + return; } /* output an int field */ void cli_field_int (struct ui_out *uiout, int fldno, int width, - enum ui_align alignment, char *fldname, int value) + enum ui_align alignment, + const char *fldname, int value) { char buffer[20]; /* FIXME: how many chars long a %d can become? */ + cli_out_data *data = ui_out_data (uiout); + if (data->suppress_output) + return; sprintf (buffer, "%d", value); cli_field_string (uiout, fldno, width, alignment, fldname, buffer); } @@ -161,8 +202,12 @@ cli_field_int (struct ui_out *uiout, int fldno, int width, void cli_field_skip (struct ui_out *uiout, int fldno, int width, - enum ui_align alignment, char *fldname) + enum ui_align alignment, + const char *fldname) { + cli_out_data *data = ui_out_data (uiout); + if (data->suppress_output) + return; cli_field_string (uiout, fldno, width, alignment, fldname, ""); } @@ -174,12 +219,16 @@ cli_field_string (struct ui_out *uiout, int fldno, int width, enum ui_align align, - char *fldname, + const char *fldname, const char *string) { int before = 0; int after = 0; + cli_out_data *data = ui_out_data (uiout); + if (data->suppress_output) + return; + if ((align != ui_noalign) && string) { before = width - strlen (string); @@ -219,9 +268,14 @@ cli_field_string (struct ui_out *uiout, void cli_field_fmt (struct ui_out *uiout, int fldno, int width, enum ui_align align, - char *fldname, char *format, va_list args) + const char *fldname, + const char *format, + va_list args) { - struct ui_out_data *data = ui_out_data (uiout); + cli_out_data *data = ui_out_data (uiout); + if (data->suppress_output) + return; + vfprintf_filtered (data->stream, format, args); if (align != ui_noalign) @@ -231,21 +285,28 @@ cli_field_fmt (struct ui_out *uiout, int fldno, void cli_spaces (struct ui_out *uiout, int numspaces) { - struct ui_out_data *data = ui_out_data (uiout); + cli_out_data *data = ui_out_data (uiout); + if (data->suppress_output) + return; print_spaces_filtered (numspaces, data->stream); } void -cli_text (struct ui_out *uiout, char *string) +cli_text (struct ui_out *uiout, const char *string) { - struct ui_out_data *data = ui_out_data (uiout); + cli_out_data *data = ui_out_data (uiout); + if (data->suppress_output) + return; fputs_filtered (string, data->stream); } void -cli_message (struct ui_out *uiout, int verbosity, char *format, va_list args) +cli_message (struct ui_out *uiout, int verbosity, + const char *format, va_list args) { - struct ui_out_data *data = ui_out_data (uiout); + cli_out_data *data = ui_out_data (uiout); + if (data->suppress_output) + return; if (ui_out_get_verblvl (uiout) >= verbosity) vfprintf_unfiltered (data->stream, format, args); } @@ -253,16 +314,37 @@ cli_message (struct ui_out *uiout, int verbosity, char *format, va_list args) void cli_wrap_hint (struct ui_out *uiout, char *identstring) { + cli_out_data *data = ui_out_data (uiout); + if (data->suppress_output) + return; wrap_here (identstring); } void cli_flush (struct ui_out *uiout) { - struct ui_out_data *data = ui_out_data (uiout); + cli_out_data *data = ui_out_data (uiout); gdb_flush (data->stream); } +int +cli_redirect (struct ui_out *uiout, struct ui_file *outstream) +{ + struct ui_out_data *data = ui_out_data (uiout); + if (outstream != NULL) + { + data->original_stream = data->stream; + data->stream = outstream; + } + else if (data->original_stream != NULL) + { + data->stream = data->original_stream; + data->original_stream = NULL; + } + + return 0; +} + /* local functions */ /* Like cli_field_fmt, but takes a variable number of args @@ -270,10 +352,11 @@ cli_flush (struct ui_out *uiout) /* VARARGS */ static void -out_field_fmt (struct ui_out *uiout, int fldno, char *fldname, - char *format,...) +out_field_fmt (struct ui_out *uiout, int fldno, + const char *fldname, + const char *format,...) { - struct ui_out_data *data = ui_out_data (uiout); + cli_out_data *data = ui_out_data (uiout); va_list args; va_start (args, format); @@ -287,7 +370,7 @@ out_field_fmt (struct ui_out *uiout, int fldno, char *fldname, static void field_separator (void) { - struct ui_out_data *data = ui_out_data (uiout); + cli_out_data *data = ui_out_data (uiout); fputc_filtered (' ', data->stream); } @@ -298,11 +381,22 @@ cli_out_new (struct ui_file *stream) { int flags = ui_source_list; - struct ui_out_data *data = XMALLOC (struct ui_out_data); + cli_out_data *data = XMALLOC (cli_out_data); data->stream = stream; + data->original_stream = NULL; + data->suppress_output = 0; return ui_out_new (&cli_ui_out_impl, data, flags); } +struct ui_file * +cli_out_set_stream (struct ui_out *uiout, struct ui_file *stream) +{ + cli_out_data *data = ui_out_data (uiout); + struct ui_file *old = data->stream; + data->stream = stream; + return old; +} + /* standard gdb initialization hook */ void _initialize_cli_out (void)