diff options
| author | ptitSeb <sebastien.chev@gmail.com> | 2024-03-27 11:16:26 +0100 |
|---|---|---|
| committer | ptitSeb <sebastien.chev@gmail.com> | 2024-03-27 11:16:26 +0100 |
| commit | 81f25b219ff69171f2fac2263ce7d49e8b7456b0 (patch) | |
| tree | 3907c4c6ca30f2922d1f0b2067dc59524601dd8a /src | |
| parent | d191b8c090b4dfab83ea1d1cf177f7e6ced34302 (diff) | |
| download | box64-81f25b219ff69171f2fac2263ce7d49e8b7456b0.tar.gz box64-81f25b219ff69171f2fac2263ce7d49e8b7456b0.zip | |
Added some path for termux/glibc builds
Diffstat (limited to 'src')
| -rw-r--r-- | src/core.c | 4 | ||||
| -rw-r--r-- | src/tools/fileutils.c | 13 |
2 files changed, 11 insertions, 6 deletions
diff --git a/src/core.c b/src/core.c index d4cd32b3..5bfc9810 100644 --- a/src/core.c +++ b/src/core.c @@ -1259,6 +1259,8 @@ void LoadEnvVars(box64context_t *context) AddPath("/usr/lib/x86_64-linux-gnu", &context->box64_ld_lib, 1); if(FileExist("/usr/x86_64-linux-gnu/lib", 0)) AddPath("/usr/x86_64-linux-gnu/lib", &context->box64_ld_lib, 1); + if(FileExist("/data/data/com.termux/files/usr/glibc/lib/x86_64-linux-gnu", 0)) + AddPath("/data/data/com.termux/files/usr/glibc/lib/x86_64-linux-gnu", &context->box64_ld_lib, 1); #else //TODO: Add Termux Library Path - Lily if(FileExist("/data/data/com.termux/files/usr/lib/x86_64-linux-gnu", 0)) @@ -1560,6 +1562,8 @@ static void load_rcfiles() #ifndef TERMUX if(FileExist("/etc/box64.box64rc", IS_FILE)) LoadRCFile("/etc/box64.box64rc"); + else if(FileExist("/data/data/com.termux/files/usr/glibc/etc/box64.box64rc", IS_FILE)) + LoadRCFile("/data/data/com.termux/files/usr/glibc/etc/box64.box64rc"); #else if(FileExist("/data/data/com.termux/files/usr/etc/box64.box64rc", IS_FILE)) LoadRCFile("/data/data/com.termux/files/usr/etc/box64.box64rc"); diff --git a/src/tools/fileutils.c b/src/tools/fileutils.c index d6d15568..327f798f 100644 --- a/src/tools/fileutils.c +++ b/src/tools/fileutils.c @@ -124,12 +124,13 @@ int FileIsShell(const char* filename) const char* GetTmpDir() { char *tmpdir; - if ((tmpdir = getenv ("TMPDIR")) != NULL) return tmpdir; - if ((tmpdir = getenv ("TEMP")) != NULL) return tmpdir; - if ((tmpdir = getenv ("TMP")) != NULL) return tmpdir; - if(FileExist("/tmp", 0)) return "/tmp"; - if(FileExist("/var/tmp", 0)) return "/var/tmp"; - if(FileExist("/usr/tmp", 0)) return "/usr/tmp"; + if ((tmpdir = getenv ("TMPDIR")) != NULL) return tmpdir; + if ((tmpdir = getenv ("TEMP")) != NULL) return tmpdir; + if ((tmpdir = getenv ("TMP")) != NULL) return tmpdir; + if(FileExist("/data/data/com.termux/files/usr/tmp", 0)) return "/data/data/com.termux/files/usr/tmp"; + if(FileExist("/tmp", 0)) return "/tmp"; + if(FileExist("/var/tmp", 0)) return "/var/tmp"; + if(FileExist("/usr/tmp", 0)) return "/usr/tmp"; return "/tmp"; // meh... } |