Merge pull request #551 from bytedance/fix-re_match

Fix re match
bytedance · Nov 7, 2023 · 16e84b7 · 16e84b7
2 parents 6daf60c + 6c07d62
commit 16e84b7
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/rasp/librasp/src/comm.rs b/rasp/librasp/src/comm.rs
@@ -269,7 +269,8 @@ impl RASPComm for ThreadMode {
 
 fn mount(pid: i32, from: &str, to: &str) -> AnyhowResult<()> {
     let pid_str = pid.to_string();
-    let args = [pid_str.as_str(), from, to];
+    let nsenter_str = settings::RASP_NS_ENTER_BIN();
+    let args = [pid_str.as_str(), from, to, nsenter_str.as_str()];
     return match run_async_process(
         std::process::Command::new(settings::RASP_MOUNT_SCRIPT_BIN()).args(args),
     ) {

diff --git a/rasp/php/CMakeLists.txt b/rasp/php/CMakeLists.txt
@@ -46,6 +46,7 @@ target_link_libraries(
         PRIVATE
         aio::aio
         runtime::c_runtime
+        regex::tiny-regex-c
         $<$<BOOL:${STATIC_BUILD}>:-static-libgcc>
         $<$<BOOL:${STATIC_BUILD}>:-static-libstdc++>
         -Wl,--exclude-libs,ALL

diff --git a/rasp/python/python-probe/rasp/probe/CMakeLists.txt b/rasp/python/python-probe/rasp/probe/CMakeLists.txt
@@ -37,6 +37,7 @@ target_link_libraries(
         PRIVATE
         aio::aio
         runtime::c_runtime
+        regex::tiny-regex-c
         $<$<BOOL:${STATIC_BUILD}>:-static-libgcc>
         $<$<BOOL:${STATIC_BUILD}>:-static-libstdc++>
         -Wl,--exclude-libs,ALL