Split utility files into separate library.

Everything in src/common has been moved to src/uucore. This is defined
as a Cargo library, instead of directly included. This gives us
flexibility to make the library an external crate in the future.

Fixes #717.

.gitignore

@@ -1,5 +1,6 @@
+target/
 /src/*/gen_table
-/target/
+/build/
 /tmp/
 /busybox/
 *~

Cargo.toml

@@ -85,6 +85,7 @@ all = [
 ]
 
 [dependencies]
+uucore   = { path="src/uucore" }
 base64   = { optional=true, path="src/base64" }
 basename = { optional=true, path="src/basename" }
 cat      = { optional=true, path="src/cat" }

src/base64/Cargo.toml

@@ -11,6 +11,7 @@ path = "base64.rs"
 getopts = "*"
 libc = "*"
 rustc-serialize = "*"
+uucore = { path="../uucore" }
 
 [[bin]]
 name="base64"

src/base64/base64.rs

@@ -13,6 +13,9 @@ extern crate rustc_serialize as serialize;
 extern crate getopts;
 extern crate libc;
 
+#[macro_use]
+extern crate uucore;
+
 use getopts::Options;
 use serialize::base64::{self, FromBase64, ToBase64};
 use std::ascii::AsciiExt;
@@ -21,10 +24,6 @@ use std::fs::File;
 use std::io::{BufReader, Read, stdin, stdout, Write};
 use std::path::Path;
 
-#[path = "../common/util.rs"]
-#[macro_use]
-mod util;
-
 enum Mode {
     Decode,
     Encode,

src/basename/Cargo.toml

@@ -10,6 +10,7 @@ path = "basename.rs"
 [dependencies]
 getopts = "*"
 libc = "*"
+uucore = { path="../uucore" }
 
 [[bin]]
 name="basename"

src/basename/basename.rs

@@ -12,14 +12,13 @@
 extern crate getopts;
 extern crate libc;
 
+#[macro_use]
+extern crate uucore;
+
 use getopts::Options;
 use std::io::Write;
 use std::path::{is_separator, PathBuf};
 
-#[path = "../common/util.rs"]
-#[macro_use]
-mod util;
-
 static NAME: &'static str = "basename";
 static VERSION: &'static str = "1.0.0";
 

src/cat/Cargo.toml

@@ -10,6 +10,7 @@ path = "cat.rs"
 [dependencies]
 getopts = "*"
 libc = "*"
+uucore = { path="../uucore" }
 
 [[bin]]
 name="cat"

src/cat/cat.rs

@@ -14,16 +14,15 @@
 extern crate getopts;
 extern crate libc;
 
+#[macro_use]
+extern crate uucore;
+
+use libc::STDIN_FILENO;
+use libc::{c_int, isatty};
 use getopts::Options;
 use std::fs::File;
 use std::intrinsics::{copy_nonoverlapping};
 use std::io::{stdout, stdin, stderr, Write, Read, Result};
-use libc::STDIN_FILENO;
-use libc::{c_int, isatty};
-
-#[path = "../common/util.rs"]
-#[macro_use]
-mod util;
 
 static NAME: &'static str = "cat";
 static VERSION: &'static str = "1.0.0";

src/chmod/Cargo.toml

@@ -14,6 +14,7 @@ aho-corasick = "*"
 memchr = "*"
 regex = "*"
 regex-syntax = "*"
+uucore = { path="../uucore" }
 walker = "*"
 
 [[bin]]

src/chmod/chmod.rs

@@ -19,23 +19,18 @@ extern crate regex;
 extern crate regex_syntax;
 extern crate walker;
 
+#[macro_use]
+extern crate uucore;
+
 use getopts::Options;
 use regex::Regex;
 use std::ffi::CString;
 use std::io::{Error, Write};
 use std::mem;
 use std::path::Path;
+use uucore::fs::UUPathExt;
 use walker::Walker;
 
-#[path = "../common/util.rs"]
-#[macro_use]
-mod util;
-
-#[path = "../common/filesystem.rs"]
-mod filesystem;
-
-use filesystem::UUPathExt;
-
 const NAME: &'static str = "chmod";
 const VERSION: &'static str = "1.0.0";
 

src/chroot/Cargo.toml

@@ -10,6 +10,7 @@ path = "chroot.rs"
 [dependencies]
 getopts = "*"
 libc = "*"
+uucore = { path="../uucore" }
 
 [[bin]]
 name="chroot"

src/chroot/chroot.rs

@@ -12,7 +12,9 @@
 extern crate getopts;
 extern crate libc;
 
-use c_types::{get_pw_from_args, get_group};
+#[macro_use]
+extern crate uucore;
+
 use getopts::Options;
 use libc::{setgid, setuid};
 use std::ffi::CString;
@@ -20,12 +22,8 @@ use std::io::{Error, Write};
 use std::iter::FromIterator;
 use std::path::Path;
 use std::process::Command;
-
-#[path = "../common/util.rs"] #[macro_use] mod util;
-#[path = "../common/c_types.rs"] mod c_types;
-#[path = "../common/filesystem.rs"] mod filesystem;
-
-use filesystem::UUPathExt;
+use uucore::c_types::{get_pw_from_args, get_group};
+use uucore::fs::UUPathExt;
 
 extern {
     fn chroot(path: *const libc::c_char) -> libc::c_int;

src/cksum/Cargo.toml

@@ -10,6 +10,7 @@ path = "cksum.rs"
 [dependencies]
 getopts = "*"
 libc = "*"
+uucore = { path="../uucore" }
 
 [[bin]]
 name="cksum"

src/cksum/cksum.rs

@@ -11,6 +11,9 @@
 
 extern crate getopts;
 
+#[macro_use]
+extern crate uucore;
+
 use getopts::Options;
 use std::fs::File;
 use std::io::{self, stdin, Read, Write, BufReader};
@@ -19,10 +22,6 @@ use std::path::Path;
 
 use crc_table::CRC_TABLE;
 
-#[path="../common/util.rs"]
-#[macro_use]
-mod util;
-
 mod crc_table;
 
 static NAME: &'static str = "cksum";

src/cp/Cargo.toml

@@ -10,6 +10,7 @@ path = "cp.rs"
 [dependencies]
 getopts = "*"
 libc = "*"
+uucore = { path="../uucore" }
 
 [[bin]]
 name="cp"

src/cp/cp.rs

@@ -11,19 +11,14 @@
 
 extern crate getopts;
 
+#[macro_use]
+extern crate uucore;
+
 use getopts::Options;
 use std::fs;
 use std::io::{ErrorKind, Result, Write};
 use std::path::Path;
-
-#[path = "../common/util.rs"]
-#[macro_use]
-mod util;
-
-#[path = "../common/filesystem.rs"]
-mod filesystem;
-
-use filesystem::{canonicalize, CanonicalizeMode, UUPathExt};
+use uucore::fs::{canonicalize, CanonicalizeMode, UUPathExt};
 
 #[derive(Clone, Eq, PartialEq)]
 pub enum Mode {

src/cut/Cargo.toml

@@ -10,6 +10,7 @@ path = "cut.rs"
 [dependencies]
 getopts = "*"
 libc = "*"
+uucore = { path="../uucore" }
 
 [[bin]]
 name="cut"

src/cut/cut.rs

@@ -12,22 +12,17 @@
 extern crate getopts;
 extern crate libc;
 
+#[macro_use]
+extern crate uucore;
+
 use std::fs::File;
 use std::io::{stdout, stdin, BufRead, BufReader, Read, Stdout, Write};
 use std::path::Path;
+use uucore::fs::UUPathExt;
 
 use ranges::Range;
 use searcher::Searcher;
 
-#[path = "../common/util.rs"]
-#[macro_use]
-mod util;
-
-#[path = "../common/filesystem.rs"]
-mod filesystem;
-
-use filesystem::UUPathExt;
-
 mod buffer;
 mod ranges;
 mod searcher;

src/du/Cargo.toml

@@ -11,6 +11,7 @@ path = "du.rs"
 getopts = "*"
 libc = "*"
 time = "*"
+uucore = { path="../uucore" }
 
 [[bin]]
 name="du"

src/du/du.rs

@@ -15,6 +15,9 @@ extern crate getopts;
 extern crate libc;
 extern crate time;
 
+#[macro_use]
+extern crate uucore;
+
 use std::fs;
 use std::io::{stderr, Write};
 use std::os::unix::fs::MetadataExt;
@@ -24,10 +27,6 @@ use time::Timespec;
 use std::sync::mpsc::channel;
 use std::thread;
 
-#[path = "../common/util.rs"]
-#[macro_use]
-mod util;
-
 static NAME: &'static str = "du";
 static VERSION: &'static str = "1.0.0";
 

src/echo/Cargo.toml

@@ -10,6 +10,7 @@ path = "echo.rs"
 [dependencies]
 getopts = "*"
 libc = "*"
+uucore = { path="../uucore" }
 
 [[bin]]
 name="echo"

src/echo/echo.rs

@@ -12,13 +12,12 @@
 extern crate getopts;
 extern crate libc;
 
+#[macro_use]
+extern crate uucore;
+
 use std::io::Write;
 use std::str::from_utf8;
 
-#[path = "../common/util.rs"]
-#[macro_use]
-mod util;
-
 #[allow(dead_code)]
 static NAME: &'static str = "echo";
 static VERSION: &'static str = "1.0.0";

src/env/Cargo.toml

@@ -10,6 +10,7 @@ path = "env.rs"
 [dependencies]
 getopts = "*"
 libc = "*"
+uucore = { path="../uucore" }
 
 [[bin]]
 name="env"

src/env/env.rs

@@ -13,14 +13,13 @@
 
 #![allow(non_camel_case_types)]
 
+#[macro_use]
+extern crate uucore;
+
 use std::env;
 use std::io::Write;
 use std::process::Command;
 
-#[path = "../common/util.rs"]
-#[macro_use]
-mod util;
-
 static NAME: &'static str = "env";
 static VERSION: &'static str = "1.0.0";
 

src/expand/Cargo.toml

@@ -11,6 +11,7 @@ path = "expand.rs"
 getopts = "*"
 libc = "*"
 unicode-width = "*"
+uucore = { path="../uucore" }
 
 [[bin]]
 name="expand"

src/expand/expand.rs

@@ -17,6 +17,9 @@ extern crate libc;
 extern crate rustc_unicode;
 extern crate unicode_width;
 
+#[macro_use]
+extern crate uucore;
+
 use std::fs::File;
 use std::io::{stdin, stdout, BufRead, BufReader, BufWriter, Read, Write};
 use std::iter::repeat;
@@ -24,10 +27,6 @@ use std::str::from_utf8;
 use rustc_unicode::str::utf8_char_width;
 use unicode_width::UnicodeWidthChar;
 
-#[path = "../common/util.rs"]
-#[macro_use]
-mod util;
-
 static NAME: &'static str = "expand";
 static VERSION: &'static str = "0.0.1";
 

src/expr/Cargo.toml

@@ -11,6 +11,7 @@ path = "expr.rs"
 [dependencies]
 getopts = "*"
 libc = "*"
+uucore = { path="../uucore" }
 
 [[bin]]
 name="expr"

src/expr/expr.rs

@@ -12,9 +12,9 @@
 extern crate getopts;
 extern crate libc;
 
-#[path="../common/util.rs"]
 #[macro_use]
-mod util;
+extern crate uucore;
+
 mod tokens;
 mod syntax_tree;
 

src/factor/Cargo.toml

@@ -11,6 +11,7 @@ path = "factor.rs"
 getopts = "*"
 libc = "*"
 rand = "*"
+uucore = { path="../uucore" }
 
 [[bin]]
 name="factor"

src/factor/factor.rs

@@ -17,6 +17,9 @@ extern crate getopts;
 extern crate libc;
 extern crate rand;
 
+#[macro_use]
+extern crate uucore;
+
 use numeric::*;
 use prime_table::P_INVS_U64;
 use rand::weak_rng;
@@ -26,9 +29,6 @@ use std::io::{stdin, BufRead, BufReader, Write};
 use std::num::Wrapping;
 use std::mem::swap;
 
-#[path="../common/util.rs"]
-#[macro_use]
-mod util;
 mod numeric;
 mod prime_table;
 

src/fmt/Cargo.toml

@@ -11,6 +11,7 @@ path = "fmt.rs"
 getopts = "*"
 libc = "*"
 unicode-width = "*"
+uucore = { path="../uucore" }
 
 [[bin]]
 name="fmt"

src/fmt/fmt.rs

@@ -14,6 +14,9 @@ extern crate getopts;
 extern crate rustc_unicode;
 extern crate unicode_width;
 
+#[macro_use]
+extern crate uucore;
+
 use std::cmp;
 use std::io::{Read, BufReader, BufWriter};
 use std::fs::File;
@@ -30,9 +33,6 @@ macro_rules! silent_unwrap(
     )
 );
 
-#[path = "../common/util.rs"]
-#[macro_use]
-mod util;
 mod linebreak;
 mod parasplit;
 

src/fold/Cargo.toml

@@ -10,6 +10,7 @@ path = "fold.rs"
 [dependencies]
 getopts = "*"
 libc = "*"
+uucore = { path="../uucore" }
 
 [[bin]]
 name="fold"

src/fold/fold.rs

@@ -12,14 +12,13 @@
 extern crate getopts;
 extern crate libc;
 
+#[macro_use]
+extern crate uucore;
+
 use std::fs::File;
 use std::io::{BufRead, BufReader, Read, stdin, Write};
 use std::path::Path;
 
-#[path = "../common/util.rs"]
-#[macro_use]
-mod util;
-
 static NAME: &'static str = "fold";
 static VERSION: &'static str = "1.0.0";
 

src/groups/Cargo.toml

@@ -10,6 +10,7 @@ path = "groups.rs"
 [dependencies]
 getopts = "*"
 libc = "*"
+uucore = { path="../uucore" }
 
 [[bin]]
 name="groups"

src/groups/groups.rs

@@ -9,13 +9,14 @@
  * file that was distributed with this source code.
  *
  */
