Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sandboxfs 0.1.0 #12534

Merged
merged 1 commit into from
Jun 21, 2019
Merged

Sandboxfs 0.1.0 #12534

merged 1 commit into from
Jun 21, 2019

Conversation

misuchiru03
Copy link
Contributor

No description provided.

@misuchiru03 misuchiru03 force-pushed the sandboxfs-0.1.0 branch 3 times, most recently from 5b0dbe0 to 6a8fa1d Compare June 18, 2019 20:15
@abenson
Copy link
Contributor

abenson commented Jun 19, 2019

--- src/nodes/mod.rs.orig
+++ src/nodes/mod.rs
@@ -173,11 +173,11 @@
     }
     let size = size.unwrap();
 
-    let result = if size > ::std::i64::MAX as u64 {
-        warn!("truncate request got size {}, which is too large (exceeds i64's MAX)", size);
+    let result = if size > ::nix::libc::off_t::max_value() as u64 {
+        warn!("truncate request got size {}, which is too large (exceeds off_t's MAX)", size);
         Err(nix::Error::invalid_argument())
     } else {
-        try_path(path, |p| unistd::truncate(p, size as i64))
+        try_path(path, |p| unistd::truncate(p, size as nix::libc::off_t))
     };
     if result.is_ok() {
         attr.size = size;
--- src/nodes/conv.rs.orig
+++ src/nodes/conv.rs
@@ -69,7 +69,7 @@
     } else {
         val.tv_usec() as i32
     };
-    Timespec::new(val.tv_sec() as sys::time::time_t, usec)
+    Timespec::new((val.tv_sec() as sys::time::time_t).into(), usec)
 }
 
 /// Converts a file type as returned by the file system to a FUSE file type.

@abenson
Copy link
Contributor

abenson commented Jun 19, 2019

I do plan to! I don't know if the patch is correct, but it does solve an existing open issue! Upstream PR

@xtraeme xtraeme merged commit 9d60ee1 into void-linux:master Jun 21, 2019
@misuchiru03 misuchiru03 deleted the sandboxfs-0.1.0 branch October 6, 2019 02:06
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Mar 18, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants