From e1f1ed1ad75d43e928ce1fa347659d3490b539aa Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Wed, 15 Jul 1998 18:00:49 +0000 Subject: [PATCH] Cope with setting trace points on symbols which do not have an associated directory. --- gdb/ChangeLog | 10 ++++++++++ gdb/tracepoint.c | 32 ++++++++++++++++++++------------ 2 files changed, 30 insertions(+), 12 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 4ae49736615..1e815f8f20c 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,13 @@ +Wed Jul 15 10:58:29 1998 Nick Clifton + + * tracepoint.c (set_raw_tracepoint): Cope with symbols that do not + have an associated directory. + +Mon Jul 13 15:21:04 1998 Mark Alexander + + * utils.c (puts_debug): Display non-printable characters in hex + instead of octal. + Thu Jul 9 16:16:47 1998 Jeffrey A Law (law@cygnus.com) * mn10300-tdep.c (mn10300_generic_register_names): New variable. diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c index fa5ac4db38d..20379c1cf4c 100644 --- a/gdb/tracepoint.c +++ b/gdb/tracepoint.c @@ -333,18 +333,26 @@ set_raw_tracepoint (sal) t->source_file = NULL; else { - char *p; - - t->source_file = (char *) xmalloc (strlen (sal.symtab->filename) + - strlen (sal.symtab->dirname) + 2); - - strcpy (t->source_file, sal.symtab->dirname); - p = t->source_file; - while (*p) - p++; - if (*(--p) != '/') /* Will this work on Windows? */ - strcat (t->source_file, "/"); - strcat (t->source_file, sal.symtab->filename); + if (sal.symtab->dirname == NULL) + { + t->source_file = (char *) xmalloc (strlen (sal.symtab->filename) + 1); + strcpy (t->source_file, sal.symtab->filename); + } + else + { + char *p; + + t->source_file = (char *) xmalloc (strlen (sal.symtab->filename) + + strlen (sal.symtab->dirname) + 2); + + strcpy (t->source_file, sal.symtab->dirname); + p = t->source_file; + while (*p) + p++; + if (*(--p) != '/') /* Will this work on Windows? */ + strcat (t->source_file, "/"); + strcat (t->source_file, sal.symtab->filename); + } } t->language = current_language->la_language; -- 2.30.2