From 04affae3ef7aa124b6ac0ce4f3a54063b7b4784f Mon Sep 17 00:00:00 2001 From: Jan Kratochvil Date: Mon, 2 Dec 2013 22:24:32 +0100 Subject: Record objfile->original_name as an absolute path gdb/ 2013-12-02 Doug Evans Jan Kratochvil * objfiles.c (allocate_objfile): Save original_name as an absolute path. * objfiles.h (struct objfile): Expand comment on original_name. * source.c (openp): Call gdb_abspath. * utils.c (gdb_abspath): New function. * utils.h (gdb_abspath): Declare. gdb/testsuite/ 2013-12-02 Doug Evans * gdb.dwarf/dwp-symlink.c: Fake out gdb to not load debug info at start. * gdb.dwarf/dwp-symlink.exp: Test trying to load dwp when the binary has been specified with a relative path and we have chdir'd before accessing the debug info. --- gdb/source.c | 24 +++--------------------- 1 file changed, 3 insertions(+), 21 deletions(-) (limited to 'gdb/source.c') diff --git a/gdb/source.c b/gdb/source.c index 0959585..6234bfc 100644 --- a/gdb/source.c +++ b/gdb/source.c @@ -853,28 +853,10 @@ done: /* If a file was opened, canonicalize its filename. */ if (fd < 0) *filename_opened = NULL; + else if ((opts & OPF_RETURN_REALPATH) != 0) + *filename_opened = gdb_realpath (filename); else - { - char *(*realpath_fptr) (const char *); - - realpath_fptr = ((opts & OPF_RETURN_REALPATH) != 0 - ? gdb_realpath : xstrdup); - - if (IS_ABSOLUTE_PATH (filename)) - *filename_opened = realpath_fptr (filename); - else - { - /* Beware the // my son, the Emacs barfs, the botch that catch... */ - - char *f = concat (current_directory, - IS_DIR_SEPARATOR (current_directory[strlen (current_directory) - 1]) - ? "" : SLASH_STRING, - filename, (char *)NULL); - - *filename_opened = realpath_fptr (f); - xfree (f); - } - } + *filename_opened = gdb_abspath (filename); } return fd; -- cgit v1.1