Fix environment variable path separator handling for AXVISOR_VM_CONFIGS

Author: YanLien

kernel/build.rs

@@ -42,18 +42,13 @@ struct ConfigFile {
     pub content: String,
 }
 
-/// Gets the paths (semicolon-separated) from the `AXVISOR_VM_CONFIGS` environment variable.
+/// Gets the paths (colon-separated) from the `AXVISOR_VM_CONFIGS` environment variable.
 ///
 /// Returns `None` if the environment variable is not set.
 fn get_config_paths() -> Option<Vec<OsString>> {
     env::var("AXVISOR_VM_CONFIGS")
         .ok()
-        .map(|paths| {
-            paths
-                .split(';')
-                .map(|s| OsString::from(s.trim()))
-                .collect()
-        })
+        .map(|paths| env::split_paths(&paths).map(OsString::from).collect())
 }
 
 /// Gets the paths and contents of the configuration files specified by the `AXVISOR_VM_CONFIGS` environment variable.

xtask/src/tbuld.rs

@@ -1,4 +1,4 @@
-use std::path::PathBuf;
+use std::{env, path::PathBuf};
 
 use anyhow::Context as _;
 use ostool::build::config::{Cargo, LogLevel};
@@ -85,12 +85,12 @@ impl Context {
         }
 
         if !vm_config_paths.is_empty() {
-            let value = vm_config_paths
-                .iter()
-                .map(|p| format!("{}", p.display()))
-                .collect::<Vec<_>>()
-                .join(";");
-            cargo.env.insert("AXVISOR_VM_CONFIGS".to_string(), value);
+            if let Ok(joined) = env::join_paths(&vm_config_paths) {
+                cargo.env.insert(
+                    "AXVISOR_VM_CONFIGS".to_string(),
+                    joined.to_string_lossy().into_owned()
+                );
+            }
         }
 
         Ok(cargo)