From 933c91ebcf476df9a4be51fe13a8e9702b5c82b3 Mon Sep 17 00:00:00 2001 From: Guido van Rossum Date: Wed, 4 Aug 1999 18:00:12 +0000 Subject: [PATCH] Vladimir Marangozov fixes an AIX-specific problem, writing: """ Following up Robin Dunn's troubles with freeze, here's a patch that fixes an oddity regarding the import logic of shared modules on AIX. Symbol resolution of shared modules is now handled properly for the cases when the python library is linked to a binary with an arbitrary name. This includes the standard python[version] executable, but also applications that are embedding the python core (i.e. linked with libpython[version].a, the latter being static or shared). """ --- Python/importdl.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/Python/importdl.c b/Python/importdl.c index 3b43bbc0a21..a40d0846b78 100644 --- a/Python/importdl.c +++ b/Python/importdl.c @@ -898,6 +898,7 @@ aix_getoldmodules(modlistptr) register char *ldibuf; register int errflag, bufsize = 1024; register unsigned int offset; + char *progname = Py_GetProgramName(); /* -- Get the list of loaded modules into ld_info structures. @@ -925,11 +926,13 @@ aix_getoldmodules(modlistptr) ldiptr = (struct ld_info *)ldibuf; prevmodptr = NULL; do { - if (strstr(ldiptr->ldinfo_filename, "python") == NULL) { + if (strstr(progname, ldiptr->ldinfo_filename) == NULL && + strstr(ldiptr->ldinfo_filename, "python") == NULL) { /* - -- Extract only the modules containing "python" as a - -- substring, like the "python[version]" executable or - -- "libpython[version].a" in case python is embedded. + -- Extract only the modules belonging to the main + -- executable + those containing "python" as a + -- substring (like the "python[version]" binary or + -- "libpython[version].a" in case it's a shared lib). */ offset = (unsigned int)ldiptr->ldinfo_next; ldiptr = (struct ld_info *)((unsigned int)