diff options
| author | bjorn3 <17426603+bjorn3@users.noreply.github.com> | 2025-03-13 16:17:40 +0000 |
|---|---|---|
| committer | bjorn3 <17426603+bjorn3@users.noreply.github.com> | 2025-03-13 16:17:50 +0000 |
| commit | 83ee034d037d2386085ce44bddad286c24e4ed6c (patch) | |
| tree | ba3c3ba90ccf67ecbb3626eda00a379bd2705cd6 | |
| parent | a2aba0578ba440130d2ee213fc9dfdaa7095bdb5 (diff) | |
| download | rust-83ee034d037d2386085ce44bddad286c24e4ed6c.tar.gz rust-83ee034d037d2386085ce44bddad286c24e4ed6c.zip | |
Remove usage of legacy scheme paths on RedoxOS
The name:/path path syntax is getting phased out in favor of /scheme/name/path. Also using null: is no longer necessary as /dev/null is available on Redox OS too.
| -rw-r--r-- | library/std/src/sys/pal/unix/os.rs | 7 | ||||
| -rw-r--r-- | library/std/src/sys/pal/unix/process/process_common.rs | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/library/std/src/sys/pal/unix/os.rs b/library/std/src/sys/pal/unix/os.rs index 3a238d160cb..91f55fcd32b 100644 --- a/library/std/src/sys/pal/unix/os.rs +++ b/library/std/src/sys/pal/unix/os.rs @@ -484,7 +484,12 @@ pub fn current_exe() -> io::Result<PathBuf> { } } -#[cfg(any(target_os = "redox", target_os = "rtems"))] +#[cfg(target_os = "redox")] +pub fn current_exe() -> io::Result<PathBuf> { + crate::fs::read_to_string("/scheme/sys/exe").map(PathBuf::from) +} + +#[cfg(target_os = "rtems")] pub fn current_exe() -> io::Result<PathBuf> { crate::fs::read_to_string("sys:exe").map(PathBuf::from) } diff --git a/library/std/src/sys/pal/unix/process/process_common.rs b/library/std/src/sys/pal/unix/process/process_common.rs index 0ea9db211b3..dd41921f263 100644 --- a/library/std/src/sys/pal/unix/process/process_common.rs +++ b/library/std/src/sys/pal/unix/process/process_common.rs @@ -19,8 +19,6 @@ use crate::{fmt, io, ptr}; cfg_if::cfg_if! { if #[cfg(target_os = "fuchsia")] { // fuchsia doesn't have /dev/null - } else if #[cfg(target_os = "redox")] { - const DEV_NULL: &CStr = c"null:"; } else if #[cfg(target_os = "vxworks")] { const DEV_NULL: &CStr = c"/null"; } else { |