use LKL's generic seek and stat functions

Author: M1cha

Info.c

@@ -104,10 +104,10 @@ LKLGetVolumeInfo (
   UINTN                 ResultSize;
   EFI_STATUS            Status;
   EFI_FILE_SYSTEM_INFO  *Info;
-  struct lkl_statfs64   StatBuf;
+  struct lkl_statfs     StatBuf;
   INTN                  RC;
 
-  RC = lkl_sys_statfs64(Volume->LKLMountPoint, sizeof(StatBuf), &StatBuf);
+  RC = lkl_sys_statfs(Volume->LKLMountPoint, &StatBuf);
   if (RC) {
     return EFI_UNSUPPORTED;
   }
@@ -221,7 +221,7 @@ LKLSetFileInfo (
   UINT8         NewAttribute;
   BOOLEAN       ReadOnly;
   BOOLEAN       IsDirectory;
-  struct lkl_stat64     StatBuf;
+  struct lkl_stat       StatBuf;
   struct lkl_utimbuf    UTimeBuf;
   INTN                  RC;
   BOOLEAN               TimeChanged = FALSE;
@@ -243,7 +243,7 @@ LKLSetFileInfo (
   }
 
   // read old file info
-  RC = lkl_sys_fstat64(IFile->FD, &StatBuf);
+  RC = lkl_sys_fstat(IFile->FD, &StatBuf);
   if (RC) {
     return LKLError2EfiError(RC);
   }

LKL.h

@@ -106,7 +106,7 @@ typedef struct {
 
   INTN                FD;
   INTN                LinuxOpenFlags;
-  struct lkl_stat64   StatBuf;
+  struct lkl_stat     StatBuf;
   CHAR8               FilePath[4096];
 
   struct lkl_dir      *Dir;

Misc.c

@@ -209,7 +209,7 @@ RealPath (
   }
 
   for (start = end = name; *start; start = end) {
-    struct lkl_stat64 st;
+    struct lkl_stat st;
     INTN n;
 
     /* Skip sequence of multiple path-separators.  */
@@ -262,7 +262,7 @@ RealPath (
       dest = mempcpy (dest, start, end - start);
       *dest = '\0';
 
-      if (lkl_sys_lstat64 (rpath, &st) < 0)
+      if (lkl_sys_lstat (rpath, &st) < 0)
         goto error;
 
       if (LKL_S_ISLNK (st.st_mode)) {
@@ -496,9 +496,9 @@ LKLFillFileInfo (
   )
 {
   INTN              RC;
-  struct lkl_stat64 StatBuf;
+  struct lkl_stat   StatBuf;
 
-  RC = lkl_sys_fstat64(FD, &StatBuf);
+  RC = lkl_sys_fstat(FD, &StatBuf);
   if (RC) {
     return  EFI_DEVICE_ERROR;
   }

Open.c

@@ -44,7 +44,7 @@ LKLAllocateIFile (
     return EFI_OUT_OF_RESOURCES;
   }
 
-  RC = lkl_sys_fstat64(FD, &IFile->StatBuf);
+  RC = lkl_sys_fstat(FD, &IFile->StatBuf);
   if (RC) {
     Status = LKLError2EfiError(RC);
     goto Done;

ReadWrite.c

@@ -35,17 +35,16 @@ LKLGetPosition (
   LKL_IFILE  *IFile;
   LKL_VOLUME *Volume;
   lkl_loff_t NewPosition;
-  INTN       RC;
   EFI_STATUS Status;
 
   IFile = IFILE_FROM_FHAND (FHand);
   Volume  = IFile->Volume;
   (VOID)(Volume);
 
-  RC = lkl_sys_llseek(IFile->FD, 0, 0, &NewPosition, LKL_SEEK_CUR);
+  NewPosition = lkl_sys_lseek(IFile->FD, 0, LKL_SEEK_CUR);
 
-  if (RC) {
-    Status = LKLError2EfiError(RC);
+  if (NewPosition<0) {
+    Status = LKLError2EfiError((INTN)NewPosition);
   }
   else {
     *Position = NewPosition;
@@ -65,7 +64,6 @@ LKLSetPosition (
   LKL_IFILE  *IFile;
   LKL_VOLUME *Volume;
   lkl_loff_t NewPosition;
-  INTN       RC;
   EFI_STATUS Status;
 
   IFile = IFILE_FROM_FHAND (FHand);
@@ -88,13 +86,16 @@ LKLSetPosition (
   }
 
   if (Position==0xffffffffffffffff) {
-    RC = lkl_sys_llseek(IFile->FD, 0, 0, &NewPosition, LKL_SEEK_END);
+    NewPosition = lkl_sys_lseek(IFile->FD, 0, LKL_SEEK_END);
   }
   else {
-    RC = lkl_sys_llseek(IFile->FD, (Position>>32)&0xffffffff, Position&0xffffffff, &NewPosition, LKL_SEEK_SET);
+    NewPosition = lkl_sys_lseek(IFile->FD, Position, LKL_SEEK_SET);
   }
 
-  Status = LKLError2EfiError(RC);
+  if (NewPosition<0)
+    Status = LKLError2EfiError((INTN)NewPosition);
+  else
+    Status = EFI_SUCCESS;
 
 Done:
 
@@ -108,7 +109,7 @@ LKLIFileReadDir (
      OUT VOID                   *Buffer
   )
 {
-  INTN        RC;
+  int         RC;
   struct lkl_linux_dirent64 *DirEnt;
   UINTN       Size;
   UINTN       NameSize;