Merge pull request #994 from Will-W/windowsfixes

Windowsfixes

Cargo.toml

@@ -21,8 +21,6 @@ unix = [
   "logname",
   "mkfifo",
   "mknod",
-  "more",
-  "mv",
   "nice",
   "nohup",
   "pathchk",
@@ -64,6 +62,8 @@ generic = [
   "ls",
   "mkdir",
   "mktemp",
+  "more",
+  "mv",
   "nl",
   "nproc",
   "od",

Makefile

@@ -67,6 +67,7 @@ PROGS       := \
   mkdir \
   mktemp \
   more \
+  mv \
   nl \
   nproc \
   od \
@@ -118,7 +119,6 @@ UNIX_PROGS := \
   logname \
   mkfifo \
   mknod \
-  mv \
   nice \
   nohup \
   pathchk \

src/ls/ls.rs

@@ -31,6 +31,7 @@ use std::fs;
 use std::fs::{DirEntry, FileType, Metadata};
 use std::path::{Path, PathBuf};
 use std::io::Write;
+#[cfg(unix)]
 use std::collections::HashMap;
 
 #[cfg(unix)]
@@ -51,8 +52,10 @@ static LONG_HELP: &'static str = "
  whose names start with '.'
 "; 
 
+#[cfg(unix)]
 static DEFAULT_COLORS: &'static str = "rs=0:di=01;34:ln=01;36:mh=00:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=40;31;01:mi=00:su=37;41:sg=30;43:ca=30;41:tw=30;42:ow=34;42:st=37;44:ex=01;32:*.tar=01;31:*.tgz=01;31:*.arc=01;31:*.arj=01;31:*.taz=01;31:*.lha=01;31:*.lz4=01;31:*.lzh=01;31:*.lzma=01;31:*.tlz=01;31:*.txz=01;31:*.tzo=01;31:*.t7z=01;31:*.zip=01;31:*.z=01;31:*.Z=01;31:*.dz=01;31:*.gz=01;31:*.lrz=01;31:*.lz=01;31:*.lzo=01;31:*.xz=01;31:*.bz2=01;31:*.bz=01;31:*.tbz=01;31:*.tbz2=01;31:*.tz=01;31:*.deb=01;31:*.rpm=01;31:*.jar=01;31:*.war=01;31:*.ear=01;31:*.sar=01;31:*.rar=01;31:*.alz=01;31:*.ace=01;31:*.zoo=01;31:*.cpio=01;31:*.7z=01;31:*.rz=01;31:*.cab=01;31:*.jpg=01;35:*.jpeg=01;35:*.gif=01;35:*.bmp=01;35:*.pbm=01;35:*.pgm=01;35:*.ppm=01;35:*.tga=01;35:*.xbm=01;35:*.xpm=01;35:*.tif=01;35:*.tiff=01;35:*.png=01;35:*.svg=01;35:*.svgz=01;35:*.mng=01;35:*.pcx=01;35:*.mov=01;35:*.mpg=01;35:*.mpeg=01;35:*.m2v=01;35:*.mkv=01;35:*.webm=01;35:*.ogm=01;35:*.mp4=01;35:*.m4v=01;35:*.mp4v=01;35:*.vob=01;35:*.qt=01;35:*.nuv=01;35:*.wmv=01;35:*.asf=01;35:*.rm=01;35:*.rmvb=01;35:*.flc=01;35:*.avi=01;35:*.fli=01;35:*.flv=01;35:*.gl=01;35:*.dl=01;35:*.xcf=01;35:*.xwd=01;35:*.yuv=01;35:*.cgm=01;35:*.emf=01;35:*.ogv=01;35:*.ogx=01;35:*.aac=00;36:*.au=00;36:*.flac=00;36:*.m4a=00;36:*.mid=00;36:*.midi=00;36:*.mka=00;36:*.mp3=00;36:*.mpc=00;36:*.ogg=00;36:*.ra=00;36:*.wav=00;36:*.oga=00;36:*.opus=00;36:*.spx=00;36:*.xspf=00;36:";
 
+#[cfg(unix)]
 lazy_static! {
     static ref LS_COLORS: String = std::env::var("LS_COLORS").unwrap_or(DEFAULT_COLORS.to_string());
     static ref COLOR_MAP: HashMap<&'static str, &'static str> = {
@@ -400,6 +403,7 @@ fn display_date(metadata: &Metadata, options: &getopts::Matches) -> String {
 }
 
 #[cfg(not(unix))]
+#[allow(unused_variables)]
 fn display_date(metadata: &Metadata, options: &getopts::Matches) -> String {
     if let Ok(mtime) = metadata.modified() {
         let time =
@@ -461,11 +465,6 @@ fn display_file_name(path: &Path,
     if options.opt_present("long") && metadata.file_type().is_symlink() {
         if let Ok(target) = path.read_link() {
             // We don't bother updating width here because it's not used for long listings
-            let code = if target.exists() {
-                "fi"
-            } else {
-                "mi"
-            };
             let target_name = target.to_string_lossy().to_string();
             name.push_str(" -> ");
             name.push_str(&target_name);
@@ -475,6 +474,7 @@ fn display_file_name(path: &Path,
     name.into()
 }
 
+#[cfg(unix)]
 fn color_name(name: String, typ: &str) -> String {
     let mut typ = typ;
     if !COLOR_MAP.contains_key(typ) {

src/mkdir/mkdir.rs

@@ -148,6 +148,7 @@ fn mkdir(path: &Path, mode: u16, verbose: bool) -> i32 {
         0
     }
     #[cfg(windows)]
+    #[allow(unused_variables)]
     fn chmod(path: &Path, mode: u16) -> i32 {
         // chmod on Windows only sets the readonly flag, which isn't even honored on directories
         0

src/mv/Cargo.toml

@@ -9,10 +9,7 @@ path = "mv.rs"
 
 [dependencies]
 getopts = "*"
-
-[dependencies.uucore]
-path = "../uucore"
-default-features = false
+uucore = { path="../uucore" }
 
 [[bin]]
 name = "mv"

src/mv/mv.rs

@@ -17,7 +17,6 @@ extern crate uucore;
 use std::fs;
 use std::env;
 use std::io::{BufRead, BufReader, Result, stdin, Write};
-use std::os::unix::fs::MetadataExt;
 use std::path::{Path, PathBuf};
 
 static NAME: &'static str = "mv";
@@ -319,7 +318,7 @@ fn rename(from: &PathBuf, to: &PathBuf, b: &Behaviour) -> Result<()> {
         }
 
         if b.update {
-            if try!(fs::metadata(from)).mtime() <= try!(fs::metadata(to)).mtime() {
+            if try!(try!(fs::metadata(from)).modified()) <= try!(try!(fs::metadata(to)).modified()) {
                 return Ok(());
             }
         }

src/uucore/fs.rs

@@ -14,6 +14,7 @@ use std::fs;
 use std::io::{Error, ErrorKind};
 use std::io::Result as IOResult;
 use std::path::{Component, Path, PathBuf};
+#[cfg(unix)]
 use std::borrow::Cow;
 
 #[cfg(unix)]