Merge pull request #7 from BlockProject3D/develop

bp3d-os release 2.2.1

Author: Yuri6037

core/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "bp3d-os"
-version = "2.2.0"
+version = "2.2.1"
 authors = ["Yuri Edward <[email protected]>"]
 edition = "2021"
 description = "Operating System tools designed for BlockProject3D"

core/src/assets/apple.rs

@@ -53,14 +53,14 @@ pub fn get_exe_path() -> Option<PathBuf> {
                 return None;
             }
             let str = OsStr::from_bytes(std::mem::transmute(&v[..size as usize]));
-            return Some(PathBuf::from(str));
+            return PathBuf::from(str).parent().map(|v| v.into());
         }
         if res != 0 {
             return None;
         }
         let len = strlen(buf.as_ptr());
         let str = OsStr::from_bytes(std::mem::transmute(&buf[..len]));
-        Some(PathBuf::from(str))
+        PathBuf::from(str).parent().map(|v| v.into())
     }
 }
 

core/src/assets/bsd.rs

@@ -1,4 +1,4 @@
-// Copyright (c) 2023, BlockProject 3D
+// Copyright (c) 2025, BlockProject 3D
 //
 // All rights reserved.
 //
@@ -56,10 +56,13 @@ pub fn get_exe_path() -> Option<PathBuf> {
             //This is where we defer from process_path: we use std::os::unix::ffi::OsStrExt.
             let str = OsStr::from_bytes(&buf[..len]);
             let path = PathBuf::from(str);
-            Some(path)
+            path.parent().map(|v| v.into())
         } else {
             //FreeBSD with procfs.
-            std::fs::read_link("/proc/curproc/file").ok()
+            std::fs::read_link("/proc/curproc/file")
+                .ok()
+                .map(|v| v.parent().map(PathBuf::from))
+                .flatten()
         }
     }
 }

core/src/assets/windows.rs

@@ -67,7 +67,7 @@ pub fn get_exe_path() -> Option<PathBuf> {
         }
         //We finally found the executable file name!
         let str1 = OsString::from_wide(&buf[..res as usize]);
-        Some(str1.into())
+        Some(PathBuf::from(str1).parent()?.into())
     }
 }
 

module_test/test_mod/Cargo.toml

@@ -11,5 +11,5 @@ crate-type = ["rlib", "cdylib"]
 bp3d-os-build = { version = "1.1.0", path = "../../build" }
 
 [dependencies]
-bp3d-os = { version = "2.2.0", path = "../../core", features = ["module"] }
+bp3d-os = { version = "2.2.1", path = "../../core", features = ["module"] }
 bp3d-debug = "1.0.0"

module_test/testbin/Cargo.toml

@@ -5,4 +5,4 @@ edition = "2024"
 publish = false
 
 [dependencies]
-bp3d-os = { version = "2.2.0", path = "../../core", features = ["module"] }
+bp3d-os = { version = "2.2.1", path = "../../core", features = ["module"] }

shelltestbin/Cargo.toml

@@ -5,4 +5,4 @@ edition = "2024"
 publish = false
 
 [dependencies]
-bp3d-os = { version = "2.2.0", path = "../core", features = ["shell"] }
+bp3d-os = { version = "2.2.1", path = "../core", features = ["shell"] }