diff options
| author | Ryan Harkin <ryan.harkin@linaro.org> | 2013-05-08 17:42:58 +0100 |
|---|---|---|
| committer | Ryan Harkin <ryan.harkin@linaro.org> | 2013-05-08 17:42:58 +0100 |
| commit | d347264b2620dcd43d1e0f588b932d3d04e8a495 (patch) | |
| tree | 2c2faa170a1717fdaf65a35492edadc0480693bd | |
| parent | eb04b23c277827db34bb853d58965bb11393aa64 (diff) | |
| parent | 4d38c7606cb3b664f51a2a1985f601ea6c7a99da (diff) | |
Merge branch 'trunk' of /linaro/uefi/master/git/edk2-fatdriver2
| -rw-r--r-- | FatPkg/FatPei/FatLiteAccess.c | 4 | ||||
| -rw-r--r-- | FatPkg/FatPei/FatLiteLib.c | 11 |
2 files changed, 8 insertions, 7 deletions
diff --git a/FatPkg/FatPei/FatLiteAccess.c b/FatPkg/FatPei/FatLiteAccess.c index 20537c0f26..a409eacb8a 100644 --- a/FatPkg/FatPei/FatLiteAccess.c +++ b/FatPkg/FatPei/FatLiteAccess.c @@ -1,7 +1,7 @@ /** @file
FAT file system access routines for FAT recovery PEIM
-Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the Software
@@ -471,7 +471,7 @@ FatReadNextDirectoryEntry ( // We only search for *FILE* in root directory
// Long file name entry is *NOT* supported
//
- if ((DirEntry.Attributes == FAT_ATTR_DIRECTORY) || (DirEntry.Attributes == FAT_ATTR_LFN)) {
+ if (((DirEntry.Attributes & FAT_ATTR_DIRECTORY) == FAT_ATTR_DIRECTORY) || (DirEntry.Attributes == FAT_ATTR_LFN)) {
continue;
}
//
diff --git a/FatPkg/FatPei/FatLiteLib.c b/FatPkg/FatPei/FatLiteLib.c index 9c93900fd5..4789e10365 100644 --- a/FatPkg/FatPei/FatLiteLib.c +++ b/FatPkg/FatPei/FatLiteLib.c @@ -1,7 +1,7 @@ /** @file
General purpose supporting routines for FAT recovery PEIM
-Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the Software
@@ -313,15 +313,16 @@ EngFatToStr ( // No DBCS issues, just expand and add null terminate to end of string
//
while (*Fat != 0 && FatSize != 0) {
+ if (*Fat == ' ') {
+ break;
+ }
*String = *Fat;
String += 1;
Fat += 1;
FatSize -= 1;
- if (*Fat == ' ') {
- *String = 0;
- return ;
- }
}
+
+ *String = 0;
}
|