Move the library code into its own crate

This change is mostly to prepare for adding debug logging to `sh`,
but it has the side benefit of making the final executable slightly
smaller as well as slightly improving compilation time (maybe we
should split some of the utility modules into crates like in
uutils/coreutils?).

Author: Arcterus

Cargo.lock

@@ -6,42 +6,43 @@ description = "A collection of utilities important to basic system functionality
 autotests = false
 
 [features]
-arch = ["platform-info"]
-base32 = ["uucore"]
-base64 = ["uucore"]
-yes = []
+arch = ["libmesabox/arch"]
+base32 = ["libmesabox/base32"]
+base64 = ["libmesabox/base64"]
+yes = ["libmesabox/yes"]
 gnu = [
     "arch",
     "base32",
     "base64",
     "yes"
 ]
 
-getty = ["libc"]
+getty = ["libmesabox/getty"]
 loginutils = [
     "getty"
 ]
 
-# XXX: temporary until renaming dependencies is supported
-tar_util = ["tar", "globset"]
+# FIXME: this is only like this because we can't rename dependencies and we use the same macro in
+#        the tests that libmesabox uses to build
+tar_util = ["libmesabox/tar_util"]
 lsb = [
     "tar_util"
 ]
 
-ping = ["chrono", "crossbeam", "libc", "pnet", "byteorder", "trust-dns-resolver", "mio", "socket2"]
+ping = ["libmesabox/ping"]
 networking = [
     "ping"
 ]
 
