Changeset 3289 for trunk

Timestamp:

May 2, 2007, 11:43:02 PM (18 years ago)

Author:

bird

Message:

Implemented /@system_root, /@system_drive and /@tmpdir default rewrite rules. Fixes #160.

File:

• trunk/libc/src/kNIX/os2/fs-os2.c (modified) (2 diffs)

trunk/libc/src/kNIX/os2/fs-os2.c

@@ -169 +169 @@
 /** The full path to the executable directory. */
 char __libc_gszExecPath[CCHMAXPATH];
-
-/**
- * The special /@executable_path rewrite rule.
- */
-static __LIBC_PATHREWRITE   gExecRewriteRule =
-{
-    __LIBC_PRWF_CASE_SENSITIVE | __LIBC_PRWF_TYPE_DIR,  "/@executable_path",  17, __libc_gszExecPath, 0
+/** The system drive. */
+char __libc_gszSystemDrive[4] = "C:";
+/** The full path to the host system root directory. */
+char __libc_gszSystemRoot[8] = "C:/OS2";
+/** The path to the default tmp directory (might be a winding path). */
+char __libc_gszTmpDir[CCHMAXPATH] = "C:/TEMP";
+
+/**
+ * The misc rewrite rules.
+ */
+static __LIBC_PATHREWRITE   gaMiscRewriteRules[4] =
+{
+    { __LIBC_PRWF_CASE_SENSITIVE | __LIBC_PRWF_TYPE_DIR,  "/@executable_path",  17, __libc_gszExecPath, 0 },
+    { __LIBC_PRWF_CASE_SENSITIVE | __LIBC_PRWF_TYPE_DIR,  "/@system_drive",     14, __libc_gszSystemDrive, 2 },
+    { __LIBC_PRWF_CASE_SENSITIVE | __LIBC_PRWF_TYPE_DIR,  "/@system_root",      13, __libc_gszSystemRoot, 6 },
+    { __LIBC_PRWF_CASE_SENSITIVE | __LIBC_PRWF_TYPE_DIR,  "/@tmpdir",            8, __libc_gszTmpDir, 7 }
 };
 
@@ -285 +294 @@
             psz--;
         *psz = '\0';
-        gExecRewriteRule.cchTo = psz - &__libc_gszExecPath[0];
+        gaMiscRewriteRules[0].cchTo = psz - &__libc_gszExecPath[0];
     }
     else
     {
         LIBC_ASSERTM_FAILED("DosQueryModuleName(exe) failed: hmte=%lx rc=%d\n", pPib->pib_hmte, rc);
-        gExecRewriteRule.cchTo = 1;
-        gExecRewriteRule.pszTo = "/";
-    }
-    if (__libc_PathRewriteAdd(&gExecRewriteRule, 1))
-        LIBCLOG_RETURN_INT(-1);
+        gaMiscRewriteRules[0].cchTo = 1;
+        gaMiscRewriteRules[0].pszTo = "/";
+    }
+
+    /*
+     * Setup the the (host) system root path and system root drive rewrite rules.
+     */
+    ULONG ulBootDrive;
+    if (DosQuerySysInfo(QSV_BOOT_DRIVE, QSV_BOOT_DRIVE, &ulBootDrive, sizeof(ulBootDrive)))
+        ulBootDrive = 'C' - 'A' - 1; /* A = 1 */
+    __libc_gszTmpDir[0] = __libc_gszSystemRoot[0] = __libc_gszSystemDrive[0] 
+        = (char)ulBootDrive + 'A' - 1;
+
+    /*
+     * Setup the the temp path rewrite rule.
+     */
+    size_t cchTmp = 0;
+    char *pszTmp = getenv("TMP");
+    if (pszTmp)
+        cchTmp = strlen(pszTmp);
+    if (!pszTmp || cchTmp >= sizeof(__libc_gszTmpDir) - 1)
+    {
+        pszTmp = getenv("TEMP");
+        if (pszTmp)
+            cchTmp = strlen(pszTmp);
+        if (!pszTmp || cchTmp >= sizeof(__libc_gszTmpDir) - 1)
+        {
+            pszTmp = getenv("TMPDIR");
+            if (pszTmp)
+                cchTmp = strlen(pszTmp);
+        }
+    }
+    if (pszTmp && cchTmp <= sizeof(__libc_gszTmpDir) - 1)
+    {
+        /** @todo cleanup the thing so it won't get rejected! */
+        memcpy(__libc_gszTmpDir, pszTmp, cchTmp + 1);
+        gaMiscRewriteRules[3].cchTo = cchTmp;
+    }
+
+    /*
+     * Finally register the rules.
+     */
+/** @todo Make static rules from these and only update the replacement value and length. */
+    if (__libc_PathRewriteAdd(&gaMiscRewriteRules[0], 4))
+    {
+        /* tmp rewrite rule is busted by the env.var., use the default. */
+        memcpy(__libc_gszTmpDir, "C:/TEMP", sizeof("C:/TEMP"));
+        gaMiscRewriteRules[3].cchTo = sizeof("C:/TEMP") - 1;
+        if (__libc_PathRewriteAdd(&gaMiscRewriteRules[0], 4))
+            LIBCLOG_RETURN_INT(-1);
+    }
+
 
     /*