Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
This commit is contained in:
Wolfgang Bumiller 2022-08-19 13:38:46 +02:00
parent 10cc2a13b2
commit 2a23675db3
2 changed files with 12 additions and 22 deletions

View File

@ -409,13 +409,8 @@ impl Extractor {
} }
let mut file = unsafe { let mut file = unsafe {
std::fs::File::from_raw_fd( std::fs::File::from_raw_fd(
nix::fcntl::openat( nix::fcntl::openat(parent, file_name, oflags, Mode::from_bits(0o600).unwrap())
parent, .map_err(|err| format_err!("failed to create file {:?}: {}", file_name, err))?,
file_name,
oflags,
Mode::from_bits(0o600).unwrap(),
)
.map_err(|err| format_err!("failed to create file {:?}: {}", file_name, err))?,
) )
}; };
@ -472,13 +467,8 @@ impl Extractor {
} }
let mut file = tokio::fs::File::from_std(unsafe { let mut file = tokio::fs::File::from_std(unsafe {
std::fs::File::from_raw_fd( std::fs::File::from_raw_fd(
nix::fcntl::openat( nix::fcntl::openat(parent, file_name, oflags, Mode::from_bits(0o600).unwrap())
parent, .map_err(|err| format_err!("failed to create file {:?}: {}", file_name, err))?,
file_name,
oflags,
Mode::from_bits(0o600).unwrap(),
)
.map_err(|err| format_err!("failed to create file {:?}: {}", file_name, err))?,
) )
}); });

View File

@ -1237,14 +1237,14 @@ We do not extract '.pxar' archives when writing to standard output.
)] )]
/// Restore backup repository. /// Restore backup repository.
async fn restore( async fn restore(
param: Value, param: Value,
allow_existing_dirs: bool, allow_existing_dirs: bool,
ignore_acls: bool, ignore_acls: bool,
ignore_xattrs: bool, ignore_xattrs: bool,
ignore_ownership: bool, ignore_ownership: bool,
ignore_permissions: bool, ignore_permissions: bool,
overwrite: bool overwrite: bool,
) -> Result<Value, Error> { ) -> Result<Value, Error> {
let repo = extract_repository_from_value(&param)?; let repo = extract_repository_from_value(&param)?;
let archive_name = json::required_string_param(&param, "archive-name")?; let archive_name = json::required_string_param(&param, "archive-name")?;