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

ShellPkg/Level2Command: Use UnicodeCollation in StrinCmp

Browse Source 
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>
This commit is contained in:
Ruiyu Ni
-
parent d65f2cea36
commit 630cb8507b
5 changed files with 48 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.c
View File

@ -22,7 +22,7 @@
* functions are non-interactive only
Copyright (c) 2014 Hewlett-Packard Development Company, L.P.
Copyright (c) 2009 - 2015, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at
@ -260,19 +260,6 @@ VerifyIntermediateDirectories (
return (Status);
}
/**
Be lazy and borrow from baselib.
@param[in] Char The character to convert to upper case.
@return Char as an upper case character.
**/
CHAR16
EFIAPI
InternalCharToUpper (
IN CHAR16 Char
);
/**
String comparison without regard to case for a limited number of characters.
@ -280,31 +267,47 @@ InternalCharToUpper (
@param[in] Target The second item to compare.
@param[in] Count How many characters to compare.
@retval NULL Source and Target are identical strings without regard to case.
@return The location in Source where there is a difference.
@retval 0 Source and Target are identical strings without regard to case.
@retval !=0 Source is not identical to Target.
**/
CONST CHAR16*
INTN
StrniCmp(
IN CONST CHAR16 *Source,
IN CONST CHAR16 *Target,
IN CONST UINTN Count
)
{
UINTN LoopCount;
CHAR16 Char1;
CHAR16 Char2;
CHAR16 *SourceCopy;
CHAR16 *TargetCopy;
UINTN SourceLength;
UINTN TargetLength;
INTN Result;
ASSERT(Source != NULL);
ASSERT(Target != NULL);
for (LoopCount = 0 ; LoopCount < Count ; LoopCount++) {
Char1 = InternalCharToUpper(Source[LoopCount]);
Char2 = InternalCharToUpper(Target[LoopCount]);
if (Char1 != Char2) {
return (&Source[LoopCount]);
}
if (Count == 0) {
return 0;
}
return (NULL);
SourceLength = StrLen (Source);
TargetLength = StrLen (Target);
SourceLength = MIN (SourceLength, Count);
TargetLength = MIN (TargetLength, Count);
SourceCopy = AllocateCopyPool ((SourceLength + 1) * sizeof (CHAR16), Source);
if (SourceCopy == NULL) {
return -1;
}
TargetCopy = AllocateCopyPool ((TargetLength + 1) * sizeof (CHAR16), Target);
if (TargetCopy == NULL) {
FreePool (SourceCopy);
return -1;
}
SourceCopy[SourceLength] = L'\0';
TargetCopy[TargetLength] = L'\0';
Result = gUnicodeCollation->StriColl (gUnicodeCollation, SourceCopy, TargetCopy);
FreePool (SourceCopy);
FreePool (TargetCopy);
return Result;
}