Changeset 3462 for trunk/emx/src/emxomf/weakld.c

Timestamp:

Jun 17, 2007, 2:11:18 AM (18 years ago)

Author:

bird

Message:

do _realrealpath on the TMPDIR before using it. Fixes #179.

File:

• trunk/emx/src/emxomf/weakld.c (modified) (2 diffs)

trunk/emx/src/emxomf/weakld.c

@@ -3611 +3611 @@
     unsigned        c = 0;
     pid_t           pid = getpid();
-    const char *    pszTmp = getenv("TMP");
-    if (!pszTmp)    pszTmp = getenv("TMPDIR");
-    if (!pszTmp)    pszTmp = getenv("TEMP");
-    if (!pszTmp)    pszTmp = ".";
+    static char     s_szTmp[_MAX_PATH + 1];
+    
+    /* We need to apply _realrealpath to the tmpdir, so resolve that once and for all. */
+    if (!s_szTmp[0])
+    {
+        const char *    pszTmp = getenv("TMP");
+        if (!pszTmp)    pszTmp = getenv("TMPDIR");
+        if (!pszTmp)    pszTmp = getenv("TEMP");
+        if (!pszTmp)    pszTmp = ".";
+        if (!_realrealpath(pszTmp, s_szTmp, sizeof(s_szTmp)))
+        {
+            printf("emxomfld: _realrealpath failed on '%s'!!!\n", pszTmp);
+            exit(1);
+        }
+    }
 
     do
@@ -3622 +3633 @@
             return -1;
         gettimeofday(&tv, NULL);
-        sprintf(pszFile, "%s\\%s%x%lx%d%lx%s", pszTmp, pszPrefix, pid, tv.tv_sec, c, tv.tv_usec, pszSuffix);
+        sprintf(pszFile, "%s\\%s%x%lx%d%lx%s", s_szTmp, pszPrefix, pid, tv.tv_sec, c, tv.tv_usec, pszSuffix);
     } while (!stat(pszFile, &s));