-cat = []
-chmod = ["walkdir", "uucore"]
-echo = []
-false = []
-head = []
-sh = ["nom", "glob", "rustyline", "libc"]
-sleep = ["uucore"]
-true = []
-uname = ["platform-info"]
+cat = ["libmesabox/cat"]
+chmod = ["libmesabox/chmod"]
+echo = ["libmesabox/echo"]
+false = ["libmesabox/false"]
+head = ["libmesabox/head"]
+sh = ["libmesabox/sh"]
+sleep = ["libmesabox/sleep"]
+true = ["libmesabox/true"]
+uname = ["libmesabox/uname"]
 posix = [
     "cat",
     "chmod",
@@ -54,7 +55,7 @@ posix = [
     "uname"
 ]
 
-init = ["fnv", "libc"]
+init = ["libmesabox/init"]
 sysinit = [
     "init"
 ]
@@ -66,7 +67,7 @@ unix = [
     "lsb",
     "networking",
     "posix",
-    "sysinit",
+    "sysinit"
 ]
 
 # utilities that work on Windows
@@ -84,41 +85,19 @@ windows = [
 
 # the following are real features (rather than utilities)
 # used to prioritize latency over throughput in utilites that care
-latency = []
+latency = ["libmesabox/latency"]
 # use dynamic dispatch rather than static dispatch (makes utilities slower, but sometimes smaller
 # as well).  this is preferred to no-dynamic if both are specified
-full-dynamic = []
+full-dynamic = ["libmesabox/full-dynamic"]
 # only use static dispatch (this will lead to dramatically larger compile times and binary sizes)
-no-dynamic = []
+no-dynamic = ["libmesabox/no-dynamic"]
 
 default = ["unix"]
 
+[workspace]
+
 [dependencies]
-clap = "2.31.2"
-failure = "0.1.1"
-failure_derive = "0.1.1"
-kernel32-sys = "0.2.2"
-winapi = { version = "0.3.5", features = ["namedpipeapi"] }
-nix = "0.10.0"
-
-libc = { version = "0.2.40", optional = true }
-platform-info = { git = "https://github.com/uutils/platform-info", optional = true }
-uucore = { git = "https://github.com/uutils/coreutils", features = ["encoding", "fs", "mode", "parse_time"], optional = true }
-tar = { version = "0.4.15", optional = true }
-globset = { version = "0.4.0", optional = true }
-glob = { git = "https://github.com/mesalock-linux/glob", optional = true }
-chrono = { version = "0.4.2", optional = true }
-crossbeam = { version = "0.3.2", optional = true }
-pnet = { version = "0.21.0", optional = true }
-byteorder = { version = "1.2.3", optional = true }
-trust-dns-resolver = { version = "0.9.0", optional = true }
-mio = { version = "0.6.14", optional = true }
-socket2 = { version = "0.3.5", optional = true }
-walkdir = { version = "2.1.4", optional = true }
-fnv = { version = "1.0.6", optional = true }
-nom = { version = "4.0.0", features = ["verbose-errors"], optional = true }
-#rustyline = { version = "1.0.0", optional = true }
-rustyline = { git = "https://github.com/kkawakam/rustyline", optional = true }
+libmesabox = { path = "libmesabox" }
 
 [dev-dependencies]
 tempfile = "3.0.2"

Cargo.toml

@@ -1,4 +1,4 @@
-extern crate mesabox;
+extern crate libmesabox as mesabox;
 
 use mesabox::UtilData;
 use std::io::Write;

examples/server.rs

@@ -0,0 +1,120 @@
+[package]
+name = "libmesabox"
+version = "0.1.0"
+authors = ["Alex Lyon <[email protected]>"]
+description = "A collection of common command-line utilities in library form"
+
+[features]
+arch = ["platform-info"]
+base32 = ["uucore"]
+base64 = ["uucore"]
+yes = []
+gnu = [
+    "arch",
+    "base32",
+    "base64",
+    "yes"
+]
+
+getty = ["libc"]
+loginutils = [
+    "getty"
+]
+
+# XXX: temporary until renaming dependencies is supported
+tar_util = ["tar", "globset"]
+lsb = [
+    "tar"
+]
+
+ping = ["chrono", "crossbeam", "libc", "pnet", "byteorder", "trust-dns-resolver", "mio", "socket2"]
+networking = [
+    "ping"
+]
+
+cat = []
+chmod = ["walkdir", "uucore"]
+echo = []
+false = []
+head = []
+sh = ["nom", "glob", "rustyline", "libc"]
+sleep = ["uucore"]
+true = []
+uname = ["platform-info"]
+posix = [
+    "cat",
+    "chmod",
+    "echo",
+    "false",
+    "head",
+    "sh",
+    "sleep",
+    "true",
+    "uname"
+]
+
+init = ["fnv", "libc"]
+sysinit = [
+    "init"
+]
+
+# utilities that work on Unix
+unix = [
+    "gnu",
+    "loginutils",
+    "lsb",
+    "networking",
+    "posix",
+    "sysinit",
+]
+
+# utilities that work on Windows
+windows = [
+    "gnu",
+
+    "cat",
+    "echo",
+    "false",
+    "head",
+    "sleep",
+    "true",
+    "uname"
+]
+
+# the following are real features (rather than utilities)
+# used to prioritize latency over throughput in utilites that care
+latency = []
+# use dynamic dispatch rather than static dispatch (makes utilities slower, but sometimes smaller
+# as well).  this is preferred to no-dynamic if both are specified
+full-dynamic = []
+# only use static dispatch (this will lead to dramatically larger compile times and binary sizes)
+no-dynamic = []
+
+default = ["unix"]
+
+[dependencies]
+clap = "2.31.2"
+failure = "0.1.1"
+failure_derive = "0.1.1"
+kernel32-sys = "0.2.2"
+winapi = { version = "0.3.5", features = ["namedpipeapi"] }
+nix = "0.10.0"
+
+libc = { version = "0.2.40", optional = true }
+platform-info = { git = "https://github.com/uutils/platform-info", optional = true }
+uucore = { git = "https://github.com/uutils/coreutils", features = ["encoding", "fs", "mode", "parse_time"], optional = true }
+tar = { version = "0.4.15", optional = true }
+globset = { version = "0.4.0", optional = true }
+glob = { git = "https://github.com/mesalock-linux/glob", optional = true }
+chrono = { version = "0.4.2", optional = true }
+crossbeam = { version = "0.3.2", optional = true }
+pnet = { version = "0.21.0", optional = true }
+byteorder = { version = "1.2.3", optional = true }
+trust-dns-resolver = { version = "0.9.0", optional = true }
+mio = { version = "0.6.14", optional = true }
+socket2 = { version = "0.3.5", optional = true }
+walkdir = { version = "2.1.4", optional = true }
+fnv = { version = "1.0.6", optional = true }
+nom = { version = "4.0.0", features = ["verbose-errors"], optional = true }
+#rustyline = { version = "1.0.0", optional = true }
+rustyline = { git = "https://github.com/kkawakam/rustyline", optional = true }

libmesabox/Cargo.toml

@@ -300,10 +300,6 @@ impl Environment {
         &self.fds[fd]
     }
 
-    pub fn get_fd_mut(&mut self, fd: usize) -> &mut EnvFd {
-        &mut self.fds[fd]
-    }
-
     pub fn fds(&self) -> &FdArray {
         &self.fds
     }

src/error.rs renamed to libmesabox/src/error.rs

@@ -1,5 +1,5 @@
 use std::iter::IntoIterator;
-use std::ops::{Index, IndexMut};
+use std::ops::Index;
 use std::slice;
 
 use super::{Locality, Scoped};
@@ -24,8 +24,6 @@ impl<T: FixedArray<Item = Locality<V>>, V> ScopedArray<T, V> {
     }
 }
 
-// XXX: do we really want to implement this?  this allows stuff like arr[idx] = val to work, which
-//      will end up ignoring Locality::set_val()
 impl<T: FixedArray<Item = Locality<V>>, V> ScopedArray<T, V> {
     pub fn iter_mut(&mut self) -> ScopedArrayIter<V> {
         ScopedArrayIter {
@@ -65,12 +63,6 @@ impl<T: FixedArray<Item = Locality<V>>, V> Index<usize> for ScopedArray<T, V> {
     }
 }
 
-impl<T: FixedArray<Item = Locality<V>>, V> IndexMut<usize> for ScopedArray<T, V> {
-    fn index_mut(&mut self, index: usize) -> &mut Self::Output {
-        self.inner.as_mut()[index].current_val_mut()
-    }
-}
-
 pub struct ScopedArrayIter<'a, V: 'a> {
     inner: IterMut<'a, Locality<V>>,
 }

src/gnu/arch.rs renamed to libmesabox/src/gnu/arch.rs

@@ -6,7 +6,7 @@
 // For a copy, see the LICENSE file.
 //
 
-extern crate mesabox;
+extern crate libmesabox as mesabox;
 
 use mesabox::UtilData;
 use std::env;

src/gnu/base32/common.rs renamed to libmesabox/src/gnu/base32/common.rs

@@ -6,7 +6,7 @@
 // For a copy, see the LICENSE file.
 //
 
-extern crate mesabox;
+extern crate libmesabox as mesabox;
 #[macro_use]
 extern crate lazy_static;
 extern crate libc;
@@ -16,7 +16,7 @@ mod util;
 #[macro_use]
 mod macros;
 
-include!("../src/util/build/import.rs");
+include!("../libmesabox/src/util/build/import.rs");
 
 macro_rules! generate_fns {
     ($($group:ident { $(($util:tt, $feature:expr)),+ }),*) => {
@@ -25,4 +25,4 @@ macro_rules! generate_fns {
 }
 
 // calls generate_fns!()
-include!("../src/util_list.rs");
+include!("../libmesabox/src/util_list.rs");