tyler/proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tree-wide: use the new vec/io tools modules

Browse Source 
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
This commit is contained in:
Wolfgang Bumiller
2019-05-22 15:02:16 +02:00
parent 6f0069ae1e
commit 8ea3b1d188
5 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/pxar/encoder.rs
View File

@ -24,6 +24,8 @@ use nix::sys::stat::Mode;
use nix::errno::Errno;
use nix::sys::stat::FileStat;
use crate::tools::vec;
/// The format requires to build sorted directory lookup tables in
/// memory, so we restrict the number of allowed entries to limit
/// maximum memory usage.
@ -480,7 +482,7 @@ impl <'a, W: Write> Encoder<'a, W> {
}
} else if ifmt == libc::S_IFLNK {
let mut buffer = [0u8; libc::PATH_MAX as usize];
let mut buffer = vec::undefined(libc::PATH_MAX as usize);
let res = filename.with_nix_path(|cstr| {
unsafe { libc::readlinkat(rawfd, cstr.as_ptr(), buffer.as_mut_ptr() as *mut libc::c_char, buffer.len()-1) }

17
src/pxar/sequential_decoder.rs
View File

@ -20,6 +20,9 @@ use nix::fcntl::OFlag;
use nix::sys::stat::Mode;
use nix::errno::Errno;
use nix::NixPath;
use crate::tools::io::ops::*;
use crate::tools::vec;
use crate::tools::xattr;
// This one need Read, but works without Seek
@ -34,7 +37,7 @@ const HEADER_SIZE: u64 = std::mem::size_of::<CaFormatHeader>() as u64;
impl <'a, R: Read> SequentialDecoder<'a, R> {
pub fn new(reader: &'a mut R, no_xattrs: bool, no_fcaps: bool) -> Self {
let skip_buffer = vec![0u8; 64*1024];
let skip_buffer = vec::undefined(64*1024);
let mut feature_flags = CA_FORMAT_DEFAULT;
if no_xattrs {
feature_flags ^= CA_FORMAT_WITH_XATTRS;
@ -78,8 +81,7 @@ impl <'a, R: Read> SequentialDecoder<'a, R> {
bail!("link target too long ({}).", target_len);
}
let mut buffer = vec![0u8; target_len as usize];
self.reader.read_exact(&mut buffer)?;
let mut buffer = self.reader.read_exact_allocated(target_len as usize)?;
let last_byte = buffer.pop().unwrap();
if last_byte != 0u8 {
@ -118,8 +120,7 @@ impl <'a, R: Read> SequentialDecoder<'a, R> {
bail!("filename too long ({}).", name_len);
}
let mut buffer = vec![0u8; name_len as usize];
self.reader.read_exact(&mut buffer)?;
let mut buffer = self.reader.read_exact_allocated(name_len as usize)?;
let last_byte = buffer.pop().unwrap();
if last_byte != 0u8 {
@ -147,8 +148,7 @@ impl <'a, R: Read> SequentialDecoder<'a, R> {
}
fn read_xattr(&mut self, size: usize) -> Result<CaFormatXAttr, Error> {
let mut buffer = vec![0u8; size];
self.reader.read_exact(&mut buffer)?;
let buffer = self.reader.read_exact_allocated(size)?;
match buffer.iter().position(|c| *c == '\0' as u8) {
Some(pos) => {
@ -172,8 +172,7 @@ impl <'a, R: Read> SequentialDecoder<'a, R> {
}
fn read_fcaps(&mut self, size: usize) -> Result<CaFormatFCaps, Error> {
let mut buffer = vec![0u8; size];
self.reader.read_exact(&mut buffer)?;
let buffer = self.reader.read_exact_allocated(size)?;
Ok(CaFormatFCaps { data: buffer })
}