Added support for Xcode on Snow Leopard. Upaded with bug fixes for Snow Leopard.

[mirror_edk2.git] / UnixPkg / UnixSimpleFileSystemDxe / UnixSimpleFileSystem.c

diff --git a/UnixPkg/UnixSimpleFileSystemDxe/UnixSimpleFileSystem.c b/UnixPkg/UnixSimpleFileSystemDxe/UnixSimpleFileSystem.c
index d01fd4e7510b3d4b7b3384410a75f477211943b3..b46c9dce973ed21365a6e96332c5880a136eac21 100644 (file)
--- a/UnixPkg/UnixSimpleFileSystemDxe/UnixSimpleFileSystem.c
+++ b/UnixPkg/UnixSimpleFileSystemDxe/UnixSimpleFileSystem.c
@@ -457,7 +457,7 @@ EFI_STATUS
 EFIAPI\r
 UnixSimpleFileSystemOpenVolume (\r
   IN EFI_SIMPLE_FILE_SYSTEM_PROTOCOL  *This,\r
-  OUT EFI_FILE                        **Root\r
+  OUT EFI_FILE_PROTOCOL               **Root\r
   )\r
 /*++\r
 \r
@@ -578,11 +578,11 @@ Done:
 EFI_STATUS\r
 EFIAPI\r
 UnixSimpleFileSystemOpen (\r
-  IN  EFI_FILE  *This,\r
-  OUT EFI_FILE  **NewHandle,\r
-  IN  CHAR16    *FileName,\r
-  IN  UINT64    OpenMode,\r
-  IN  UINT64    Attributes\r
+  IN  EFI_FILE_PROTOCOL   *This,\r
+  OUT EFI_FILE_PROTOCOL   **NewHandle,\r
+  IN  CHAR16              *FileName,\r
+  IN  UINT64              OpenMode,\r
+  IN  UINT64              Attributes\r
   )\r
 /*++\r
 \r
@@ -630,7 +630,7 @@ Returns:
 // TODO:    EFI_INVALID_PARAMETER - add return value to function comment\r
 // TODO:    EFI_INVALID_PARAMETER - add return value to function comment\r
 {\r
-  EFI_FILE                          *Root;\r
+  EFI_FILE_PROTOCOL                 *Root;\r
   UNIX_EFI_FILE_PRIVATE           *PrivateFile;\r
   UNIX_EFI_FILE_PRIVATE           *NewPrivateFile;\r
   UNIX_SIMPLE_FILE_SYSTEM_PRIVATE *PrivateRoot;\r
@@ -836,7 +836,7 @@ OpenRoot:
       NewPrivateFile->IsDirectoryPath = FALSE;\r
     }\r
   } else {\r
-    struct stat finfo;\r
+    STAT_FIX finfo;\r
     int res = NewPrivateFile->UnixThunk->Stat (NewPrivateFile->FileName, &finfo);\r
     if (res == 0 && S_ISDIR(finfo.st_mode))\r
       NewPrivateFile->IsDirectoryPath = TRUE;\r
@@ -963,7 +963,7 @@ Done: ;
 EFI_STATUS\r
 EFIAPI\r
 UnixSimpleFileSystemClose (\r
-  IN EFI_FILE  *This\r
+  IN EFI_FILE_PROTOCOL  *This\r
   )\r
 /*++\r
 \r
@@ -1017,7 +1017,7 @@ Returns:
 EFI_STATUS\r
 EFIAPI\r
 UnixSimpleFileSystemDelete (\r
-  IN EFI_FILE  *This\r
+  IN EFI_FILE_PROTOCOL  *This\r
   )\r
 /*++\r
 \r
@@ -1107,7 +1107,7 @@ Returns:
   struct tm *tm;\r
   tm = UnixThunk->GmTime (&SystemTime);\r
   Time->Year   = tm->tm_year;\r
-  Time->Month  = tm->tm_mon;\r
+  Time->Month  = tm->tm_mon + 1;\r
   Time->Day    = tm->tm_mday;\r
   Time->Hour   = tm->tm_hour;\r
   Time->Minute = tm->tm_min;\r
@@ -1151,10 +1151,10 @@ Returns:
   UINTN                       NameSize;\r
   UINTN                       ResultSize;\r
   EFI_FILE_INFO               *Info;\r
-  CHAR8                      *RealFileName;\r
-  CHAR8                      *TempPointer;\r
+  CHAR8                       *RealFileName;\r
+  CHAR8                       *TempPointer;\r
   CHAR16                      *BufferFileName;\r
-  struct stat                 buf;\r
+  STAT_FIX                    buf;\r
 \r
   if (FileName != NULL) {\r
     RealFileName = FileName;\r
@@ -1221,9 +1221,9 @@ Returns:
 EFI_STATUS\r
 EFIAPI\r
 UnixSimpleFileSystemRead (\r
-  IN     EFI_FILE  *This,\r
-  IN OUT UINTN     *BufferSize,\r
-  OUT    VOID      *Buffer\r
+  IN     EFI_FILE_PROTOCOL  *This,\r
+  IN OUT UINTN              *BufferSize,\r
+  OUT    VOID               *Buffer\r
   )\r
 /*++\r
 \r
@@ -1357,9 +1357,9 @@ Done:
 EFI_STATUS\r
 EFIAPI\r
 UnixSimpleFileSystemWrite (\r
-  IN     EFI_FILE  *This,\r
-  IN OUT UINTN     *BufferSize,\r
-  IN     VOID      *Buffer\r
+  IN     EFI_FILE_PROTOCOL  *This,\r
+  IN OUT UINTN              *BufferSize,\r
+  IN     VOID               *Buffer\r
   )\r
 /*++\r
 \r
@@ -1445,8 +1445,8 @@ Done:
 EFI_STATUS\r
 EFIAPI\r
 UnixSimpleFileSystemSetPosition (\r
-  IN EFI_FILE  *This,\r
-  IN UINT64    Position\r
+  IN EFI_FILE_PROTOCOL  *This,\r
+  IN UINT64             Position\r
   )\r
 /*++\r
 \r
@@ -1512,8 +1512,8 @@ Done:
 EFI_STATUS\r
 EFIAPI\r
 UnixSimpleFileSystemGetPosition (\r
-  IN  EFI_FILE  *This,\r
-  OUT UINT64    *Position\r
+  IN  EFI_FILE_PROTOCOL   *This,\r
+  OUT UINT64              *Position\r
   )\r
 /*++\r
 \r
@@ -1562,10 +1562,10 @@ Returns:
 EFI_STATUS\r
 EFIAPI\r
 UnixSimpleFileSystemGetInfo (\r
-  IN     EFI_FILE  *This,\r
-  IN     EFI_GUID  *InformationType,\r
-  IN OUT UINTN     *BufferSize,\r
-  OUT    VOID      *Buffer\r
+  IN     EFI_FILE_PROTOCOL  *This,\r
+  IN     EFI_GUID           *InformationType,\r
+  IN OUT UINTN              *BufferSize,\r
+  OUT    VOID               *Buffer\r
   )\r
 /*++\r
 \r
@@ -1671,7 +1671,7 @@ Done:
 EFI_STATUS\r
 EFIAPI\r
 UnixSimpleFileSystemSetInfo (\r
-  IN EFI_FILE         *This,\r
+  IN EFI_FILE_PROTOCOL*This,\r
   IN EFI_GUID         *InformationType,\r
   IN UINTN            BufferSize,\r
   IN VOID             *Buffer\r
@@ -1724,7 +1724,7 @@ Returns:
   UINTN                             OldInfoSize;\r
   EFI_TPL                           OldTpl;\r
   mode_t                            NewAttr;\r
-  struct stat                       OldAttr;\r
+  STAT_FIX                          OldAttr;\r
   CHAR8                             *OldFileName;\r
   CHAR8                             *NewFileName;\r
   CHAR8                             *CharPointer;\r
@@ -2117,7 +2117,7 @@ Done:
 EFI_STATUS\r
 EFIAPI\r
 UnixSimpleFileSystemFlush (\r
-  IN EFI_FILE  *This\r
+  IN EFI_FILE_PROTOCOL  *This\r
   )\r
 /*++\r
 \r