From bc3aa6c30087ecab7a06ec986344d2954e7c847c Mon Sep 17 00:00:00 2001 From: Doug Evans Date: Wed, 11 Apr 2012 18:37:14 +0000 Subject: [PATCH] * source.c (find_and_open_source): Consistently pass resulting full path through xfullpath. --- gdb/ChangeLog | 5 +++++ gdb/source.c | 11 ++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index aceef1e..c511d06 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2012-04-11 Yuanhui Zhang + + * source.c (find_and_open_source): Consistently pass resulting + full path through xfullpath. + 2012-04-11 Jan Kratochvil Provide more specific displaced-stepping memory error message. diff --git a/gdb/source.c b/gdb/source.c index 97f5d46..9b464f9 100644 --- a/gdb/source.c +++ b/gdb/source.c @@ -997,7 +997,16 @@ find_and_open_source (const char *filename, result = open (*fullname, OPEN_MODE); if (result >= 0) - return result; + { + /* Call xfullpath here to be consistent with openp + which we use below. */ + char *lpath = xfullpath (*fullname); + + xfree (*fullname); + *fullname = lpath; + return result; + } + /* Didn't work -- free old one, try again. */ xfree (*fullname); *fullname = NULL; -- 2.7.4