sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

A short-term fix that StrCpy() needs to handle two overlapping strings.

Browse Source 
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@4762 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
qhuang8
2008-02-26 12:03:38 +00:00
parent fb42e02bb4
commit cd4c1ac312
1 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
MdeModulePkg/Universal/BdsDxe/BootMaint/BootOption.c
View File

@@ -1103,6 +1103,27 @@ Returns:
return MenuCount; return MenuCount;
} }
CHAR16 *
BdsStrCpy (
OUT CHAR16 *Destination,
IN CONST CHAR16 *Source
)
{
CHAR16 *ReturnValue;
//
// Destination cannot be NULL
//
ASSERT (Destination != NULL);
ReturnValue = Destination;
while (*Source) {
*(Destination++) = *(Source++);
}
*Destination = 0;
return ReturnValue;
}
CHAR16 * CHAR16 *
BOpt_AppendFileName ( BOpt_AppendFileName (
IN CHAR16 *Str1, IN CHAR16 *Str1,
@@ -1150,13 +1171,13 @@ Returns:
// DO NOT convert the .. if it is at the end of the string. This will // DO NOT convert the .. if it is at the end of the string. This will
// break the .. behavior in changing directories. // break the .. behavior in changing directories.
// //
StrCpy (LastSlash, Ptr + 3); BdsStrCpy (LastSlash, Ptr + 3);
Ptr = LastSlash; Ptr = LastSlash;
} else if (*Ptr == '\\' && *(Ptr + 1) == '.' && *(Ptr + 2) == '\\') { } else if (*Ptr == '\\' && *(Ptr + 1) == '.' && *(Ptr + 2) == '\\') {
// //
// Convert a \.\ to a \ // Convert a \.\ to a \
// //
StrCpy (Ptr, Ptr + 2); BdsStrCpy (Ptr, Ptr + 2);
Ptr = LastSlash; Ptr = LastSlash;
} else if (*Ptr == '\\') { } else if (*Ptr == '\\') {
LastSlash = Ptr; LastSlash = Ptr;