tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-04-08 17:05:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

ArmPkg/BdsLib: Fixed TFTP when there are directories in the name

Browse Source 
The TFTP Device Path might contain a list of File Path device
path nodes.
ConvertDevicePathToText() allows to concatenate these File Path
nodes.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Olivier Martin <Olivier.Martin@arm.com>
Reviewed-by: Ronald Cron <Ronald.Cron@arm.com>



git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17539 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
Olivier Martin 2015-05-29 14:00:39 +00:00 committed by oliviermartin
parent 90cd0f1ad7
commit 9d8ee7815c
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ArmPkg/Library/BdsLib/BdsFilePath.c
View File

@ -1038,7 +1038,7 @@ BdsTftpLoadImage (
EFI_DHCP4_MODE_DATA Dhcp4Mode; EFI_DHCP4_MODE_DATA Dhcp4Mode;
EFI_MTFTP4_CONFIG_DATA Mtftp4CfgData; EFI_MTFTP4_CONFIG_DATA Mtftp4CfgData;
IPv4_DEVICE_PATH *IPv4DevicePathNode; IPv4_DEVICE_PATH *IPv4DevicePathNode;
FILEPATH_DEVICE_PATH *FilePathDevicePathNode; CHAR16 *PathName;
CHAR8 *AsciiFilePath; CHAR8 *AsciiFilePath;
EFI_MTFTP4_TOKEN Mtftp4Token; EFI_MTFTP4_TOKEN Mtftp4Token;
UINT64 FileSize; UINT64 FileSize;
@ -1185,17 +1185,10 @@ BdsTftpLoadImage (
goto Error; goto Error;
} }
// // The Device Path might contain multiple FilePath nodes
// Convert the Unicode path of the file to Ascii PathName = ConvertDevicePathToText ((EFI_DEVICE_PATH_PROTOCOL*)(IPv4DevicePathNode + 1), FALSE, FALSE);
// AsciiFilePath = AllocatePool (StrLen (PathName) + 1);
UnicodeStrToAsciiStr (PathName, AsciiFilePath);
FilePathDevicePathNode = (FILEPATH_DEVICE_PATH*)(IPv4DevicePathNode + 1);
AsciiFilePath = AllocatePool ((StrLen (FilePathDevicePathNode->PathName) + 1) * sizeof (CHAR8));
if (AsciiFilePath == NULL) {
Status = EFI_OUT_OF_RESOURCES;
goto Error;
}
UnicodeStrToAsciiStr (FilePathDevicePathNode->PathName, AsciiFilePath);
// //
// Try to get the size of the file in bytes from the server. If it fails, // Try to get the size of the file in bytes from the server. If it fails,
@ -1241,7 +1234,7 @@ BdsTftpLoadImage (
Mtftp4Token.CheckPacket = Mtftp4CheckPacket; Mtftp4Token.CheckPacket = Mtftp4CheckPacket;
Mtftp4Token.Context = (VOID*)TftpContext; Mtftp4Token.Context = (VOID*)TftpContext;
Print (L"Downloading the file <%s> from the TFTP server\n", FilePathDevicePathNode->PathName); Print (L"Downloading the file <%a> from the TFTP server\n", AsciiFilePath);
Status = Mtftp4->ReadFile (Mtftp4, &Mtftp4Token); Status = Mtftp4->ReadFile (Mtftp4, &Mtftp4Token);
Print (L"\n"); Print (L"\n");
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
@ -1303,6 +1296,7 @@ Error:
} }
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
*Image = 0;
Print (L"Failed to download the file - Error=%r\n", Status); Print (L"Failed to download the file - Error=%r\n", Status);
} }