Re: [PATCH RC2] VMS nits, add getppid(), admit absence of fork()

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

diff --git a/os2/dl_os2.c b/os2/dl_os2.c
index 02ca2ef..5c8b6e6 100644 (file)
--- a/os2/dl_os2.c
+++ b/os2/dl_os2.c
@@ -8,19 +8,24 @@
 static ULONG retcode;
 static char fail[300];
 
+char *os2error(int rc);
+
 void *
-dlopen(char *path, int mode)
+dlopen(const char *path, int mode)
 {
        HMODULE handle;
        char tmp[260], *beg, *dot;
        ULONG rc;
 
        fail[0] = 0;
-       if ((rc = DosLoadModule(fail, sizeof fail, path, &handle)) == 0)
+       if ((rc = DosLoadModule(fail, sizeof fail, (char*)path, &handle)) == 0)
                return (void *)handle;
 
        retcode = rc;
 
+       if (strlen(path) >= sizeof(tmp))
+           return NULL;
+
        /* Not found. Check for non-FAT name and try truncated name. */
        /* Don't know if this helps though... */
        for (beg = dot = path + strlen(path);
@@ -30,6 +35,7 @@ dlopen(char *path, int mode)
                        dot = beg;
        if (dot - beg > 8) {
                int n = beg+8-path;
+
                memmove(tmp, path, n);
                memmove(tmp+n, dot, strlen(dot)+1);
                if (DosLoadModule(fail, sizeof fail, tmp, &handle) == 0)
@@ -40,7 +46,7 @@ dlopen(char *path, int mode)
 }
 
 void *
-dlsym(void *handle, char *symbol)
+dlsym(void *handle, const char *symbol)
 {
        ULONG rc, type;
        PFN addr;
@@ -62,29 +68,17 @@ dlerror(void)
 {
        static char buf[700];
        ULONG len;
+       char *err;
 
        if (retcode == 0)
                return NULL;
-       if (DosGetMessage(NULL, 0, buf, sizeof buf - 1, retcode,
-                         "OSO001.MSG", &len)) {
-               if (fail[0])
-                 sprintf(buf, 
-"OS/2 system error code %lu, possible problematic module: '%s'",
-                         retcode, fail);
-               else
-                 sprintf(buf, "OS/2 system error code %lu", 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);
-       }
+       err = os2error(retcode);
+       len = strlen(err);
+       if (len > sizeof(buf) - 1)
+           len = sizeof(buf) - 1;
+       strncpy(buf, err, len+1);
+       if (fail[0] && len < 300)
+           sprintf(buf + len, ", possible problematic module: '%s'", fail);
        retcode = 0;
        return buf;
 }