Changeset 1750

Timestamp:

Dec 21, 2004, 2:38:04 AM (21 years ago)

Author:

bird

Message:

Inode and Dev stuff of stat/lstat/fstat.

Location:

trunk/src/emx

Files:

• include/emx/io.h (modified) (1 diff, 1 prop)
• src/lib/sys/__dup.c (modified) (1 diff, 1 prop)
• src/lib/sys/__dup2.c (modified) (1 diff, 1 prop)
• src/lib/sys/b_fs.h (modified) (3 diffs, 1 prop)
• src/lib/sys/b_fsDirCreate.c (modified) (1 diff, 1 prop)
• src/lib/sys/b_fsFileStatFH.c (modified) (1 diff, 1 prop)
• src/lib/sys/b_fsNativeFileStat.c (modified) (1 diff, 1 prop)
• src/lib/sys/b_ioFileOpen.c (modified) (3 diffs, 1 prop)
• src/lib/sys/filehandles.c (modified) (1 diff, 1 prop)
• src/lib/sys/fs.c (modified) (3 diffs, 1 prop)

trunk/src/emx/include/emx/io.h

@@ -373 +373 @@
     __LIBC_PCFHOPS          pOps;
 
+
+
+
+
+
+
+
+
 } __LIBC_FH;
 /** Pointer to filehandle. */

trunk/src/emx/src/lib/sys/__dup.c

@@ -57 +57 @@
                 pFHNew->fFlags      = pFH->fFlags;
                 pFHNew->iLookAhead  = pFH->iLookAhead;
+
+
             }
             else

trunk/src/emx/src/lib/sys/__dup2.c

@@ -90 +90 @@
                 pFHNew->fFlags      = pFH->fFlags;
                 pFHNew->iLookAhead  = pFH->iLookAhead;
+
+
             }
             else

trunk/src/emx/src/lib/sys/b_fs.h

@@ -31 +31 @@
 #include <sys/syslimits.h>
 #include <sys/types.h>
+
 #include <InnoTekLIBC/sharedpm.h>
 #include "backend.h"
@@ -136 +137 @@
 /**
  * Creates the unix EAs for a new file or directory.
+
  * @returns 0 on success.
  * @returns Negative errno on failure.
  * @param   hFile           File handle to the newly created fs object. If no
  *                          handle handy, set to -1.
- * @param   pszNativePath   Native path of the newly created fs object. If
- *                          handle is give this will be ignored.
+ * @param   pszNativePath   Native path to the newly created fs object.
  * @param   mode            The specified file permission mode mask.
- */
-int __libc_back_fsUnixAttribsSet(int hFile, const char *pszNativePath, mode_t mode);
+ * @param   pDev            Where to store the dev number.
+ * @param   pInode          Where to store the calculated inode number.
+ */
+int __libc_back_fsUnixAttribsSet(int hFile, const char *pszNativePath, mode_t mode, dev_t *pDev, ino_t *pInode);
 
 /**
@@ -197 +200 @@
 int __libc_back_fsNativeFileStat(const char *pszNativePath, struct stat *pStat);
 
+
+
+
+
+
+
+
+
+
+
+
 
 __END_DECLS

trunk/src/emx/src/lib/sys/b_fsDirCreate.c

@@ -71 +71 @@
     if (!rc)
     {
-        __libc_back_fsUnixAttribsSet(-1, &szNativePath[0], Mode);
+        __libc_back_fsUnixAttribsSet(-1, &szNativePath[0], Mode);
         LIBCLOG_RETURN_INT(0);
     }

trunk/src/emx/src/lib/sys/b_fsFileStatFH.c

@@ -93 +93 @@
         pStat->st_uid = 0;
         pStat->st_gid = 0;
-        pStat->st_ino = _sys_ino++;
-        if (_sys_ino == 0)
-            _sys_ino = 1;
-        pStat->st_dev = 0;
+        pStat->st_ino = pFH->Inode;
+        pStat->st_dev = pFH->Dev;
         pStat->st_rdev = 0;
         pStat->st_nlink = 1;

trunk/src/emx/src/lib/sys/b_fsNativeFileStat.c

@@ -188 +188 @@
     pStat->st_uid = 0;
     pStat->st_gid = 0;
-    pStat->st_ino = _sys_ino++;
-    if (_sys_ino == 0)
-        _sys_ino = 1;
-    pStat->st_dev = 0;
+    pStat->st_dev = __libc_back_fsPathCalcInodeAndDev(pszNativePath, &pStat->st_ino);
     pStat->st_rdev = 0;
     pStat->st_nlink = 1;

trunk/src/emx/src/lib/sys/b_ioFileOpen.c

@@ -174 +174 @@
         ULONG   fulType;
         ULONG   fulDevFlags;
+
+
 
         /*
@@ -180 +182 @@
         if (   (ulAction == FILE_CREATED)
             && !__libc_gfNoUnix)
-            __libc_back_fsUnixAttribsSet(hFile, NULL, Mode);
+            __libc_back_fsUnixAttribsSet(hFile, pszFile, Mode, &Dev, &Inode);
+        else
+            Dev = __libc_back_fsPathCalcInodeAndDev(szNativePath, &(*ppFH)->Inode);
+
 
         /*
@@ -203 +208 @@
 
             /*
-             * Register the handle.
+             * Register the handle and calc Dev and Inode.
+             * We calc the Dev/Inode regardless of whether it's stored in an EA or not.
              */
             rc = __libc_FHAllocate(hFile, fLibc, sizeof(LIBCFH), NULL, ppFH, NULL);
