keremet/rpm-ostree
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rust/treefile: Avoid unnecessary dup() of fd

Browse Source 
We weren't checking for an error from `dup()`, and further it shouldn't
be necessary.  This is the best I could come up with, though it's
obviously not pretty.

Closes: #1444
Approved by: jlebon
This commit is contained in:
Colin Walters 2018-07-04 19:55:48 +00:00 committed by Atomic Bot
parent d7b4046599
commit 2e237513b0
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
rust/src/lib.rs
View File

@ -29,7 +29,7 @@ extern crate serde_yaml;
use std::ffi::{CStr, OsStr};
use std::os::unix::ffi::OsStrExt;
use std::os::unix::io::FromRawFd;
use std::os::unix::io::{FromRawFd, IntoRawFd};
use std::path::Path;
use std::{fs, io};
@ -49,10 +49,14 @@ pub extern "C" fn rpmostree_rs_treefile_read(
// using an O_TMPFILE is an easy way to avoid ownership transfer issues w/ returning allocated
// memory across the Rust/C boundary
// let's just get the unsafory stuff (see what I did there?) out of the way first
let output = io::BufWriter::new(unsafe { fs::File::from_raw_fd(libc::dup(fd)) });
let c_str: &CStr = unsafe { CStr::from_ptr(filename) };
let filename_path = Path::new(OsStr::from_bytes(c_str.to_bytes()));
treefile_read_impl(filename_path, output).to_glib_convention(error)
// The dance with `file` is to avoid dup()ing the fd unnecessarily
let file = unsafe { fs::File::from_raw_fd(fd) };
let r = {
let output = io::BufWriter::new(&file);
let c_str: &CStr = unsafe { CStr::from_ptr(filename) };
let filename_path = Path::new(OsStr::from_bytes(c_str.to_bytes()));
treefile_read_impl(filename_path, output).to_glib_convention(error)
};
file.into_raw_fd(); // Drop ownership of the FD again
r
}