Mercurial > jwe > octave
changeset 29645:4c613e473f9f
maint: merge stable to default.
author | Markus Mützel <markus.muetzel@gmx.de> |
---|---|
date | Sat, 08 May 2021 19:51:08 +0200 |
parents | 75556567592e (current diff) 161daebce243 (diff) |
children | c0a028c5d7ac |
files | libinterp/octave-value/ov-mex-fcn.cc |
diffstat | 2 files changed, 8 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/libinterp/octave-value/ov-dld-fcn.cc Sat May 08 09:39:19 2021 -0700 +++ b/libinterp/octave-value/ov-dld-fcn.cc Sat May 08 19:51:08 2021 +0200 @@ -27,6 +27,7 @@ # include "config.h" #endif +#include "file-ops.h" #include "oct-shlib.h" #include "defaults.h" @@ -51,7 +52,8 @@ std::string file_name = fcn_file_name (); - std::string oct_file_dir = octave::config::oct_file_dir (); + static const std::string oct_file_dir + = octave::sys::canonicalize_file_name (octave::config::oct_file_dir ()); system_fcn_file = (! file_name.empty () @@ -67,7 +69,8 @@ std::string file_name = fcn_file_name (); - std::string oct_file_dir = octave::config::oct_file_dir (); + static const std::string oct_file_dir + = octave::sys::canonicalize_file_name (octave::config::oct_file_dir ()); system_fcn_file = (! file_name.empty ()
--- a/libinterp/octave-value/ov-mex-fcn.cc Sat May 08 09:39:19 2021 -0700 +++ b/libinterp/octave-value/ov-mex-fcn.cc Sat May 08 19:51:08 2021 +0200 @@ -27,6 +27,7 @@ # include "config.h" #endif +#include "file-ops.h" #include "oct-shlib.h" #include "defaults.h" @@ -56,7 +57,8 @@ std::string file_name = fcn_file_name (); - std::string oct_file_dir = octave::config::oct_file_dir (); + static const std::string oct_file_dir + = octave::sys::canonicalize_file_name (octave::config::oct_file_dir ()); m_is_system_fcn_file = (! file_name.empty () && oct_file_dir == file_name.substr (0, oct_file_dir.length ()));