2 files changed, 24 insertions, 33 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> {
diff --git a/crates/shirabe-php-shim/src/string.rs b/crates/shirabe-php-shim/src/string.rs
index 024a3943..3a61a59d 100644
--- a/crates/shirabe-php-shim/src/string.rs
+++ b/crates/shirabe-php-shim/src/string.rs
@@ -299,11 +299,8 @@ pub fn trim(s: &str, chars: Option<&str>) -> String {
 }
 
 // Byte-based, matching PHP's substr. A negative start/length counts from the end.
-// The result is reinterpreted as UTF-8 (lossily), which only matters when a slice
-// boundary falls inside a multibyte sequence.
-pub fn substr(s: &str, start: i64, length: Option<i64>) -> String {
-    let bytes = s.as_bytes();
-    let len = bytes.len() as i64;
+pub fn substr_bytes(s: &[u8], start: i64, length: Option<i64>) -> Vec<u8> {
+    let len = s.len() as i64;
     let start = if start < 0 {
         (len + start).max(0)
     } else {
@@ -314,7 +311,13 @@ pub fn substr(s: &str, start: i64, length: Option<i64>) -> String {
         Some(l) if l < 0 => (len + l).max(start),
         Some(l) => (start + l).min(len),
     };
-    String::from_utf8_lossy(&bytes[start as usize..end as usize]).into_owned()
+    s[start as usize..end as usize].to_vec()
+}
+
+// The result is reinterpreted as UTF-8 (lossily), which only matters when a slice
+// boundary falls inside a multibyte sequence.
+pub fn substr(s: &str, start: i64, length: Option<i64>) -> String {
+    String::from_utf8_lossy(&substr_bytes(s.as_bytes(), start, length)).into_owned()
 }
 
 pub fn implode(glue: &str, pieces: &[String]) -> String {