diff options
| author | Qiu Shumin <shumin.qiu@intel.com> | 2015-08-26 02:25:42 +0000 |
|---|---|---|
| committer | shenshushi <shenshushi@Edk2> | 2015-08-26 02:25:42 +0000 |
| commit | ad6f6f86789eb27215b083f376fbec6389126284 (patch) | |
| tree | 85061a81aed157fe7831ee844a95fe1a1e7b2e04 /MdePkg | |
| parent | 12e6c7381d297e9612145902d3eeab9c3a7a4b5e (diff) | |
| download | edk2-platforms-ad6f6f86789eb27215b083f376fbec6389126284.tar.xz | |
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 <shumin.qiu@intel.com>
Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@18314 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'MdePkg')
| -rw-r--r-- | MdePkg/Include/Library/FileHandleLib.h | 4 | ||||
| -rw-r--r-- | 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);
}
|