luke
/
xschem
mirror of https://github.com/StefanSchippers/xschem.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix regression: correctly resolve ../../some/path/to/file in abs_sym_path

This commit is contained in:
Stefan Schippers 2020-10-14 11:14:15 +02:00
parent b834df35e7
commit abb698ea63
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/xschem.tcl
View File

@ -2664,11 +2664,14 @@ proc abs_sym_path {fname {ext {} } } {
if { $ext ne {} } {
set fname [file rootname $fname]$ext
}
# prepend current_dirname to ../file_or_path --> $current_dirname/file_or_path
if { [regexp {^\.\./} $fname ] } {
if { [regexp {^/} $current_dirname] } {
set fname "${current_dirname}[regsub {^\.\.} $fname {}]"
# prepend current_dirname to ../file_or_path --> [file dirname $current_dirname]/file_or_path
if { [regexp {^/} $current_dirname] } {
set tmpdir $current_dirname
while { [regexp {^\.\./} $fname ] } {
set tmpdir [file dirname $tmpdir]
regsub {^\.\./} $fname {} fname
}
set fname "${tmpdir}/$fname"
# transform ./file_or_path to file_or_path
} elseif {[regexp {^\./} $fname ] } {
regsub {^\./} $fname {} fname