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

pbs-client: pxar: drop link_to_pathbuf 

pxar's Hardlink and Symlink structs implement `AsRef<OsStr>`
and have an `.as_os_str()` method.

Simply use `Path::new(link)`.

Also, the function was not very well written, and we don't
always need an owned copy.

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
This commit is contained in:
Wolfgang Bumiller 2022-04-13 10:18:30 +02:00
parent 84d3af3a0e
commit 0bb4036f25
1 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pbs-client/src/pxar/extract.rs
View File

@ -4,7 +4,7 @@ use std::collections::HashMap;
use std::convert::TryFrom; use std::convert::TryFrom;
use std::ffi::{CStr, CString, OsStr, OsString}; use std::ffi::{CStr, CString, OsStr, OsString};
use std::io; use std::io;
use std::os::unix::ffi::{OsStrExt, OsStringExt}; use std::os::unix::ffi::OsStrExt;
use std::os::unix::io::{AsRawFd, FromRawFd, RawFd}; use std::os::unix::io::{AsRawFd, FromRawFd, RawFd};
use std::path::{Path, PathBuf}; use std::path::{Path, PathBuf};
use std::pin::Pin; use std::pin::Pin;
@ -533,14 +533,6 @@ where
Ok(()) Ok(())
} }
// converts to a pathbuf and removes the trailing '\0'
fn link_to_pathbuf(link: &[u8]) -> PathBuf {
let len = link.len();
let mut buf = Vec::with_capacity(len);
buf.extend_from_slice(&link[..len - 1]);
OsString::from_vec(buf).into()
}
/// Creates a tar file from `path` and writes it into `output` /// Creates a tar file from `path` and writes it into `output`
pub async fn create_tar<T, W, P>( pub async fn create_tar<T, W, P>(
output: W, output: W,
@ -592,7 +584,7 @@ where
.ok_or(format_err!("error looking up '{:?}'", path))?; .ok_or(format_err!("error looking up '{:?}'", path))?;
let realfile = accessor.follow_hardlink(&entry).await?; let realfile = accessor.follow_hardlink(&entry).await?;
let metadata = realfile.entry().metadata(); let metadata = realfile.entry().metadata();
let realpath = link_to_pathbuf(&link.data); let realpath = Path::new(link);
if verbose { if verbose {
eprintln!("adding '{}' to tar", path.display()); eprintln!("adding '{}' to tar", path.display());
@ -602,7 +594,7 @@ where
Ok(path) => path, Ok(path) => path,
Err(_) => { Err(_) => {
// outside of our tar archive, add the first occurrance to the tar // outside of our tar archive, add the first occurrance to the tar
if let Some(path) = hardlinks.get(&realpath) { if let Some(path) = hardlinks.get(realpath) {
path path
} else { } else {
let size = decoder.content_size().unwrap_or(0); let size = decoder.content_size().unwrap_or(0);
@ -614,7 +606,7 @@ where
&path, &path,
) )
.await?; .await?;
hardlinks.insert(realpath, path); hardlinks.insert(realpath.to_owned(), path);
continue; continue;
} }
} }
@ -633,7 +625,7 @@ where
if verbose { if verbose {
eprintln!("adding '{}' to tar", path.display()); eprintln!("adding '{}' to tar", path.display());
} }
let realpath = link_to_pathbuf(&link.data); let realpath = Path::new(link);
let mut header = tar::Header::new_gnu(); let mut header = tar::Header::new_gnu();
header.set_entry_type(tar::EntryType::Symlink); header.set_entry_type(tar::EntryType::Symlink);
add_metadata_to_header(&mut header, metadata); add_metadata_to_header(&mut header, metadata);