X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Futils.c;h=97b6a9bb4b9fc6928a0c5c2becf6608225e9ea2b;hb=1130734da52cb2f2e2d2c0db9a5fcd8795552deb;hp=18e0fe862453055950459bf6b76c431e4fad9e0c;hpb=1c997a4ae86938343edb715efc3fc742c5f668fe;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/utils.c b/gdb/utils.c index 18e0fe8624..97b6a9bb4b 100644 --- a/gdb/utils.c +++ b/gdb/utils.c @@ -1,32 +1,72 @@ /* General utility routines for GDB, the GNU debugger. - Copyright (C) 1986, 1989 Free Software Foundation, Inc. + Copyright 1986, 1989, 1990, 1991, 1992, 1995 Free Software Foundation, Inc. This file is part of GDB. -GDB is free software; you can redistribute it and/or modify +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 1, or (at your option) -any later version. +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. -GDB is distributed in the hope that it will be useful, +This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with GDB; see the file COPYING. If not, write to -the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ +along with this program; if not, write to the Free Software +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include -#include +#include "defs.h" +#if !defined(__GO32__) && !defined(__WIN32__) #include #include #include -#include "defs.h" -#include "param.h" -#ifdef HAVE_TERMIO -#include #endif +#ifdef ANSI_PROTOTYPES +#include +#else +#include +#endif +#include +#include "gdb_string.h" +#ifdef HAVE_UNISTD_H +#include +#endif + +#include "signals.h" +#include "gdbcmd.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_MMALLOC) || defined (NO_MMALLOC_CHECK) +#else + +static void +malloc_botch PARAMS ((void)); + +#endif /* NO_MMALLOC, etc */ + +static void +fatal_dump_core PARAMS((char *, ...)); + +static void +prompt_for_continue PARAMS ((void)); + +static void +set_width_command PARAMS ((char *, int, struct cmd_list_element *)); /* If this definition isn't overridden by the header files, assume that isatty and fileno exist on this system. */ @@ -34,22 +74,60 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ #define ISATTY(FP) (isatty (fileno (FP))) #endif -void error (); -void fatal (); - /* Chain of cleanup actions established with make_cleanup, to be executed if an error happens. */ 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; + +/* Nonzero means that encoded C++ names should be printed out in their + C++ form rather than raw. */ + +int demangle = 1; + +/* Nonzero means that encoded C++ names should be printed out in their + C++ form even in assembler language displays. If this is set, but + DEMANGLE is zero, names are printed raw, i.e. DEMANGLE controls. */ + +int asm_demangle = 0; + +/* Nonzero means that strings with character values >0x7F should be printed + as octal escapes. Zero means just print the value (e.g. it's an + international character, and the terminal or window can cope.) */ + +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, and return the previous chain pointer @@ -58,8 +136,8 @@ int immediate_quit; struct cleanup * make_cleanup (function, arg) - void (*function) (); - int arg; + void (*function) PARAMS ((PTR)); + PTR arg; { register struct cleanup *new = (struct cleanup *) xmalloc (sizeof (struct cleanup)); @@ -83,8 +161,8 @@ do_cleanups (old_chain) register struct cleanup *ptr; while ((ptr = cleanup_chain) != old_chain) { + cleanup_chain = ptr->next; /* Do this first incase recursion */ (*ptr->function) (ptr->arg); - cleanup_chain = ptr->next; free (ptr); } } @@ -100,7 +178,7 @@ discard_cleanups (old_chain) while ((ptr = cleanup_chain) != old_chain) { cleanup_chain = ptr->next; - free (ptr); + free ((PTR)ptr); } } @@ -136,34 +214,236 @@ free_current_contents (location) { free (*location); } + +/* Provide a known function that does nothing, to use as a base for + for a possibly long chain of cleanups. This is useful where we + use the cleanup chain for handling normal cleanups as well as dealing + with cleanups that need to be done as a result of a call to error(). + In such cases, we may not be certain where the first cleanup is, unless + we have a do-nothing one to always use as the base. */ + +/* ARGSUSED */ +void +null_cleanup (arg) + char **arg; +{ +} + -/* Generally useful subroutines used throughout the program. */ +/* 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_begin () +{ + target_terminal_ours (); + wrap_here(""); /* Force out any buffered output */ + gdb_flush (gdb_stdout); + if (warning_pre_print) + fprintf_unfiltered (gdb_stderr, warning_pre_print); +} -/* Like malloc but get error if no storage available. */ +/* 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. */ + +/* 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); + string = va_arg (args, char *); +#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. */ + +#ifdef ANSI_PROTOTYPES +NORETURN void +error (char *string, ...) +#else +void +error (va_alist) + va_dcl +#endif +{ + va_list args; +#ifdef ANSI_PROTOTYPES + va_start (args, string); +#else + va_start (args); +#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. + + This function cannot be declared volatile (NORETURN) in an + ANSI environment because exit() is not declared volatile. */ + +/* 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 *); +#endif + fprintf_unfiltered (gdb_stderr, "\ngdb: "); + vfprintf_unfiltered (gdb_stderr, string, args); + fprintf_unfiltered (gdb_stderr, "\n"); + va_end (args); + exit (1); +} + +/* Print an error message and exit, dumping core. + The arguments are printed a la printf (). */ + +/* 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_unfiltered (gdb_stderr, "\ngdb internal error: "); + vfprintf_unfiltered (gdb_stderr, string, args); + fprintf_unfiltered (gdb_stderr, "\n"); + va_end (args); + + signal (SIGQUIT, SIG_DFL); + kill (getpid (), SIGQUIT); + /* We should never get here, but just in case... */ + exit (1); +} + +/* The strerror() function can return NULL for errno values that are + out of range. Provide a "safe" version that always returns a + printable string. */ char * -xmalloc (size) - long size; +safe_strerror (errnum) + int errnum; { - register char *val = (char *) malloc (size); - if (!val) - fatal ("virtual memory exhausted.", 0); - return val; + char *msg; + static char buf[32]; + + if ((msg = strerror (errnum)) == NULL) + { + sprintf (buf, "(undocumented errno %d)", errnum); + msg = buf; + } + return (msg); } -/* Like realloc but get error if no storage available. */ +/* The strsignal() function can return NULL for signal values that are + out of range. Provide a "safe" version that always returns a + printable string. */ char * -xrealloc (ptr, size) - char *ptr; - long size; +safe_strsignal (signo) + int signo; { - register char *val = (char *) realloc (ptr, size); - if (!val) - fatal ("virtual memory exhausted.", 0); - return val; + char *msg; + static char buf[32]; + + if ((msg = strsignal (signo)) == NULL) + { + sprintf (buf, "(undocumented signal %d)", signo); + msg = buf; + } + return (msg); } + /* Print the system error message for errno, and also mention STRING as the file name for which the error was encountered. Then return to command level. */ @@ -172,22 +452,21 @@ void perror_with_name (string) char *string; { - extern int sys_nerr; - extern char *sys_errlist[]; - extern int errno; char *err; char *combined; - if (errno < sys_nerr) - err = sys_errlist[errno]; - else - err = "unknown error"; - + err = safe_strerror (errno); combined = (char *) alloca (strlen (err) + strlen (string) + 3); strcpy (combined, string); strcat (combined, ": "); strcat (combined, err); + /* 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_set_error (bfd_error_no_error); + errno = 0; + error ("%s.", combined); } @@ -199,130 +478,389 @@ print_sys_errmsg (string, errcode) char *string; int errcode; { - extern int sys_nerr; - extern char *sys_errlist[]; char *err; char *combined; - if (errcode < sys_nerr) - err = sys_errlist[errcode]; - else - err = "unknown error"; - + err = safe_strerror (errcode); combined = (char *) alloca (strlen (err) + strlen (string) + 3); strcpy (combined, string); 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. */ + void quit () { -#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 */ + serial_t gdb_stdout_serial = serial_fdopen (1); + + target_terminal_ours (); + + /* 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 -request_quit () +request_quit (signo) + int signo; { quit_flag = 1; + /* 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); + +/* 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 +} -#ifdef USG - /* Restore the signal handler. */ - signal (SIGINT, request_quit); + +/* Memory management stuff (malloc friends). */ + +#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 */ - if (immediate_quit) - quit (); +PTR +mmalloc (md, size) + PTR md; + size_t size; +{ + return malloc (size); } -/* Print an error message and return to command level. - STRING is the error message, used as a fprintf string, - and ARG is passed as an argument to it. */ +PTR +mrealloc (md, ptr, size) + PTR md; + PTR ptr; + size_t size; +{ + if (ptr == 0) /* Guard against old realloc's */ + return malloc (size); + else + return realloc (ptr, size); +} void -error (string, arg1, arg2, arg3) - char *string; - int arg1, arg2, arg3; +mfree (md, ptr) + PTR md; + PTR ptr; { - terminal_ours (); /* Should be ok even if no inf. */ - fflush (stdout); - fprintf (stderr, string, arg1, arg2, arg3); - fprintf (stderr, "\n"); - return_to_top_level (); + free (ptr); } -/* Print an error message and exit reporting failure. - This is for a error that we cannot continue from. - STRING and ARG are passed to fprintf. */ +#endif /* NO_MMALLOC */ + +#if defined (NO_MMALLOC) || defined (NO_MMALLOC_CHECK) void -fatal (string, arg) - char *string; - int arg; +init_malloc (md) + PTR md; { - fprintf (stderr, "gdb: "); - fprintf (stderr, string, arg); - fprintf (stderr, "\n"); - exit (1); } -/* Print an error message and exit, dumping core. - STRING is a printf-style control string, and ARG is a corresponding - argument. */ +#else /* have mmalloc and want corruption checking */ + +static void +malloc_botch () +{ + fatal_dump_core ("Memory corruption"); +} + +/* Attempt to install hooks in mmalloc/mrealloc/mfree for the heap specified + by MD, to detect memory corruption. Note that MD may be NULL to specify + the default heap that grows via sbrk. + + Note that for freshly created regions, we must call mmcheck prior to any + mallocs in the region. Otherwise, any region which was allocated prior to + installing the checking hooks, which is later reallocated or freed, will + fail the checks! The mmcheck function only allows initial hooks to be + installed before the first mmalloc. However, anytime after we have called + mmcheck the first time to install the checking hooks, we can call it again + to update the function pointer to the memory corruption handler. + + Returns zero on failure, non-zero on success. */ + void -fatal_dump_core (string, arg) - char *string; - int arg; +init_malloc (md) + PTR md; { - /* "internal error" is always correct, since GDB should never dump - core, no matter what the input. */ - fprintf (stderr, "gdb internal error: "); - fprintf (stderr, string, arg); - fprintf (stderr, "\n"); - signal (SIGQUIT, SIG_DFL); - kill (getpid (), SIGQUIT); - /* We should never get here, but just in case... */ - exit (1); + if (!mmcheck (md, malloc_botch)) + { + warning ("internal error: failed to install memory consistency checks"); + } + + mmtrace (); +} + +#endif /* Have mmalloc and want corruption checking */ + +/* Called when a memory allocation fails, with the number of bytes of + memory requested in SIZE. */ + +NORETURN void +nomem (size) + long size; +{ + if (size > 0) + { + fatal ("virtual memory exhausted: can't allocate %ld bytes.", size); + } + else + { + fatal ("virtual memory exhausted."); + } } +/* Like mmalloc but get error if no storage available, and protect against + the caller wanting to allocate zero bytes. Whether to return NULL for + a zero byte request, or translate the request into a request for one + byte of zero'd storage, is a religious issue. */ + +PTR +xmmalloc (md, size) + PTR md; + long size; +{ + register PTR val; + + if (size == 0) + { + val = NULL; + } + else if ((val = mmalloc (md, size)) == NULL) + { + nomem (size); + } + return (val); +} + +/* Like mrealloc but get error if no storage available. */ + +PTR +xmrealloc (md, ptr, size) + PTR md; + PTR ptr; + long size; +{ + register PTR val; + + if (ptr != NULL) + { + val = mrealloc (md, ptr, size); + } + else + { + val = mmalloc (md, size); + } + if (val == NULL) + { + nomem (size); + } + return (val); +} + +/* Like malloc but get error if no storage available, and protect against + the caller wanting to allocate zero bytes. */ + +PTR +xmalloc (size) + long size; +{ + return (xmmalloc ((PTR) NULL, size)); +} + +/* Like mrealloc but get error if no storage available. */ + +PTR +xrealloc (ptr, size) + PTR ptr; + long size; +{ + return (xmrealloc ((PTR) NULL, ptr, size)); +} + + +/* My replacement for the read system call. + Used like `read' but keeps going if `read' returns too soon. */ + +int +myread (desc, addr, len) + int desc; + char *addr; + int len; +{ + register int val; + int orglen = len; + + while (len > 0) + { + val = read (desc, addr, len); + if (val < 0) + return val; + if (val == 0) + return orglen - len; + len -= val; + addr += val; + } + return orglen; +} + /* Make a copy of the string at PTR with SIZE characters (and add a null character at the end in the copy). Uses malloc to get the space. Returns the address of the copy. */ char * savestring (ptr, size) - char *ptr; + const char *ptr; 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) + PTR md; + const char *ptr; + int size; +{ + register char *p = (char *) xmmalloc (md, size + 1); + memcpy (p, ptr, size); p[size] = 0; return p; } +/* The "const" is so it compiles under DGUX (which prototypes strsave + in . FIXME: This should be named "xstrsave", shouldn't it? + Doesn't real strsave return NULL if out of memory? */ +char * +strsave (ptr) + const char *ptr; +{ + return savestring (ptr, strlen (ptr)); +} + char * -concat (s1, s2, s3) - char *s1, *s2, *s3; +mstrsave (md, ptr) + PTR md; + const char *ptr; { - register int len = strlen (s1) + strlen (s2) + strlen (s3) + 1; - register char *val = (char *) xmalloc (len); - strcpy (val, s1); - strcat (val, s2); - strcat (val, s3); - return val; + return (msavestring (md, ptr, strlen (ptr))); } void @@ -334,42 +872,122 @@ 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 "? ". It should not say how to answer, because we do that. */ +/* VARARGS */ int -query (ctlstr, arg1, arg2) - char *ctlstr; +#ifdef ANSI_PROTOTYPES +query (char *ctlstr, ...) +#else +query (va_alist) + va_dcl +#endif { + va_list args; 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) { - printf (ctlstr, arg1, arg2); - 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 != '\n') - while (fgetc (stdin) != '\n') clearerr (stdin); + if (answer == EOF) /* C-d */ + { + retval = 1; + break; + } + if (answer != '\n') /* Eat rest of input line, to EOF or newline */ + do + { + ans2 = fgetc (stdin); + clearerr (stdin); + } + while (ans2 != EOF && ans2 != '\n'); 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; } + /* Parse a C escape sequence. STRING_PTR points to a variable containing a pointer to the string to parse. That pointer + should point to the character after the \. That pointer is updated past the characters we use. The value of the escape sequence is returned. @@ -390,10 +1008,10 @@ parse_escape (string_ptr) switch (c) { case 'a': - return '\a'; + return 007; /* Bell (alert) char */ case 'b': return '\b'; - case 'e': + case 'e': /* Escape character */ return 033; case 'f': return '\f'; @@ -449,17 +1067,23 @@ parse_escape (string_ptr) } } -/* Print the character CH 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 (ch, stream, quoter) - unsigned char ch; +gdb_printchar (c, stream, quoter) + register int c; FILE *stream; int quoter; { - register int c = ch; - if (c < 040 || c >= 0177) + + 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 */ switch (c) { case '\n': @@ -487,64 +1111,115 @@ printchar (ch, stream, quoter) fprintf_filtered (stream, "\\%.3o", (unsigned int) c); break; } - else - { - if (c == '\\' || c == quoter) - fputs_filtered ("\\", stream); - fprintf_filtered (stream, "%c", c); - } + } else { + if (c == '\\' || c == quoter) + fputs_filtered ("\\", stream); + fprintf_filtered (stream, "%c", c); + } } -static int lines_per_page, lines_printed, chars_per_line, chars_printed; - -/* Set values of page and line size. */ -static void -set_screensize_command (arg, from_tty) - char *arg; +/* Number of lines per page or UINT_MAX if paging is disabled. */ +static unsigned int lines_per_page; +/* Number of chars per line or UNIT_MAX is line folding is disabled. */ +static unsigned int chars_per_line; +/* Current count of lines printed on this page, chars on this line. */ +static unsigned int lines_printed, chars_printed; + +/* Buffer and start column of buffered text, for doing smarter word- + wrapping. When someone calls wrap_here(), we start buffering output + that comes through fputs_filtered(). If we see a newline, we just + 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. */ + +/* 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; + +/* 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 */ +static void +set_width_command (args, from_tty, c) + char *args; int from_tty; + struct cmd_list_element *c; { - char *p = arg; - char *p1; - int tolinesize = lines_per_page; - int tocharsize = chars_per_line; + if (!wrap_buffer) + { + wrap_buffer = (char *) xmalloc (chars_per_line + 2); + wrap_buffer[0] = '\0'; + } + else + wrap_buffer = (char *) xrealloc (wrap_buffer, chars_per_line + 2); + wrap_pointer = wrap_buffer; /* Start it at the beginning */ +} - if (p == 0) - error_no_arg ("set screensize"); +/* Wait, so the user can read what's on the screen. Prompt the user + to continue by pressing RETURN. */ - while (*p >= '0' && *p <= '9') - p++; +static void +prompt_for_continue () +{ + char *ignore; + char cont_prompt[120]; - if (*p && *p != ' ' && *p != '\t') - error ("Non-integral argument given to \"set screensize\"."); + if (annotation_level > 1) + printf_unfiltered ("\n\032\032pre-prompt-for-continue\n"); - tolinesize = atoi (arg); + strcpy (cont_prompt, + "---Type to continue, or q to quit---"); + if (annotation_level > 1) + strcat (cont_prompt, "\n\032\032prompt-for-continue\n"); - while (*p == ' ' || *p == '\t') - p++; + /* 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 (); - if (*p) + immediate_quit++; + /* 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) { - p1 = p; - while (*p1 >= '0' && *p1 <= '9') - p1++; - - if (*p1) - error ("Non-integral second argument given to \"set screensize\"."); - - tocharsize = atoi (p); + char *p = ignore; + while (*p == ' ' || *p == '\t') + ++p; + if (p[0] == 'q') + request_quit (SIGINT); + free (ignore); } + immediate_quit--; - lines_per_page = tolinesize; - chars_per_line = tocharsize; -} + /* 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 (); -static void -prompt_for_continue () -{ - immediate_quit++; - gdb_readline ("---Type to continue---", 0); - chars_printed = lines_printed = 0; - immediate_quit--; + dont_repeat (); /* Forget prev cmd -- CR won't repeat it. */ } /* Reinitialize filter; ie. tell it to reset to original values. */ @@ -556,47 +1231,128 @@ reinitialize_more_filter () chars_printed = 0; } -static void -screensize_info (arg, from_tty) - char *arg; - int from_tty; +/* 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 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(). + + If the line is already overfull, we immediately print a newline and + the indentation, and disable further wrapping. + + If we don't know the width of lines, but we know the page height, + 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. + + 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; { - if (arg) - error ("\"info screensize\" does not take any arguments."); - - if (!lines_per_page) - printf ("Output more filtering is disabled.\n"); + /* This should have been allocated, but be paranoid anyway. */ + if (!wrap_buffer) + abort (); + + if (wrap_buffer[0]) + { + *wrap_pointer = '\0'; + fputs_unfiltered (wrap_buffer, gdb_stdout); + } + wrap_pointer = wrap_buffer; + wrap_buffer[0] = '\0'; + if (chars_per_line == UINT_MAX) /* No line overflow checking */ + { + wrap_column = 0; + } + else if (chars_printed >= chars_per_line) + { + puts_filtered ("\n"); + if (indent != NULL) + puts_filtered (indent); + wrap_column = 0; + } else { - printf ("Output more filtering is enabled with\n"); - printf ("%d lines per page and %d characters per line.\n", - lines_per_page, chars_per_line); + wrap_column = chars_printed; + 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"); + } +} + + +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 pause after every screenful. - Unlike fputs, fputs_filtered does not return a value. +/* 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) - char *linebuffer; +static void +fputs_maybe_filtered (linebuffer, stream, filter) + const char *linebuffer; FILE *stream; + int filter; { - char *lineptr; + const char *lineptr; if (linebuffer == 0) return; - + /* Don't do any filtering if it is disabled. */ - if (stream != stdout || !ISATTY(stdout) || lines_per_page == 0) + if (stream != gdb_stdout + || (lines_per_page == UINT_MAX && chars_per_line == UINT_MAX)) { - fputs (linebuffer, stream); + fputs_unfiltered (linebuffer, stream); return; } @@ -608,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') @@ -616,7 +1373,10 @@ fputs_filtered (linebuffer, stream) /* Print a single line. */ if (*lineptr == '\t') { - putc ('\t', stream); + if (wrap_column) + *wrap_pointer++ = '\t'; + else + 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. */ @@ -625,235 +1385,499 @@ fputs_filtered (linebuffer, stream) } else { - putc (*lineptr, stream); + if (wrap_column) + *wrap_pointer++ = *lineptr; + else + fputc_unfiltered (*lineptr, stream); chars_printed++; lineptr++; } if (chars_printed >= chars_per_line) { + unsigned int save_chars = chars_printed; + chars_printed = 0; lines_printed++; + /* If we aren't actually wrapping, don't output newline -- + if chars_per_line is right, we probably just overflowed + anyway; if it's wrong, let us keep going. */ + if (wrap_column) + fputc_unfiltered ('\n', stream); + /* Possible new page. */ if (lines_printed >= lines_per_page - 1) prompt_for_continue (); + + /* Now output indentation and wrapped string */ + if (wrap_column) + { + 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 + longer than (the user settable) chars_per_line. + Note also that this can set chars_printed > chars_per_line + if we are printing a long string. */ + chars_printed = strlen (wrap_indent) + + (save_chars - wrap_column); + wrap_pointer = wrap_buffer; /* Reset buffer */ + wrap_buffer[0] = '\0'; + wrap_column = 0; /* And disable fancy wrap */ + } } } if (*lineptr == '\n') { + chars_printed = 0; + wrap_here ((char *)0); /* Spit out chars, cancel further wraps */ lines_printed++; - putc ('\n', stream); + fputc_unfiltered ('\n', stream); lineptr++; - chars_printed = 0; } } } -/* Print ARG1, ARG2, and ARG3 on stdout using format FORMAT. If this - information is going to put the amount written since the last call - to INIIALIZE_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. +void +fputs_filtered (linebuffer, stream) + const char *linebuffer; + FILE *stream; +{ + fputs_maybe_filtered (linebuffer, stream, 1); +} + +int +putchar_unfiltered (c) + int c; +{ + char buf[2]; + + buf[0] = c; + buf[1] = 0; + fputs_unfiltered (buf, gdb_stdout); + return c; +} + +int +fputc_unfiltered (c, stream) + int c; + FILE * stream; +{ + char buf[2]; + + 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 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. - 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. + We implement three variants, vfprintf (takes a vararg list and stream), + fprintf (takes a stream to write on), and printf (the usual). 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. */ -void -fprintf_filtered (stream, format, arg1, arg2, arg3, arg4, arg5, arg6) +static void +vfprintf_maybe_filtered (stream, format, args, filter) FILE *stream; char *format; - int arg1, arg2, arg3, arg4, arg5, arg6; + va_list args; + int filter; { - static char *linebuffer = (char *) 0; - static int line_size; - int format_length = strlen (format); - int numchars; + 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; + + 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); +} - /* This won't blow up if the restrictions described above are - followed. */ - (void) sprintf (linebuffer, format, arg1, arg2, arg3, arg4, arg5, arg6); +void +vprintf_filtered (format, args) + const char *format; + va_list args; +{ + vfprintf_maybe_filtered (gdb_stdout, format, args, 1); +} - fputs_filtered (linebuffer, stream); +void +vprintf_unfiltered (format, args) + const char *format; + va_list args; +{ + vfprintf_unfiltered (gdb_stdout, format, args); } +/* VARARGS */ void -printf_filtered (format, arg1, arg2, arg3, arg4, arg5, arg6) - char *format; - int arg1, arg2, arg3, arg4, arg5, arg6; +#ifdef ANSI_PROTOTYPES +fprintf_filtered (FILE *stream, const char *format, ...) +#else +fprintf_filtered (va_alist) + va_dcl +#endif { - fprintf_filtered (stdout, format, arg1, arg2, arg3, arg4, arg5, arg6); + 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); } -/* Print N spaces. */ +/* VARARGS */ void -print_spaces_filtered (n, stream) - int n; - FILE *stream; +#ifdef ANSI_PROTOTYPES +fprintf_unfiltered (FILE *stream, const char *format, ...) +#else +fprintf_unfiltered (va_alist) + va_dcl +#endif { - register char *s = (char *) alloca (n + 1); - register char *t = s; + 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); +} - while (n--) - *t++ = ' '; - *t = '\0'; +/* Like fprintf_filtered, but prints its result indented. + Called as fprintfi_filtered (spaces, stream, format, ...); */ - fputs_filtered (s, stream); +/* 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); + + vfprintf_filtered (stream, format, args); + va_end (args); } - -#ifdef USG -bcopy (from, to, count) -char *from, *to; + +/* 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 { - memcpy (to, from, count); + 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); } -bcmp (from, to, count) +/* 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 { - return (memcmp (to, from, count)); + va_list args; +#ifdef ANSI_PROTOTYPES + va_start (args, format); +#else + int spaces; + char *format; + + 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); } -bzero (to, count) -char *to; +/* 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) + const char *string; { - while (count--) - *to++ = 0; + fputs_filtered (string, gdb_stdout); } -getwd (buf) -char *buf; +void +puts_unfiltered (string) + const char *string; { - getcwd (buf, MAXPATHLEN); + fputs_unfiltered (string, gdb_stdout); } +/* Return a pointer to N spaces and a null. The pointer is good + until the next call to here. */ char * -index (s, c) - char *s; +n_spaces (n) + int n; { - char *strchr (); - return strchr (s, c); + register char *t; + static char *spaces; + static int max_spaces; + + if (n > max_spaces) + { + if (spaces) + free (spaces); + spaces = (char *) xmalloc (n+1); + for (t = spaces+n; t != spaces;) + *--t = ' '; + spaces[n] = '\0'; + max_spaces = n; + } + + return spaces + max_spaces - n; } -char * -rindex (s, c) - char *s; -{ - char *strrchr (); - return strrchr (s, c); -} - -#ifndef USG -char *sys_siglist[32] = { - "SIG0", - "SIGHUP", - "SIGINT", - "SIGQUIT", - "SIGILL", - "SIGTRAP", - "SIGIOT", - "SIGEMT", - "SIGFPE", - "SIGKILL", - "SIGBUS", - "SIGSEGV", - "SIGSYS", - "SIGPIPE", - "SIGALRM", - "SIGTERM", - "SIGUSR1", - "SIGUSR2", - "SIGCLD", - "SIGPWR", - "SIGWIND", - "SIGPHONE", - "SIGPOLL", -}; -#endif - -/* Queue routines */ - -struct queue { - struct queue *forw; - struct queue *back; -}; - -insque (item, after) -struct queue *item; -struct queue *after; -{ - item->forw = after->forw; - after->forw->back = item; - - item->back = after; - after->forw = item; -} - -remque (item) -struct queue *item; -{ - item->forw->back = item->back; - item->back->forw = item->forw; -} -#endif /* USG */ +/* Print N spaces. */ +void +print_spaces_filtered (n, stream) + int n; + FILE *stream; +{ + fputs_filtered (n_spaces (n), stream); +} -#ifdef USG -/* There is too much variation in Sys V signal numbers and names, so - we must initialize them at runtime. */ -static char undoc[] = "(undocumented)"; - -char *sys_siglist[NSIG]; -#endif /* USG */ +/* C++ demangler stuff. */ -extern struct cmd_list_element *setlist; +/* 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 -_initialize_utils () +fprintf_symbol_filtered (stream, name, lang, arg_mode) + FILE *stream; + char *name; + enum language lang; + int arg_mode; +{ + char *demangled; + + 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; { - int i; - add_cmd ("screensize", class_support, set_screensize_command, - "Change gdb's notion of the size of the output screen.\n\ -The first argument is the number of lines on a page.\n\ -The second argument (optional) is the number of characters on a line.", - &setlist); - add_info ("screensize", screensize_info, - "Show gdb's current notion of the size of the output screen."); + while ((*string1 != '\0') && (*string2 != '\0')) + { + 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 () +{ + struct cmd_list_element *c; + + c = add_set_cmd ("width", class_support, var_uinteger, + (char *)&chars_per_line, + "Set number of characters gdb thinks are in a line.", + &setlist); + add_show_from_set (c, &showlist); + c->function.sfunc = set_width_command; + + add_show_from_set + (add_set_cmd ("height", class_support, + var_uinteger, (char *)&lines_per_page, + "Set number of lines gdb thinks are in a page.", &setlist), + &showlist); + /* 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. */ { - int termtype = getenv ("TERM"); + char *termtype = getenv ("TERM"); /* Positive means success, nonpositive means failure. */ int status; @@ -877,7 +1901,7 @@ The second argument (optional) is the number of characters on a line.", in the terminal description. This probably means that paging is not useful (e.g. emacs shell window), so disable paging. */ - lines_per_page = 0; + lines_per_page = UINT_MAX; val = tgetnum ("co"); if (val >= 0) @@ -885,116 +1909,45 @@ The second argument (optional) is the number of characters on a line.", } } } +#endif /* MPW */ -#ifdef USG - /* Initialize signal names. */ - for (i = 0; i < NSIG; i++) - sys_siglist[i] = undoc; +#if defined(SIGWINCH) && defined(SIGWINCH_HANDLER) -#ifdef SIGHUP - sys_siglist[SIGHUP ] = "SIGHUP"; -#endif -#ifdef SIGINT - sys_siglist[SIGINT ] = "SIGINT"; -#endif -#ifdef SIGQUIT - sys_siglist[SIGQUIT ] = "SIGQUIT"; -#endif -#ifdef SIGILL - sys_siglist[SIGILL ] = "SIGILL"; -#endif -#ifdef SIGTRAP - sys_siglist[SIGTRAP ] = "SIGTRAP"; -#endif -#ifdef SIGIOT - sys_siglist[SIGIOT ] = "SIGIOT"; + /* If there is a better way to determine the window size, use it. */ + SIGWINCH_HANDLER (); #endif -#ifdef SIGEMT - sys_siglist[SIGEMT ] = "SIGEMT"; #endif -#ifdef SIGFPE - sys_siglist[SIGFPE ] = "SIGFPE"; -#endif -#ifdef SIGKILL - sys_siglist[SIGKILL ] = "SIGKILL"; -#endif -#ifdef SIGBUS - sys_siglist[SIGBUS ] = "SIGBUS"; -#endif -#ifdef SIGSEGV - sys_siglist[SIGSEGV ] = "SIGSEGV"; -#endif -#ifdef SIGSYS - sys_siglist[SIGSYS ] = "SIGSYS"; -#endif -#ifdef SIGPIPE - sys_siglist[SIGPIPE ] = "SIGPIPE"; -#endif -#ifdef SIGALRM - sys_siglist[SIGALRM ] = "SIGALRM"; -#endif -#ifdef SIGTERM - sys_siglist[SIGTERM ] = "SIGTERM"; -#endif -#ifdef SIGUSR1 - sys_siglist[SIGUSR1 ] = "SIGUSR1"; -#endif -#ifdef SIGUSR2 - sys_siglist[SIGUSR2 ] = "SIGUSR2"; -#endif -#ifdef SIGCLD - sys_siglist[SIGCLD ] = "SIGCLD"; -#endif -#ifdef SIGCHLD - sys_siglist[SIGCHLD ] = "SIGCHLD"; -#endif -#ifdef SIGPWR - sys_siglist[SIGPWR ] = "SIGPWR"; -#endif -#ifdef SIGTSTP - sys_siglist[SIGTSTP ] = "SIGTSTP"; -#endif -#ifdef SIGTTIN - sys_siglist[SIGTTIN ] = "SIGTTIN"; -#endif -#ifdef SIGTTOU - sys_siglist[SIGTTOU ] = "SIGTTOU"; -#endif -#ifdef SIGSTOP - sys_siglist[SIGSTOP ] = "SIGSTOP"; -#endif -#ifdef SIGXCPU - sys_siglist[SIGXCPU ] = "SIGXCPU"; -#endif -#ifdef SIGXFSZ - sys_siglist[SIGXFSZ ] = "SIGXFSZ"; -#endif -#ifdef SIGVTALRM - sys_siglist[SIGVTALRM ] = "SIGVTALRM"; -#endif -#ifdef SIGPROF - sys_siglist[SIGPROF ] = "SIGPROF"; -#endif -#ifdef SIGWINCH - sys_siglist[SIGWINCH ] = "SIGWINCH"; -#endif -#ifdef SIGCONT - sys_siglist[SIGCONT ] = "SIGCONT"; -#endif -#ifdef SIGURG - sys_siglist[SIGURG ] = "SIGURG"; -#endif -#ifdef SIGIO - sys_siglist[SIGIO ] = "SIGIO"; -#endif -#ifdef SIGWIND - sys_siglist[SIGWIND ] = "SIGWIND"; -#endif -#ifdef SIGPHONE - sys_siglist[SIGPHONE ] = "SIGPHONE"; -#endif -#ifdef SIGPOLL - sys_siglist[SIGPOLL ] = "SIGPOLL"; -#endif -#endif /* USG */ + /* If the output is not a terminal, don't paginate it. */ + if (!ISATTY (gdb_stdout)) + lines_per_page = UINT_MAX; + + set_width_command ((char *)NULL, 0, c); + + add_show_from_set + (add_set_cmd ("demangle", class_support, var_boolean, + (char *)&demangle, + "Set demangling of encoded C++ names when displaying symbols.", + &setprintlist), + &showprintlist); + + add_show_from_set + (add_set_cmd ("sevenbit-strings", class_support, var_boolean, + (char *)&sevenbit_strings, + "Set printing of 8-bit characters in strings as \\nnn.", + &setprintlist), + &showprintlist); + + add_show_from_set + (add_set_cmd ("asm-demangle", class_support, var_boolean, + (char *)&asm_demangle, + "Set demangling of C++ names in disassembly listings.", + &setprintlist), + &showprintlist); } + +/* Machine specific function to handle SIGWINCH signal. */ + +#ifdef SIGWINCH_HANDLER_BODY + SIGWINCH_HANDLER_BODY +#endif +