+
 extern crate getopts;
 
-use c_types::{get_pw_from_args, group};
-use std::io::Write;
+#[macro_use]
+extern crate uucore;
 
-#[path = "../common/util.rs"] #[macro_use]  mod util;
-#[path = "../common/c_types.rs"] mod c_types;
+use std::io::Write;
+use uucore::c_types::{get_pw_from_args, group};
 
 static NAME: &'static str = "groups";
 static VERSION: &'static str = "1.0.0";

src/hashsum/Cargo.toml

@@ -13,6 +13,7 @@ libc = "*"
 regex = "*"
 regex-syntax = "*"
 rust-crypto = "*"
+uucore = { path="../uucore" }
 
 [[bin]]
 name="hashsum"

src/hashsum/hashsum.rs

@@ -16,6 +16,9 @@ extern crate getopts;
 extern crate regex_syntax;
 extern crate regex;
 
+#[macro_use]
+extern crate uucore;
+
 use crypto::digest::Digest;
 use crypto::md5::Md5;
 use crypto::sha1::Sha1;
@@ -26,10 +29,6 @@ use std::fs::File;
 use std::io::{self, BufRead, BufReader, Read, stdin, Write};
 use std::path::Path;
 
-#[path = "../common/util.rs"]
-#[macro_use]
-mod util;
-
 static NAME: &'static str = "hashsum";
 static VERSION: &'static str = "1.0.0";
 

