From 02a3070f4d6995d4bc52d797ff29be9de5ef3c71 Mon Sep 17 00:00:00 2001 From: "larryh%netscape.com" Date: Mon, 6 Nov 2000 23:33:07 +0000 Subject: [PATCH] Bugzilla: 53014 git-svn-id: svn://10.0.0.236/branches/NSPRPUB_CLIENT_BRANCH@82360 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/nsprpub/pr/src/linking/prlink.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/mozilla/nsprpub/pr/src/linking/prlink.c b/mozilla/nsprpub/pr/src/linking/prlink.c index d302e559f07..57bc6a43058 100644 --- a/mozilla/nsprpub/pr/src/linking/prlink.c +++ b/mozilla/nsprpub/pr/src/linking/prlink.c @@ -829,11 +829,17 @@ pr_LoadLibraryByPathname(const char *name, PRIntn flags) cookie = 0; while (get_next_image_info(0, &cookie, &info) == B_OK) { - char *endOfName = info.name + strlen(info.name) - strlen(name); - if (endOfName < info.name) - continue; - - if (strcmp(name, endOfName) == 0) { + char *endOfSystemName = strrchr(info.name, '/'); + char *endOfPassedName = strrchr(name, '/'); + if( 0 == endOfSystemName ) + endOfSystemName=info.name; + else + endOfSystemName++; + if( 0 == endOfPassedName ) + endOfPassedName=name; + else + endOfPassedName++; + if (strcmp(endOfSystemName, endOfPassedName) == 0) { /* this is the actual component - remember it */ h = info.id; break;