proxmox-mirrors/proxmox
1
0
Fork 1
mirror of https://git.proxmox.com/git/proxmox synced 2025-07-19 12:11:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

make_tmp_file: return File instead of Fd

Browse Source
This commit is contained in:
Dietmar Maurer 2021-07-14 12:26:24 +02:00
parent fff7b926ee
commit 26c06df420
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
proxmox/src/tools/fs.rs
View File

@ -126,14 +126,14 @@ pub fn file_read_firstline<P: AsRef<Path>>(path: P) -> Result<String, Error> {
pub fn make_tmp_file<P: AsRef<Path>>( pub fn make_tmp_file<P: AsRef<Path>>(
path: P, path: P,
options: CreateOptions, options: CreateOptions,
) -> Result<(Fd, PathBuf), Error> { ) -> Result<(File, PathBuf), Error> {
let path = path.as_ref(); let path = path.as_ref();
// use mkstemp here, because it works with different processes, threads, even tokio tasks // use mkstemp here, because it works with different processes, threads, even tokio tasks
let mut template = path.to_owned(); let mut template = path.to_owned();
template.set_extension("tmp_XXXXXX"); template.set_extension("tmp_XXXXXX");
let (fd, tmp_path) = match unistd::mkstemp(&template) { let (file, tmp_path) = match unistd::mkstemp(&template) {
Ok((fd, path)) => (unsafe { Fd::from_raw_fd(fd) }, path), Ok((fd, path)) => (unsafe { File::from_raw_fd(fd) }, path),
Err(err) => bail!("mkstemp {:?} failed: {}", template, err), Err(err) => bail!("mkstemp {:?} failed: {}", template, err),
}; };
@ -143,19 +143,19 @@ pub fn make_tmp_file<P: AsRef<Path>>(
.perm .perm
.unwrap_or(stat::Mode::from_bits_truncate(0o644)); .unwrap_or(stat::Mode::from_bits_truncate(0o644));
if let Err(err) = stat::fchmod(fd.as_raw_fd(), mode) { if let Err(err) = stat::fchmod(file.as_raw_fd(), mode) {
let _ = unistd::unlink(&tmp_path); let _ = unistd::unlink(&tmp_path);
bail!("fchmod {:?} failed: {}", tmp_path, err); bail!("fchmod {:?} failed: {}", tmp_path, err);
} }
if options.owner.is_some() || options.group.is_some() { if options.owner.is_some() || options.group.is_some() {
if let Err(err) = fchown(fd.as_raw_fd(), options.owner, options.group) { if let Err(err) = fchown(file.as_raw_fd(), options.owner, options.group) {
let _ = unistd::unlink(&tmp_path); let _ = unistd::unlink(&tmp_path);
bail!("fchown {:?} failed: {}", tmp_path, err); bail!("fchown {:?} failed: {}", tmp_path, err);
} }
} }
Ok((fd, tmp_path)) Ok((file, tmp_path))
} }
/// Atomically replace a file. /// Atomically replace a file.