aboutsummaryrefslogtreecommitdiffhomepage
path: root/crates/shirabe-php-shim/src/fs.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-php-shim/src/fs.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-php-shim/src/fs.rs')
-rw-r--r--crates/shirabe-php-shim/src/fs.rs42
1 files changed, 15 insertions, 27 deletions
diff --git a/crates/shirabe-php-shim/src/fs.rs b/crates/shirabe-php-shim/src/fs.rs
index 26ea1fdf..41383490 100644
--- a/crates/shirabe-php-shim/src/fs.rs
+++ b/crates/shirabe-php-shim/src/fs.rs
@@ -1,4 +1,3 @@
-use crate::PhpMixed;
use crate::PhpResource;
use crate::StreamBacking;
use crate::StreamState;
@@ -871,7 +870,7 @@ pub fn file_put_contents3(filename: &str, data: &str, flags: i64) -> Option<i64>
Some(data.len() as i64)
}
-pub fn file_get_contents(path: impl AsRef<std::path::Path>) -> Option<String> {
+pub fn file_get_contents(path: impl AsRef<std::path::Path>) -> std::io::Result<Vec<u8>> {
let path = path.as_ref();
// PHP supports the file:// stream wrapper; strip it to read the local file.
let path = path
@@ -879,34 +878,23 @@ pub fn file_get_contents(path: impl AsRef<std::path::Path>) -> Option<String> {
.and_then(|s| s.strip_prefix("file://"))
.map_or(path, std::path::Path::new);
std::fs::read(path)
- .ok()
- .map(|bytes| String::from_utf8_lossy(&bytes).into_owned())
}
-/// `$use_include_path` and the stream `$context` have no effect; the read always goes to the
-/// local filesystem.
-pub fn file_get_contents5(
- path: &str,
- _use_include_path: bool,
- _context: PhpMixed,
- offset: i64,
- length: Option<i64>,
-) -> Option<String> {
+pub fn file_get_contents_with_max_length(
+ path: impl AsRef<std::path::Path>,
+ length: usize,
+) -> std::io::Result<Vec<u8>> {
+ let path = path.as_ref();
// PHP supports the file:// stream wrapper; strip it to read the local file.
- let path = path.strip_prefix("file://").unwrap_or(path);
- let bytes = std::fs::read(path).ok()?;
- let len = bytes.len() as i64;
- let start = if offset < 0 {
- (len + offset).max(0)
- } else {
- offset.min(len)
- } as usize;
- let slice = &bytes[start..];
- let slice = match length {
- Some(l) if l >= 0 => &slice[..(l as usize).min(slice.len())],
- _ => slice,
- };
- Some(String::from_utf8_lossy(slice).into_owned())
+ let path = path
+ .to_str()
+ .and_then(|s| s.strip_prefix("file://"))
+ .map_or(path, std::path::Path::new);
+ let mut buf = Vec::new();
+ std::fs::File::open(path)?
+ .take(length as u64)
+ .read_to_end(&mut buf)?;
+ Ok(buf)
}
pub fn getcwd() -> Option<String> {