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

src/bin/pxar.rs - dump: allow to read from stdin

Browse Source
This commit is contained in:
Dietmar Maurer 2019-07-05 12:32:15 +02:00
parent bf1252619a
commit c6c9e093d0
1 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/bin/pxar.rs
View File

@ -41,6 +41,18 @@ fn print_filenames(
Ok(Value::Null) Ok(Value::Null)
} }
fn dump_archive_from_reader<R: std::io::Read>(reader: &mut R, feature_flags: u64) -> Result<(), Error> {
let mut decoder = pxar::SequentialDecoder::new(reader, feature_flags, |_| Ok(()));
let stdout = std::io::stdout();
let mut out = stdout.lock();
let mut path = PathBuf::new();
decoder.dump_entry(&mut path, true, &mut out)?;
Ok(())
}
fn dump_archive( fn dump_archive(
param: Value, param: Value,
_info: &ApiMethod, _info: &ApiMethod,
@ -51,9 +63,6 @@ fn dump_archive(
let with_xattrs = param["with-xattrs"].as_bool().unwrap_or(false); let with_xattrs = param["with-xattrs"].as_bool().unwrap_or(false);
let with_fcaps = param["with-fcaps"].as_bool().unwrap_or(false); let with_fcaps = param["with-fcaps"].as_bool().unwrap_or(false);
let with_acls = param["with-acls"].as_bool().unwrap_or(false); let with_acls = param["with-acls"].as_bool().unwrap_or(false);
let file = std::fs::File::open(archive)?;
let mut reader = std::io::BufReader::new(file);
let mut feature_flags = pxar::CA_FORMAT_DEFAULT; let mut feature_flags = pxar::CA_FORMAT_DEFAULT;
if !with_xattrs { if !with_xattrs {
@ -65,15 +74,17 @@ fn dump_archive(
if !with_acls { if !with_acls {
feature_flags ^= pxar::CA_FORMAT_WITH_ACL; feature_flags ^= pxar::CA_FORMAT_WITH_ACL;
} }
let mut decoder = pxar::SequentialDecoder::new(&mut reader, feature_flags, |_| Ok(()));
let stdout = std::io::stdout(); if archive == "-" {
let mut out = stdout.lock(); let stdin = std::io::stdin();
let mut reader = stdin.lock();
println!("PXAR dump: {}", archive); dump_archive_from_reader(&mut reader, feature_flags)?;
} else {
let mut path = PathBuf::new(); println!("PXAR dump: {}", archive);
decoder.dump_entry(&mut path, true, &mut out)?; let file = std::fs::File::open(archive)?;
let mut reader = std::io::BufReader::new(file);
dump_archive_from_reader(&mut reader, feature_flags)?;
};
Ok(Value::Null) Ok(Value::Null)
} }