aboutsummaryrefslogtreecommitdiffhomepage
path: root/crates/shirabe/src/installer/binary_installer.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/installer/binary_installer.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/installer/binary_installer.rs')
-rw-r--r--crates/shirabe/src/installer/binary_installer.rs14
1 files changed, 9 insertions, 5 deletions
diff --git a/crates/shirabe/src/installer/binary_installer.rs b/crates/shirabe/src/installer/binary_installer.rs
index 554620df..1f70a5ca 100644
--- a/crates/shirabe/src/installer/binary_installer.rs
+++ b/crates/shirabe/src/installer/binary_installer.rs
@@ -9,9 +9,9 @@ use crate::util::Platform;
use crate::util::ProcessExecutor;
use crate::util::Silencer;
use shirabe_php_shim::{
- PhpMixed, basename, basename_with_suffix, chmod, dirname, fclose, fgets, file_exists,
- file_get_contents5, file_put_contents, fopen, is_dir, is_file, is_link, php_regex, preg_match,
- realpath, rmdir, substr, trim, umask,
+ basename, basename_with_suffix, chmod, dirname, fclose, fgets, file_exists,
+ file_get_contents_with_max_length, file_put_contents, fopen, is_dir, is_file, is_link,
+ php_regex, preg_match, realpath, rmdir, substr, trim, umask,
};
/// Seam over the BinaryInstaller methods reached through LibraryInstaller, so tests can inject a
@@ -311,8 +311,12 @@ impl BinaryInstaller {
let bin_dir = ProcessExecutor::escape(&dirname(&bin_path));
let bin_file = basename(&bin_path);
- let bin_contents =
- file_get_contents5(bin, false, PhpMixed::Null, 0, Some(500)).unwrap_or_default();
+ // TODO(bytes): preg_match matches over a &str, and the shebang it captures is spliced
+ // into the generated proxy as a String.
+ let bin_contents = String::from_utf8_lossy(
+ &file_get_contents_with_max_length(bin, 500).unwrap_or_default(),
+ )
+ .into_owned();
// For php files, we generate a PHP proxy instead of a shell one,
// which allows calling the proxy with a custom php process
if let Some(m) = preg_match(