Changeset 1324

Timestamp:

Mar 21, 2004, 7:37:19 AM (21 years ago)

Author:

bird

Message:

#991: Initial implementation of the Path Rewrite Feature.

Location:

trunk/src/emx

Files:

• include/InnoTekLIBC/pathrewrite.h (added)
• src/lib/libc.def (modified) (1 diff, 1 prop)
• src/lib/sys/__open.c (modified) (6 diffs, 1 prop)
• src/lib/sys/pathrewrite.c (added)

trunk/src/emx/src/lib/libc.def

@@ -1093 +1093 @@
     "_catgets" @1116
     "_catopen" @1117
+    "___libc_PathRewrite" @1118
+    "___libc_PathRewriteAdd" @1119
+    "___libc_PathRewriteRemove" @1120

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

@@ -15 +15 @@
 #include <alloca.h>
 #include "syscalls.h"
+#include <InnoTekLIBC/pathrewrite.h>
+#define __LIBC_LOG_GROUP __LIBC_LOG_GRP_BACK_IO
+#include <InnoTekLIBC/logstrict.h>
 
 int __open(const char *pszFile, int flags, off_t cbInitial, unsigned fLibc, PLIBCFH *ppFH)
 {
+    LIBCLOG_ENTER("pszFile=%s flags=%#x cbInitial=%lld fLibc=%#x ppFH=%p\n",
+                  pszFile, flags, cbInitial, fLibc, (void*)ppFH);
     ULONG   rc;
     ULONG   flOpenMode;
@@ -24 +29 @@
     ULONG   ulAction;
     HFILE   hFile;
+    int     cch;
     int     failed_open_errno;
     FS_VAR();
 
+
     /*
-     * Interpret "/dev/null" as the pszFile of the null device "NUL".
-     * Interpret "/dev/tty" as the pszFile of the console device "CON".
+     * Rewrite the specified file path.
      */
-    if (!strcmp(pszFile, "/dev/null"))
-        pszFile = "nul";
-    else if (!strcmp(pszFile, "/dev/tty"))
-        pszFile = "con";
+    cch = __libc_PathRewrite(pszFile, NULL, 0);
+    if (cch > 0)
+    {
+        char *pszRewritten = alloca(cch);
+        if (!pszRewritten)
+        {
+            errno = ENOMEM;
+            LIBCLOG_RETURN_INT(-1);
+        }
+        cch = __libc_PathRewrite(pszFile, pszRewritten, cch);
+        if (cch > 0)
+            pszFile = pszRewritten;
+        /* else happens when someone changes the rules between the two calls. */
+        else if (cch < 0)
+        {
+            errno = EAGAIN;             /* non-standard, I'm sure. */
+            LIBCLOG_RETURN_INT(-1);
+        }
+    }
 
     /*
@@ -98 +119 @@
         {
             strcpy(pszFile_safe, pszFile);
-            rc = __pfnDosOpenL(pszFile_safe, &hFile, &ulAction, cbInitialTmp, flAttr, flOpenFlags, flOpenMode, NULL);
+            rc = __pfnDosOpenL((PCSZ)pszFile_safe, &hFile, &ulAction, cbInitialTmp, flAttr, flOpenFlags, flOpenMode, NULL);
         }
         else
@@ -110 +131 @@
             FS_RESTORE();
             errno = EOVERFLOW;
-            return -1;
+            LIBCLOG_RETURN_INT(-1);
         }
-        rc = DosOpen(pszFile, &hFile, &ulAction, cbInitialTmp, flAttr, flOpenFlags, flOpenMode, NULL);
+        rc = DosOpen((PCSZ)pszFile, &hFile, &ulAction, cbInitialTmp, flAttr, flOpenFlags, flOpenMode, NULL);
     }
 #else
     {
         ULONG cbInitialTmp = cbInitial;
-        rc = DosOpen(pszFile, &hFile, &ulAction, cbInitialTmp, flAttr, flOpenFlags, flOpenMode, NULL);
+        rc = DosOpen((PCSZ)pszFile, &hFile, &ulAction, cbInitialTmp, flAttr, flOpenFlags, flOpenMode, NULL);
     }
 #endif
@@ -150 +171 @@
              */
             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);
         }
 
@@ -166 +189 @@
         else
             _sys_set_errno(rc);
-        return -1;
+        LIBCLOG_RETURN_INT(-1);
     }
     return hFile;