aboutsummaryrefslogtreecommitdiffhomepage
path: root/crates/shirabe/src/util/platform.rs
diff options
context:
space:
mode:
authornsfisis <nsfisis@gmail.com>2026-08-23 12:43:10 +0900
committernsfisis <nsfisis@gmail.com>2026-08-23 13:24:29 +0900
commit0b48f4a46d24248e4c012ef37d25b5963c27a78c (patch)
treea4c189be4419ded8e2252bc0c250aecfc66b3c36 /crates/shirabe/src/util/platform.rs
parent890a50de2a740cc4c4edba12b37cc9aa4d0efdc5 (diff)
downloadphp-shirabe-0b48f4a46d24248e4c012ef37d25b5963c27a78c.tar.gz
php-shirabe-0b48f4a46d24248e4c012ef37d25b5963c27a78c.tar.zst
php-shirabe-0b48f4a46d24248e4c012ef37d25b5963c27a78c.zip
fix(fs): carry file_get_contents results as bytes
file_get_contents() and file_get_contents_with_max_length() return Vec<u8> instead of a from_utf8_lossy'd String. Call sites whose consumer takes a &str still convert lossily and are marked TODO(bytes). file_get_contents_with_max_length() now reads at most the requested number of bytes instead of the whole file. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Diffstat (limited to 'crates/shirabe/src/util/platform.rs')
-rw-r--r--crates/shirabe/src/util/platform.rs12
1 files changed, 7 insertions, 5 deletions
diff --git a/crates/shirabe/src/util/platform.rs b/crates/shirabe/src/util/platform.rs
index ad530db3..bb3dd739 100644
--- a/crates/shirabe/src/util/platform.rs
+++ b/crates/shirabe/src/util/platform.rs
@@ -164,13 +164,14 @@ impl Platform {
return false;
}
- let file_contents = Silencer::call(|| Ok(file_get_contents("/proc/version")))
+ let file_contents = Silencer::call(|| Ok(file_get_contents("/proc/version").ok()))
.ok()
.flatten()
.unwrap_or_default();
if !ini_get("open_basedir").is_some_and(|s| PhpMixed::String(s).to_bool())
&& is_readable("/proc/version")
- && stripos(&file_contents, "microsoft").is_some()
+ // TODO(bytes)
+ && stripos(&String::from_utf8_lossy(&file_contents), "microsoft").is_some()
&& !Self::is_docker()
// Docker and Podman running inside WSL should not be seen as WSL
{
@@ -224,11 +225,12 @@ impl Platform {
Err(_) => break,
};
let data = match data {
- Some(d) => d,
- None => continue,
+ Ok(d) => d,
+ Err(_) => continue,
};
// detect default mount points created by Docker/containerd
- if data.contains("/var/lib/docker/") || data.contains("/io.containerd.snapshotter") {
+ let contains = |needle: &[u8]| data.windows(needle.len()).any(|w| w == needle);
+ if contains(b"/var/lib/docker/") || contains(b"/io.containerd.snapshotter") {
*cached = Some(true);
return true;
}