Changeset 3811 for trunk

Timestamp:

Feb 16, 2014, 11:56:50 PM (11 years ago)

Author:

bird

Message:

libc_Back_ldr*: Allow opening of the NULL module that represents the global name space, though don't (yet) resolve any symbols within it. The special loader handle LIBC_BACK_LDR_GLOBAL (-2) represents this fake module. Fixes #264.

Location:

trunk/libc

Files:

• include/klibc/backend.h (modified) (1 diff)
• src/kNIX/os2/b_ldrClose.c (modified) (2 diffs)
• src/kNIX/os2/b_ldrOpen.c (modified) (2 diffs)
• src/kNIX/os2/b_ldrSymbol.c (modified) (2 diffs)

trunk/libc/include/klibc/backend.h

@@ -725 +725 @@
  * @{ */
 
+/** Special handle that's returned when passing NULL as library name to
+ * __libc_Back_ldrOpen. */
+#define __LIBC_BACK_LDR_GLOBAL  ((void *)(intptr_t)-2)
+
 /**
  * Opens a shared library.

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

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- *
  * kNIX - dlclose, OS/2.
- *
- * Copyright (c) 2004-2006 knut st. osmundsen <bird-src-spam@anduin.net>
+ */
+
+/*
+ * Copyright (c) 2004-2014 knut st. osmundsen <bird-src-spam@anduin.net>
  *
  *
@@ -44 +45 @@
 {
     LIBCLOG_ENTER("pvModule=%p\n", pvModule);
-    FS_VAR();
-    FS_SAVE_LOAD();
-    int rc = DosFreeModuleEx((HMODULE)pvModule);
-    FS_RESTORE();
+    int rc;
+    if (pvModule == __LIBC_BACK_LDR_GLOBAL)
+        rc = NO_ERROR;
+    else
+    {
+        FS_VAR();
+        FS_SAVE_LOAD();
+        int rc = DosFreeModuleEx((HMODULE)pvModule);
+        FS_RESTORE();
+    }
     if (!rc)
         LIBCLOG_RETURN_INT(rc);

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

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- *
  * kNIX - dlopen, OS/2.
- *
- * Copyright (c) 2004-2006 knut st. osmundsen <bird-src-spam@anduin.net>
+ */
+
+/*
+ * Copyright (c) 2004-2014 knut st. osmundsen <bird-src-spam@anduin.net>
  *
  *
@@ -48 +49 @@
 
     /*
+     * Sepecial case where we're requested to open the global namespace object
+     * for the process.
+     */
+    if (!pszLibrary)
+    {
+        *ppvModule = __LIBC_BACK_LDR_GLOBAL;
+        LIBCLOG_RETURN_INT(0);
+    }
+
+    /*
      * 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,

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

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- *
  * kNIX - dlsym, OS/2.
- *
- * Copyright (c) 2004-2006 knut st. osmundsen <bird-src-spam@anduin.net>
+ */
+
+/*
+ * Copyright (c) 2004-2014 knut st. osmundsen <bird-src-spam@anduin.net>
  *
  *
@@ -42 +43 @@
     LIBCLOG_ENTER("pvHandle=%p pszSymbol=%p:{%s} ppfn=%p\n", pvHandle,
                   (void *)pszSymbol, (uintptr_t)pszSymbol >= 10000 ? pszSymbol : "<ordinal>", (void *)ppfn);
-    PFN     pfn;
-    FS_VAR();
-    FS_SAVE_LOAD();
     int rc;
-    if ((uintptr_t)pszSymbol < 10000)
-        rc = DosQueryProcAddr((HMODULE)pvHandle, (uintptr_t)pszSymbol, NULL, &pfn);
+    if (pvHandle == __LIBC_BACK_LDR_GLOBAL)
+    {
+        /* Pretending there aren't anything in the global name space for now.
+           Later we could probably do a QS_MTE assisted scan of loaded modules
+           and what not.  */
+        rc = ERROR_PROC_NOT_FOUND;
+    }
     else
-        rc = DosQueryProcAddr((HMODULE)pvHandle, 0, (PCSZ)pszSymbol, &pfn);
-    FS_RESTORE();
-    if (!rc)
     {
-        *ppfn = (void *)pfn;
-        LIBCLOG_RETURN_MSG(0, "ret 0 *ppfn=%p\n", (void *)pfn);
+        PFN     pfn;
+        FS_VAR();
+        FS_SAVE_LOAD();
+        if ((uintptr_t)pszSymbol < 10000)
+            rc = DosQueryProcAddr((HMODULE)pvHandle, (uintptr_t)pszSymbol, NULL, &pfn);
+        else
+            rc = DosQueryProcAddr((HMODULE)pvHandle, 0, (PCSZ)pszSymbol, &pfn);
+        FS_RESTORE();
+        if (!rc)
+        {
+            *ppfn = (void *)pfn;
+            LIBCLOG_RETURN_MSG(0, "ret 0 *ppfn=%p\n", (void *)pfn);
+        }
     }
     LIBCLOG_ERROR_RETURN_INT(rc);