From 8161bb7fe185c25f73aa767481fa5096d0fa0ec3 Mon Sep 17 00:00:00 2001 From: Steve Smith Date: Sat, 4 Jun 2016 15:30:39 +0100 Subject: [PATCH] Flag uname/group functions as unix-specific and add NO-OP Windows versions. --- src/ls/ls.rs | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/ls/ls.rs b/src/ls/ls.rs index d414a1ac8..c3803cbfc 100644 --- a/src/ls/ls.rs +++ b/src/ls/ls.rs @@ -164,6 +164,7 @@ fn cstr2string(cstr: *const c_char) -> String { unsafe { String::from_utf8_lossy(CStr::from_ptr(cstr).to_bytes()).to_string() } } +#[cfg(target_family = "unix")] fn display_uname(metadata: &Metadata) -> String { use std::os::unix::fs::MetadataExt; @@ -175,6 +176,7 @@ fn display_uname(metadata: &Metadata) -> String { } } +#[cfg(target_family = "unix")] fn display_group(metadata: &Metadata) -> String { use std::os::unix::fs::MetadataExt; @@ -186,6 +188,18 @@ fn display_group(metadata: &Metadata) -> String { } } +#[cfg(target_family = "windows")] +#[allow(unused_variables)] +fn display_uname(metadata: &Metadata) -> String { + "somebody".to_string() +} + +#[cfg(target_family = "windows")] +#[allow(unused_variables)] +fn display_group(metadata: &Metadata) -> String { + "somegroup".to_string() +} + fn display_file_size(metadata: &Metadata, options: &getopts::Matches) -> String { if options.opt_present("human-readable") { convert(metadata.len() as f64)