Fix issue with VOLUMN Name as an alias for device name.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@9970 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
andrewfish 2010-02-10 19:14:55 +00:00
parent 6640eb366c
commit 37e0f9ac51
1 changed files with 43 additions and 42 deletions

View File

@ -659,7 +659,13 @@ EfiOpen (
}
}
//
// Matching volume name has precedence over handle based names
//
VolumeNameMatch = EblMatchVolumeName (PathName, FileStart, &DevNumber);
if (!VolumeNameMatch) {
if (FileStart == StrLen) {
// No Volume name or device name, so try Current Working Directory
if (gCwd == NULL) {
// No CWD
return NULL;
@ -701,11 +707,6 @@ EfiOpen (
return File;
}
//
// Matching volume name has precedence over handle based names
//
VolumeNameMatch = EblMatchVolumeName (PathName, FileStart, &DevNumber);
if (!VolumeNameMatch) {
DevNumber = EblConvertDevStringToNumber ((CHAR8 *)PathName);
}