diff options
| author | nsfisis <nsfisis@gmail.com> | 2026-08-10 02:59:50 +0900 |
|---|---|---|
| committer | nsfisis <nsfisis@gmail.com> | 2026-08-10 03:05:26 +0900 |
| commit | 264feb1093d587e5df457fac023852a0e578b22f (patch) | |
| tree | fc23db88f628bd421c2a9819ebbdb96b05ed99de /crates/shirabe-php-shim/src/fs.rs | |
| parent | 54760d5c73ca20de2e155df274d576cec9ea0ed0 (diff) | |
| download | php-shirabe-264feb1093d587e5df457fac023852a0e578b22f.tar.gz php-shirabe-264feb1093d587e5df457fac023852a0e578b22f.tar.zst php-shirabe-264feb1093d587e5df457fac023852a0e578b22f.zip | |
fix(php-shim): return an error from fileperms instead of 0
fileperms swallowed metadata errors and reported a mode of 0, which the
callers could not tell apart from a real (if implausible) mode: the zip
archiver stored entries with no permission bits, and Filesystem::copy
chmod-ed the target to 0. It now returns Result<u32, io::Error> so both
callers propagate the failure. The switch to u32 also drops the casts
around the mode arithmetic and ZipArchive's entry attributes.
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.rs | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/crates/shirabe-php-shim/src/fs.rs b/crates/shirabe-php-shim/src/fs.rs index a948a6f2..6aa8eeee 100644 --- a/crates/shirabe-php-shim/src/fs.rs +++ b/crates/shirabe-php-shim/src/fs.rs @@ -791,13 +791,10 @@ pub fn chmod(path: impl AsRef<std::path::Path>, mode: u32) -> bool { std::fs::set_permissions(path.as_ref(), std::fs::Permissions::from_mode(mode)).is_ok() } -pub fn fileperms(path: impl AsRef<std::path::Path>) -> i64 { +pub fn fileperms(path: impl AsRef<std::path::Path>) -> Result<u32, std::io::Error> { use std::os::unix::fs::MetadataExt; - // PHP returns the full st_mode (file type bits included). - // TODO(phase-c): PHP returns false on error; this i64 signature reports 0 instead. - std::fs::metadata(path.as_ref()) - .map(|m| m.mode() as i64) - .unwrap_or(0) + // TODO(phase-e): PHP returns the full st_mode (file type bits included). + std::fs::metadata(path.as_ref()).map(|m| m.mode()) } pub fn filesize(path: impl AsRef<std::path::Path>) -> Option<i64> { |
