mirrors/pocketlang
1
0
Fork 0
mirror of https://github.com/zekexiao/pocketlang.git synced 2025-03-04 13:15:55 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

cwd added to search paths

Browse Source
This commit is contained in:
Thakee Nathees 2022-06-13 13:22:06 +05:30
parent 72a957daef
commit f249d118b2
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/libs/std_path.c
View File

@ -98,12 +98,17 @@ static char* tryImportPaths(PKVM* vm, char* path, char* buff) {
"", "",
".pk", ".pk",
#ifdef _WIN32
"\\_init.pk",
#else
"/_init.pk", "/_init.pk",
#endif
#ifndef PK_NO_DL #ifndef PK_NO_DL
#if defined(_WIN32) #if defined(_WIN32)
".dll", ".dll",
"/_init.dll", "\\_init.dll",
#elif defined(__APPLE__) #elif defined(__APPLE__)
".dylib", ".dylib",
@ -412,14 +417,24 @@ DEF(_pathListDir,
// Add the executables path and exe_path + 'libs/' as a search path for // Add the executables path and exe_path + 'libs/' as a search path for
// the PKVM. // the PKVM.
void _registerSearchPaths(PKVM* vm) { void _registerSearchPaths(PKVM* vm) {
enum cwk_path_style ps = cwk_path_get_style();
char cwd[MAX_PATH_LEN];
if (getcwd(cwd, sizeof(cwd)) != NULL) {
size_t len = strlen(cwd);
if (len < MAX_PATH_LEN - 1) {
cwd[len] = (ps == CWK_STYLE_WINDOWS) ? '\\' : '/';
cwd[++len] = '\0';
pkAddSearchPath(vm, cwd);
}
}
char buff[MAX_PATH_LEN]; char buff[MAX_PATH_LEN];
if (!osGetExeFilePath(buff, MAX_PATH_LEN)) return; if (!osGetExeFilePath(buff, MAX_PATH_LEN)) return;
size_t length; size_t length;
cwk_path_get_dirname(buff, &length); cwk_path_get_dirname(buff, &length);
if (length == 0) return; if (length == 0) return;
enum cwk_path_style ps = cwk_path_get_style();
// Add path separator. Otherwise pkAddSearchPath will fail an assertion. // Add path separator. Otherwise pkAddSearchPath will fail an assertion.
char last = buff[length - 1]; char last = buff[length - 1];
if (last != '/' && last != '\\') { if (last != '/' && last != '\\') {
@ -430,6 +445,7 @@ void _registerSearchPaths(PKVM* vm) {
// FIXME: the bellow code is hard coded. // FIXME: the bellow code is hard coded.
ASSERT(length + strlen("libs/") < MAX_PATH_LEN, OOPS); ASSERT(length + strlen("libs/") < MAX_PATH_LEN, OOPS);
strcpy(buff + length, (ps == CWK_STYLE_WINDOWS) ? "libs\\" : "libs/"); strcpy(buff + length, (ps == CWK_STYLE_WINDOWS) ? "libs\\" : "libs/");
pkAddSearchPath(vm, buff); pkAddSearchPath(vm, buff);
} }