X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Futils.c;h=97b6a9bb4b9fc6928a0c5c2becf6608225e9ea2b;hb=1130734da52cb2f2e2d2c0db9a5fcd8795552deb;hp=14ff2fc89b187e1d164c88f6e8e284eff88a27ca;hpb=fcdb113e5707f165e91cd75cb3dffa78c4f043ca;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/utils.c b/gdb/utils.c index 14ff2fc89b..97b6a9bb4b 100644 --- a/gdb/utils.c +++ b/gdb/utils.c @@ -1,5 +1,5 @@ /* General utility routines for GDB, the GNU debugger. - Copyright 1986, 1989, 1990, 1991, 1992 Free Software Foundation, Inc. + Copyright 1986, 1989, 1990, 1991, 1992, 1995 Free Software Foundation, Inc. This file is part of GDB. @@ -15,34 +15,52 @@ 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., 675 Mass Ave, Cambridge, MA 02139, USA. */ +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "defs.h" - +#if !defined(__GO32__) && !defined(__WIN32__) #include #include #include +#endif +#ifdef ANSI_PROTOTYPES +#include +#else #include +#endif #include -#include +#include "gdb_string.h" +#ifdef HAVE_UNISTD_H +#include +#endif #include "signals.h" #include "gdbcmd.h" -#include "terminal.h" +#include "serial.h" #include "bfd.h" #include "target.h" +#include "demangle.h" +#include "expression.h" +#include "language.h" +#include "annotate.h" + +#include "readline.h" + +/* readline defines this. */ +#undef savestring /* Prototypes for local functions */ -#if !defined (NO_MALLOC_CHECK) +#if defined (NO_MMALLOC) || defined (NO_MMALLOC_CHECK) +#else static void malloc_botch PARAMS ((void)); -#endif /* NO_MALLOC_CHECK */ +#endif /* NO_MMALLOC, etc */ static void -fatal_dump_core (); /* Can't prototype with usage... */ +fatal_dump_core PARAMS((char *, ...)); static void prompt_for_continue PARAMS ((void)); @@ -50,9 +68,6 @@ prompt_for_continue PARAMS ((void)); static void set_width_command PARAMS ((char *, int, struct cmd_list_element *)); -static void -vfprintf_filtered PARAMS ((FILE *, char *, va_list)); - /* If this definition isn't overridden by the header files, assume that isatty and fileno exist on this system. */ #ifndef ISATTY @@ -64,12 +79,24 @@ vfprintf_filtered PARAMS ((FILE *, char *, va_list)); static struct cleanup *cleanup_chain; +/* Nonzero if we have job control. */ + +int job_control; + /* Nonzero means a quit has been requested. */ int quit_flag; -/* Nonzero means quit immediately if Control-C is typed now, - rather than waiting until QUIT is executed. */ +/* Nonzero means quit immediately if Control-C is typed now, rather + than waiting until QUIT is executed. Be careful in setting this; + code which executes with immediate_quit set has to be very careful + about being able to deal with being interrupted at any time. It is + almost always better to use QUIT; the only exception I can think of + is being able to quit out of a system call (using EINTR loses if + the SIGINT happens between the previous QUIT and the system call). + To immediately quit in the case in which a SIGINT happens between + the previous QUIT and setting immediate_quit (desirable anytime we + expect to block), call QUIT after setting immediate_quit. */ int immediate_quit; @@ -93,6 +120,13 @@ int sevenbit_strings = 0; /* String to be printed before error messages, if any. */ char *error_pre_print; + +/* String to be printed before quit messages, if any. */ + +char *quit_pre_print; + +/* String to be printed before warning messages, if any. */ + char *warning_pre_print = "\nwarning: "; /* Add a new cleanup to the cleanup_chain, @@ -196,69 +230,116 @@ null_cleanup (arg) } -/* Provide a hook for modules wishing to print their own warning messages - to set up the terminal state in a compatible way, without them having - to import all the target_<...> macros. */ +/* Print a warning message. Way to use this is to call warning_begin, + output the warning message (use unfiltered output to gdb_stderr), + ending in a newline. There is not currently a warning_end that you + call afterwards, but such a thing might be added if it is useful + for a GUI to separate warning messages from other output. + + FIXME: Why do warnings use unfiltered output and errors filtered? + Is this anything other than a historical accident? */ void -warning_setup () +warning_begin () { target_terminal_ours (); wrap_here(""); /* Force out any buffered output */ - fflush (stdout); + gdb_flush (gdb_stdout); + if (warning_pre_print) + fprintf_unfiltered (gdb_stderr, warning_pre_print); } /* Print a warning message. The first argument STRING is the warning message, used as a fprintf string, and the remaining args are passed as arguments to it. The primary difference between warnings and errors is that a warning - does not force the return to command level. */ + does not force the return to command level. */ /* VARARGS */ void +#ifdef ANSI_PROTOTYPES +warning (char *string, ...) +#else warning (va_alist) va_dcl +#endif { va_list args; +#ifdef ANSI_PROTOTYPES + va_start (args, string); +#else char *string; va_start (args); - target_terminal_ours (); - wrap_here(""); /* Force out any buffered output */ - fflush (stdout); - if (warning_pre_print) - fprintf (stderr, warning_pre_print); string = va_arg (args, char *); - vfprintf (stderr, string, args); - fprintf (stderr, "\n"); +#endif + warning_begin (); + vfprintf_unfiltered (gdb_stderr, string, args); + fprintf_unfiltered (gdb_stderr, "\n"); va_end (args); } +/* Start the printing of an error message. Way to use this is to call + this, output the error message (use filtered output to gdb_stderr + (FIXME: Some callers, like memory_error, use gdb_stdout)), ending + in a newline, and then call return_to_top_level (RETURN_ERROR). + error() provides a convenient way to do this for the special case + that the error message can be formatted with a single printf call, + but this is more general. */ +void +error_begin () +{ + target_terminal_ours (); + wrap_here (""); /* Force out any buffered output */ + gdb_flush (gdb_stdout); + + annotate_error_begin (); + + if (error_pre_print) + fprintf_filtered (gdb_stderr, error_pre_print); +} + /* Print an error message and return to command level. The first argument STRING is the error message, used as a fprintf string, and the remaining args are passed as arguments to it. */ -/* VARARGS */ +#ifdef ANSI_PROTOTYPES NORETURN void +error (char *string, ...) +#else +void error (va_alist) va_dcl +#endif { va_list args; - char *string; - +#ifdef ANSI_PROTOTYPES + va_start (args, string); +#else va_start (args); - target_terminal_ours (); - wrap_here(""); /* Force out any buffered output */ - fflush (stdout); - if (error_pre_print) - fprintf (stderr, error_pre_print); - string = va_arg (args, char *); - vfprintf (stderr, string, args); - fprintf (stderr, "\n"); - va_end (args); - return_to_top_level (); +#endif + if (error_hook) + (*error_hook) (); + else + { + error_begin (); +#ifdef ANSI_PROTOTYPES + vfprintf_filtered (gdb_stderr, string, args); +#else + { + char *string1; + + string1 = va_arg (args, char *); + vfprintf_filtered (gdb_stderr, string1, args); + } +#endif + fprintf_filtered (gdb_stderr, "\n"); + va_end (args); + return_to_top_level (RETURN_ERROR); + } } + /* Print an error message and exit reporting failure. This is for a error that we cannot continue from. The arguments are printed a la printf. @@ -268,17 +349,24 @@ error (va_alist) /* VARARGS */ NORETURN void +#ifdef ANSI_PROTOTYPES +fatal (char *string, ...) +#else fatal (va_alist) va_dcl +#endif { va_list args; +#ifdef ANSI_PROTOTYPES + va_start (args, string); +#else char *string; - va_start (args); string = va_arg (args, char *); - fprintf (stderr, "\ngdb: "); - vfprintf (stderr, string, args); - fprintf (stderr, "\n"); +#endif + fprintf_unfiltered (gdb_stderr, "\ngdb: "); + vfprintf_unfiltered (gdb_stderr, string, args); + fprintf_unfiltered (gdb_stderr, "\n"); va_end (args); exit (1); } @@ -288,19 +376,27 @@ fatal (va_alist) /* VARARGS */ static void +#ifdef ANSI_PROTOTYPES +fatal_dump_core (char *string, ...) +#else fatal_dump_core (va_alist) va_dcl +#endif { va_list args; +#ifdef ANSI_PROTOTYPES + va_start (args, string); +#else char *string; va_start (args); string = va_arg (args, char *); +#endif /* "internal error" is always correct, since GDB should never dump core, no matter what the input. */ - fprintf (stderr, "\ngdb internal error: "); - vfprintf (stderr, string, args); - fprintf (stderr, "\n"); + fprintf_unfiltered (gdb_stderr, "\ngdb internal error: "); + vfprintf_unfiltered (gdb_stderr, string, args); + fprintf_unfiltered (gdb_stderr, "\n"); va_end (args); signal (SIGQUIT, SIG_DFL); @@ -368,7 +464,7 @@ perror_with_name (string) /* I understand setting these is a matter of taste. Still, some people may clear errno but not know about bfd_error. Doing this here is not unreasonable. */ - bfd_error = no_error; + bfd_set_error (bfd_error_no_error); errno = 0; error ("%s.", combined); @@ -391,7 +487,10 @@ print_sys_errmsg (string, errcode) strcat (combined, ": "); strcat (combined, err); - printf ("%s.\n", combined); + /* We want anything which was printed on stdout to come out first, before + this message. */ + gdb_flush (gdb_stdout); + fprintf_unfiltered (gdb_stderr, "%s.\n", combined); } /* Control C eventually causes this to be called, at a convenient time. */ @@ -399,20 +498,98 @@ print_sys_errmsg (string, errcode) void quit () { + serial_t gdb_stdout_serial = serial_fdopen (1); + target_terminal_ours (); - wrap_here ((char *)0); /* Force out any pending output */ -#ifdef HAVE_TERMIO - ioctl (fileno (stdout), TCFLSH, 1); -#else /* not HAVE_TERMIO */ - ioctl (fileno (stdout), TIOCFLUSH, 0); -#endif /* not HAVE_TERMIO */ -#ifdef TIOCGPGRP - error ("Quit"); -#else - error ("Quit (expect signal %d when inferior is resumed)", SIGINT); -#endif /* TIOCGPGRP */ + + /* We want all output to appear now, before we print "Quit". We + have 3 levels of buffering we have to flush (it's possible that + some of these should be changed to flush the lower-level ones + too): */ + + /* 1. The _filtered buffer. */ + wrap_here ((char *)0); + + /* 2. The stdio buffer. */ + gdb_flush (gdb_stdout); + gdb_flush (gdb_stderr); + + /* 3. The system-level buffer. */ + SERIAL_FLUSH_OUTPUT (gdb_stdout_serial); + SERIAL_UN_FDOPEN (gdb_stdout_serial); + + annotate_error_begin (); + + /* Don't use *_filtered; we don't want to prompt the user to continue. */ + if (quit_pre_print) + fprintf_unfiltered (gdb_stderr, quit_pre_print); + + if (job_control + /* If there is no terminal switching for this target, then we can't + possibly get screwed by the lack of job control. */ + || current_target.to_terminal_ours == NULL) + fprintf_unfiltered (gdb_stderr, "Quit\n"); + else + fprintf_unfiltered (gdb_stderr, + "Quit (expect signal SIGINT when the program is resumed)\n"); + return_to_top_level (RETURN_QUIT); } + +#if defined(__GO32__)||defined(WINGDB) + +/* In the absence of signals, poll keyboard for a quit. + Called from #define QUIT pollquit() in xm-go32.h. */ + +void +pollquit() +{ + if (kbhit ()) + { + int k = getkey (); + if (k == 1) { + quit_flag = 1; + quit(); + } + else if (k == 2) { + immediate_quit = 1; + quit (); + } + else + { + /* We just ignore it */ + fprintf_unfiltered (gdb_stderr, "CTRL-A to quit, CTRL-B to quit harder\n"); + } + } +} + + +#endif +#if defined(__GO32__)||defined(WINGDB) +void notice_quit() +{ + if (kbhit ()) + { + int k = getkey (); + if (k == 1) { + quit_flag = 1; + } + else if (k == 2) + { + immediate_quit = 1; + } + else + { + fprintf_unfiltered (gdb_stderr, "CTRL-A to quit, CTRL-B to quit harder\n"); + } + } +} +#else +void notice_quit() +{ + /* Done by signals */ +} +#endif /* Control C comes here */ void @@ -420,14 +597,23 @@ request_quit (signo) int signo; { quit_flag = 1; - -#ifdef USG - /* Restore the signal handler. */ + /* Restore the signal handler. Harmless with BSD-style signals, needed + for System V-style signals. So just always do it, rather than worrying + about USG defines and stuff like that. */ signal (signo, request_quit); -#endif - if (immediate_quit) +/* start-sanitize-gm */ +#ifdef GENERAL_MAGIC_HACKS + target_kill (); +#endif /* GENERAL_MAGIC_HACKS */ +/* end-sanitize-gm */ + +#ifdef REQUEST_QUIT + REQUEST_QUIT; +#else + if (immediate_quit) quit (); +#endif } @@ -435,19 +621,31 @@ request_quit (signo) #if defined (NO_MMALLOC) +/* Make a substitute size_t for non-ANSI compilers. */ + +#ifdef _AIX +#include +#else /* Not AIX */ +#ifndef __STDC__ +#ifndef size_t +#define size_t unsigned int +#endif +#endif +#endif /* Not AIX */ + PTR mmalloc (md, size) PTR md; - long size; + size_t size; { - return (malloc (size)); + return malloc (size); } PTR mrealloc (md, ptr, size) PTR md; PTR ptr; - long size; + size_t size; { if (ptr == 0) /* Guard against old realloc's */ return malloc (size); @@ -504,7 +702,7 @@ init_malloc (md) warning ("internal error: failed to install memory consistency checks"); } - (void) mmtrace (); + mmtrace (); } #endif /* Have mmalloc and want corruption checking */ @@ -581,7 +779,7 @@ PTR xmalloc (size) long size; { - return (xmmalloc ((void *) NULL, size)); + return (xmmalloc ((PTR) NULL, size)); } /* Like mrealloc but get error if no storage available. */ @@ -591,7 +789,7 @@ xrealloc (ptr, size) PTR ptr; long size; { - return (xmrealloc ((void *) NULL, ptr, size)); + return (xmrealloc ((PTR) NULL, ptr, size)); } @@ -630,19 +828,19 @@ savestring (ptr, size) int size; { register char *p = (char *) xmalloc (size + 1); - bcopy (ptr, p, size); + memcpy (p, ptr, size); p[size] = 0; return p; } char * msavestring (md, ptr, size) - void *md; + PTR md; const char *ptr; int size; { register char *p = (char *) xmmalloc (md, size + 1); - bcopy (ptr, p, size); + memcpy (p, ptr, size); p[size] = 0; return p; } @@ -659,7 +857,7 @@ strsave (ptr) char * mstrsave (md, ptr) - void *md; + PTR md; const char *ptr; { return (msavestring (md, ptr, strlen (ptr))); @@ -674,6 +872,21 @@ print_spaces (n, file) fputc (' ', file); } +/* Print a host address. */ + +void +gdb_print_address (addr, stream) + PTR addr; + GDB_FILE *stream; +{ + + /* We could use the %p conversion specifier to fprintf if we had any + way of knowing whether this host supports it. But the following + should work on the Alpha and on 32 bit machines. */ + + fprintf_filtered (stream, "0x%lx", (unsigned long)addr); +} + /* Ask user a y-or-n question and return 1 iff answer is yes. Takes three args which are given to printf to print the question. The first, a control string, should end in "? ". @@ -681,30 +894,69 @@ print_spaces (n, file) /* VARARGS */ int +#ifdef ANSI_PROTOTYPES +query (char *ctlstr, ...) +#else query (va_alist) va_dcl +#endif { va_list args; - char *ctlstr; register int answer; register int ans2; + int retval; + +#ifdef ANSI_PROTOTYPES + va_start (args, ctlstr); +#else + char *ctlstr; + va_start (args); + ctlstr = va_arg (args, char *); +#endif + + if (query_hook) + { + return query_hook (ctlstr, args); + } /* Automatically answer "yes" if input is not from a terminal. */ if (!input_from_terminal_p ()) return 1; +#ifdef MPW + /* FIXME Automatically answer "yes" if called from MacGDB. */ + if (mac_app) + return 1; +#endif /* MPW */ while (1) { - va_start (args); - ctlstr = va_arg (args, char *); - vfprintf (stdout, ctlstr, args); - va_end (args); - printf ("(y or n) "); - fflush (stdout); + wrap_here (""); /* Flush any buffered output */ + gdb_flush (gdb_stdout); + + if (annotation_level > 1) + printf_filtered ("\n\032\032pre-query\n"); + + vfprintf_filtered (gdb_stdout, ctlstr, args); + printf_filtered ("(y or n) "); + + if (annotation_level > 1) + printf_filtered ("\n\032\032query\n"); + +#ifdef MPW + /* If not in MacGDB, move to a new line so the entered line doesn't + have a prompt on the front of it. */ + if (!mac_app) + fputs_unfiltered ("\n", gdb_stdout); +#endif /* MPW */ + + gdb_flush (gdb_stdout); answer = fgetc (stdin); clearerr (stdin); /* in case of C-d */ if (answer == EOF) /* C-d */ - return 1; + { + retval = 1; + break; + } if (answer != '\n') /* Eat rest of input line, to EOF or newline */ do { @@ -715,11 +967,21 @@ query (va_alist) if (answer >= 'a') answer -= 040; if (answer == 'Y') - return 1; + { + retval = 1; + break; + } if (answer == 'N') - return 0; - printf ("Please answer y or n.\n"); + { + retval = 0; + break; + } + printf_filtered ("Please answer y or n.\n"); } + + if (annotation_level > 1) + printf_filtered ("\n\032\032post-query\n"); + return retval; } @@ -805,16 +1067,20 @@ parse_escape (string_ptr) } } -/* Print the character C on STREAM as part of the contents - of a literal string whose delimiter is QUOTER. */ +/* Print the character C on STREAM as part of the contents of a literal + string whose delimiter is QUOTER. Note that this routine should only + be call for printing things which are independent of the language + of the program being debugged. */ void -printchar (c, stream, quoter) +gdb_printchar (c, stream, quoter) register int c; FILE *stream; int quoter; { + c &= 0xFF; /* Avoid sign bit follies */ + if ( c < 0x20 || /* Low control chars */ (c >= 0x7F && c < 0xA0) || /* DEL, High controls */ (sevenbit_strings && c >= 0x80)) { /* high order bit set */ @@ -865,17 +1131,22 @@ static unsigned int lines_printed, chars_printed; spit it out and forget about the wrap_here(). If we see another wrap_here(), we spit it out and remember the newer one. If we see the end of the line, we spit out a newline, the indent, and then - the buffered output. + the buffered output. */ - wrap_column is the column number on the screen where wrap_buffer begins. - When wrap_column is zero, wrapping is not in effect. - wrap_buffer is malloc'd with chars_per_line+2 bytes. - When wrap_buffer[0] is null, the buffer is empty. - wrap_pointer points into it at the next character to fill. - wrap_indent is the string that should be used as indentation if the - wrap occurs. */ +/* Malloc'd buffer with chars_per_line+2 bytes. Contains characters which + are waiting to be output (they have already been counted in chars_printed). + When wrap_buffer[0] is null, the buffer is empty. */ +static char *wrap_buffer; -static char *wrap_buffer, *wrap_pointer, *wrap_indent; +/* Pointer in wrap_buffer to the next character to fill. */ +static char *wrap_pointer; + +/* String to indent by if the wrap occurs. Must not be NULL if wrap_column + is non-zero. */ +static char *wrap_indent; + +/* Column number on the screen where wrap_buffer begins, or 0 if wrapping + is not in effect. */ static int wrap_column; /* ARGSUSED */ @@ -895,17 +1166,59 @@ set_width_command (args, from_tty, c) wrap_pointer = wrap_buffer; /* Start it at the beginning */ } +/* Wait, so the user can read what's on the screen. Prompt the user + to continue by pressing RETURN. */ + static void prompt_for_continue () { char *ignore; + char cont_prompt[120]; + + if (annotation_level > 1) + printf_unfiltered ("\n\032\032pre-prompt-for-continue\n"); + + strcpy (cont_prompt, + "---Type to continue, or q to quit---"); + if (annotation_level > 1) + strcat (cont_prompt, "\n\032\032prompt-for-continue\n"); + + /* We must do this *before* we call gdb_readline, else it will eventually + call us -- thinking that we're trying to print beyond the end of the + screen. */ + reinitialize_more_filter (); immediate_quit++; - ignore = gdb_readline ("---Type to continue---"); + /* On a real operating system, the user can quit with SIGINT. + But not on GO32. + + 'q' is provided on all systems so users don't have to change habits + from system to system, and because telling them what to do in + the prompt is more user-friendly than expecting them to think of + SIGINT. */ + /* Call readline, not gdb_readline, because GO32 readline handles control-C + whereas control-C to gdb_readline will cause the user to get dumped + out to DOS. */ + ignore = readline (cont_prompt); + + if (annotation_level > 1) + printf_unfiltered ("\n\032\032post-prompt-for-continue\n"); + if (ignore) - free (ignore); - chars_printed = lines_printed = 0; + { + char *p = ignore; + while (*p == ' ' || *p == '\t') + ++p; + if (p[0] == 'q') + request_quit (SIGINT); + free (ignore); + } immediate_quit--; + + /* Now we have to do this again, so that GDB will know that it doesn't + need to save the ---Type --- line at the top of the screen. */ + reinitialize_more_filter (); + dont_repeat (); /* Forget prev cmd -- CR won't repeat it. */ } @@ -920,7 +1233,7 @@ reinitialize_more_filter () /* Indicate that if the next sequence of characters overflows the line, a newline should be inserted here rather than when it hits the end. - If INDENT is nonzero, it is a string to be printed to indent the + If INDENT is non-null, it is a string to be printed to indent the wrapped part on the next line. INDENT must remain accessible until the next call to wrap_here() or until a newline is printed through fputs_filtered(). @@ -932,17 +1245,25 @@ reinitialize_more_filter () we must not wrap words, but should still keep track of newlines that were explicitly printed. - INDENT should not contain tabs, as that - will mess up the char count on the next line. FIXME. */ + INDENT should not contain tabs, as that will mess up the char count + on the next line. FIXME. + + This routine is guaranteed to force out any output which has been + squirreled away in the wrap_buffer, so wrap_here ((char *)0) can be + used to force out output from the wrap_buffer. */ void wrap_here(indent) - char *indent; + char *indent; { + /* This should have been allocated, but be paranoid anyway. */ + if (!wrap_buffer) + abort (); + if (wrap_buffer[0]) { *wrap_pointer = '\0'; - fputs (wrap_buffer, stdout); + fputs_unfiltered (wrap_buffer, gdb_stdout); } wrap_pointer = wrap_buffer; wrap_buffer[0] = '\0'; @@ -953,41 +1274,85 @@ wrap_here(indent) else if (chars_printed >= chars_per_line) { puts_filtered ("\n"); - puts_filtered (indent); + if (indent != NULL) + puts_filtered (indent); wrap_column = 0; } else { wrap_column = chars_printed; - wrap_indent = indent; + if (indent == NULL) + wrap_indent = ""; + else + wrap_indent = indent; + } +} + +/* Ensure that whatever gets printed next, using the filtered output + commands, starts at the beginning of the line. I.E. if there is + any pending output for the current line, flush it and start a new + line. Otherwise do nothing. */ + +void +begin_line () +{ + if (chars_printed > 0) + { + puts_filtered ("\n"); } } -/* Like fputs but pause after every screenful, and can wrap at points - other than the final character of a line. - Unlike fputs, fputs_filtered does not return a value. + +GDB_FILE * +gdb_fopen (name, mode) + char * name; + char * mode; +{ + return fopen (name, mode); +} + +void +gdb_flush (stream) + FILE *stream; +{ + if (flush_hook) + { + flush_hook (stream); + return; + } + + fflush (stream); +} + +/* Like fputs but if FILTER is true, pause after every screenful. + + Regardless of FILTER can wrap at points other than the final + character of a line. + + Unlike fputs, fputs_maybe_filtered does not return a value. It is OK for LINEBUFFER to be NULL, in which case just don't print anything. - Note that a longjmp to top level may occur in this routine - (since prompt_for_continue may do so) so this routine should not be - called when cleanups are not in place. */ + Note that a longjmp to top level may occur in this routine (only if + FILTER is true) (since prompt_for_continue may do so) so this + routine should not be called when cleanups are not in place. */ -void -fputs_filtered (linebuffer, stream) +static void +fputs_maybe_filtered (linebuffer, stream, filter) const char *linebuffer; FILE *stream; + int filter; { const char *lineptr; if (linebuffer == 0) return; - + /* Don't do any filtering if it is disabled. */ - if (stream != stdout + if (stream != gdb_stdout || (lines_per_page == UINT_MAX && chars_per_line == UINT_MAX)) { - fputs (linebuffer, stream); + fputs_unfiltered (linebuffer, stream); return; } @@ -999,7 +1364,8 @@ fputs_filtered (linebuffer, stream) while (*lineptr) { /* Possible new page. */ - if (lines_printed >= lines_per_page - 1) + if (filter && + (lines_printed >= lines_per_page - 1)) prompt_for_continue (); while (*lineptr && *lineptr != '\n') @@ -1010,7 +1376,7 @@ fputs_filtered (linebuffer, stream) if (wrap_column) *wrap_pointer++ = '\t'; else - putc ('\t', stream); + fputc_unfiltered ('\t', stream); /* Shifting right by 3 produces the number of tab stops we have already passed, and then adding one and shifting left 3 advances to the next tab stop. */ @@ -1022,7 +1388,7 @@ fputs_filtered (linebuffer, stream) if (wrap_column) *wrap_pointer++ = *lineptr; else - putc (*lineptr, stream); + fputc_unfiltered (*lineptr, stream); chars_printed++; lineptr++; } @@ -1037,7 +1403,7 @@ fputs_filtered (linebuffer, stream) if chars_per_line is right, we probably just overflowed anyway; if it's wrong, let us keep going. */ if (wrap_column) - putc ('\n', stream); + fputc_unfiltered ('\n', stream); /* Possible new page. */ if (lines_printed >= lines_per_page - 1) @@ -1046,10 +1412,9 @@ fputs_filtered (linebuffer, stream) /* Now output indentation and wrapped string */ if (wrap_column) { - if (wrap_indent) - fputs (wrap_indent, stream); - *wrap_pointer = '\0'; /* Null-terminate saved stuff */ - fputs (wrap_buffer, stream); /* and eject it */ + fputs_unfiltered (wrap_indent, stream); + *wrap_pointer = '\0'; /* Null-terminate saved stuff */ + fputs_unfiltered (wrap_buffer, stream); /* and eject it */ /* FIXME, this strlen is what prevents wrap_indent from containing tabs. However, if we recurse to print it and count its chars, we risk trouble if wrap_indent is @@ -1070,181 +1435,297 @@ fputs_filtered (linebuffer, stream) chars_printed = 0; wrap_here ((char *)0); /* Spit out chars, cancel further wraps */ lines_printed++; - putc ('\n', stream); + fputc_unfiltered ('\n', stream); lineptr++; } } } - -/* fputs_demangled is a variant of fputs_filtered that - demangles g++ names.*/ - void -fputs_demangled (linebuffer, stream, arg_mode) - char *linebuffer; +fputs_filtered (linebuffer, stream) + const char *linebuffer; FILE *stream; - int arg_mode; { -#define SYMBOL_MAX 1024 - -#define SYMBOL_CHAR(c) (isascii(c) \ - && (isalnum(c) || (c) == '_' || (c) == CPLUS_MARKER)) - - char buf[SYMBOL_MAX+1]; -# define SLOP 5 /* How much room to leave in buf */ - char *p; - - if (linebuffer == NULL) - return; - - /* If user wants to see raw output, no problem. */ - if (!demangle) { - fputs_filtered (linebuffer, stream); - return; - } + fputs_maybe_filtered (linebuffer, stream, 1); +} - p = linebuffer; +int +putchar_unfiltered (c) + int c; +{ + char buf[2]; - while ( *p != (char) 0 ) { - int i = 0; + buf[0] = c; + buf[1] = 0; + fputs_unfiltered (buf, gdb_stdout); + return c; +} - /* collect non-interesting characters into buf */ - while ( *p != (char) 0 && !SYMBOL_CHAR(*p) && i < (int)sizeof(buf)-SLOP ) { - buf[i++] = *p; - p++; - } - if (i > 0) { - /* output the non-interesting characters without demangling */ - buf[i] = (char) 0; - fputs_filtered(buf, stream); - i = 0; /* reset buf */ - } +int +fputc_unfiltered (c, stream) + int c; + FILE * stream; +{ + char buf[2]; - /* and now the interesting characters */ - while (i < SYMBOL_MAX - && *p != (char) 0 - && SYMBOL_CHAR(*p) - && i < (int)sizeof(buf) - SLOP) { - buf[i++] = *p; - p++; - } - buf[i] = (char) 0; - if (i > 0) { - char * result; - - if ( (result = cplus_demangle(buf, arg_mode)) != NULL ) { - fputs_filtered(result, stream); - free(result); - } - else { - fputs_filtered(buf, stream); - } - } - } + buf[0] = c; + buf[1] = 0; + fputs_unfiltered (buf, stream); + return c; } + /* Print a variable number of ARGS using format FORMAT. If this information is going to put the amount written (since the last call - to INITIALIZE_MORE_FILTER or the last page break) over the page size, - print out a pause message and do a gdb_readline to get the users - permision to continue. + to REINITIALIZE_MORE_FILTER or the last page break) over the page size, + call prompt_for_continue to get the users permision to continue. Unlike fprintf, this function does not return a value. We implement three variants, vfprintf (takes a vararg list and stream), fprintf (takes a stream to write on), and printf (the usual). - Note that this routine has a restriction that the length of the - final output line must be less than 255 characters *or* it must be - less than twice the size of the format string. This is a very - arbitrary restriction, but it is an internal restriction, so I'll - put it in. This means that the %s format specifier is almost - useless; unless the caller can GUARANTEE that the string is short - enough, fputs_filtered should be used instead. - Note also that a longjmp to top level may occur in this routine (since prompt_for_continue may do so) so this routine should not be called when cleanups are not in place. */ static void -vfprintf_filtered (stream, format, args) +vfprintf_maybe_filtered (stream, format, args, filter) FILE *stream; char *format; va_list args; + int filter; { - static char *linebuffer = (char *) 0; - static int line_size; - int format_length; - - format_length = strlen (format); + char *linebuffer; + struct cleanup *old_cleanups; - /* Allocated linebuffer for the first time. */ - if (!linebuffer) + vasprintf (&linebuffer, format, args); + if (linebuffer == NULL) { - linebuffer = (char *) xmalloc (255); - line_size = 255; + fputs_unfiltered ("\ngdb: virtual memory exhausted.\n", gdb_stderr); + exit (1); } + old_cleanups = make_cleanup (free, linebuffer); + fputs_maybe_filtered (linebuffer, stream, filter); + do_cleanups (old_cleanups); +} - /* Reallocate buffer to a larger size if this is necessary. */ - if (format_length * 2 > line_size) - { - line_size = format_length * 2; - /* You don't have to copy. */ - free (linebuffer); - linebuffer = (char *) xmalloc (line_size); - } +void +vfprintf_filtered (stream, format, args) + FILE *stream; + const char *format; + va_list args; +{ + vfprintf_maybe_filtered (stream, format, args, 1); +} +void +vfprintf_unfiltered (stream, format, args) + FILE *stream; + const char *format; + va_list args; +{ + char *linebuffer; + struct cleanup *old_cleanups; - /* This won't blow up if the restrictions described above are - followed. */ - (void) vsprintf (linebuffer, format, args); + vasprintf (&linebuffer, format, args); + if (linebuffer == NULL) + { + fputs_unfiltered ("\ngdb: virtual memory exhausted.\n", gdb_stderr); + exit (1); + } + old_cleanups = make_cleanup (free, linebuffer); + fputs_unfiltered (linebuffer, stream); + do_cleanups (old_cleanups); +} - fputs_filtered (linebuffer, stream); +void +vprintf_filtered (format, args) + const char *format; + va_list args; +{ + vfprintf_maybe_filtered (gdb_stdout, format, args, 1); +} + +void +vprintf_unfiltered (format, args) + const char *format; + va_list args; +{ + vfprintf_unfiltered (gdb_stdout, format, args); } /* VARARGS */ void +#ifdef ANSI_PROTOTYPES +fprintf_filtered (FILE *stream, const char *format, ...) +#else fprintf_filtered (va_alist) va_dcl +#endif +{ + va_list args; +#ifdef ANSI_PROTOTYPES + va_start (args, format); +#else + FILE *stream; + char *format; + + va_start (args); + stream = va_arg (args, FILE *); + format = va_arg (args, char *); +#endif + vfprintf_filtered (stream, format, args); + va_end (args); +} + +/* VARARGS */ +void +#ifdef ANSI_PROTOTYPES +fprintf_unfiltered (FILE *stream, const char *format, ...) +#else +fprintf_unfiltered (va_alist) + va_dcl +#endif { + va_list args; +#ifdef ANSI_PROTOTYPES + va_start (args, format); +#else FILE *stream; char *format; + + va_start (args); + stream = va_arg (args, FILE *); + format = va_arg (args, char *); +#endif + vfprintf_unfiltered (stream, format, args); + va_end (args); +} + +/* Like fprintf_filtered, but prints its result indented. + Called as fprintfi_filtered (spaces, stream, format, ...); */ + +/* VARARGS */ +void +#ifdef ANSI_PROTOTYPES +fprintfi_filtered (int spaces, FILE *stream, const char *format, ...) +#else +fprintfi_filtered (va_alist) + va_dcl +#endif +{ va_list args; +#ifdef ANSI_PROTOTYPES + va_start (args, format); +#else + int spaces; + FILE *stream; + char *format; va_start (args); + spaces = va_arg (args, int); stream = va_arg (args, FILE *); format = va_arg (args, char *); +#endif + print_spaces_filtered (spaces, stream); - /* This won't blow up if the restrictions described above are - followed. */ vfprintf_filtered (stream, format, args); va_end (args); } + /* VARARGS */ void +#ifdef ANSI_PROTOTYPES +printf_filtered (const char *format, ...) +#else printf_filtered (va_alist) va_dcl +#endif +{ + va_list args; +#ifdef ANSI_PROTOTYPES + va_start (args, format); +#else + char *format; + + va_start (args); + format = va_arg (args, char *); +#endif + vfprintf_filtered (gdb_stdout, format, args); + va_end (args); +} + + +/* VARARGS */ +void +#ifdef ANSI_PROTOTYPES +printf_unfiltered (const char *format, ...) +#else +printf_unfiltered (va_alist) + va_dcl +#endif { va_list args; +#ifdef ANSI_PROTOTYPES + va_start (args, format); +#else char *format; va_start (args); format = va_arg (args, char *); +#endif + vfprintf_unfiltered (gdb_stdout, format, args); + va_end (args); +} + +/* Like printf_filtered, but prints it's result indented. + Called as printfi_filtered (spaces, format, ...); */ + +/* VARARGS */ +void +#ifdef ANSI_PROTOTYPES +printfi_filtered (int spaces, const char *format, ...) +#else +printfi_filtered (va_alist) + va_dcl +#endif +{ + va_list args; +#ifdef ANSI_PROTOTYPES + va_start (args, format); +#else + int spaces; + char *format; - vfprintf_filtered (stdout, format, args); + va_start (args); + spaces = va_arg (args, int); + format = va_arg (args, char *); +#endif + print_spaces_filtered (spaces, gdb_stdout); + vfprintf_filtered (gdb_stdout, format, args); va_end (args); } -/* Easy */ +/* Easy -- but watch out! + + This routine is *not* a replacement for puts()! puts() appends a newline. + This one doesn't, and had better not! */ void puts_filtered (string) - char *string; + const char *string; { - fputs_filtered (string, stdout); + fputs_filtered (string, gdb_stdout); +} + +void +puts_unfiltered (string) + const char *string; +{ + fputs_unfiltered (string, gdb_stdout); } /* Return a pointer to N spaces and a null. The pointer is good @@ -1282,24 +1763,90 @@ print_spaces_filtered (n, stream) /* C++ demangler stuff. */ -/* Print NAME on STREAM, demangling if necessary. */ +/* fprintf_symbol_filtered attempts to demangle NAME, a symbol in language + LANG, using demangling args ARG_MODE, and print it filtered to STREAM. + If the name is not mangled, or the language for the name is unknown, or + demangling is off, the name is printed in its "raw" form. */ + void -fprint_symbol (stream, name) +fprintf_symbol_filtered (stream, name, lang, arg_mode) FILE *stream; char *name; + enum language lang; + int arg_mode; { char *demangled; - if ((!demangle) || NULL == (demangled = cplus_demangle (name, 1))) - fputs_filtered (name, stream); - else + + if (name != NULL) + { + /* If user wants to see raw output, no problem. */ + if (!demangle) + { + fputs_filtered (name, stream); + } + else + { + switch (lang) + { + case language_cplus: + demangled = cplus_demangle (name, arg_mode); + break; + case language_chill: + demangled = chill_demangle (name); + break; + default: + demangled = NULL; + break; + } + fputs_filtered (demangled ? demangled : name, stream); + if (demangled != NULL) + { + free (demangled); + } + } + } +} + +/* Do a strcmp() type operation on STRING1 and STRING2, ignoring any + differences in whitespace. Returns 0 if they match, non-zero if they + don't (slightly different than strcmp()'s range of return values). + + As an extra hack, string1=="FOO(ARGS)" matches string2=="FOO". + This "feature" is useful when searching for matching C++ function names + (such as if the user types 'break FOO', where FOO is a mangled C++ + function). */ + +int +strcmp_iw (string1, string2) + const char *string1; + const char *string2; +{ + while ((*string1 != '\0') && (*string2 != '\0')) { - fputs_filtered (demangled, stream); - free (demangled); + while (isspace (*string1)) + { + string1++; + } + while (isspace (*string2)) + { + string2++; + } + if (*string1 != *string2) + { + break; + } + if (*string1 != '\0') + { + string1++; + string2++; + } } + return (*string1 != '\0' && *string1 != '(') || (*string2 != '\0'); } + void -_initialize_utils () +initialize_utils () { struct cmd_list_element *c; @@ -1318,8 +1865,16 @@ _initialize_utils () /* These defaults will be used if we are unable to get the correct values from termcap. */ +#if defined(__GO32__) || defined(__WIN32__) + lines_per_page = ScreenRows(); + chars_per_line = ScreenCols(); +#else lines_per_page = 24; chars_per_line = 80; + +#ifndef MPW + /* No termcap under MPW, although might be cool to do something + by looking at worksheet or console window sizes. */ /* Initialize the screen height and width from termcap. */ { char *termtype = getenv ("TERM"); @@ -1354,15 +1909,16 @@ _initialize_utils () } } } +#endif /* MPW */ #if defined(SIGWINCH) && defined(SIGWINCH_HANDLER) /* If there is a better way to determine the window size, use it. */ SIGWINCH_HANDLER (); #endif - +#endif /* If the output is not a terminal, don't paginate it. */ - if (!ISATTY (stdout)) + if (!ISATTY (gdb_stdout)) lines_per_page = UINT_MAX; set_width_command ((char *)NULL, 0, c); @@ -1394,3 +1950,4 @@ _initialize_utils () #ifdef SIGWINCH_HANDLER_BODY SIGWINCH_HANDLER_BODY #endif +