add uid/gid, fix access/mod/create date, print all inode fields

Author: tihmstar

orbisFSTool/OrbisFSFormat.h

@@ -79,8 +79,10 @@ typedef struct {
     uint32_t inodeNum;
     uint32_t _pad0;
     uint16_t fileMode;
-    uint8_t _pad1[6];     //should be zero
-    uint64_t unk1;
+    uint8_t _pad1[2];     //should be zero
+    uint32_t uid;
+    uint32_t gid;
+    uint32_t unk1;
     uint32_t unk2;
     uint32_t unk3;
     uint64_t filesize;
@@ -89,9 +91,9 @@ typedef struct {
     uint64_t unk6;
     uint64_t createDate;
     uint64_t _pad2;         //should be zero
-    uint64_t accessOrModDate;
+    uint64_t modDate;
     uint64_t _pad3;         //should be zero
-    uint64_t modOrAccessDate;
+    uint64_t accessDate;
     uint64_t _pad4;         //should be zero
     OrbisFSChainLink_t resourceLnk[4];
     OrbisFSChainLink_t dataLnk[0x20];

orbisFSTool/OrbisFSFuse.cpp

@@ -40,21 +40,18 @@ static int fs_getattr(const char *path, struct stat *stbuf) noexcept{
 #ifdef __APPLE__
     stbuf->st_birthtimespec.tv_sec = node.createDate;
     stbuf->st_birthtimespec.tv_nsec = 0;
-    stbuf->st_mtimespec.tv_sec = node.modOrAccessDate;
+    stbuf->st_mtimespec.tv_sec = node.modDate;
     stbuf->st_mtimespec.tv_nsec = 0;
-    stbuf->st_ctimespec.tv_sec = node.modOrAccessDate;
+    stbuf->st_ctimespec.tv_sec = node.createDate;
     stbuf->st_ctimespec.tv_nsec = 0;
-    stbuf->st_atimespec.tv_sec = node.accessOrModDate;
+    stbuf->st_atimespec.tv_sec = node.accessDate;
     stbuf->st_atimespec.tv_nsec = 0;
 #elif defined(__linux__)
-    /*
-        birthtime is not available on linux stat
-     */
-    stbuf->st_mtim.tv_sec = node.modOrAccessDate;
+    stbuf->st_mtim.tv_sec = node.modDate;
     stbuf->st_mtim.tv_nsec = 0;
-    stbuf->st_ctim.tv_sec = node.modOrAccessDate;
+    stbuf->st_ctim.tv_sec = node.createDate;
     stbuf->st_ctim.tv_nsec = 0;
-    stbuf->st_atim.tv_sec = node.accessOrModDate;
+    stbuf->st_atim.tv_sec = node.accessDate;
     stbuf->st_atim.tv_nsec = 0;
 #else
 #error unexpected platform!

orbisFSTool/main.cpp

@@ -290,10 +290,17 @@ int main_r(int argc, const char * argv[]) {
                 printInfo += perm;
                 {
                     char buf[0x400];
-                    uint64_t fsize = S_ISDIR(node.fileMode) ? 0 : node.filesize;
-                    snprintf(buf, sizeof(buf), "%10llu ",fsize);
-                    printInfo += buf;
-                    printInfo += strForDate(node.accessOrModDate)+"\t";
+                    {
+                        int didprint = snprintf(buf, sizeof(buf), " %d:%d ",node.uid,node.gid);
+                        printInfo += buf;
+                        while (didprint++ < 7) printInfo+=" ";
+                    }
+                    {
+                        uint64_t fsize = S_ISDIR(node.fileMode) ? 0 : node.filesize;
+                        snprintf(buf, sizeof(buf), "%10llu ",fsize);
+                        printInfo += buf;
+                        printInfo += strForDate(node.modDate)+"\t";
+                    }
                 }
             }
 
@@ -317,10 +324,18 @@ int main_r(int argc, const char * argv[]) {
                 printf("\tfatStages         : 0x%08x\n",node.fatStages);
                 printf("\tinodeNum          : 0x%08x\n",node.inodeNum);
                 printf("\tfileMode          :  o0%o\n",node.fileMode);
+                printf("\tuid               : %d\n",node.uid);
+                printf("\tgid               : %d\n",node.gid);
+                printf("\tunk1              : %d\n",node.unk1);
+                printf("\tunk2              : %d\n",node.unk2);
+                printf("\tunk3              : %d\n",node.unk3);
                 printf("\tfilesize          : 0x%016llx (%lld)\n",node.filesize,node.filesize);
+                printf("\tunk4              : %d\n",node.unk4);
+                printf("\tunk5              : %d\n",node.unk5);
+                printf("\tunk6              : %lld\n",node.unk6);
                 printf("\tcreateDate        : %10lld (%s)\n",node.createDate,strForDate(node.createDate).c_str());
-                printf("\taccessOrModDate   : %10lld (%s)\n",node.accessOrModDate,strForDate(node.accessOrModDate).c_str());
-                printf("\tmodOrAccessDate   : %10lld (%s)\n",node.modOrAccessDate,strForDate(node.modOrAccessDate).c_str());
+                printf("\tmodDate           : %10lld (%s)\n",node.modDate,strForDate(node.modDate).c_str());
+                printf("\taccessDate        : %10lld (%s)\n",node.accessDate,strForDate(node.accessDate).c_str());
                 for (int i=0; i<ARRAYOF(node.resourceLnk); i++) {
                     if (node.resourceLnk[i].type != ORBIS_FS_CHAINLINK_TYPE_LINK) break;
                     printf("\tresourceLnk[%2d]   : type: 0x%02x blk: %d\n",i,node.resourceLnk[i].type,node.resourceLnk[i].blk);