Proxmox/proxmox
5
0
Fork 1
Code Issues Pull Requests Releases Activity

replace create_dir_chown with create_dir using CreateOptions

Browse Source 
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
This commit is contained in:
Wolfgang Bumiller 2019-12-18 11:09:23 +01:00
parent ffcbcc117a
commit 81cac5fc29
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
proxmox-tools/src/fs.rs
View File

@ -215,18 +215,15 @@ impl CreateOptions {
}
}
/// Creates directory at the provided path with specified ownership
/// Creates directory at the provided path with specified ownership.
///
/// Simply returns if the directory already exists.
pub fn create_dir_chown<P: AsRef<Path>>(
path: P,
perm: Option<stat::Mode>,
owner: Option<Uid>,
group: Option<Gid>,
) -> Result<(), nix::Error> {
pub fn create_dir<P: AsRef<Path>>(path: P, options: CreateOptions) -> Result<(), nix::Error> {
// clippy bug?: from_bits_truncate is actually a const fn...
#[allow(clippy::or_fun_call)]
let mode: stat::Mode = perm.unwrap_or(stat::Mode::from_bits_truncate(0o770));
let mode: stat::Mode = options
.perm
.unwrap_or(stat::Mode::from_bits_truncate(0o770));
let path = path.as_ref();
@ -238,7 +235,7 @@ pub fn create_dir_chown<P: AsRef<Path>>(
err => return err,
}
unistd::chown(path, owner, group)?;
unistd::chown(path, options.owner, options.group)?;
Ok(())
}