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

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

Browse Source
This commit is contained in:
Dietmar Maurer 2019-07-05 12:39:25 +02:00
parent c6c9e093d0
commit 9eae781ab8
1 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/bin/pxar.rs
View File

@ -84,11 +84,24 @@ fn dump_archive(
let file = std::fs::File::open(archive)?; let file = std::fs::File::open(archive)?;
let mut reader = std::io::BufReader::new(file); let mut reader = std::io::BufReader::new(file);
dump_archive_from_reader(&mut reader, feature_flags)?; dump_archive_from_reader(&mut reader, feature_flags)?;
}; }
Ok(Value::Null) Ok(Value::Null)
} }
fn extract_archive_from_reader<R: std::io::Read>(reader: &mut R, target: &str, feature_flags: u64, verbose: bool) -> Result<(), Error> {
let mut decoder = pxar::SequentialDecoder::new(reader, feature_flags, |path| {
if verbose {
println!("{:?}", path);
}
Ok(())
});
decoder.restore(Path::new(target))?;
Ok(())
}
fn extract_archive( fn extract_archive(
param: Value, param: Value,
_info: &ApiMethod, _info: &ApiMethod,
@ -102,9 +115,6 @@ fn extract_archive(
let no_fcaps = param["no-fcaps"].as_bool().unwrap_or(false); let no_fcaps = param["no-fcaps"].as_bool().unwrap_or(false);
let no_acls = param["no-acls"].as_bool().unwrap_or(false); let no_acls = param["no-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 no_xattrs { if no_xattrs {
feature_flags ^= pxar::CA_FORMAT_WITH_XATTRS; feature_flags ^= pxar::CA_FORMAT_WITH_XATTRS;
@ -116,14 +126,16 @@ fn extract_archive(
feature_flags ^= pxar::CA_FORMAT_WITH_ACL; feature_flags ^= pxar::CA_FORMAT_WITH_ACL;
} }
let mut decoder = pxar::SequentialDecoder::new(&mut reader, feature_flags, |path| { if archive == "-" {
if verbose { let stdin = std::io::stdin();
println!("{:?}", path); let mut reader = stdin.lock();
extract_archive_from_reader(&mut reader, target, feature_flags, verbose)?;
} else {
println!("PXAR dump: {}", archive);
let file = std::fs::File::open(archive)?;
let mut reader = std::io::BufReader::new(file);
extract_archive_from_reader(&mut reader, target, feature_flags, verbose)?;
} }
Ok(())
});
decoder.restore(Path::new(target))?;
Ok(Value::Null) Ok(Value::Null)
} }