X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=os2%2Fdl_os2.c;h=4a9688cb591c7a0a9ac4cf045f541c2f268f66c8;hb=6e7c9e4dbac15378c097f03304f6025aebc78a15;hp=19f36f6aa7fa9cfd59986b644342a89cee0606ce;hpb=5102b790fbd2a20471bf6f85d8337fd8b34f8dff;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/os2/dl_os2.c b/os2/dl_os2.c
index 19f36f6..4a9688c 100644
--- 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,15 +58,31 @@ 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;
 }