Use the which crate to figure out sys.executable

coolreader18 · coolreader18 · commit 36f525732e98 · 2021-01-29T00:46:17.000-06:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -33,7 +33,7 @@ rustpython-vm = { path = "vm", version = "0.1.1", default-features = false, feat
 pylib = { package = "rustpython-pylib", path = "vm/pylib-crate", version = "0.1.0", default-features = false, optional = true }
 dirs = { package = "dirs-next", version = "1.0" }
 num-traits = "0.2.8"
-cfg-if = "0.1"
+cfg-if = "1.0"
 libc = "0.2"
 
 flame = { version = "0.2", optional = true }
diff --git a/common/Cargo.toml b/common/Cargo.toml
@@ -15,7 +15,7 @@ num-complex = "0.3"
 num-bigint = "0.3"
 lexical-core = "0.7"
 hexf-parse = "0.1.0"
-cfg-if = "0.1"
+cfg-if = "1.0"
 once_cell = "1.4.1"
 siphasher = "0.3"
 rand = "0.8"
diff --git a/vm/Cargo.toml b/vm/Cargo.toml
@@ -78,7 +78,7 @@ bstr = "0.2.12"
 crossbeam-utils = "0.8"
 parking_lot = "0.11"
 thread_local = "1.0"
-cfg-if = "0.1.10"
+cfg-if = "1.0"
 timsort = "0.1"
 thiserror = "1.0"
 atty = "0.2"
@@ -117,6 +117,7 @@ openssl = { version = "0.10", features = ["vendored"], optional = true }
 openssl-sys = { version = "0.9", optional = true }
 openssl-probe = { version = "0.1", optional = true }
 utime = "0.3"
+which = "4.0"
 
 [target.'cfg(any(not(target_arch = "wasm32"), target_os = "wasi"))'.dependencies]
 num_cpus = "1"
diff --git a/vm/src/sysmodule.rs b/vm/src/sysmodule.rs
@@ -29,6 +29,18 @@ fn argv(vm: &VirtualMachine) -> PyObjectRef {
 }
 
 fn executable(ctx: &PyContext) -> PyObjectRef {
+    #[cfg(not(target_arch = "wasm32"))]
+    {
+        if let Some(exec_path) = env::args_os().next() {
+            if let Ok(path) = which::which(exec_path) {
+                return ctx.new_str(
+                    path.into_os_string()
+                        .into_string()
+                        .unwrap_or_else(|p| p.to_string_lossy().into_owned()),
+                );
+            }
+        }
+    }
     if let Some(exec_path) = env::args().next() {
         let path = path::Path::new(&exec_path);
         if !path.exists() {
