fix OS/2 coredump with POSIX::tmpnam() (from Ilya Zakharevich)

[p5sagit/p5-mst-13.2.git] / os2 / dl_os2.c

diff --git a/os2/dl_os2.c b/os2/dl_os2.c
index 19f36f6..aab48dd 100644 (file)
--- a/os2/dl_os2.c
+++ b/os2/dl_os2.c
@@ -4,15 +4,16 @@
 #include <os2.h>
 
 static ULONG retcode;
+static char fail[300];
 
 void *
 dlopen(char *path, int mode)
 {
        HMODULE handle;
        char tmp[260], *beg, *dot;
-       char fail[300];
        ULONG rc;
 
+       fail[0] = 0;
        if ((rc = DosLoadModule(fail, sizeof fail, path, &handle)) == 0)
                return (void *)handle;
 
@@ -42,6 +43,7 @@ dlsym(void *handle, char *symbol)
        ULONG rc, type;
        PFN addr;
 
+       fail[0] = 0;
        rc = DosQueryProcAddr((HMODULE)handle, 0, symbol, &addr);
        if (rc == 0) {
                rc = DosQueryProcType((HMODULE)handle, 0, symbol, &type);
@@ -56,16 +58,42 @@ dlsym(void *handle, char *symbol)
 char *
 dlerror(void)
 {
-       static char buf[300];
+       static char buf[700];
        ULONG len;
 
        if (retcode == 0)
                return NULL;
-       if (DosGetMessage(NULL, 0, buf, sizeof buf - 1, retcode, "OSO001.MSG", &len))
-               sprintf(buf, "OS/2 system error code %d", retcode);
-       else
+       if (DosGetMessage(NULL, 0, buf, sizeof buf - 1, retcode,
+                         "OSO001.MSG", &len)) {
+               if (fail[0])
+                 sprintf(buf, 
+"OS/2 system error code %d, possible problematic module: '%s'",
+                         retcode, fail);
+               else
+                 sprintf(buf, "OS/2 system error code %d", retcode);
+       } else {
                buf[len] = '\0';
+               if (len && buf[len - 1] == '\n')
+                       buf[--len] = 0;
+               if (len && buf[len - 1] == '\r')
+                       buf[--len] = 0;
+               if (len && buf[len - 1] == '.')
+                       buf[--len] = 0;
+               if (fail[0] && len < 300)
+                 sprintf(buf + len, ", possible problematic module: '%s'",
+                         fail);
+       }
        retcode = 0;
        return buf;
 }
 
+int
+dlclose(void *handle)
+{
+       ULONG rc;
+
+       if ((rc = DosFreeModule((HMODULE)handle)) == 0) return 0;
+
+       retcode = rc;
+       return 2;
+}