src/head/Cargo.toml

@@ -10,6 +10,7 @@ path = "head.rs"
 [dependencies]
 getopts = "*"
 libc = "*"
+uucore = { path="../uucore" }
 
 [[bin]]
 name="head"

src/head/head.rs

@@ -13,15 +13,14 @@
 
 extern crate getopts;
 
+#[macro_use]
+extern crate uucore;
+
 use std::io::{BufRead, BufReader, Read, stdin, Write};
 use std::fs::File;
 use std::path::Path;
 use std::str::from_utf8;
 
-#[path = "../common/util.rs"]
-#[macro_use]
-mod util;
-
 static NAME: &'static str = "head";
 static VERSION: &'static str = "1.0.0";
 

src/hostid/Cargo.toml

@@ -10,6 +10,7 @@ path = "hostid.rs"
 [dependencies]
 getopts = "*"
 libc = "*"
+uucore = { path="../uucore" }
 
 [[bin]]
 name="hostid"

src/hostid/hostid.rs

@@ -12,11 +12,10 @@
 extern crate getopts;
 extern crate libc;
 
-use libc::c_long;
-
-#[path = "../common/util.rs"]
 #[macro_use]
-mod util;
+extern crate uucore;
+
+use libc::c_long;
 
 static NAME: &'static str = "hostid";
 static VERSION: &'static str = "0.0.1";

