Changeset 3683

Timestamp:

Mar 14, 2011, 11:19:23 PM (14 years ago)

Author:

bird

Message:

kNIX/os2: Resolve the dll path passed to DosLoadModule[Ex]. References #181.

Location:

trunk/libc/src/kNIX

Files:

• Makefile.kmk (modified) (1 diff)
• kNIX.h (modified) (1 diff)
• os2/__libc_back_errno2native.c (added)
• os2/b_ldrOpen.c (modified) (1 diff)

trunk/libc/src/kNIX/Makefile.kmk

@@ -166 +166 @@
     $(PATH_LIBC_SRC)/kNIX/os2/safesems.c \
     $(PATH_LIBC_SRC)/kNIX/os2/__libc_back_native2errno.c \
+    $(PATH_LIBC_SRC)/kNIX/os2/__libc_back_errno2native.c \
     $(PATH_LIBC_SRC)/kNIX/os2/sharedpm.c \
     $(PATH_LIBC_SRC)/kNIX/os2/signals.c \

trunk/libc/src/kNIX/kNIX.h

@@ -262 +262 @@
 int __libc_back_sys_processGetResourceLimit(int iResId, struct rlimit *pLimit);
 int __libc_back_native2errno(int rc);
+int __libc_back_errno2native(int rc);
 void __libc_back_hooksInit(const char *pszSpec, uintptr_t hmod);
 /** @} */

trunk/libc/src/kNIX/os2/b_ldrOpen.c

@@ -43 +43 @@
     LIBCLOG_ENTER("pszLibrary=%p:{%s} fFlags=%#x ppvModule=%p pszError=%p cchError=%d\n",
                   (void *)pszLibrary, pszLibrary, fFlags, (void *)ppvModule, (void *)pszError, cchError);
-    HMODULE     hmod;
-    FS_VAR();
-    FS_SAVE_LOAD();
-    int rc = DosLoadModuleEx((PSZ)pszError, cchError, (PCSZ)pszLibrary, &hmod);
-    FS_RESTORE();
-    if (!rc)
+    const char *pszNativePath;
+    char        szNativePath[PATH_MAX];
+    int         rc;
+
+    /*
+     * Resolve the path if one is given.  Ignore failures to resolve the file
+     * name is it may lack the extension (I think) - DosLoadModule will fail,
+     * so no problem.
+     */
+    if (!strpbrk(pszLibrary, ":/\\"))
     {
-        *ppvModule = (void *)hmod;
-        LIBCLOG_RETURN_INT(0);
+        pszNativePath = pszLibrary; /* no path, don't try resolve anything. */
+        rc = 0;
     }
+    else
+    {
+        pszNativePath = szNativePath;
+        rc = __libc_back_fsResolve(pszLibrary, BACKFS_FLAGS_RESOLVE_FULL_MAYBE, &szNativePath[0], NULL);
+    }
+    if (rc == 0)
+    {
+        HMODULE hmod;
+        FS_VAR_SAVE_LOAD();
+        rc = DosLoadModuleEx((PSZ)pszError, cchError, (PCSZ)pszLibrary, &hmod);
+        FS_RESTORE();
+        if (!rc)
+        {
+            *ppvModule = (void *)hmod;
+            LIBCLOG_RETURN_INT(0);
+        }
+    }
+    else
+        rc = __libc_back_errno2native(-rc);
     LIBCLOG_ERROR_RETURN_INT(rc);
 }