Ryan/drop
1
0
Fork 0
mirror of https://github.com/Drop-OSS/drop.git synced 2026-06-22 04:11:32 +10:00
Code Issues Packages Projects Releases Wiki Activity

fix: add send trait to filereader

Browse Source
This commit is contained in:
DecDuck
2026-02-28 14:59:54 +11:00
parent c7b823dc10
commit e5d818f819
1 changed files with 27 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/libarchive/src/reader.rs
+27 -18
View File
@@ -8,18 +8,19 @@ use std::path::Path;
use std::ptr;
use std::slice;
use libc::{c_void, ssize_t};
use libarchive3_sys::ffi;
use libc::{c_void, ssize_t};
use archive::{Entry, ReadCompression, ReadFilter, ReadFormat, Handle};
use error::{ArchiveResult, ArchiveError};
use archive::{Entry, Handle, ReadCompression, ReadFilter, ReadFormat};
use error::{ArchiveError, ArchiveResult};
const BLOCK_SIZE: usize = 10240;
unsafe extern "C" fn stream_read_callback(handle: *mut ffi::Struct_archive,
data: *mut c_void,
buff: *mut *const c_void)
-> ssize_t {
unsafe extern "C" fn stream_read_callback(
handle: *mut ffi::Struct_archive,
data: *mut c_void,
buff: *mut *const c_void,
) -> ssize_t {
let pipe: &mut Pipe = &mut *(data as *mut Pipe);
*buff = pipe.buffer.as_mut_ptr() as *mut c_void;
match pipe.read_bytes() {
@@ -32,7 +33,7 @@ unsafe extern "C" fn stream_read_callback(handle: *mut ffi::Struct_archive,
}
}
pub trait Reader : Handle {
pub trait Reader: Handle {
fn entry(&mut self) -> &mut ReaderEntry;
fn header_position(&self) -> i64 {
@@ -68,6 +69,8 @@ pub struct FileReader {
entry: ReaderEntry,
}
unsafe impl Send for FileReader {}
pub struct StreamReader {
handle: *mut ffi::Struct_archive,
entry: ReaderEntry,
@@ -149,11 +152,13 @@ impl StreamReader {
unsafe {
let mut pipe = Box::new(Pipe::new(src));
let pipe_ptr: *mut c_void = &mut *pipe as *mut Pipe as *mut c_void;
match ffi::archive_read_open(builder.handle(),
pipe_ptr,
None,
Some(stream_read_callback),
None) {
match ffi::archive_read_open(
builder.handle(),
pipe_ptr,
None,
Some(stream_read_callback),
None,
) {
ffi::ARCHIVE_OK => {
let reader = StreamReader {
handle: builder.handle(),
@@ -259,10 +264,12 @@ impl Builder {
ReadFilter::ProgramSignature(prog, cb, size) => {
let c_prog = CString::new(prog).unwrap();
unsafe {
ffi::archive_read_support_filter_program_signature(self.handle,
c_prog.as_ptr(),
mem::transmute(cb),
size)
ffi::archive_read_support_filter_program_signature(
self.handle,
c_prog.as_ptr(),
mem::transmute(cb),
size,
)
}
}
ReadFilter::Rpm => unsafe { ffi::archive_read_support_filter_rpm(self.handle) },
@@ -363,7 +370,9 @@ impl ReaderEntry {
impl Default for ReaderEntry {
fn default() -> Self {
ReaderEntry { handle: ptr::null_mut() }
ReaderEntry {
handle: ptr::null_mut(),
}
}
}