From e60f6bd4ce831ced94fafeb527c429b6f88159ac Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 27 Mar 2019 20:45:56 +0100 Subject: Enable Rust code to call C++ Source objects --- nix-rust/src/lib.rs | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) (limited to 'nix-rust/src/lib.rs') diff --git a/nix-rust/src/lib.rs b/nix-rust/src/lib.rs index abcb89055..799d52e31 100644 --- a/nix-rust/src/lib.rs +++ b/nix-rust/src/lib.rs @@ -7,13 +7,28 @@ use std::os::unix::fs::OpenOptionsExt; use std::path::Path; use tar::Archive; +/// A wrapper around Nix's Source class that provides the Read trait. +#[repr(C)] +pub struct Source { + fun: extern "C" fn(this: *mut libc::c_void, data: &mut [u8]) -> usize, + this: *mut libc::c_void, +} + +impl std::io::Read for Source { + fn read(&mut self, buf: &mut [u8]) -> std::result::Result { + let n = (self.fun)(self.this, buf); + assert!(n <= buf.len()); + Ok(n) + } +} + #[no_mangle] -pub extern "C" fn unpack_tarfile(data: &[u8], dest_dir: &str) -> bool { +pub extern "C" fn unpack_tarfile(source: Source, dest_dir: &str) -> bool { // FIXME: handle errors. let dest_dir = Path::new(dest_dir); - let mut tar = Archive::new(data); + let mut tar = Archive::new(source); for file in tar.entries().unwrap() { let mut file = file.unwrap(); -- cgit v1.2.3