src/hostname/Cargo.toml

@@ -10,6 +10,7 @@ path = "hostname.rs"
 [dependencies]
 getopts = "*"
 libc = "*"
+uucore = { path="../uucore" }
 
 [[bin]]
 name="hostname"

src/hostname/hostname.rs

@@ -16,16 +16,15 @@
 extern crate getopts;
 extern crate libc;
 
+#[macro_use]
+extern crate uucore;
+
+use getopts::Options;
 use std::collections::hash_set::HashSet;
 use std::iter::repeat;
 use std::str;
 use std::io::Write;
 use std::net::ToSocketAddrs;
-use getopts::Options;
-
-#[path = "../common/util.rs"]
-#[macro_use]
-mod util;
 
 static NAME: &'static str = "hostname";
 

src/id/Cargo.toml

@@ -10,6 +10,7 @@ path = "id.rs"
 [dependencies]
 getopts = "*"
 libc = "*"
+uucore = { path="../uucore" }
 
 [[bin]]
 name="id"

src/id/id.rs

@@ -17,11 +17,14 @@
 extern crate getopts;
 extern crate libc;
 
+#[macro_use]
+extern crate uucore;
+
 use libc::{getgid, getuid, uid_t, getegid, geteuid, getlogin};
 use std::ffi::CStr;
 use std::io::Write;
 use std::ptr::read;
