didnt want to change pointer for copymem...

corrected full file name creation

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@9007 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/ShellPkg/Library/BaseFileHandleLib/BaseFileHandleLib.c b/ShellPkg/Library/BaseFileHandleLib/BaseFileHandleLib.c
index 808ac74d30b62eb811370a9d43e1ac69a71a9073..cd72cbd50aa7262dfbcad2bc511afd5776493954 100644 (file)
--- a/ShellPkg/Library/BaseFileHandleLib/BaseFileHandleLib.c
+++ b/ShellPkg/Library/BaseFileHandleLib/BaseFileHandleLib.c
@@ -708,8 +708,8 @@ StrnCatGrowLeft (
   }\r
 \r
   CopySize = StrSize(*Destination);\r
-  *Destination = CopyMem(*Destination+Count-sizeof(CHAR16), *Destination, CopySize);\r
-  *Destination = CopyMem(*Destination, Source, Count);\r
+  CopyMem((*Destination)+((Count-2)/sizeof(CHAR16)), *Destination, CopySize);\r
+  CopyMem(*Destination, Source, Count-2);\r
   return (*Destination);\r
 }\r
 \r
@@ -766,12 +766,17 @@ FileHandleGetFileName (
         // We got info... do we have a name? if yes preceed the current path with it...\r
         //\r
         if (StrLen (FileInfo->FileName) == 0) {\r
-          *FullFileName = StrnCatGrowLeft(FullFileName, &Size, L"/", 0);\r
+          if (*FullFileName == NULL) {\r
+            *FullFileName = StrnCatGrowLeft(FullFileName, &Size, L"\\", 0);\r
+          }\r
           FreePool(FileInfo);\r
           break;\r
         } else {\r
+          if (*FullFileName == NULL) {\r
+            *FullFileName = StrnCatGrowLeft(FullFileName, &Size, L"\\", 0);\r
+          }\r
           *FullFileName = StrnCatGrowLeft(FullFileName, &Size, FileInfo->FileName, 0);\r
-          *FullFileName = StrnCatGrowLeft(FullFileName, &Size, L"/", 0);\r
+          *FullFileName = StrnCatGrowLeft(FullFileName, &Size, L"\\", 0);\r
           FreePool(FileInfo);\r
         }\r
       }\r
@@ -855,7 +860,7 @@ FileHandleReadLine(
     //\r
     if ((CountSoFar+1)*sizeof(CHAR16) < *Size){\r
       ((CHAR16*)Buffer)[CountSoFar] = CharBuffer;\r
-      ((CHAR16*)Buffer)[CountSoFar+1] = '\0';\r
+      ((CHAR16*)Buffer)[CountSoFar+1] = CHAR_NULL;\r
     }\r
   }\r
 \r