BaseTool/Upt: Avoid UNI file name conflict

[mirror_edk2.git] / BaseTools / Source / Python / UPT / Library / ParserValidate.py

diff --git a/BaseTools/Source/Python/UPT/Library/ParserValidate.py b/BaseTools/Source/Python/UPT/Library/ParserValidate.py
index bfb4bc749fdf20c01616d220987654c49ab67857..028cf9a54f84cc569397ab5bd590a96653618129 100644 (file)
--- a/BaseTools/Source/Python/UPT/Library/ParserValidate.py
+++ b/BaseTools/Source/Python/UPT/Library/ParserValidate.py
@@ -27,6 +27,7 @@ from Library.DataType import TAB_SPACE_SPLIT
 from Library.String import GetSplitValueList\r
 from Library.ExpressionValidate import IsValidBareCString\r
 from Library.ExpressionValidate import IsValidFeatureFlagExp\r
+from Common.MultipleWorkspace import MultipleWorkspace as mws\r
 \r
 ## __HexDigit() method\r
 #\r
@@ -236,7 +237,7 @@ def IsValidPath(Path, Root):
     \r
     Path = os.path.normpath(Path).replace('\\', '/')\r
     Root = os.path.normpath(Root).replace('\\', '/')\r
-    FullPath = os.path.normpath(os.path.join(Root, Path)).replace('\\', '/')\r
+    FullPath = mws.join(Root, Path)\r
     \r
     if not os.path.exists(FullPath):\r
         return False\r
@@ -721,3 +722,12 @@ def IsValidUserId(UserId):
             return False\r
     return True\r
 \r
+#\r
+# Check if a UTF16-LE file has a BOM header\r
+#\r
+def CheckUTF16FileHeader(File):\r
+    FileIn = open(File, 'rb').read(2)\r
+    if FileIn != '\xff\xfe':\r
+        return False\r
+\r
+    return True\r