-use c_types::{
+use uucore::c_types::{
     c_passwd,
     c_group,
     get_groups,
@@ -31,9 +34,6 @@ use c_types::{
     group
 };
 
-#[path = "../common/util.rs"] #[macro_use] mod util;
-#[path = "../common/c_types.rs"] mod c_types;
-
 #[cfg(not(target_os = "linux"))]
 mod audit {
     pub use std::mem::uninitialized;

src/kill/Cargo.toml

@@ -10,6 +10,7 @@ path = "kill.rs"
 [dependencies]
 getopts = "*"
 libc = "*"
+uucore = { path="../uucore" }
 
 [[bin]]
 name="kill"

src/kill/kill.rs

@@ -12,19 +12,12 @@
 extern crate getopts;
 extern crate libc;
 
-use libc::{c_int, pid_t};
-use signals::ALL_SIGNALS;
-use std::io::{Error, Write};
-
-#[path = "../common/util.rs"]
 #[macro_use]
-mod util;
+extern crate uucore;
 
-#[path = "../common/c_types.rs"]
-mod c_types;
-
-#[path = "../common/signals.rs"]
-mod signals;
+use libc::{c_int, pid_t};
+use std::io::{Error, Write};
+use uucore::signals::ALL_SIGNALS;
 
 static NAME: &'static str = "kill";
 static VERSION: &'static str = "0.0.1";
@@ -96,7 +89,7 @@ fn handle_obsolete(mut args: Vec<String>) -> (Vec<String>, Option<String>) {
             let val = &slice[1..];
             match val.parse() {
                 Ok(num) => {
-                    if signals::is_signal(num) {
+                    if uucore::signals::is_signal(num) {
                         args.remove(i);
                         return (args, Some(val.to_string()));
                     }
@@ -174,7 +167,7 @@ Usage:
 
 fn kill(signalname: &str, pids: std::vec::Vec<String>) -> i32 {
     let mut status = 0;
-    let optional_signal_value = signals::signal_by_name_or_value(signalname);
+    let optional_signal_value = uucore::signals::signal_by_name_or_value(signalname);
     let signal_value = match optional_signal_value {
         Some(x) => x,
         None => crash!(EXIT_ERR, "unknown signal name {}", signalname)

src/link/Cargo.toml

@@ -10,6 +10,7 @@ path = "link.rs"
 [dependencies]
 getopts = "*"
 libc = "*"
+uucore = { path="../uucore" }
 
 [[bin]]
 name="link"

src/link/link.rs

@@ -11,14 +11,13 @@
 
 extern crate getopts;
 
+#[macro_use]
+extern crate uucore;
+
 use std::fs::hard_link;
 use std::io::Write;
 use std::path::Path;
 
-#[path="../common/util.rs"]
-#[macro_use]
-mod util;
-
 static NAME: &'static str = "link";
 static VERSION: &'static str = "1.0.0";
 

src/ln/Cargo.toml

@@ -10,6 +10,7 @@ path = "ln.rs"
 [dependencies]
 getopts = "*"
 libc = "*"
+uucore = { path="../uucore" }
 
 [[bin]]
 name="ln"

src/ln/ln.rs

@@ -11,20 +11,15 @@
 
 extern crate getopts;
 
+#[macro_use]
+extern crate uucore;
+
 use std::fs;
 use std::io::{BufRead, BufReader, Result, stdin, Write};
 #[cfg(unix)] use std::os::unix::fs::symlink as symlink_file;
 #[cfg(windows)] use std::os::windows::fs::symlink_file;
 use std::path::{Path, PathBuf};
-
-#[path="../common/util.rs"]
-#[macro_use]
-mod util;
-
-#[path="../common/filesystem.rs"]
-mod filesystem;
-
-use filesystem::UUPathExt;
+use uucore::fs::UUPathExt;
 
 static NAME: &'static str = "ln";
 static VERSION: &'static str = "1.0.0";

src/logname/Cargo.toml

@@ -10,6 +10,7 @@ path = "logname.rs"
 [dependencies]
 getopts = "*"
 libc = "*"
+uucore = { path="../uucore" }
 
 [[bin]]
 name="logname"

src/logname/logname.rs

@@ -14,11 +14,12 @@
 extern crate getopts;
 extern crate libc;
 
+#[macro_use]
+extern crate uucore;
+
 use std::ffi::CStr;
 use std::io::Write;
 
-#[path = "../common/util.rs"] #[macro_use] mod util;
-
 extern {
     // POSIX requires using getlogin (or equivalent code)
     pub fn getlogin() -> *const libc::c_char;

src/mkdir/Cargo.toml

@@ -10,6 +10,7 @@ path = "mkdir.rs"
 [dependencies]
 getopts = "*"
 libc = "*"
+uucore = { path="../uucore" }
 
 [[bin]]
 name="mkdir"

src/mkdir/mkdir.rs

@@ -12,19 +12,14 @@
 extern crate getopts;
 extern crate libc;
 
+#[macro_use]
+extern crate uucore;
+
 use std::ffi::CString;
 use std::fs;
 use std::io::{Error, Write};
 use std::path::{Path, PathBuf};
-
-#[path = "../common/util.rs"]
-#[macro_use]
-mod util;
-
-#[path = "../common/filesystem.rs"]
-mod filesystem;
-
-use filesystem::UUPathExt;
+use uucore::fs::UUPathExt;
 
 static NAME: &'static str = "mkdir";
 static VERSION: &'static str = "1.0.0";

src/mkfifo/Cargo.toml

@@ -10,6 +10,7 @@ path = "mkfifo.rs"
 [dependencies]
 getopts = "*"
 libc = "*"
+uucore = { path="../uucore" }
 
 [[bin]]
 name="mkfifo"

src/mkfifo/mkfifo.rs

@@ -12,14 +12,13 @@
 extern crate getopts;
 extern crate libc;
 
+#[macro_use]
+extern crate uucore;
+
 use libc::mkfifo;
 use std::ffi::CString;
 use std::io::{Error, Write};
 
-#[path = "../common/util.rs"]
-#[macro_use]
-mod util;
-
 static NAME: &'static str = "mkfifo";
 static VERSION: &'static str = "1.0.0";
 

src/mv/Cargo.toml

@@ -10,6 +10,7 @@ path = "mv.rs"
 [dependencies]
 getopts = "*"
 libc = "*"
+uucore = { path="../uucore" }
 
 [dev-dependencies]
 time = "*"

src/mv/mv.rs

@@ -13,19 +13,14 @@
 extern crate getopts;
 extern crate libc;
 
+#[macro_use]
+extern crate uucore;
+
 use std::fs;
 use std::io::{BufRead, BufReader, Result, stdin, Write};
 use std::os::unix::fs::MetadataExt;
 use std::path::{Path, PathBuf};
-
-#[path = "../common/util.rs"]
-#[macro_use]
-mod util;
-
-#[path = "../common/filesystem.rs"]
-mod filesystem;
-
-use filesystem::UUPathExt;
+use uucore::fs::UUPathExt;
 
 static NAME: &'static str = "mv";
 static VERSION: &'static str = "0.0.1";

src/nice/Cargo.toml

@@ -10,6 +10,7 @@ path = "nice.rs"
 [dependencies]
 getopts = "*"
 libc = "*"
+uucore = { path="../uucore" }
 
 [[bin]]
 name="nice"

src/nice/nice.rs

@@ -12,6 +12,9 @@
 extern crate getopts;
 extern crate libc;
 
+#[macro_use]
+extern crate uucore;
+
 use libc::{c_char, c_int, execvp};
 use std::ffi::CString;
 use std::io::{Error, Write};
@@ -22,10 +25,6 @@ const VERSION: &'static str = "1.0.0";
 // XXX: PRIO_PROCESS is 0 on at least FreeBSD and Linux.  Don't know about Mac OS X.
 const PRIO_PROCESS: c_int = 0;
 
-#[path = "../common/util.rs"]
-#[macro_use]
-mod util;
-
 extern {
     fn getpriority(which: c_int, who: c_int) -> c_int;
     fn setpriority(which: c_int, who: c_int, prio: c_int) -> c_int;

src/nl/Cargo.toml

@@ -14,6 +14,7 @@ aho-corasick = "*"
 memchr = "*"
 regex = "*"
 regex-syntax = "*"
+uucore = { path="../uucore" }
 
 [[bin]]
 name="nl"

src/nl/nl.rs

@@ -16,14 +16,14 @@ extern crate memchr;
 extern crate regex_syntax;
 extern crate regex;
 
+#[macro_use]
+extern crate uucore;
+
 use std::fs::File;
 use std::io::{BufRead, BufReader, Read, stdin, Write};
 use std::iter::repeat;
 use std::path::Path;
 
-#[path="../common/util.rs"]
-#[macro_use]
-mod util;
 mod helper;
 
 static NAME: &'static str = "nl";

src/nohup/Cargo.toml

@@ -10,6 +10,7 @@ path = "nohup.rs"
 [dependencies]
 getopts = "*"
 libc = "*"
+uucore = { path="../uucore" }
 
 [[bin]]
 name="nohup"

src/nohup/nohup.rs

@@ -12,6 +12,9 @@
 extern crate getopts;
 extern crate libc;
 
+#[macro_use]
+extern crate uucore;
+
 use libc::{c_char, signal, dup2, execvp, isatty};
 use libc::{SIG_IGN, SIGHUP};
 use std::ffi::CString;
@@ -21,9 +24,6 @@ use std::os::unix::prelude::*;
 use std::path::{Path, PathBuf};
 use std::env;
 
-#[path = "../common/util.rs"] #[macro_use] mod util;
-#[path = "../common/c_types.rs"] mod c_types;
-
 static NAME: &'static str = "nohup";
 static VERSION: &'static str = "1.0.0";
 

src/nproc/Cargo.toml

@@ -11,6 +11,7 @@ path = "nproc.rs"
 getopts = "*"
 libc = "*"
 num_cpus = "*"
+uucore = { path="../uucore" }
 
 [[bin]]
 name="nproc"

src/nproc/nproc.rs

@@ -12,16 +12,15 @@
 extern crate getopts;
 extern crate num_cpus;
 
+#[macro_use]
+extern crate uucore;
+
 use std::io::Write;
 use std::env;
 
 static NAME : &'static str = "nproc";
 static VERSION : &'static str = "0.0.0";
 
-#[path = "../common/util.rs"]
-#[macro_use]
-mod util;
-
 pub fn uumain(args: Vec<String>) -> i32 {
     let mut opts = getopts::Options::new();
 

src/paste/Cargo.toml

@@ -10,6 +10,7 @@ path = "paste.rs"
 [dependencies]
 getopts = "*"
 libc = "*"
+uucore = { path="../uucore" }
 
 [[bin]]
 name="paste"

src/paste/paste.rs

@@ -12,15 +12,14 @@
 extern crate getopts;
 extern crate libc;
 
+#[macro_use]
+extern crate uucore;
+
 use std::io::{BufRead, BufReader, Read, stdin, Write};
 use std::iter::repeat;
 use std::fs::File;
 use std::path::Path;
 
-#[path = "../common/util.rs"]
-#[macro_use]
-mod util;
-
 static NAME: &'static str = "paste";
 static VERSION: &'static str = "1.0.0";
 

src/printenv/Cargo.toml

@@ -10,6 +10,7 @@ path = "printenv.rs"
 [dependencies]
 getopts = "*"
 libc = "*"
+uucore = { path="../uucore" }
 
 [[bin]]
 name="printenv"

src/printenv/printenv.rs

@@ -14,13 +14,12 @@
 extern crate getopts;
 extern crate libc;
 
+#[macro_use]
+extern crate uucore;
+
 use std::io::Write;
 use std::env;
 
-#[path = "../common/util.rs"]
-#[macro_use]
-mod util;
-
 static NAME: &'static str = "printenv";
 static VERSION: &'static str = "1.0.0";
 

src/ptx/Cargo.toml

@@ -14,6 +14,7 @@ aho-corasick = "*"
 memchr = "*"
 regex-syntax = "*"
 regex = "*"
+uucore = { path="../uucore" }
 
 [[bin]]
 name="ptx"

src/ptx/ptx.rs

@@ -15,18 +15,16 @@ extern crate memchr;
 extern crate regex_syntax;
 extern crate regex;
 
+#[macro_use]
+extern crate uucore;
+
+use getopts::{Options, Matches};
+use regex::Regex;
+use std::cmp;
 use std::collections::{HashMap, HashSet, BTreeSet};
 use std::default::Default;
 use std::fs::File;
-use getopts::{Options, Matches};
 use std::io::{stdin, stdout, BufReader, BufWriter, BufRead, Read, Write};
-use regex::Regex;
-use std::cmp;
-
-
-#[path = "../common/util.rs"]
-#[macro_use]
-mod util;
 
 static NAME: &'static str = "ptx";
 static VERSION: &'static str = "1.0.0";

src/pwd/Cargo.toml

@@ -10,6 +10,7 @@ path = "pwd.rs"
 [dependencies]
 getopts = "*"
 libc = "*"
+uucore = { path="../uucore" }
 
 [[bin]]
 name="pwd"

src/pwd/pwd.rs

@@ -12,13 +12,12 @@
 extern crate getopts;
 extern crate libc;
 
+#[macro_use]
+extern crate uucore;
+
 use std::io::Write;
 use std::env;
 
-#[path = "../common/util.rs"]
-#[macro_use]
-mod util;
-
 static NAME: &'static str = "pwd";
 static VERSION: &'static str = "1.0.0";
 

src/readlink/Cargo.toml

@@ -10,6 +10,7 @@ path = "readlink.rs"
 [dependencies]
 getopts = "*"
 libc = "*"
+uucore = { path="../uucore" }
 
 [[bin]]
 name="readlink"

src/readlink/readlink.rs

@@ -11,18 +11,13 @@
 
 extern crate getopts;
 
+#[macro_use]
+extern crate uucore;
+
 use std::fs;
 use std::io::Write;
 use std::path::PathBuf;
-
-#[path = "../common/util.rs"]
-#[macro_use]
-mod util;
-
-#[path = "../common/filesystem.rs"]
-mod filesystem;
-
-use filesystem::{canonicalize, CanonicalizeMode};
+use uucore::fs::{canonicalize, CanonicalizeMode};
 
 const NAME: &'static str = "readlink";
 const VERSION: &'static str = "0.0.1";

src/realpath/Cargo.toml

@@ -10,6 +10,7 @@ path = "realpath.rs"
 [dependencies]
 getopts = "*"
 libc = "*"
+uucore = { path="../uucore" }
 
 [[bin]]
 name="realpath"

src/realpath/realpath.rs

@@ -12,18 +12,13 @@
 extern crate getopts;
 extern crate libc;
 
+#[macro_use]
+extern crate uucore;
+
 use std::fs;
 use std::io::Write;
 use std::path::{Path, PathBuf};
-
-#[path = "../common/util.rs"]
-#[macro_use]
-mod util;
-
-#[path = "../common/filesystem.rs"]
-mod filesystem;
-
-use filesystem::{canonicalize, CanonicalizeMode};
+use uucore::fs::{canonicalize, CanonicalizeMode};
 
 static NAME: &'static str = "realpath";
 static VERSION: &'static str = "1.0.0";

src/relpath/Cargo.toml

@@ -10,6 +10,7 @@ path = "relpath.rs"
 [dependencies]
 getopts = "*"
 libc = "*"
+uucore = { path="../uucore" }
 
 [[bin]]
 name="relpath"

src/relpath/relpath.rs

@@ -12,18 +12,13 @@
 extern crate getopts;
 extern crate libc;
 
+#[macro_use]
+extern crate uucore;
+
 use std::env;
 use std::io::Write;
 use std::path::{Path, PathBuf};
-
-#[path = "../common/util.rs"]
-#[macro_use]
-mod util;
-
-#[path = "../common/filesystem.rs"]
-mod filesystem;
-
-use filesystem::{canonicalize, CanonicalizeMode};
+use uucore::fs::{canonicalize, CanonicalizeMode};
 
 static NAME: &'static str = "relpath";
 static VERSION: &'static str = "1.0.0";

src/rm/Cargo.toml

@@ -10,6 +10,7 @@ path = "rm.rs"
 [dependencies]
 getopts = "*"
 libc = "*"
+uucore = { path="../uucore" }
 
 [[bin]]
 name="rm"

src/rm/rm.rs

@@ -12,20 +12,15 @@
 extern crate getopts;
 extern crate libc;
 
+#[macro_use]
+extern crate uucore;
+
 use std::collections::VecDeque;
 use std::fs;
 use std::io::{stdin, stderr, BufRead, Write};
 use std::ops::BitOr;
 use std::path::{Path, PathBuf};
-
-#[path = "../common/util.rs"]
-#[macro_use]
-mod util;
-
-#[path = "../common/filesystem.rs"]
-mod filesystem;
-
-use filesystem::UUPathExt;
+use uucore::fs::UUPathExt;
 
 #[derive(Eq, PartialEq, Clone, Copy)]
 enum InteractiveMode {

src/rmdir/Cargo.toml

@@ -10,6 +10,7 @@ path = "rmdir.rs"
 [dependencies]
 getopts = "*"
 libc = "*"
+uucore = { path="../uucore" }
 
 [[bin]]
 name="rmdir"

src/rmdir/rmdir.rs

@@ -12,14 +12,13 @@
 extern crate getopts;
 extern crate libc;
 
+#[macro_use]
+extern crate uucore;
+
 use std::fs;
 use std::io::Write;
 use std::path::Path;
 
-#[path = "../common/util.rs"]
-#[macro_use]
-mod util;
-
 static NAME: &'static str = "rmdir";
 static VERSION: &'static str = "1.0.0";
 

src/seq/Cargo.toml

@@ -10,6 +10,7 @@ path = "seq.rs"
 [dependencies]
 getopts = "*"
 libc = "*"
+uucore = { path="../uucore" }
 
 [[bin]]
 name="seq"

src/seq/seq.rs

@@ -6,13 +6,12 @@
 extern crate getopts;
 extern crate libc;
 
+#[macro_use]
+extern crate uucore;
+
 use std::cmp;
 use std::io::Write;
 
-#[path = "../common/util.rs"]
-#[macro_use]
-mod util;
-
 static NAME: &'static str = "seq";
 static VERSION: &'static str = "1.0.0";
 

src/shuf/Cargo.toml

@@ -11,6 +11,7 @@ path = "shuf.rs"
 getopts = "*"
 libc = "*"
 rand = "*"
+uucore = { path="../uucore" }
 
 [[bin]]
 name="shuf"

src/shuf/shuf.rs

@@ -13,16 +13,15 @@ extern crate getopts;
 extern crate libc;
 extern crate rand;
 
+#[macro_use]
+extern crate uucore;
+
 use rand::{Rng, ThreadRng};
 use rand::read::ReadRng;
 use std::fs::File;
 use std::io::{stdin, stdout, BufReader, BufWriter, Read, Write};
 use std::usize::MAX as MAX_USIZE;
 
-#[path = "../common/util.rs"]
-#[macro_use]
-mod util;
-
 enum Mode {
     Default,
     Echo,

src/sleep/Cargo.toml

@@ -10,6 +10,7 @@ path = "sleep.rs"
 [dependencies]
 getopts = "*"
 libc = "*"
+uucore = { path="../uucore" }
 
 [[bin]]
 name="sleep"

src/sleep/sleep.rs

@@ -12,18 +12,14 @@
 extern crate getopts;
 extern crate libc;
 
+#[macro_use]
+extern crate uucore;
+
 use std::io::Write;
 use std::thread::{self};
 use std::time::Duration;
 use std::u32::MAX as U32_MAX;
 
-#[path = "../common/util.rs"]
-#[macro_use]
-mod util;
-
-#[path = "../common/parse_time.rs"]
-mod parse_time;
-
 static NAME: &'static str = "sleep";
 static VERSION: &'static str = "1.0.0";
 
@@ -68,7 +64,7 @@ specified by the sum of their values.", NAME, VERSION);
 
 fn sleep(args: Vec<String>) {
     let sleep_time = args.iter().fold(0.0, |result, arg|
-        match parse_time::from_str(&arg[..]) {
+        match uucore::parse_time::from_str(&arg[..]) {
             Ok(m) => m + result,
             Err(f) => crash!(1, "{}", f),
         });

src/sort/Cargo.toml

@@ -10,6 +10,7 @@ path = "sort.rs"
 [dependencies]
 getopts = "*"
 libc = "*"
+uucore = { path="../uucore" }
 
 [[bin]]
 name="sort"

src/sort/sort.rs

@@ -14,6 +14,9 @@
 extern crate getopts;
 extern crate libc;
 
+#[macro_use]
+extern crate uucore;
+
 use libc::STDIN_FILENO;
 use libc::{c_int, isatty};
 use std::cmp::Ordering;
@@ -21,10 +24,6 @@ use std::fs::File;
 use std::io::{BufRead, BufReader, Read, stdin, Write};
 use std::path::Path;
 
-#[path = "../common/util.rs"]
-#[macro_use]
-mod util;
-
 static NAME: &'static str = "sort";
 static VERSION: &'static str = "0.0.1";
 

src/split/Cargo.toml

@@ -10,6 +10,7 @@ path = "split.rs"
 [dependencies]
 getopts = "*"
 libc = "*"
+uucore = { path="../uucore" }
 
 [[bin]]
 name="split"

src/split/split.rs

@@ -12,15 +12,14 @@
 extern crate getopts;
 extern crate libc;
 
+#[macro_use]
+extern crate uucore;
+
 use std::char;
 use std::fs::{File, OpenOptions};
 use std::io::{BufRead, BufReader, BufWriter, Read, stdin, stdout, Write};
 use std::path::Path;
 
-#[path = "../common/util.rs"]
-#[macro_use]
-mod util;
-
 static NAME: &'static str = "split";
 static VERSION: &'static str = "1.0.0";
 

src/stdbuf/Cargo.toml

@@ -10,6 +10,7 @@ path = "stdbuf.rs"
 [dependencies]
 getopts = "*"
 libc = "*"
+uucore = { path="../uucore" }
 
 [[bin]]
 name="stdbuf"

src/stdbuf/libstdbuf.rs

@@ -3,15 +3,14 @@
 
 extern crate libc;
 
+#[macro_use]
+extern crate uucore;
+
 use libc::{c_int, size_t, c_char, FILE, _IOFBF, _IONBF, _IOLBF, setvbuf};
 use std::env;
 use std::io::Write;
 use std::ptr;
 
-#[path = "../common/util.rs"]
-#[macro_use]
-mod util;
-
 extern {
     static stdin: *mut FILE;
     static stdout: *mut FILE;

src/stdbuf/stdbuf.rs

@@ -12,20 +12,15 @@
 extern crate getopts;
 extern crate libc;
 
+#[macro_use]
+extern crate uucore;
+
 use getopts::{Matches, Options};
 use std::io::{self, Write};
 use std::os::unix::process::ExitStatusExt;
 use std::path::PathBuf;
 use std::process::Command;
-
-#[path = "../common/util.rs"]
-#[macro_use]
-mod util;
-
-#[path = "../common/filesystem.rs"]
-mod filesystem;
-
-use filesystem::{canonicalize, CanonicalizeMode, UUPathExt};
+use uucore::fs::{canonicalize, CanonicalizeMode, UUPathExt};
 
 static NAME: &'static str = "stdbuf";
 static VERSION: &'static str = "1.0.0";

src/sum/Cargo.toml

@@ -10,6 +10,7 @@ path = "sum.rs"
 [dependencies]
 getopts = "*"
 libc = "*"
+uucore = { path="../uucore" }
 
 [[bin]]
 name="sum"