The original implementation only looks for very last backslash and removes the string after that. But when the path is like "FS0:File.txt" which doesn't contain backslash, the function cannot work well. The patch enhances the code to look for very last backslash or colon to support the path which doesn't contain backslash. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com> Reviewed-by: Jaben Carsey <jaben.carsey@intel.com> Reviewed-by: Tapan Shah <tapandshah@hpe.com>
130 lines
3.6 KiB
C
130 lines
3.6 KiB
C
/** @file
|
|
Defines file-path manipulation functions.
|
|
|
|
Copyright (c) 2011 - 2016, 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
|
|
http://opensource.org/licenses/bsd-license.php.
|
|
|
|
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
|
|
**/
|
|
#include <Uefi/UefiBaseType.h>
|
|
#include <Library/BaseMemoryLib.h>
|
|
#include <Library/BaseLib.h>
|
|
#include <Protocol/SimpleTextIn.h>
|
|
|
|
/**
|
|
Removes the last directory or file entry in a path by changing the last
|
|
L'\' to a CHAR_NULL. For a path which is like L"fs0:startup.nsh",
|
|
it's converted to L"fs0:".
|
|
|
|
@param[in,out] Path A pointer to the path to modify.
|
|
|
|
@retval FALSE Nothing was found to remove.
|
|
@retval TRUE A directory or file was removed.
|
|
**/
|
|
BOOLEAN
|
|
EFIAPI
|
|
PathRemoveLastItem(
|
|
IN OUT CHAR16 *Path
|
|
)
|
|
{
|
|
CHAR16 *Walker;
|
|
CHAR16 *LastSlash;
|
|
//
|
|
// get directory name from path... ('chop' off extra)
|
|
//
|
|
for ( Walker = Path, LastSlash = NULL
|
|
; Walker != NULL && *Walker != CHAR_NULL
|
|
; Walker++
|
|
){
|
|
if ((*Walker == L'\\' || *Walker == L':') && *(Walker + 1) != CHAR_NULL) {
|
|
LastSlash = Walker+1;
|
|
}
|
|
}
|
|
if (LastSlash != NULL) {
|
|
*LastSlash = CHAR_NULL;
|
|
return (TRUE);
|
|
}
|
|
return (FALSE);
|
|
}
|
|
|
|
/**
|
|
Function to clean up paths.
|
|
|
|
- Single periods in the path are removed.
|
|
- Double periods in the path are removed along with a single parent directory.
|
|
- Forward slashes L'/' are converted to backward slashes L'\'.
|
|
|
|
This will be done inline and the existing buffer may be larger than required
|
|
upon completion.
|
|
|
|
@param[in] Path The pointer to the string containing the path.
|
|
|
|
@return Returns Path, otherwise returns NULL to indicate that an error has occured.
|
|
**/
|
|
CHAR16*
|
|
EFIAPI
|
|
PathCleanUpDirectories(
|
|
IN CHAR16 *Path
|
|
)
|
|
{
|
|
CHAR16 *TempString;
|
|
UINTN TempSize;
|
|
|
|
if (Path==NULL) {
|
|
return(NULL);
|
|
}
|
|
//
|
|
// Fix up the '/' vs '\'
|
|
//
|
|
for (TempString = Path ; TempString != NULL && *TempString != CHAR_NULL ; TempString++) {
|
|
if (*TempString == L'/') {
|
|
*TempString = L'\\';
|
|
}
|
|
}
|
|
//
|
|
// Fix up the ..
|
|
//
|
|
while ((TempString = StrStr(Path, L"\\..\\")) != NULL) {
|
|
*TempString = CHAR_NULL;
|
|
TempString += 4;
|
|
PathRemoveLastItem(Path);
|
|
TempSize = StrSize(TempString);
|
|
CopyMem(Path+StrLen(Path), TempString, TempSize);
|
|
}
|
|
if ((TempString = StrStr(Path, L"\\..")) != NULL && *(TempString + 3) == CHAR_NULL) {
|
|
*TempString = CHAR_NULL;
|
|
if (!PathRemoveLastItem(Path)) {
|
|
*TempString = L'\\';
|
|
}
|
|
}
|
|
//
|
|
// Fix up the .
|
|
//
|
|
while ((TempString = StrStr(Path, L"\\.\\")) != NULL) {
|
|
*TempString = CHAR_NULL;
|
|
TempString += 2;
|
|
TempSize = StrSize(TempString);
|
|
CopyMem(Path+StrLen(Path), TempString, TempSize);
|
|
}
|
|
if ((TempString = StrStr(Path, L"\\.")) != NULL && *(TempString + 2) == CHAR_NULL) {
|
|
*(TempString + 1) = CHAR_NULL;
|
|
}
|
|
|
|
while ((TempString = StrStr(Path, L"\\\\")) != NULL) {
|
|
*TempString = CHAR_NULL;
|
|
TempString += 1;
|
|
TempSize = StrSize(TempString);
|
|
CopyMem(Path+StrLen(Path), TempString, TempSize);
|
|
}
|
|
if ((TempString = StrStr(Path, L"\\\\")) != NULL && *(TempString + 1) == CHAR_NULL) {
|
|
*(TempString) = CHAR_NULL;
|
|
}
|
|
|
|
return (Path);
|
|
}
|
|
|