/* List lines of source files for GDB, the GNU debugger.
- Copyright 1986, 87, 88, 89, 91, 92, 93, 94, 95, 96, 97, 1998
- Free Software Foundation, Inc.
+ Copyright 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995,
+ 1996, 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
This file is part of GDB.
#include "expression.h"
#include "language.h"
#include "command.h"
+#include "source.h"
#include "gdbcmd.h"
#include "frame.h"
#include "value.h"
#include "gdb_string.h"
#include "gdb_stat.h"
#include <fcntl.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
#include "gdbcore.h"
-#include "gnu-regex.h"
+#include "gdb_regex.h"
#include "symfile.h"
#include "objfiles.h"
#include "annotate.h"
#include "gdbtypes.h"
+#include "linespec.h"
+#include "completer.h"
+#ifdef UI_OUT
+#include "ui-out.h"
+#endif
#ifdef CRLF_SOURCE_FILES
#endif /* ! defined (CRLF_SOURCE_FILES) */
-/* Forward declarations */
-
-int open_source_file PARAMS ((struct symtab *));
-
-void find_source_lines PARAMS ((struct symtab *, int));
-
/* Prototypes for exported functions. */
-void _initialize_source PARAMS ((void));
+void _initialize_source (void);
/* Prototypes for local functions. */
-static int get_filename_and_charpos PARAMS ((struct symtab *, char **));
+static int get_filename_and_charpos (struct symtab *, char **);
-static void reverse_search_command PARAMS ((char *, int));
+static void reverse_search_command (char *, int);
-static void forward_search_command PARAMS ((char *, int));
+static void forward_search_command (char *, int);
-static void line_info PARAMS ((char *, int));
+static void line_info (char *, int);
-static void list_command PARAMS ((char *, int));
+static void list_command (char *, int);
-static void ambiguous_line_spec PARAMS ((struct symtabs_and_lines *));
+static void ambiguous_line_spec (struct symtabs_and_lines *);
-static void source_info PARAMS ((char *, int));
+static void source_info (char *, int);
-static void show_directories PARAMS ((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. */
before we need to would make things slower than necessary. */
void
-select_source_symtab (s)
- register struct symtab *s;
+select_source_symtab (register struct symtab *s)
{
struct symtabs_and_lines sals;
struct symtab_and_line sal;
{
sals = decode_line_spec ("main", 1);
sal = sals.sals[0];
- free (sals.sals);
+ xfree (sals.sals);
current_source_symtab = sal.symtab;
current_source_line = max (sal.line - (lines_to_list - 1), 1);
if (current_source_symtab)
{
if (cs_pst->readin)
{
- fatal ("Internal: select_source_symtab: readin pst found and no symtabs.");
+ internal_error (__FILE__, __LINE__,
+ "select_source_symtab: "
+ "readin pst found and no symtabs.");
}
else
{
}
\f
static void
-show_directories (ignore, from_tty)
- char *ignore;
- int from_tty;
+show_directories (char *ignore, int from_tty)
{
puts_filtered ("Source directories searched: ");
puts_filtered (source_path);
may be found in a different directory now. */
void
-forget_cached_source_info ()
+forget_cached_source_info (void)
{
register struct symtab *s;
register struct objfile *objfile;
}
void
-init_source_path ()
+init_source_path (void)
{
char buf[20];
sprintf (buf, "$cdir%c$cwd", DIRNAME_SEPARATOR);
- source_path = strsave (buf);
+ source_path = xstrdup (buf);
forget_cached_source_info ();
}
/* Add zero or more directories to the front of the source path. */
void
-directory_command (dirname, from_tty)
- char *dirname;
- int from_tty;
+directory_command (char *dirname, int from_tty)
{
dont_repeat ();
/* FIXME, this goes to "delete dir"... */
{
if (from_tty && query ("Reinitialize source path to empty? "))
{
- free (source_path);
+ xfree (source_path);
init_source_path ();
}
}
/* Add zero or more directories to the front of an arbitrary path. */
void
-mod_path (dirname, which_path)
- char *dirname;
- char **which_path;
+mod_path (char *dirname, char **which_path)
{
char *old = *which_path;
int prefix = 0;
if (dirname == 0)
return;
- dirname = strsave (dirname);
- make_cleanup (free, dirname);
+ dirname = xstrdup (dirname);
+ make_cleanup (xfree, dirname);
do
{
}
}
-#ifndef _WIN32
- /* On win32 h:\ is different to h: */
- 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;
-#endif
*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);
+#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);
+ make_cleanup (xfree, name);
/* Unless it's a variable, check existence. */
if (name[0] != '$')
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))
{
old[prefix] = c;
*which_path = concat (temp, "", &old[prefix], NULL);
prefix = strlen (temp);
- free (temp);
+ xfree (temp);
}
else
{
*which_path = concat (name, (old[0] ? tinybuf : old), old, NULL);
prefix = strlen (name);
}
- free (old);
+ xfree (old);
old = *which_path;
}
}
static void
-source_info (ignore, from_tty)
- char *ignore;
- int from_tty;
+source_info (char *ignore, int from_tty)
{
register struct symtab *s = current_source_symtab;
so that "exec-file ./foo" or "symbol-file ./foo" insures that you
get that particular version of foo or an error message).
- If FILENAMED_OPENED is non-null, set it to a newly allocated string naming
+ If FILENAME_OPENED is non-null, set it to a newly allocated string naming
the actual file opened (this string will always start with a "/". We
have to take special pains to avoid doubling the "/" between the directory
and the file, sigh! Emacs gets confuzzed by this when we print the
/* >>>> This should only allow files of certain types,
>>>> eg executable, non-directory */
int
-openp (path, try_cwd_first, string, mode, prot, filename_opened)
- char *path;
- int try_cwd_first;
- char *string;
- int mode;
- int prot;
- char **filename_opened;
+openp (char *path, int try_cwd_first, char *string, int mode, int prot,
+ char **filename_opened)
{
register int fd;
register char *filename;
/* 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_P (current_directory[strlen (current_directory) - 1])
? "" : SLASH_STRING,
filename, NULL);
}
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;
+source_full_path_of (char *filename, char **full_pathname)
{
int fd;
negative number for error. */
int
-open_source_file (s)
- struct symtab *s;
+open_source_file (struct symtab *s)
{
char *path = source_path;
char *p;
{
fullname = s->fullname;
s->fullname = mstrsave (s->objfile->md, s->fullname);
- free (fullname);
+ xfree (fullname);
}
return result;
}
if no symtab. */
char *
-symtab_to_filename (s)
- struct symtab *s;
+symtab_to_filename (struct symtab *s)
{
int fd;
All set S->nlines to the number of such lines. */
void
-find_source_lines (s, desc)
- struct symtab *s;
- int desc;
+find_source_lines (struct symtab *s, int desc)
{
struct stat st;
register char *data, *p, *end;
/* Use malloc, not alloca, because this may be pretty large, and we may
run into various kinds of limits on stack size. */
data = (char *) xmalloc (size);
- old_cleanups = make_cleanup (free, data);
+ old_cleanups = make_cleanup (xfree, data);
/* Reassign `size' to result of read for systems where \r\n -> \n. */
size = myread (desc, data, size);
#if 0 /* Currently unused */
int
-source_line_charpos (s, line)
- struct symtab *s;
- int line;
+source_line_charpos (struct symtab *s, int line)
{
if (!s)
return 0;
/* Return the line number of character position POS in symtab S. */
int
-source_charpos_line (s, chr)
- register struct symtab *s;
- register int chr;
+source_charpos_line (register struct symtab *s, register int chr)
{
register int line = 0;
register int *lnp;
or to 0 if the file is not found. */
static int
-get_filename_and_charpos (s, fullname)
- struct symtab *s;
- char **fullname;
+get_filename_and_charpos (struct symtab *s, char **fullname)
{
register int desc, linenums_changed = 0;
Return 1 if successful, 0 if could not find the file. */
int
-identify_source_line (s, line, mid_statement, pc)
- struct symtab *s;
- int line;
- int mid_statement;
- CORE_ADDR pc;
+identify_source_line (struct symtab *s, int line, int mid_statement,
+ CORE_ADDR pc)
{
if (s->line_charpos == 0)
get_filename_and_charpos (s, (char **) NULL);
/* Print source lines from the file of symtab S,
starting with line number LINE and stopping before line number STOPLINE. */
-static void print_source_lines_base PARAMS ((struct symtab * s, int line, int stopline, int 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;
- int stopline;
- int noerror;
+print_source_lines_base (struct symtab *s, int line, int stopline, int noerror)
{
register int c;
register int desc;
current_source_line = line;
first_line_listed = line;
+#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))
{
desc = last_source_error;
noerror = 1;
}
+#ifdef UI_OUT
+ }
+ else
+ {
+ desc = -1;
+ noerror = 1;
+ }
+#endif
if (desc < 0)
{
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;
}
while (nlines-- > 0)
{
+#ifdef UI_OUT
+ char buf[20];
+
+ c = fgetc (stream);
+ 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;
printf_filtered ("%c", c);
}
while (c != '\n' && (c = fgetc (stream)) >= 0);
+#endif
}
fclose (stream);
window otherwise it is simply printed */
void
-print_source_lines (s, line, stopline, noerror)
- struct symtab *s;
- int line, stopline, noerror;
+print_source_lines (struct symtab *s, int line, int stopline, int noerror)
{
#if defined(TUI)
if (!tui_version ||
else
{
TuiGenWinInfoPtr locator = locatorWinInfoPtr ();
- extern void tui_vAddWinToLayout PARAMS ((va_list));
- extern void tui_vUpdateSourceWindowsWithLine PARAMS ((va_list));
+extern void tui_vAddWinToLayout (va_list);
+extern void tui_vUpdateSourceWindowsWithLine (va_list);
/* Regardless of whether we can open the file,
set current_source_symtab. */
SALS provides the filenames and line numbers. */
static void
-ambiguous_line_spec (sals)
- struct symtabs_and_lines *sals;
+ambiguous_line_spec (struct symtabs_and_lines *sals)
{
int i;
}
static void
-list_command (arg, from_tty)
- char *arg;
- int from_tty;
+list_command (char *arg, int from_tty)
{
struct symtabs_and_lines sals, sals_end;
struct symtab_and_line sal, sal_end;
if (sals.nelts > 1)
{
ambiguous_line_spec (&sals);
- free (sals.sals);
+ xfree (sals.sals);
return;
}
sal = sals.sals[0];
- free (sals.sals);
+ xfree (sals.sals);
}
/* Record whether the BEG arg is all digits. */
if (sals_end.nelts > 1)
{
ambiguous_line_spec (&sals_end);
- free (sals_end.sals);
+ xfree (sals_end.sals);
return;
}
sal_end = sals_end.sals[0];
- free (sals_end.sals);
+ xfree (sals_end.sals);
}
}
error ("No default source file yet. Do \"help list\".");
else if (no_end)
{
- if (lines_to_list % 2 == 0)
- print_source_lines (sal.symtab,
- max (sal.line - (lines_to_list / 2), 1),
- sal.line + (lines_to_list / 2), 0);
- else
- /* If lines_to_list is odd, then we round down in
- * one of the lines_to_list/2 computations, round up in
- * the other, so the total window size around the specified
- * line comes out right.
- */
- print_source_lines (sal.symtab,
- max (sal.line - (lines_to_list / 2), 1),
- sal.line + ((1 + 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,
/* Print info on range of pc's in a specified line. */
static void
-line_info (arg, from_tty)
- char *arg;
- int from_tty;
+line_info (char *arg, int from_tty)
{
struct symtabs_and_lines sals;
struct symtab_and_line sal;
printf_filtered ("Line number %d is out of range for \"%s\".\n",
sal.line, sal.symtab->filename);
}
- free (sals.sals);
+ xfree (sals.sals);
}
\f
/* Commands to search the source file for a regexp. */
/* ARGSUSED */
static void
-forward_search_command (regex, from_tty)
- char *regex;
- int from_tty;
+forward_search_command (char *regex, int from_tty)
{
register int c;
register int desc;
}
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;
if (re_exec (buf) > 0)
/* ARGSUSED */
static void
-reverse_search_command (regex, from_tty)
- char *regex;
- int from_tty;
+reverse_search_command (char *regex, int from_tty)
{
register int c;
register int desc;
}
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;
if (re_exec (buf) > 0)
}
\f
void
-_initialize_source ()
+_initialize_source (void)
{
struct cmd_list_element *c;
current_source_symtab = 0;
projects / deliverable / binutils-gdb.git / blobdiff