mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-31 05:58:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Added code to import dynamic modules using mac CFM.

Browse source
This commit is contained in:
Jack Jansen 1995-02-13 22:42:34 +00:00
parent f2038a3593
commit 4e04373073
1 changed files with 41 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

43
Python/importdl.c
View file

@ -43,6 +43,7 @@ extern int verbose; /* Defined in pythonrun.c */
NT -- NT style dynamic linking (using DLLs) NT -- NT style dynamic linking (using DLLs)
_DL_FUNCPTR_DEFINED -- if the typedef dl_funcptr has been defined _DL_FUNCPTR_DEFINED -- if the typedef dl_funcptr has been defined
WITH_MAC_DL -- Mac dynamic linking (highly experimental) WITH_MAC_DL -- Mac dynamic linking (highly experimental)
USE_MAC_SHARED_LIBRARY -- Another mac dynamic linking method
SHORT_EXT -- short extension for dynamic module, e.g. ".so" SHORT_EXT -- short extension for dynamic module, e.g. ".so"
LONG_EXT -- long extension, e.g. "module.so" LONG_EXT -- long extension, e.g. "module.so"
hpux -- HP-UX Dynamic Linking - defined by the compiler hpux -- HP-UX Dynamic Linking - defined by the compiler
@ -98,6 +99,15 @@ typedef FARPROC dl_funcptr;
#define DYNAMIC_LINK #define DYNAMIC_LINK
#endif #endif
#ifdef USE_MAC_SHARED_LIBRARY
#define DYNAMIC_LINK
#define SHORT_EXT ".shlb"
#define LONG_EXT "module.shlb"
#ifndef _DL_FUNCPTR_DEFINED
typedef void (*dl_funcptr)();
#endif
#endif
#if !defined(DYNAMIC_LINK) && defined(HAVE_DLFCN_H) && defined(HAVE_DLOPEN) #if !defined(DYNAMIC_LINK) && defined(HAVE_DLFCN_H) && defined(HAVE_DLOPEN)
#define DYNAMIC_LINK #define DYNAMIC_LINK
#define USE_SHLIB #define USE_SHLIB
@ -138,6 +148,13 @@ typedef void (*dl_funcptr)();
#include "dynamic_load.h" #include "dynamic_load.h"
#endif #endif
#ifdef USE_MAC_SHARED_LIBRARY
#include <CodeFragments.h>
#include <Files.h>
#include "macdefs.h"
#include "macglue.h"
#endif
#ifdef USE_RLD #ifdef USE_RLD
#include <mach-o/rld.h> #include <mach-o/rld.h>
#define FUNCNAME_PATTERN "_init%.200s" #define FUNCNAME_PATTERN "_init%.200s"
@ -163,9 +180,9 @@ extern char *getprogramname();
#endif /* DYNAMIC_LINK */ #endif /* DYNAMIC_LINK */
/* Max length of module suffix searched for -- accommodates "module.so" */ /* Max length of module suffix searched for -- accommodates "module.shlb" */
#ifndef MAXSUFFIXSIZE #ifndef MAXSUFFIXSIZE
#define MAXSUFFIXSIZE 10 #define MAXSUFFIXSIZE 12
#endif #endif
/* Pass it on to import.c */ /* Pass it on to import.c */
@ -203,6 +220,28 @@ load_dynamic_module(name, pathname)
return NULL; return NULL;
} }
#else /* !WITH_MAC_DL */ #else /* !WITH_MAC_DL */
#ifdef USE_MAC_SHARED_LIBRARY
/* Another way to do dynloading on the mac, use CFM */
{
FSSpec libspec;
CFragConnectionID connID;
Ptr mainAddr;
Str255 errMessage;
OSErr err;
(void)FSMakeFSSpec(0, 0, Pstring(pathname), &libspec);
err = GetDiskFragment(&libspec, 0, 0, Pstring(name), kLoadCFrag, &connID, &mainAddr,
errMessage);
if ( err ) {
char buf[512];
sprintf(buf, "%#s: %s", errMessage, macstrerror(err));
err_setstr(ImportError, buf);
return NULL;
}
p = (dl_funcptr)mainAddr;
}
#endif /* USE_MAC_SHARED_LIBRARY */
#ifdef USE_SHLIB #ifdef USE_SHLIB
{ {
#ifdef RTLD_NOW #ifdef RTLD_NOW