diff host/tools/Utils/common/Properties.cpp @ 208:e0c0827131d1 ecos

Merge from eCos master repository on 2002-05-20-20:11:54-BST
author jlarmour
date Mon, 20 May 2002 22:19:26 +0000
parents 6736c52df507
children 9589be2cc5c9
line wrap: on
line diff
--- a/host/tools/Utils/common/Properties.cpp
+++ b/host/tools/Utils/common/Properties.cpp
@@ -382,6 +382,10 @@ bool CProperties::LoadFromFile(LPCTSTR p
         if(_TCHAR('\n')==buf[nLen-1]){
           buf[--nLen]=_TCHAR('\0');
         }
+        // Remove trailing '\r'
+        if(_TCHAR('\r')==buf[nLen-1]){
+          buf[--nLen]=_TCHAR('\0');
+        }
         
         // Check for continuation lines
         if(_TCHAR('\\')==buf[nLen-1]){