fix for util on linux

This commit is contained in:
debris 2017-08-01 15:06:30 +02:00
parent a2c05123fd
commit af8c5bb31a

View File

@ -304,6 +304,7 @@ impl Default for CompactionProfile {
/// Given output of df command return Linux rotational flag file path. /// Given output of df command return Linux rotational flag file path.
#[cfg(target_os = "linux")] #[cfg(target_os = "linux")]
pub fn rotational_from_df_output(df_out: Vec<u8>) -> Option<PathBuf> { pub fn rotational_from_df_output(df_out: Vec<u8>) -> Option<PathBuf> {
use std::str;
str::from_utf8(df_out.as_slice()) str::from_utf8(df_out.as_slice())
.ok() .ok()
// Get the drive name. // Get the drive name.
@ -324,6 +325,7 @@ impl CompactionProfile {
/// Attempt to determine the best profile automatically, only Linux for now. /// Attempt to determine the best profile automatically, only Linux for now.
#[cfg(target_os = "linux")] #[cfg(target_os = "linux")]
pub fn auto(db_path: &Path) -> CompactionProfile { pub fn auto(db_path: &Path) -> CompactionProfile {
use std::io::Read;
let hdd_check_file = db_path let hdd_check_file = db_path
.to_str() .to_str()
.and_then(|path_str| Command::new("df").arg(path_str).output().ok()) .and_then(|path_str| Command::new("df").arg(path_str).output().ok())