use flag ugc_directory

fesily · Aug 21, 2024 · 96774e8 · 96774e8
1 parent 1a58166
commit 96774e8
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 9 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -33,7 +33,7 @@ else ()
     message(FATAL_ERROR "Not supported platform")
 endif ()
 
-project(DontStarveLuaJIT VERSION 0.5.8)
+project(DontStarveLuaJIT VERSION 0.5.9)
 
 set(CMAKE_INSTALL_PREFIX ${CMAKE_CURRENT_SOURCE_DIR}/Mod)
 if (UNIX AND APPLE)

diff --git a/Mod/modinfo.lua b/Mod/modinfo.lua
@@ -22,7 +22,7 @@ description = translate(
 
 author = "fesil"
 
-version = "0.5.8"
+version = "0.5.9"
 
 forumthread = "https://github.com/fesily/DontStarveLuaJit2"
 

diff --git a/luajit b/luajit
diff --git a/src/DontStarveInjector/gameio.cpp b/src/DontStarveInjector/gameio.cpp
@@ -12,6 +12,9 @@
 #include <optional>
 #include "util/zipfile.hpp"
 #include "util/gum_platform.hpp"
+#include "util/platform.hpp"
+
+#include <spdlog/spdlog.h>
 
 #include <thread>
 #include <chrono>
@@ -46,8 +49,18 @@ static std::filesystem::path to_path(const char *p) {
 }
 
 static std::optional<std::filesystem::path> get_workshop_dir() {
-    static auto dir = std::filesystem::relative(std::filesystem::path("..") / ".." / ".." / "workshop" / "content" / "322330");
-    return dir;
+    auto dir = std::filesystem::relative(std::filesystem::path("..") / ".." / ".." / "workshop");
+    const auto cmd = get_cwd();
+    auto flag = "-ugc_directory";
+    if (cmd.contains(flag)) {
+        const auto cmds = get_cwds();
+        auto iter = std::find(cmds.begin(), cmds.end(), flag);
+        iter++;
+        const auto& value = *iter;
+        dir = value;
+        spdlog::info("workshop_dir ugc_directory: {}", value);
+    }
+    return dir / "content" / "322330";
 }
 
 static FILE *lj_fopen(char const *f, const char *mode) noexcept {
@@ -58,7 +71,7 @@ static FILE *lj_fopen(char const *f, const char *mode) noexcept {
     if (fp)
         return fp;
 
-    const auto &workshop_dir = get_workshop_dir();
+    static const auto workshop_dir = get_workshop_dir();
     constexpr auto mods_root = "../mods/workshop-"sv;
     if (path_s.starts_with(mods_root) && workshop_dir) {
         auto mod_path = std::filesystem::path(path_s.substr(mods_root.size()));
@@ -195,8 +208,6 @@ static void lj_clearerr(FILE *fp) noexcept {
     return clearerr(fp);
 }
 
-#include "util/platform.hpp"
-
 static int lj_need_transform_path() noexcept {
     static bool has_lua_debug_flag = [] {
         std::string_view cmd = get_cwd();
@@ -205,6 +216,7 @@ static int lj_need_transform_path() noexcept {
         }
         return cmd.contains("-enable_lua_debugger");
     }();
+    spdlog::info("lj_need_transform_path: {}", has_lua_debug_flag);
     return has_lua_debug_flag;
 }
 

diff --git a/src/DontStarveInjector/util/platform.cpp b/src/DontStarveInjector/util/platform.cpp
@@ -106,7 +106,7 @@ static std::string GetCommandLineByPid(DWORD processId) {
         HMODULE hMod;
         DWORD cbNeeded;
 
-        // »ñÈ¡ÃüÁîÐÐ
+        // ��ȡ������
         PROCESS_BASIC_INFORMATION pbi;
         ULONG returnLength;
         if (NtQueryInformationProcess(hProcess, ProcessBasicInformation, &pbi, sizeof(pbi), &returnLength) == 0) {
@@ -178,6 +178,25 @@ std::string get_cwd(uintptr_t pid) {
 #endif
 }
 
+std::vector<std::string> get_cwds(uintptr_t pid) {
+    std::vector<std::string> cmds;
+#ifdef _WIN32
+    cmds.resize(__argc);
+    for (int i = 0; i < __argc; i++) {
+        cmds[i] = __argv[i];
+    }
+#else
+    auto param = pid == 0 ? std::string("/proc/self/cmdline") : "/proc/" + std::to_string(pid) + "/cmdline";
+    std::ifstream file(param.c_str());
+    std::string cmd;
+    std::string cmdline;
+    while (std::getline(file, cmdline, '\0')) {
+        cmds.push_back(cmdline);
+    }
+#endif
+    return cmds;
+}
+
 void set_worker_directory(const char *path) {
 #ifdef _WIN32
     SetCurrentDirectoryA(path);

diff --git a/src/DontStarveInjector/util/platform.hpp b/src/DontStarveInjector/util/platform.hpp
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <filesystem>
+#include <vector>
 
 std::filesystem::path getExePath();
 
@@ -15,5 +16,6 @@ void unloadlib(module_handler_t h);
 uintptr_t getParentId();
 
 std::string get_cwd(uintptr_t pid = 0);
+std::vector<std::string> get_cwds(uintptr_t pid = 0);
 
 void set_worker_directory(const char *path);
+1 −1		Makefile
+3 −0		src/Makefile
+1 −1		src/Makefile.dep
+20 −0		src/jit/dis_arm64.lua
+1 −1		src/lj_asm_mips.h
+21 −10		src/lj_crecord.c
+14 −0		src/lj_emit_arm64.h
+2 −10		src/lj_gc.c
+10 −9		src/lj_load.c
+1 −1		src/lj_obj.h
+19 −6		src/lj_opt_fold.c
+3 −2		src/lj_record.c
+2 −1		src/lj_snap.c
+1 −0		src/lj_target_arm64.h
+1 −3		src/lj_trace.c
+5 −2		src/luaconf.h
+12 −1		src/vm_arm.dasc
+6 −14		src/vm_arm64.dasc