From ddb37a47da240a04ba2193ea3f29c1d12ad807c0 Mon Sep 17 00:00:00 2001 From: ridiculousfish Date: Sun, 15 Dec 2013 16:43:22 -0800 Subject: [PATCH] Stop using realpath() in builtin_source, so as to preserve relative path reporting in backtraces --- builtin.cpp | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/builtin.cpp b/builtin.cpp index fe7b83777..f0e918381 100644 --- a/builtin.cpp +++ b/builtin.cpp @@ -3011,10 +3011,7 @@ static int builtin_source(parser_t &parser, wchar_t ** argv) argc = builtin_count_args(argv); - const wchar_t *fn; - const wchar_t *fn_intern; - - + const wchar_t *fn, *fn_intern; if (argc < 2 || (wcscmp(argv[1], L"-") == 0)) { @@ -3047,18 +3044,7 @@ static int builtin_source(parser_t &parser, wchar_t ** argv) return STATUS_BUILTIN_ERROR; } - fn = wrealpath(argv[1], NULL); - - if (!fn) - { - fn_intern = intern(argv[1]); - } - else - { - fn_intern = intern(fn); - free((void *)fn); - } - + fn_intern = intern(argv[1]); } parser.push_block(new source_block_t(fn_intern));