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

pxar: change logic and impl all command line flags for xattrs/fcaps/acls

Browse Source 
Allows to individually set the flags for storing/dumping/restoring of
xattrs/fcaps/acls in the cli of pxar.
Changes logic so that each of them can be threated individually.

Signed-off-by: Christian Ebner <c.ebner@proxmox.com>
This commit is contained in:
Christian Ebner
2019-05-28 11:16:21 +02:00
committed by Dietmar Maurer
parent 60e589a111
commit 9b38443314
3 changed files with 88 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/bin/pxar.rs
View File

@ -48,13 +48,23 @@ fn dump_archive(
) -> Result<Value, Error> {
let archive = tools::required_string_param(&param, "archive")?;
let with_xattrs = param["with-xattrs"].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 file = std::fs::File::open(archive)?;
let mut reader = std::io::BufReader::new(file);
let mut feature_flags = pxar::CA_FORMAT_DEFAULT;
feature_flags ^= pxar::CA_FORMAT_WITH_XATTRS;
feature_flags ^= pxar::CA_FORMAT_WITH_FCAPS;
if !with_xattrs {
feature_flags ^= pxar::CA_FORMAT_WITH_XATTRS;
}
if !with_fcaps {
feature_flags ^= pxar::CA_FORMAT_WITH_FCAPS;
}
if !with_acls {
feature_flags ^= pxar::CA_FORMAT_WITH_ACL;
}
let mut decoder = pxar::SequentialDecoder::new(&mut reader, feature_flags);
let stdout = std::io::stdout();
@ -79,6 +89,7 @@ fn extract_archive(
let verbose = param["verbose"].as_bool().unwrap_or(false);
let no_xattrs = param["no-xattrs"].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 file = std::fs::File::open(archive)?;
@ -90,6 +101,9 @@ fn extract_archive(
if no_fcaps {
feature_flags ^= pxar::CA_FORMAT_WITH_FCAPS;
}
if no_acls {
feature_flags ^= pxar::CA_FORMAT_WITH_ACL;
}
let mut decoder = pxar::SequentialDecoder::new(&mut reader, feature_flags);
@ -115,6 +129,7 @@ fn create_archive(
let all_file_systems = param["all-file-systems"].as_bool().unwrap_or(false);
let no_xattrs = param["no-xattrs"].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 source = PathBuf::from(source);
@ -135,6 +150,9 @@ fn create_archive(
if no_fcaps {
feature_flags ^= pxar::CA_FORMAT_WITH_FCAPS;
}
if no_acls {
feature_flags ^= pxar::CA_FORMAT_WITH_ACL;
}
pxar::Encoder::encode(source, &mut dir, &mut writer, all_file_systems, verbose, feature_flags)?;
@ -155,6 +173,7 @@ fn main() {
.optional("verbose", BooleanSchema::new("Verbose output.").default(false))
.optional("no-xattrs", BooleanSchema::new("Ignore extended file attributes.").default(false))
.optional("no-fcaps", BooleanSchema::new("Ignore file capabilities.").default(false))
.optional("no-acls", BooleanSchema::new("Ignore access control list entries.").default(false))
.optional("all-file-systems", BooleanSchema::new("Include mounted sudirs.").default(false))
))
.arg_param(vec!["archive", "source"])
@ -171,6 +190,7 @@ fn main() {
.optional("verbose", BooleanSchema::new("Verbose output.").default(false))
.optional("no-xattrs", BooleanSchema::new("Ignore extended file attributes.").default(false))
.optional("no-fcaps", BooleanSchema::new("Ignore file capabilities.").default(false))
.optional("no-acls", BooleanSchema::new("Ignore access control list entries.").default(false))
))
.arg_param(vec!["archive", "target"])
.completion_cb("archive", tools::complete_file_name)
@ -192,6 +212,9 @@ fn main() {
dump_archive,
ObjectSchema::new("Textual dump of archive contents (debug toolkit).")
.required("archive", StringSchema::new("Archive name."))
.optional("with-xattrs", BooleanSchema::new("Dump extended file attributes.").default(false))
.optional("with-fcaps", BooleanSchema::new("Dump file capabilities.").default(false))
.optional("with-acls", BooleanSchema::new("Dump access control list entries.").default(false))
))
.arg_param(vec!["archive"])
.completion_cb("archive", tools::complete_file_name)