Merge pull request #210 from devraymondsh/develop

Fix typo in variable name Rust_CARGO_EXECUTABLE in rs_loader's CMakeLists

Author: giarve

source/loaders/rs_loader/rust/CMakeLists.txt

@@ -49,12 +49,12 @@ add_custom_target(${target}_runtime
 
 add_custom_target(${target} ALL
 	WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-	COMMAND ${CARGO_EXECUTABLE} build ${TARGET_BUILD_TYPE}
+	COMMAND ${Rust_CARGO_EXECUTABLE} build ${TARGET_BUILD_TYPE}
 	# TODO: $ORIGIN does not work, but even using absolute path, the library librustc_driver depends on libstd and libLLVM
 	# but they have the rpath hardcoded to the rustup folder, for mitigating this, we are using LD_LIBRARY_PATH in the test
 	# although it may cause problems in the future in the distributable or docker builds, this must be reviewed
-	# COMMAND ${CMAKE_COMMAND} -E env RUSTFLAGS='-C link-arg=-Wl,-rpath,${TARGET_OUTPUT_PATH}' ${CARGO_EXECUTABLE} build ${TARGET_BUILD_TYPE}
-	# COMMAND ${CMAKE_COMMAND} -E env RUSTFLAGS='-C link-arg=-Wl,-rpath,\$ORIGIN' ${CARGO_EXECUTABLE} build ${TARGET_BUILD_TYPE}
+	# COMMAND ${CMAKE_COMMAND} -E env RUSTFLAGS='-C link-arg=-Wl,-rpath,${TARGET_OUTPUT_PATH}' ${Rust_CARGO_EXECUTABLE} build ${TARGET_BUILD_TYPE}
+	# COMMAND ${CMAKE_COMMAND} -E env RUSTFLAGS='-C link-arg=-Wl,-rpath,\$ORIGIN' ${Rust_CARGO_EXECUTABLE} build ${TARGET_BUILD_TYPE}
 	COMMAND ${CMAKE_COMMAND} -E copy_if_different ${TARGET_BUILD_PATH} ${TARGET_OUTPUT}
 	DEPENDS ${target}_runtime
 )

source/loaders/rs_loader/rust/src/lifecycle/load_from_file.rs

@@ -1,8 +1,10 @@
 use crate::{bridge_api, c_char, c_int, c_void, CStr, PathBuf};
 
+use std::fmt::Display;
+
 use metacall_registrator;
 
-fn rs_loader_impl_load_from_file_on_error(error: &str) -> *mut c_void {
+fn rs_loader_impl_load_from_file_on_error<T: Display>(error: T) -> *mut c_void {
     eprintln!("{}", error);
 
     0 as c_int as *mut c_void
@@ -15,43 +17,63 @@ pub extern "C" fn rs_loader_impl_load_from_file(
     size: usize,
 ) -> *mut c_void {
     let loader_lifecycle_state = bridge_api::get_loader_lifecycle_state(loader_impl);
-    let mut execution_paths_iterator = unsafe { (*loader_lifecycle_state).execution_paths.iter() };
 
     for i in 0..size {
         let path: *const c_char = paths.wrapping_offset(i as isize) as *const c_char;
         let path_slice = unsafe { CStr::from_ptr(path) }.to_str().unwrap();
         let mut path_buf = PathBuf::from(path_slice);
 
+        let mut execution_paths_iterator =
+            unsafe { (*loader_lifecycle_state).execution_paths.iter() };
+
         if !path_buf.is_absolute() {
-            let execution_path = execution_paths_iterator.next();
+            loop {
+                let execution_path_current_iteration = execution_paths_iterator.next();
+                let original_path_buf = path_buf.clone();
+
+                match execution_path_current_iteration {
+                    Some(original_execution_path) => {
+                        let mut execution_path = original_execution_path.clone();
+                        let mut execution_path_as_str = execution_path.to_str().unwrap();
+
+                        if !execution_path_as_str.ends_with("/") {
+                            execution_path =
+                                PathBuf::from(format!("{}{}", execution_path_as_str, "/"));
 
-            match execution_path {
-                Some(execution_path) => {
-                    let mut execution_path = execution_path.clone();
-                    let mut execution_path_as_str = execution_path.to_str().unwrap();
+                            //Reassign the execution_path_as_str since the execution_path got changed
+                            execution_path_as_str = execution_path.to_str().unwrap();
+                        }
 
-                    if !execution_path_as_str.ends_with("/") {
-                        execution_path = PathBuf::from(format!("{}{}", execution_path_as_str, "/"));
+                        path_buf = PathBuf::from(format!(
+                            "{}{}",
+                            execution_path_as_str,
+                            path_buf.to_str().unwrap()
+                        ));
 
-                        //Reassign the execution_path_as_str since the execution_path got changed
-                        execution_path_as_str = execution_path.to_str().unwrap();
+                        if !path_buf.exists() || !path_buf.is_file() {
+                            path_buf = PathBuf::from(original_path_buf);
+
+                            continue;
+                        }
+                    }
+                    None => {
+                        return rs_loader_impl_load_from_file_on_error(format!(
+                        "Rs_loader was unable to find any suitable execution_path for the path: {}",
+                        original_path_buf.to_str().unwrap()
+                    ))
                     }
+                };
 
-                    path_buf = PathBuf::from(format!(
-                        "{}{}",
-                        execution_path_as_str,
-                        path_buf.to_str().unwrap()
-                    ));
+                if path_buf.exists() && path_buf.is_file() {
+                    break;
                 }
-                None => {
-                    return rs_loader_impl_load_from_file_on_error(
-                        "Execution path's length is less than non-absolute path's length",
-                    )
-                }
-            };
+            }
         }
         if !path_buf.is_file() {
-            return rs_loader_impl_load_from_file_on_error("Not a valid path to a file");
+            return rs_loader_impl_load_from_file_on_error(format!(
+                "Not a valid absolute path to a file, {}",
+                path_buf.to_str().unwrap()
+            ));
         }
 
         let cargo_cdylib_project =