- int GetSymbolFromBase(Uint base, char *name, Uint *ret);\r
-\r
-// === GLOABLS ===\r
-#define MAX_LOADED_LIBRARIES 64\r
-#define MAX_STRINGS_BYTES 4096\r
-struct {\r
- Uint Base;\r
- char *Name;\r
-} gLoadedLibraries[MAX_LOADED_LIBRARIES];\r
-char gsLoadedStrings[MAX_STRINGS_BYTES];\r
-char *gsNextAvailString = gsLoadedStrings;\r
-//tLoadLib *gpLoadedLibraries = NULL;\r
-\r
-// === CODE ===\r
-Uint LoadLibrary(char *filename, char *SearchDir, char **envp)\r
-{\r
- char sTmpName[1024] = "/Acess/Libs/";\r
- Uint iArg;\r
- void (*fEntry)(int, int, char *[], char**);\r
- \r
- DEBUGS("LoadLibrary: (filename='%s', envp=0x%x)\n", filename, envp);\r
- \r
- // Create Temp Name\r
- strcpy(&sTmpName[12], filename);\r
- DEBUGS(" LoadLibrary: sTmpName='%s'\n", sTmpName);\r
- \r
- if( (iArg = IsFileLoaded(sTmpName)) )\r
- return iArg;\r
- \r
- // Load Library\r
- iArg = SysLoadBin(sTmpName, (Uint*)&fEntry);\r
- if(iArg == 0) {\r
- DEBUGS("LoadLibrary: RETURN 0\n");\r
- return 0;\r
- }\r
- \r
- DEBUGS(" LoadLibrary: iArg=0x%x, iEntry=0x%x\n", iArg, fEntry);\r
- \r
- // Load Symbols\r
- fEntry = (void*)DoRelocate( iArg, envp, sTmpName );\r
- \r
- // Call Entrypoint\r
- DEBUGS(" LoadLibrary: '%s' Entry 0x%x\n", filename, fEntry);\r
- fEntry(iArg, 0, NULL, envp);\r
- \r
- DEBUGS("LoadLibrary: RETURN 1\n");\r
- return iArg;\r
+ int GetSymbolFromBase(Uint base, char *name, Uint *ret);
+
+// === IMPORTS ===
+extern const struct {
+ Uint Value;
+ char *Name;
+} caLocalExports[];
+extern const int ciNumLocalExports;
+
+// === GLOABLS ===
+tLoadedLib gLoadedLibraries[MAX_LOADED_LIBRARIES];
+char gsLoadedStrings[MAX_STRINGS_BYTES];
+char *gsNextAvailString = gsLoadedStrings;
+//tLoadLib *gpLoadedLibraries = NULL;
+
+// === CODE ===
+char *FindLibrary(char *DestBuf, char *SoName, char *ExtraSearchDir)
+{
+ // -- #1: Executable Specified
+ if(ExtraSearchDir)
+ {
+ strcpy(DestBuf, ExtraSearchDir);
+ strcat(DestBuf, "/");
+ strcat(DestBuf, SoName);
+ if(file_exists(DestBuf)) return DestBuf;
+ }
+
+ // -- #2: System
+ strcpy(DestBuf, SYSTEM_LIB_DIR);
+ strcat(DestBuf, SoName);
+ if(file_exists(DestBuf)) return DestBuf;
+
+ // -- #3: Current Directory
+ if(file_exists(SoName)) return SoName;
+
+ return NULL;
+}
+
+/**
+ */
+Uint LoadLibrary(char *SoName, char *SearchDir, char **envp)
+{
+ char sTmpName[1024];
+ char *filename;
+ Uint iArg;
+ void (*fEntry)(int, int, char *[], char**);
+
+ DEBUGS("LoadLibrary: (filename='%s', envp=0x%x)\n", filename, envp);
+
+ // Create Temp Name
+ filename = FindLibrary(sTmpName, SoName, SearchDir);
+ if(filename == NULL) {
+ DEBUGS("LoadLibrary: RETURN 0\n");
+ return 0;
+ }
+ DEBUGS(" LoadLibrary: filename='%s'\n", filename);
+
+ if( (iArg = IsFileLoaded(filename)) )
+ return iArg;
+
+ // Load Library
+ iArg = SysLoadBin(filename, (Uint*)&fEntry);
+ if(iArg == 0) {
+ DEBUGS("LoadLibrary: RETURN 0\n");
+ return 0;
+ }
+
+ DEBUGS(" LoadLibrary: iArg=0x%x, iEntry=0x%x\n", iArg, fEntry);
+
+ // Load Symbols
+ fEntry = (void*)DoRelocate( iArg, envp, filename );
+
+ // Call Entrypoint
+ DEBUGS(" LoadLibrary: '%s' Entry 0x%x\n", SoName, fEntry);
+ fEntry(iArg, 0, NULL, envp);
+
+ DEBUGS("LoadLibrary: RETURN 1\n");
+ return iArg;