tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

IntelFrameworkPkg/FrameworkUefiLib: don't special-case EFI_FILE_MODE_CREATE 

Synchronize EfiOpenFileByDevicePath() with the MdePkg/UefiLib instance, as
described in the previous patch.

Cc: Liming Gao <liming.gao@intel.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Ruiyu Ni <ruiyu.ni@intel.com>
Suggested-by: Ruiyu Ni <ruiyu.ni@intel.com>
Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=1074
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
This commit is contained in:
Laszlo Ersek 2018-08-17 15:06:35 +02:00
parent 5dbc768f1c
commit d00759b212
1 changed files with 6 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
IntelFrameworkPkg/Library/FrameworkUefiLib/UefiLib.c
View File

@ -1702,12 +1702,7 @@ EfiLocateProtocolBuffer (
On the remaining device path, the longest initial sequence of On the remaining device path, the longest initial sequence of
FILEPATH_DEVICE_PATH nodes is node-wise traversed with FILEPATH_DEVICE_PATH nodes is node-wise traversed with
EFI_FILE_PROTOCOL.Open(). For the pathname fragment specified by each EFI_FILE_PROTOCOL.Open().
traversed FILEPATH_DEVICE_PATH node, EfiOpenFileByDevicePath() first masks
EFI_FILE_MODE_CREATE out of OpenMode, and passes 0 for Attributes. If
EFI_FILE_PROTOCOL.Open() fails, and OpenMode includes EFI_FILE_MODE_CREATE,
then the operation is retried with the caller's OpenMode and Attributes
unmodified.
(As a consequence, if OpenMode includes EFI_FILE_MODE_CREATE, and Attributes (As a consequence, if OpenMode includes EFI_FILE_MODE_CREATE, and Attributes
includes EFI_FILE_DIRECTORY, and each FILEPATH_DEVICE_PATH specifies a single includes EFI_FILE_DIRECTORY, and each FILEPATH_DEVICE_PATH specifies a single
@ -1739,18 +1734,10 @@ EfiLocateProtocolBuffer (
the last node in FilePath. the last node in FilePath.
@param[in] OpenMode The OpenMode parameter to pass to @param[in] OpenMode The OpenMode parameter to pass to
EFI_FILE_PROTOCOL.Open(). For each EFI_FILE_PROTOCOL.Open().
FILEPATH_DEVICE_PATH node in FilePath,
EfiOpenFileByDevicePath() first opens the specified
pathname fragment with EFI_FILE_MODE_CREATE masked
out of OpenMode and with Attributes set to 0, and
only retries the operation with EFI_FILE_MODE_CREATE
unmasked and Attributes propagated if the first open
attempt fails.
@param[in] Attributes The Attributes parameter to pass to @param[in] Attributes The Attributes parameter to pass to
EFI_FILE_PROTOCOL.Open(), when EFI_FILE_MODE_CREATE EFI_FILE_PROTOCOL.Open().
is propagated unmasked in OpenMode.
@retval EFI_SUCCESS The file or directory has been opened or @retval EFI_SUCCESS The file or directory has been opened or
created. created.
@ -1861,22 +1848,8 @@ EfiOpenFileByDevicePath (
} }
// //
// Open the next pathname fragment with EFI_FILE_MODE_CREATE masked out and // Open or create the file corresponding to the next pathname fragment.
// with Attributes set to 0.
// //
Status = LastFile->Open (
LastFile,
&NextFile,
PathName,
OpenMode & ~(UINT64)EFI_FILE_MODE_CREATE,
0
);
//
// Retry with EFI_FILE_MODE_CREATE and the original Attributes if the first
// attempt failed, and the caller specified EFI_FILE_MODE_CREATE.
//
if (EFI_ERROR (Status) && (OpenMode & EFI_FILE_MODE_CREATE) != 0) {
Status = LastFile->Open ( Status = LastFile->Open (
LastFile, LastFile,
&NextFile, &NextFile,
@ -1884,7 +1857,6 @@ EfiOpenFileByDevicePath (
OpenMode, OpenMode,
Attributes Attributes
); );
}
// //
// Release any AlignedPathName on both error and success paths; PathName is // Release any AlignedPathName on both error and success paths; PathName is