/* List lines of source files for GDB, the GNU debugger.
- Copyright 1986, 1987, 1988, 1989, 1991, 1992, 1993, 1994, 1995
- Free Software Foundation, Inc.
+ Copyright 1986-1989, 1991-1999 Free Software Foundation, Inc.
-This file is part of GDB.
+ This file is part of GDB.
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+ 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 2 of the License, or
+ (at your option) any later version.
-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.
+ 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 this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
+ 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., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
#include "defs.h"
#include "symtab.h"
#include "expression.h"
#include "language.h"
#include "command.h"
+#include "source.h"
#include "gdbcmd.h"
#include "frame.h"
+#include "value.h"
#include <sys/types.h>
-#include <string.h>
-#include <sys/param.h>
-#include <sys/stat.h>
+#include "gdb_string.h"
+#include "gdb_stat.h"
#include <fcntl.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
#include "gdbcore.h"
-#include "regex.h"
+#include "gdb_regex.h"
#include "symfile.h"
#include "objfiles.h"
#include "annotate.h"
#include "gdbtypes.h"
+#ifdef UI_OUT
+#include "ui-out.h"
+#endif
-/* Prototypes for local functions. */
+#ifdef CRLF_SOURCE_FILES
+
+/* Define CRLF_SOURCE_FILES in an xm-*.h file if source files on the
+ host use \r\n rather than just \n. Defining CRLF_SOURCE_FILES is
+ much faster than defining LSEEK_NOT_LINEAR. */
-static int open_source_file PARAMS ((struct symtab *));
+#ifndef O_BINARY
+#define O_BINARY 0
+#endif
+
+#define OPEN_MODE (O_RDONLY | O_BINARY)
+#define FDOPEN_MODE FOPEN_RB
-static int get_filename_and_charpos PARAMS ((struct symtab *, char **));
+#else /* ! defined (CRLF_SOURCE_FILES) */
-static void reverse_search_command PARAMS ((char *, int));
+#define OPEN_MODE O_RDONLY
+#define FDOPEN_MODE FOPEN_RT
-static void forward_search_command PARAMS ((char *, int));
+#endif /* ! defined (CRLF_SOURCE_FILES) */
-static void line_info PARAMS ((char *, int));
+/* Prototypes for exported functions. */
-static void list_command PARAMS ((char *, int));
+void _initialize_source (void);
+
+/* Prototypes for local functions. */
-static void ambiguous_line_spec PARAMS ((struct symtabs_and_lines *));
+static int get_filename_and_charpos (struct symtab *, char **);
-static void source_info PARAMS ((char *, int));
+static void reverse_search_command (char *, int);
-static void show_directories PARAMS ((char *, int));
+static void forward_search_command (char *, int);
-static void find_source_lines PARAMS ((struct symtab *, int));
+static void line_info (char *, int);
-/* If we use this declaration, it breaks because of fucking ANSI "const" stuff
- on some systems. We just have to not declare it at all, have it default
- to int, and possibly botch on a few systems. Thanks, ANSIholes... */
-/* extern char *strstr(); */
+static void list_command (char *, int);
+
+static void ambiguous_line_spec (struct symtabs_and_lines *);
+
+static void source_info (char *, int);
+
+static void show_directories (char *, int);
/* Path of directories to search for source files.
Same format as the PATH environment variable's value. */
static int first_line_listed;
+/* Saves the name of the last source file visited and a possible error code.
+ Used to prevent repeating annoying "No such file or directories" msgs */
+
+static struct symtab *last_source_visited = NULL;
+static int last_source_error = 0;
\f
+
/* Set the source file default for the "list" command to be S.
If S is NULL, and we don't have a default, find one. This
struct partial_symtab *ps;
struct partial_symtab *cs_pst = 0;
struct objfile *ofp;
-
+
if (s)
{
current_source_symtab = s;
current_source_symtab = sal.symtab;
current_source_line = max (sal.line - (lines_to_list - 1), 1);
if (current_source_symtab)
- return;
+ return;
}
-
+
/* All right; find the last file in the symtab list (ignoring .h's). */
current_source_line = 1;
- for (ofp = object_files; ofp != NULL; ofp = ofp -> next)
+ for (ofp = object_files; ofp != NULL; ofp = ofp->next)
{
- for (s = ofp -> symtabs; s; s = s->next)
+ for (s = ofp->symtabs; s; s = s->next)
{
- char *name = s -> filename;
+ char *name = s->filename;
int len = strlen (name);
- if (! (len > 2 && (STREQ (&name[len - 2], ".h"))))
+ if (!(len > 2 && (STREQ (&name[len - 2], ".h"))))
{
current_source_symtab = s;
}
/* Howabout the partial symbol tables? */
- for (ofp = object_files; ofp != NULL; ofp = ofp -> next)
+ for (ofp = object_files; ofp != NULL; ofp = ofp->next)
{
- for (ps = ofp -> psymtabs; ps != NULL; ps = ps -> next)
+ for (ps = ofp->psymtabs; ps != NULL; ps = ps->next)
{
- char *name = ps -> filename;
+ char *name = ps->filename;
int len = strlen (name);
- if (! (len > 2 && (STREQ (&name[len - 2], ".h"))))
+ if (!(len > 2 && (STREQ (&name[len - 2], ".h"))))
{
cs_pst = ps;
}
}
if (cs_pst)
{
- if (cs_pst -> readin)
+ if (cs_pst->readin)
{
- fatal ("Internal: select_source_symtab: readin pst found and no symtabs.");
+ internal_error ("select_source_symtab: readin pst found and no symtabs.");
}
else
{
current_source_symtab = PSYMTAB_TO_SYMTAB (cs_pst);
}
}
+ if (current_source_symtab)
+ return;
error ("Can't find a default source file");
}
register struct symtab *s;
register struct objfile *objfile;
- for (objfile = object_files; objfile != NULL; objfile = objfile -> next)
+ for (objfile = object_files; objfile != NULL; objfile = objfile->next)
{
- for (s = objfile -> symtabs; s != NULL; s = s -> next)
+ for (s = objfile->symtabs; s != NULL; s = s->next)
{
- if (s -> line_charpos != NULL)
+ if (s->line_charpos != NULL)
{
- mfree (objfile -> md, s -> line_charpos);
- s -> line_charpos = NULL;
+ mfree (objfile->md, s->line_charpos);
+ s->line_charpos = NULL;
}
- if (s -> fullname != NULL)
+ if (s->fullname != NULL)
{
- mfree (objfile -> md, s -> fullname);
- s -> fullname = NULL;
+ mfree (objfile->md, s->fullname);
+ s->fullname = NULL;
}
}
}
}
/* Add zero or more directories to the front of the source path. */
-
+
void
directory_command (dirname, from_tty)
char *dirname;
/* FIXME, this goes to "delete dir"... */
if (dirname == 0)
{
- if (query ("Reinitialize source path to empty? "))
+ if (from_tty && query ("Reinitialize source path to empty? "))
{
free (source_path);
init_source_path ();
}
}
else
- mod_path (dirname, &source_path);
+ {
+ mod_path (dirname, &source_path);
+ last_source_visited = NULL;
+ }
if (from_tty)
- show_directories ((char *)0, from_tty);
+ show_directories ((char *) 0, from_tty);
forget_cached_source_info ();
}
char *space = strchr (name, ' ');
char *tab = strchr (name, '\t');
- if (separator == 0 && space == 0 && tab == 0)
+ if (separator == 0 && space == 0 && tab == 0)
p = dirname = name + strlen (name);
else
{
}
}
- if (SLASH_P (p[-1]))
+ if (!(SLASH_P (*name) && p <= name + 1) /* "/" */
+#if defined(_WIN32) || defined(__MSDOS__)
+ /* On MS-DOS and MS-Windows, h:\ is different from h: */
+ && !(!SLASH_P (*name) && ROOTED_P (name) && p <= name + 3) /* d:/ */
+#endif
+ && SLASH_P (p[-1]))
/* Sigh. "foo/" => "foo" */
--p;
*p = '\0';
- while (p[-1] == '.')
+ while (p > name && p[-1] == '.')
{
if (p - name == 1)
{
name = current_directory;
goto append;
}
- else if (SLASH_P (p[-2]))
+ else if (p > name + 1 && SLASH_P (p[-2]))
{
if (p - name == 2)
{
if (name[0] == '~')
name = tilde_expand (name);
- else if (!SLASH_P (name[0]) && name[0] != '$')
- name = concat (current_directory, SLASH_STRING, name, NULL);
+#if defined(_WIN32) || defined(__MSDOS__)
+ else if (ROOTED_P (name) && p == name + 2) /* "d:" => "d:." */
+ name = concat (name, ".", NULL);
+#endif
+ else if (!ROOTED_P (name) && name[0] != '$')
+ name = concat (current_directory, SLASH_STRING, name, NULL);
else
name = savestring (name, p - name);
make_cleanup (free, name);
/* Unless it's a variable, check existence. */
- if (name[0] != '$') {
- /* These are warnings, not errors, since we don't want a
- non-existent directory in a .gdbinit file to stop processing
- of the .gdbinit file.
-
- Whether they get added to the path is more debatable. Current
- answer is yes, in case the user wants to go make the directory
- or whatever. If the directory continues to not exist/not be
- a directory/etc, then having them in the path should be
- harmless. */
- if (stat (name, &st) < 0)
- {
- int save_errno = errno;
- fprintf_unfiltered (gdb_stderr, "Warning: ");
- print_sys_errmsg (name, save_errno);
- }
- else if (!S_ISDIR(st.st_mode))
- warning ("%s is not a directory.", name);
- }
+ if (name[0] != '$')
+ {
+ /* These are warnings, not errors, since we don't want a
+ non-existent directory in a .gdbinit file to stop processing
+ of the .gdbinit file.
+
+ Whether they get added to the path is more debatable. Current
+ answer is yes, in case the user wants to go make the directory
+ or whatever. If the directory continues to not exist/not be
+ a directory/etc, then having them in the path should be
+ harmless. */
+ if (stat (name, &st) < 0)
+ {
+ int save_errno = errno;
+ fprintf_unfiltered (gdb_stderr, "Warning: ");
+ print_sys_errmsg (name, save_errno);
+ }
+ else if ((st.st_mode & S_IFMT) != S_IFDIR)
+ warning ("%s is not a directory.", name);
+ }
append:
{
p = *which_path;
while (1)
{
+ /* FIXME: strncmp loses in interesting ways on MS-DOS and
+ MS-Windows because of case-insensitivity and two different
+ but functionally identical slash characters. We need a
+ special filesystem-dependent file-name comparison function.
+
+ Actually, even on Unix I would use realpath() or its work-
+ alike before comparing. Then all the code above which
+ removes excess slashes and dots could simply go away. */
if (!strncmp (p, name, len)
&& (p[len] == '\0' || p[len] == DIRNAME_SEPARATOR))
{
/* Found it in the search path, remove old copy */
if (p > *which_path)
- p--; /* Back over leading separator */
+ p--; /* Back over leading separator */
if (prefix > p - *which_path)
goto skip_dup; /* Same dir twice in one cmd */
- strcpy (p, &p[len+1]); /* Copy from next \0 or : */
+ strcpy (p, &p[len + 1]); /* Copy from next \0 or : */
}
p = strchr (p, DIRNAME_SEPARATOR);
if (p != 0)
tinybuf[0] = DIRNAME_SEPARATOR;
tinybuf[1] = '\0';
- /* If we have already tacked on a name(s) in this command, be sure they stay on the front as we tack on some more. */
+ /* If we have already tacked on a name(s) in this command, be sure they stay on the front as we tack on some more. */
if (prefix)
{
char *temp, c;
old = *which_path;
}
}
- skip_dup: ;
- } while (*dirname != '\0');
+ skip_dup:;
+ }
+ while (*dirname != '\0');
}
if (!s)
{
- printf_filtered("No current source file.\n");
+ printf_filtered ("No current source file.\n");
return;
}
printf_filtered ("Current source file is %s\n", s->filename);
printf_filtered ("Contains %d line%s.\n", s->nlines,
s->nlines == 1 ? "" : "s");
- printf_filtered("Source language is %s.\n", language_str (s->language));
+ printf_filtered ("Source language is %s.\n", language_str (s->language));
+ printf_filtered ("Compiled with %s debugging format.\n", s->debugformat);
}
+\f
-\f
/* Open a file named STRING, searching path PATH (dir names sep by some char)
using mode MODE and protection bits PROT in the calls to open.
Otherwise, return -1, with errno set for the last name we tried to open. */
/* >>>> This should only allow files of certain types,
- >>>> eg executable, non-directory */
+ >>>> eg executable, non-directory */
int
openp (path, try_cwd_first, string, mode, prot, filename_opened)
char *path;
if (!path)
path = ".";
- if (try_cwd_first || SLASH_P (string[0]))
+#ifdef _WIN32
+ mode |= O_BINARY;
+#endif
+
+ if (try_cwd_first || ROOTED_P (string))
{
int i;
filename = string;
if (fd >= 0)
goto done;
for (i = 0; string[i]; i++)
- if (SLASH_P(string[0]))
- goto done;
+ if (SLASH_P (string[i]))
+ goto done;
}
/* ./foo => foo */
len = strlen (p);
if (len == 4 && p[0] == '$' && p[1] == 'c'
- && p[2] == 'w' && p[3] == 'd') {
- /* Name is $cwd -- insert current directory name instead. */
- int newlen;
-
- /* First, realloc the filename buffer if too short. */
- len = strlen (current_directory);
- newlen = len + strlen (string) + 2;
- if (newlen > alloclen) {
- alloclen = newlen;
- filename = (char *) alloca (alloclen);
+ && p[2] == 'w' && p[3] == 'd')
+ {
+ /* Name is $cwd -- insert current directory name instead. */
+ int newlen;
+
+ /* First, realloc the filename buffer if too short. */
+ len = strlen (current_directory);
+ newlen = len + strlen (string) + 2;
+ if (newlen > alloclen)
+ {
+ alloclen = newlen;
+ filename = (char *) alloca (alloclen);
+ }
+ strcpy (filename, current_directory);
+ }
+ else
+ {
+ /* Normal file name in path -- just use it. */
+ strncpy (filename, p, len);
+ filename[len] = 0;
}
- strcpy (filename, current_directory);
- } else {
- /* Normal file name in path -- just use it. */
- strncpy (filename, p, len);
- filename[len] = 0;
- }
/* Remove trailing slashes */
- while (len > 0 && SLASH_P (filename[len-1]))
- filename[--len] = 0;
+ while (len > 0 && SLASH_P (filename[len - 1]))
+ filename[--len] = 0;
- strcat (filename+len, SLASH_STRING);
+ strcat (filename + len, SLASH_STRING);
strcat (filename, string);
fd = open (filename, mode);
- if (fd >= 0) break;
+ if (fd >= 0)
+ break;
}
- done:
+done:
if (filename_opened)
{
if (fd < 0)
else
{
/* Beware the // my son, the Emacs barfs, the botch that catch... */
-
- *filename_opened = concat (current_directory,
- SLASH_CHAR
- == current_directory[strlen(current_directory)-1]
- ? "": SLASH_STRING,
+
+ *filename_opened = concat (current_directory,
+ SLASH_P (current_directory[strlen (current_directory) - 1])
+ ? "" : SLASH_STRING,
filename, NULL);
- }
+ }
}
#ifdef MPW
/* This is a debugging hack that can go away when all combinations
if (debug_openp)
{
- printf("openp on %s, path %s mode %d prot %d\n returned %d",
- string, path, mode, prot, fd);
+ printf ("openp on %s, path %s mode %d prot %d\n returned %d",
+ string, path, mode, prot, fd);
if (*filename_opened)
- printf(" (filename is %s)", *filename_opened);
- printf("\n");
+ printf (" (filename is %s)", *filename_opened);
+ printf ("\n");
}
}
#endif /* MPW */
return fd;
}
+
+/* This is essentially a convenience, for clients that want the behaviour
+ of openp, using source_path, but that really don't want the file to be
+ opened but want instead just to know what the full pathname is (as
+ qualified against source_path).
+
+ The current working directory is searched first.
+
+ If the file was found, this function returns 1, and FULL_PATHNAME is
+ set to the fully-qualified pathname.
+
+ Else, this functions returns 0, and FULL_PATHNAME is set to NULL.
+ */
+int
+source_full_path_of (filename, full_pathname)
+ char *filename;
+ char **full_pathname;
+{
+ int fd;
+
+ fd = openp (source_path, 1, filename, O_RDONLY, 0, full_pathname);
+ if (fd < 0)
+ {
+ *full_pathname = NULL;
+ return 0;
+ }
+
+ close (fd);
+ return 1;
+}
+
+
/* Open a source file given a symtab S. Returns a file descriptor or
negative number for error. */
-static int
+int
open_source_file (s)
struct symtab *s;
{
char *fullname;
/* Quick way out if we already know its full name */
- if (s->fullname)
+ if (s->fullname)
{
- result = open (s->fullname, O_RDONLY);
+ result = open (s->fullname, OPEN_MODE);
if (result >= 0)
- return result;
+ return result;
/* Didn't work -- free old one, try again. */
mfree (s->objfile->md, s->fullname);
s->fullname = NULL;
/* Replace a path entry of $cdir with the compilation directory name */
#define cdir_len 5
/* We cast strstr's result in case an ANSIhole has made it const,
- which produces a "required warning" when assigned to a nonconst. */
- p = (char *)strstr (source_path, "$cdir");
+ which produces a "required warning" when assigned to a nonconst. */
+ p = (char *) strstr (source_path, "$cdir");
if (p && (p == path || p[-1] == DIRNAME_SEPARATOR)
- && (p[cdir_len] == DIRNAME_SEPARATOR || p[cdir_len] == '\0'))
+ && (p[cdir_len] == DIRNAME_SEPARATOR || p[cdir_len] == '\0'))
{
int len;
path = (char *)
alloca (strlen (source_path) + 1 + strlen (s->dirname) + 1);
len = p - source_path;
- strncpy (path, source_path, len); /* Before $cdir */
- strcpy (path + len, s->dirname); /* new stuff */
- strcat (path + len, source_path + len + cdir_len); /* After $cdir */
+ strncpy (path, source_path, len); /* Before $cdir */
+ strcpy (path + len, s->dirname); /* new stuff */
+ strcat (path + len, source_path + len + cdir_len); /* After $cdir */
}
}
- result = openp (path, 0, s->filename, O_RDONLY, 0, &s->fullname);
+ result = openp (path, 0, s->filename, OPEN_MODE, 0, &s->fullname);
if (result < 0)
{
/* Didn't work. Try using just the basename. */
p = basename (s->filename);
if (p != s->filename)
- result = openp (path, 0, p, O_RDONLY, 0, &s->fullname);
+ result = openp (path, 0, p, OPEN_MODE, 0, &s->fullname);
}
#ifdef MPW
if (result < 0)
/* Didn't work. Try using just the MPW basename. */
p = (char *) mpw_basename (s->filename);
if (p != s->filename)
- result = openp (path, 0, p, O_RDONLY, 0, &s->fullname);
+ result = openp (path, 0, p, OPEN_MODE, 0, &s->fullname);
}
if (result < 0)
{
/* Didn't work. Try using the mixed Unix/MPW basename. */
p = (char *) mpw_mixed_basename (s->filename);
if (p != s->filename)
- result = openp (path, 0, p, O_RDONLY, 0, &s->fullname);
+ result = openp (path, 0, p, OPEN_MODE, 0, &s->fullname);
}
#endif /* MPW */
close (fd);
return s->fullname;
}
-
\f
+
/* Create and initialize the table S->line_charpos that records
the positions of the lines in the source file, which is assumed
to be open on descriptor DESC.
All set S->nlines to the number of such lines. */
-static void
+void
find_source_lines (s, desc)
struct symtab *s;
int desc;
int nlines = 0;
int lines_allocated = 1000;
int *line_charpos;
- long exec_mtime;
+ long mtime = 0;
int size;
- line_charpos = (int *) xmmalloc (s -> objfile -> md,
+ line_charpos = (int *) xmmalloc (s->objfile->md,
lines_allocated * sizeof (int));
if (fstat (desc, &st) < 0)
perror_with_name (s->filename);
- if (exec_bfd)
+ if (s && s->objfile && s->objfile->obfd)
+ mtime = bfd_get_mtime (s->objfile->obfd);
+ else if (exec_bfd)
+ mtime = bfd_get_mtime (exec_bfd);
+
+ if (mtime && mtime < st.st_mtime)
{
- exec_mtime = bfd_get_mtime(exec_bfd);
- if (exec_mtime && exec_mtime < st.st_mtime)
- printf_filtered ("Source file is more recent than executable.\n");
+ if (tui_version)
+ printf_filtered ("\n");
+ warning ("Source file is more recent than executable.\n");
}
#ifdef LSEEK_NOT_LINEAR
/* Have to read it byte by byte to find out where the chars live */
- line_charpos[0] = tell(desc);
+ line_charpos[0] = lseek (desc, 0, SEEK_CUR);
nlines = 1;
- while (myread(desc, &c, 1)>0)
+ while (myread (desc, &c, 1) > 0)
{
- if (c == '\n')
+ if (c == '\n')
{
- if (nlines == lines_allocated)
+ if (nlines == lines_allocated)
{
lines_allocated *= 2;
line_charpos =
- (int *) xmrealloc (s -> objfile -> md, (char *) line_charpos,
+ (int *) xmrealloc (s->objfile->md, (char *) line_charpos,
sizeof (int) * lines_allocated);
}
- line_charpos[nlines++] = tell(desc);
+ line_charpos[nlines++] = lseek (desc, 0, SEEK_CUR);
}
}
}
data = (char *) xmalloc (size);
old_cleanups = make_cleanup (free, data);
- if (myread (desc, data, size) < 0)
+ /* Reassign `size' to result of read for systems where \r\n -> \n. */
+ size = myread (desc, data, size);
+ if (size < 0)
perror_with_name (s->filename);
end = data + size;
p = data;
while (p != end)
{
if (*p++ == '\n'
- /* A newline at the end does not start a new line. */
+ /* A newline at the end does not start a new line. */
&& p != end)
{
if (nlines == lines_allocated)
{
lines_allocated *= 2;
line_charpos =
- (int *) xmrealloc (s -> objfile -> md, (char *) line_charpos,
+ (int *) xmrealloc (s->objfile->md, (char *) line_charpos,
sizeof (int) * lines_allocated);
}
line_charpos[nlines++] = p - data;
#endif /* lseek linear. */
s->nlines = nlines;
s->line_charpos =
- (int *) xmrealloc (s -> objfile -> md, (char *) line_charpos,
- nlines * sizeof (int));
+ (int *) xmrealloc (s->objfile->md, (char *) line_charpos,
+ nlines * sizeof (int));
}
/* Return the character position of a line LINE in symtab S.
Return 0 if anything is invalid. */
-#if 0 /* Currently unused */
+#if 0 /* Currently unused */
int
source_line_charpos (s, line)
struct symtab *s;
int line;
{
- if (!s) return 0;
- if (!s->line_charpos || line <= 0) return 0;
+ if (!s)
+ return 0;
+ if (!s->line_charpos || line <= 0)
+ return 0;
if (line > s->nlines)
line = s->nlines;
return s->line_charpos[line - 1];
int
source_charpos_line (s, chr)
- register struct symtab *s;
- register int chr;
+ register struct symtab *s;
+ register int chr;
{
register int line = 0;
register int *lnp;
-
- if (s == 0 || s->line_charpos == 0) return 0;
+
+ if (s == 0 || s->line_charpos == 0)
+ return 0;
lnp = s->line_charpos;
/* Files are usually short, so sequential search is Ok */
- while (line < s->nlines && *lnp <= chr)
+ while (line < s->nlines && *lnp <= chr)
{
line++;
lnp++;
return line;
}
-#endif /* 0 */
-
+#endif /* 0 */
\f
+
/* Get full pathname and line number positions for a symtab.
Return nonzero if line numbers may have changed.
Set *FULLNAME to actual name of the file as found by `openp',
char **fullname;
{
register int desc, linenums_changed = 0;
-
+
desc = open_source_file (s);
if (desc < 0)
{
if (fullname)
*fullname = NULL;
return 0;
- }
+ }
if (fullname)
*fullname = s->fullname;
- if (s->line_charpos == 0) linenums_changed = 1;
- if (linenums_changed) find_source_lines (s, desc);
+ if (s->line_charpos == 0)
+ linenums_changed = 1;
+ if (linenums_changed)
+ find_source_lines (s, desc);
close (desc);
return linenums_changed;
}
CORE_ADDR pc;
{
if (s->line_charpos == 0)
- get_filename_and_charpos (s, (char **)NULL);
+ get_filename_and_charpos (s, (char **) NULL);
if (s->fullname == 0)
return 0;
if (line > s->nlines)
return 1;
}
\f
+
/* Print source lines from the file of symtab S,
- starting with line number LINE and stopping before line number STOPLINE. */
+ starting with line number LINE and stopping before line number STOPLINE. */
-void
-print_source_lines (s, line, stopline, noerror)
+static void print_source_lines_base (struct symtab *s, int line, int stopline,
+ int noerror);
+static void
+print_source_lines_base (s, line, stopline, noerror)
struct symtab *s;
- int line, stopline;
+ int line;
+ int stopline;
int noerror;
{
register int c;
current_source_line = line;
first_line_listed = line;
- desc = open_source_file (s);
+#ifdef UI_OUT
+ /* If printing of source lines is disabled, just print file and line number */
+ if (ui_out_test_flags (uiout, ui_source_list))
+ {
+#endif
+ /* Only prints "No such file or directory" once */
+ if ((s != last_source_visited) || (!last_source_error))
+ {
+ last_source_visited = s;
+ desc = open_source_file (s);
+ }
+ else
+ {
+ desc = last_source_error;
+ noerror = 1;
+ }
+#ifdef UI_OUT
+ }
+ else
+ {
+ desc = -1;
+ noerror = 1;
+ }
+#endif
+
if (desc < 0)
{
- if (! noerror) {
- char *name = alloca (strlen (s->filename) + 100);
- sprintf (name, "%s:%d", s->filename, line);
- print_sys_errmsg (name, errno);
- }
+ last_source_error = desc;
+
+ if (!noerror)
+ {
+ char *name = alloca (strlen (s->filename) + 100);
+ sprintf (name, "%d\t%s", line, s->filename);
+ print_sys_errmsg (name, errno);
+ }
+ else
+#ifdef UI_OUT
+ ui_out_field_int (uiout, "line", line);
+ ui_out_text (uiout, "\tin ");
+ ui_out_field_string (uiout, "file", s->filename);
+ ui_out_text (uiout, "\n");
+#else
+ printf_filtered ("%d\tin %s\n", line, s->filename);
+#endif
+
return;
}
+ last_source_error = 0;
+
if (s->line_charpos == 0)
find_source_lines (s, desc);
perror_with_name (s->filename);
}
- stream = fdopen (desc, FOPEN_RT);
+ stream = fdopen (desc, FDOPEN_MODE);
clearerr (stream);
while (nlines-- > 0)
{
+#ifdef UI_OUT
+ char buf[20];
+
c = fgetc (stream);
- if (c == EOF) break;
+ if (c == EOF)
+ break;
+ last_line_listed = current_source_line;
+ sprintf (buf, "%d\t", current_source_line++);
+ ui_out_text (uiout, buf);
+ do
+ {
+ if (c < 040 && c != '\t' && c != '\n' && c != '\r')
+ {
+ sprintf (buf, "^%c", c + 0100);
+ ui_out_text (uiout, buf);
+ }
+ else if (c == 0177)
+ ui_out_text (uiout, "^?");
+#ifdef CRLF_SOURCE_FILES
+ else if (c == '\r')
+ {
+ /* Skip a \r character, but only before a \n. */
+ int c1 = fgetc (stream);
+
+ if (c1 != '\n')
+ printf_filtered ("^%c", c + 0100);
+ if (c1 != EOF)
+ ungetc (c1, stream);
+ }
+#endif
+ else
+ {
+ sprintf (buf, "%c", c);
+ ui_out_text (uiout, buf);
+ }
+ }
+ while (c != '\n' && (c = fgetc (stream)) >= 0);
+#else
+ c = fgetc (stream);
+ if (c == EOF)
+ break;
last_line_listed = current_source_line;
printf_filtered ("%d\t", current_source_line++);
do
{
if (c < 040 && c != '\t' && c != '\n' && c != '\r')
- printf_filtered ("^%c", c + 0100);
+ printf_filtered ("^%c", c + 0100);
else if (c == 0177)
printf_filtered ("^?");
+#ifdef CRLF_SOURCE_FILES
+ else if (c == '\r')
+ {
+ /* Just skip \r characters. */
+ }
+#endif
else
printf_filtered ("%c", c);
- } while (c != '\n' && (c = fgetc (stream)) >= 0);
+ }
+ while (c != '\n' && (c = fgetc (stream)) >= 0);
+#endif
}
fclose (stream);
}
\f
+/* Show source lines from the file of symtab S, starting with line
+ number LINE and stopping before line number STOPLINE. If this is the
+ not the command line version, then the source is shown in the source
+ window otherwise it is simply printed */
+
+void
+print_source_lines (s, line, stopline, noerror)
+ struct symtab *s;
+ int line, stopline, noerror;
+{
+#if defined(TUI)
+ if (!tui_version ||
+ m_winPtrIsNull (srcWin) || !srcWin->generic.isVisible)
+ print_source_lines_base (s, line, stopline, noerror);
+ else
+ {
+ TuiGenWinInfoPtr locator = locatorWinInfoPtr ();
+extern void tui_vAddWinToLayout (va_list);
+extern void tui_vUpdateSourceWindowsWithLine (va_list);
+
+ /* Regardless of whether we can open the file,
+ set current_source_symtab. */
+ current_source_symtab = s;
+ current_source_line = line;
+ first_line_listed = line;
+
+ /* make sure that the source window is displayed */
+ tuiDo ((TuiOpaqueFuncPtr) tui_vAddWinToLayout, SRC_WIN);
+
+ tuiDo ((TuiOpaqueFuncPtr) tui_vUpdateSourceWindowsWithLine, s, line);
+ tuiDo ((TuiOpaqueFuncPtr) tui_vUpdateLocatorFilename, s->filename);
+ }
+#else
+ print_source_lines_base (s, line, stopline, noerror);
+#endif
+}
+\f
/* Print a list of files and line numbers which a user may choose from
- in order to list a function which was specified ambiguously (as with
- `list classname::overloadedfuncname', for example). The vector in
- SALS provides the filenames and line numbers. */
+ in order to list a function which was specified ambiguously (as with
+ `list classname::overloadedfuncname', for example). The vector in
+ SALS provides the filenames and line numbers. */
static void
ambiguous_line_spec (sals)
int i;
for (i = 0; i < sals->nelts; ++i)
- printf_filtered("file: \"%s\", line number: %d\n",
- sals->sals[i].symtab->filename, sals->sals[i].line);
+ printf_filtered ("file: \"%s\", line number: %d\n",
+ sals->sals[i].symtab->filename, sals->sals[i].line);
}
static void
int linenum_beg = 0;
char *p;
- if (!have_full_symbols () && !have_partial_symbols())
+ if (!have_full_symbols () && !have_partial_symbols ())
error ("No symbol table is loaded. Use the \"file\" command.");
/* Pull in a current source symtab if necessary */
{
sals = decode_line_1 (&arg1, 0, 0, 0, 0);
- if (! sals.nelts) return; /* C++ */
+ if (!sals.nelts)
+ return; /* C++ */
if (sals.nelts > 1)
{
ambiguous_line_spec (&sals);
sals_end = decode_line_1 (&arg1, 0, 0, 0, 0);
else
sals_end = decode_line_1 (&arg1, 0, sal.symtab, sal.line, 0);
- if (sals_end.nelts == 0)
+ if (sals_end.nelts == 0)
return;
if (sals_end.nelts > 1)
{
error ("Specified start and end are in different files.");
if (dummy_beg && dummy_end)
error ("Two empty args do not say what lines to list.");
-
+
/* if line was specified by address,
first print exactly which line, and which file.
In this case, sal.symtab == 0 means address is outside
if (sal.symtab == 0)
/* FIXME-32x64--assumes sal.pc fits in long. */
error ("No source file for address %s.",
- local_hex_string((unsigned long) sal.pc));
+ local_hex_string ((unsigned long) sal.pc));
sym = find_pc_function (sal.pc);
if (sym)
{
and it does not imply a symtab, it must be an undebuggable symbol
which means no source code. */
- if (! linenum_beg && sal.symtab == 0)
+ if (!linenum_beg && sal.symtab == 0)
error ("No line number known for %s.", arg);
/* If this command is repeated with RET,
else if (sal.symtab == 0)
error ("No default source file yet. Do \"help list\".");
else if (no_end)
- print_source_lines (sal.symtab,
- max (sal.line - (lines_to_list / 2), 1),
- sal.line + (lines_to_list / 2), 0);
+ {
+ int first_line = sal.line - lines_to_list / 2;
+
+ if (first_line < 1) first_line = 1;
+
+ print_source_lines (sal.symtab, first_line, first_line + lines_to_list,
+ 0);
+ }
else
print_source_lines (sal.symtab, sal.line,
(dummy_end
CORE_ADDR start_pc, end_pc;
int i;
+ INIT_SAL (&sal); /* initialize to zeroes */
+
if (arg == 0)
{
sal.symtab = current_source_symtab;
sal.line = last_line_listed;
- sal.pc = 0;
sals.nelts = 1;
sals.sals = (struct symtab_and_line *)
xmalloc (sizeof (struct symtab_and_line));
else
{
sals = decode_line_spec_1 (arg, 0);
-
+
dont_repeat ();
}
for (i = 0; i < sals.nelts; i++)
{
sal = sals.sals[i];
-
+
if (sal.symtab == 0)
{
printf_filtered ("No line number information available");
if (sal.pc != 0)
{
/* This is useful for "info line *0x7f34". If we can't tell the
- user about a source line, at least let them have the symbolic
- address. */
+ user about a source line, at least let them have the symbolic
+ address. */
printf_filtered (" for address ");
wrap_here (" ");
print_address (sal.pc, gdb_stdout);
register int c;
register int desc;
register FILE *stream;
- int line = last_line_listed + 1;
+ int line;
char *msg;
+#if defined(TUI)
+ /*
+ ** If this is the TUI, search from the first line displayed in
+ ** the source window, otherwise, search from last_line_listed+1
+ ** in current_source_symtab
+ */
+ if (!tui_version)
+ line = last_line_listed;
+ else
+ {
+ if (srcWin->generic.isVisible && srcWin->generic.contentSize > 0)
+ line = ((TuiWinContent)
+ srcWin->generic.content)[0]->whichElement.source.lineOrAddr.lineNo;
+ else
+ {
+ printf_filtered ("No source displayed.\nExpression not found.\n");
+ return;
+ }
+ }
+ line++;
+#else
+ line = last_line_listed + 1;
+#endif
+
msg = (char *) re_comp (regex);
if (msg)
error (msg);
if (current_source_symtab == 0)
select_source_symtab (0);
- /* Search from last_line_listed+1 in current_source_symtab */
-
desc = open_source_file (current_source_symtab);
if (desc < 0)
perror_with_name (current_source_symtab->filename);
perror_with_name (current_source_symtab->filename);
}
- stream = fdopen (desc, FOPEN_RT);
+ stream = fdopen (desc, FDOPEN_MODE);
clearerr (stream);
- while (1) {
- static char *buf = NULL;
- register char *p;
- int cursize, newsize;
-
- cursize = 256;
- buf = xmalloc (cursize);
- p = buf;
-
- c = getc (stream);
- if (c == EOF)
- break;
- do {
- *p++ = c;
- if (p - buf == cursize)
+ while (1)
+ {
+ static char *buf = NULL;
+ register char *p;
+ int cursize, newsize;
+
+ cursize = 256;
+ buf = xmalloc (cursize);
+ p = buf;
+
+ c = getc (stream);
+ if (c == EOF)
+ break;
+ do
{
- newsize = cursize + cursize / 2;
- buf = xrealloc (buf, newsize);
- p = buf + cursize;
- cursize = newsize;
+ *p++ = c;
+ if (p - buf == cursize)
+ {
+ newsize = cursize + cursize / 2;
+ buf = xrealloc (buf, newsize);
+ p = buf + cursize;
+ cursize = newsize;
+ }
}
- } while (c != '\n' && (c = getc (stream)) >= 0);
+ while (c != '\n' && (c = getc (stream)) >= 0);
- /* we now have a source line in buf, null terminate and match */
- *p = 0;
- if (re_exec (buf) > 0)
- {
- /* Match! */
- fclose (stream);
- print_source_lines (current_source_symtab, line, line+1, 0);
- set_internalvar (lookup_internalvar ("_"),
- value_from_longest (builtin_type_int,
- (LONGEST) line));
- current_source_line = max (line - lines_to_list / 2, 1);
- return;
- }
- line++;
- }
+#ifdef CRLF_SOURCE_FILES
+ /* Remove the \r, if any, at the end of the line, otherwise
+ regular expressions that end with $ or \n won't work. */
+ if (p - buf > 1 && p[-2] == '\r')
+ {
+ p--;
+ p[-1] = '\n';
+ }
+#endif
+
+ /* we now have a source line in buf, null terminate and match */
+ *p = 0;
+ if (re_exec (buf) > 0)
+ {
+ /* Match! */
+ fclose (stream);
+ if (tui_version)
+ print_source_lines_base (current_source_symtab, line, line + 1, 0);
+ print_source_lines (current_source_symtab, line, line + 1, 0);
+ set_internalvar (lookup_internalvar ("_"),
+ value_from_longest (builtin_type_int,
+ (LONGEST) line));
+ current_source_line = max (line - lines_to_list / 2, 1);
+ return;
+ }
+ line++;
+ }
printf_filtered ("Expression not found\n");
fclose (stream);
register int c;
register int desc;
register FILE *stream;
- int line = last_line_listed - 1;
+ int line;
char *msg;
+#if defined(TUI)
+ /*
+ ** If this is the TUI, search from the first line displayed in
+ ** the source window, otherwise, search from last_line_listed-1
+ ** in current_source_symtab
+ */
+ if (!tui_version)
+ line = last_line_listed;
+ else
+ {
+ if (srcWin->generic.isVisible && srcWin->generic.contentSize > 0)
+ line = ((TuiWinContent)
+ srcWin->generic.content)[0]->whichElement.source.lineOrAddr.lineNo;
+ else
+ {
+ printf_filtered ("No source displayed.\nExpression not found.\n");
+ return;
+ }
+ }
+ line--;
+#else
+ line = last_line_listed - 1;
+#endif
msg = (char *) re_comp (regex);
if (msg)
if (current_source_symtab == 0)
select_source_symtab (0);
- /* Search from last_line_listed-1 in current_source_symtab */
-
desc = open_source_file (current_source_symtab);
if (desc < 0)
perror_with_name (current_source_symtab->filename);
perror_with_name (current_source_symtab->filename);
}
- stream = fdopen (desc, FOPEN_RT);
+ stream = fdopen (desc, FDOPEN_MODE);
clearerr (stream);
while (line > 1)
{
c = getc (stream);
if (c == EOF)
break;
- do {
- *p++ = c;
- } while (c != '\n' && (c = getc (stream)) >= 0);
+ do
+ {
+ *p++ = c;
+ }
+ while (c != '\n' && (c = getc (stream)) >= 0);
+
+#ifdef CRLF_SOURCE_FILES
+ /* Remove the \r, if any, at the end of the line, otherwise
+ regular expressions that end with $ or \n won't work. */
+ if (p - buf > 1 && p[-2] == '\r')
+ {
+ p--;
+ p[-1] = '\n';
+ }
+#endif
/* We now have a source line in buf; null terminate and match. */
*p = 0;
{
/* Match! */
fclose (stream);
- print_source_lines (current_source_symtab,
- line, line+1, 0);
+ if (tui_version)
+ print_source_lines_base (current_source_symtab, line, line + 1, 0);
+ print_source_lines (current_source_symtab, line, line + 1, 0);
set_internalvar (lookup_internalvar ("_"),
value_from_longest (builtin_type_int,
(LONGEST) line));
re_set_syntax (RE_SYNTAX_GREP);
c = add_cmd ("directory", class_files, directory_command,
- "Add directory DIR to beginning of search path for source files.\n\
+ "Add directory DIR to beginning of search path for source files.\n\
Forget cached info on source file locations and line positions.\n\
DIR can also be $cwd for the current working directory, or $cdir for the\n\
directory in which the source file was compiled into object code.\n\
With no argument, reset the search path to $cdir:$cwd, the default.",
&cmdlist);
+
+ if (dbx_commands)
+ add_com_alias ("use", "directory", class_files, 0);
+
c->completer = filename_completer;
add_cmd ("directories", no_class, show_directories,
$cdir in the path means the compilation directory of the source file.",
&showlist);
+ if (xdb_commands)
+ {
+ add_com_alias ("D", "directory", class_files, 0);
+ add_cmd ("ld", no_class, show_directories,
+ "Current search path for finding source files.\n\
+$cwd in the path means the current working directory.\n\
+$cdir in the path means the compilation directory of the source file.",
+ &cmdlist);
+ }
+
add_info ("source", source_info,
"Information about the current source file.");
"Search backward for regular expression (see regex(3)) from last line listed.\n\
The matching line number is also stored as the value of \"$_\".");
+ if (xdb_commands)
+ {
+ add_com_alias ("/", "forward-search", class_files, 0);
+ add_com_alias ("?", "reverse-search", class_files, 0);
+ }
+
add_com ("list", class_files, list_command,
concat ("List specified function or line.\n\
With no argument, lists ten more lines after or around previous listing.\n\
*ADDRESS, to list around the line containing that address.\n\
With two args if one is empty it stands for ten lines away from the other arg.", NULL));
- add_com_alias ("l", "list", class_files, 1);
+ if (!xdb_commands)
+ add_com_alias ("l", "list", class_files, 1);
+ else
+ add_com_alias ("v", "list", class_files, 1);
+
+ if (dbx_commands)
+ add_com_alias ("file", "list", class_files, 1);
add_show_from_set
(add_set_cmd ("listsize", class_support, var_uinteger,
- (char *)&lines_to_list,
- "Set number of source lines gdb will list by default.",
+ (char *) &lines_to_list,
+ "Set number of source lines gdb will list by default.",
&setlist),
&showlist);
}
projects / deliverable / binutils-gdb.git / blobdiff