From 155408bf590f7408d898b67f3d78049605007ff7 Mon Sep 17 00:00:00 2001
From: abv <abv@opencascade.com>
Date: Fri, 1 Jan 2016 18:43:02 +0300
Subject: [PATCH] 0027054: Upgrade procedure corrupts files with DOS line
 endings

Treatment of files in DOS encoding corrected to avoid duplication of CR symbols
---
 adm/upgrade.tcl | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/adm/upgrade.tcl b/adm/upgrade.tcl
index 6193e64631..77030716d6 100644
--- a/adm/upgrade.tcl
+++ b/adm/upgrade.tcl
@@ -1160,24 +1160,16 @@ proc ReadFileToList {theFilePath theFileContent theFileEOL} {
   set aFileContent [read $aFile]
   close $aFile
 
-  set aFileEOL "\r"
-  if [regexp "\r\n" $aFileContent] {
+  # detect DOS end-of-lines
+  if { [regexp "\r\n" $aFileContent] } {
     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 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
 }