OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-04 18:06:22 +03:00
Code Packages Releases Activity

0027054: Upgrade procedure corrupts files with DOS line endings

Browse Source 
Treatment of files in DOS encoding corrected to avoid duplication of CR symbols
This commit is contained in:
abv 2016-01-01 18:43:02 +03:00
parent d573adcf38
commit 155408bf59
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
adm/upgrade.tcl
View File

@ -1160,24 +1160,16 @@ proc ReadFileToList {theFilePath theFileContent theFileEOL} {
set aFileContent [read $aFile] set aFileContent [read $aFile]
close $aFile close $aFile
set aFileEOL "\r" # detect DOS end-of-lines
if [regexp "\r\n" $aFileContent] { if { [regexp "\r\n" $aFileContent] } {
set aFileEOL "\r\n" set aFileEOL "\r\n"
} elseif [regexp "\n" $aFileContent] { set aList [split [regsub -all "\r\n" $aFileContent "\n"] "\r\n"]
} else {
# standard UNIX end-of-lines
set aFileEOL "\n" set aFileEOL "\n"
set aList [split $aFileContent "\n"]
} }
# convert to unix eol
if {"$aFileEOL" != "\n"} {
regsub -all {$aFileEOL} $aFileContent "\n" aFileContent
}
set aList [split $aFileContent "\n"]
# set aList {}
# foreach aLine [split $aFileContent "\n"] {
# lappend aList [string trimright $aLine]
# }
return $aList return $aList
} }