From ad6f6f86789eb27215b083f376fbec6389126284 Mon Sep 17 00:00:00 2001 From: Qiu Shumin Date: Wed, 26 Aug 2015 02:25:42 +0000 Subject: [PATCH] MdePkg: Make the FileHandleGetFileName return the file name in right format. 1. If the file is not a directory remove the redundant '\' char in file name string returned from UefiFileHandleLib.FileHandleGetFileName. 2. Update function comments. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Qiu Shumin Reviewed-by: Jaben Carsey Reviewed-by: Liming Gao git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@18314 6f19259b-4bc3-4df7-8a09-765794883524 --- MdePkg/Include/Library/FileHandleLib.h | 4 +++- MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.c | 12 +++++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/MdePkg/Include/Library/FileHandleLib.h b/MdePkg/Include/Library/FileHandleLib.h index fdbdc3ade4..00706f964d 100644 --- a/MdePkg/Include/Library/FileHandleLib.h +++ b/MdePkg/Include/Library/FileHandleLib.h @@ -356,7 +356,9 @@ FileHandleSetSize ( /** Function to get a full filename given a EFI_FILE_HANDLE somewhere lower on the - directory 'stack'. + directory 'stack'. If the file is a directory, then append the '\' char at the + end of name string. If it's not a directory, then the last '\' should not be + added. @param[in] Handle Handle to the Directory or File to create path to. @param[out] FullFileName Pointer to pointer to generated full file name. It diff --git a/MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.c b/MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.c index a31d12b862..04a2f189ec 100644 --- a/MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.c +++ b/MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.c @@ -769,7 +769,9 @@ StrnCatGrowLeft ( /** Function to get a full filename given a EFI_FILE_HANDLE somewhere lower on the - directory 'stack'. + directory 'stack'. If the file is a directory, then append the '\' char at the + end of name string. If it's not a directory, then the last '\' should not be + added. if Handle is NULL, return EFI_INVALID_PARAMETER @@ -856,6 +858,14 @@ FileHandleGetFileName ( *FullFileName = StrnCatGrowLeft(FullFileName, &Size, L"\\", 0); } + if (*FullFileName != NULL && + (*FullFileName)[StrLen(*FullFileName) - 1] == L'\\' && + StrLen(*FullFileName) > 1 && + FileHandleIsDirectory(Handle) == EFI_NOT_FOUND + ) { + (*FullFileName)[StrLen(*FullFileName) - 1] = CHAR_NULL; + } + if (CurrentHandle != NULL) { CurrentHandle->Close (CurrentHandle); } -- 2.39.2