-            LIBCLOG_MSG("hFile=%#lx fLibc=%#x fulType=%#lx ulAction=%lu\n",
-                        hFile, fLibc, fulType, ulAction);
+            if (!rc)
+            {
+                if (ppFH)
+                {
+                    (*ppFH)->Dev = Dev;
+                    (*ppFH)->Inode = Inode;
+                }
+                LIBCLOG_MSG("hFile=%#lx fLibc=%#x fulType=%#lx ulAction=%lu Dev=%#x Inode=%#llx\n",
+                            hFile, fLibc, fulType, ulAction, Dev, Inode);
+            }
         }
 

trunk/src/emx/src/lib/sys/filehandles.c

@@ -735 +735 @@
         pFH->iLookAhead = -1;
         pFH->pOps       = pOps;
+
+
+
+
 
         /*

trunk/src/emx/src/lib/sys/fs.c

@@ -187 +187 @@
 *******************************************************************************/
 static int fsResolveUnix(const char *pszUserPath, unsigned fFlags, char *pszNativePath, int *pfInUnixTree);
+
+
+
 
 
@@ -1234 +1237 @@
 /**
  * Creates the unix EAs for a new file or directory.
+
  * @returns 0 on success.
  * @returns Negative errno on failure.
  * @param   hFile           File handle to the newly created fs object. If no
  *                          handle handy, set to -1.
- * @param   pszNativePath   Native path to the newly created fs object. If
- *                          handle is give this will be ignored.
+ * @param   pszNativePath   Native path to the newly created fs object.
  * @param   mode            The specified file permission mode mask.
+
+
  */
-int __libc_back_fsUnixAttribsSet(int hFile, const char *pszNativePath, mode_t mode)
-{
-    /* later */
+int __libc_back_fsUnixAttribsSet(int hFile, const char *pszNativePath, mode_t mode, dev_t *pDev, ino_t *pInode)
+{
+    /*
+     * Calc device.
+     */
+    dev_t   Dev;
+    char    chDrv = *pszNativePath;
+    if (chDrv == '/' || chDrv == '\\')
+        Dev = makedev('U', 0);          /* U as in UNC */
+    else
+    {
+        /* ASSUMES that pszNativePath contains a driveletter! If not fix the resolver!!! */
+        if (chDrv >= 'a' && chDrv <= 'z')
+            chDrv -= 'a' - 'A';
+        Dev = makedev('V', chDrv);      /* V as in Volume */
+    }
+
+    /*
+     * Calc Inode number.
+     *
+     * Whether to use another hash algorithm here is a bit in the blue now
+     * because the stored value might be inaccessible at times.
+     */
+    const char *psz = pszNativePath;
+    if (psz[1] == ':')
+        psz += 2;
+    ino_t Inode = ((uint64_t)crc32str(psz) << 32) | (uint64_t)djb2(psz);
+
+    /** @todo Save unix EAs! */
+    if (pDev)
+        *pDev = Dev;
+    if (pInode)
+        *pInode = (Inode & 0xffffffff00000000ULL) | (uint64_t)sdbm(psz);
     return 0;
 }
+
 
 /**
@@ -1339 +1375 @@
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+