Merge branch 'master' into master

Author: rdzhou

.drone.yml

@@ -0,0 +1,61 @@
+language: rust
+cache: cargo
+rust:
+  - 1.26.2
+  - stable
+  - nightly
+env:
+  - TARGET=x86_64-unknown-linux-gnu TEST=1
+  - TARGET=x86_64-unknown-linux-musl TEST=1
+  - TARGET=aarch64-unknown-linux-gnu RUSTFLAGS="-C linker=aarch64-linux-gnu-gcc"
+  - TARGET=arm-unknown-linux-gnueabi RUSTFLAGS="-C linker=arm-linux-gnueabi-gcc"
+matrix:
+  include:
+    - os: osx
+      rust: stable
+      env: TARGET=x86_64-apple-darwin
+    - os: osx
+      rust: nightly
+      env: TARGET=x86_64-apple-darwin
+    - rust: nightly
+      env: TARGET=x86_64-unknown-linux-gnu COVERAGE=1
+      install:
+        - ./ci/build-lcov
+        - sudo apt-get install -qq libclang-common-3.8-dev llvm-3.8-dev
+      script:
+        - ./ci/run-cov
+        - bash <(curl -s https://codecov.io/bash) -f final.info
+    - rust: stable
+      env: TARGET=x86_64-unknown-linux-gnu FMT=1
+      before_install:
+      install:
+      before_script:
+        - rustup component add rustfmt-preview
+      script:
+        - cargo fmt -- --write-mode check
+    - rust: nightly
+      env: TARGET=x86_64-unknown-linux-gnu CLIPPY=1
+      before_install:
+      install:
+      before_script:
+        - cargo +nightly install clippy
+      script:
+        - cargo clippy
+  allow_failures:
+    - rust: nightly
+  fast_finish: true
+before_install:
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get update -qq; fi
+install:
+  - if [[ "$TARGET" == "x86_64-unknown-linux-musl" ]]; then sudo apt-get install -qq musl-tools; fi
+  - if [[ "$TARGET" == "aarch64-unknown-linux-gnu" ]]; then sudo apt-get install -qq gcc-aarch64-linux-gnu libc6-arm64-cross libc6-dev-arm64-cross; fi
+  - if [[ "$TARGET" == "arm-unknown-linux-gnueabi" ]]; then sudo apt-get install -qq gcc-arm-linux-gnueabi libc6-armel-cross libc6-dev-armel-cross; fi
+before_script:
+  - rustup target add $TARGET || true
+script:
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then cargo build --verbose --no-default-features --features gnu,lsb,networking,posix --target $TARGET; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then cargo build --verbose --all --target $TARGET; fi
+  - if [[ "$TEST" == "1" ]]; then cargo test --verbose --all --target $TARGET; fi
+notifications:
+  email:
+    on_success: never

.travis.yml

@@ -39,19 +39,22 @@ networking = [
 cat = []
 chmod = ["regex", "walkdir", "uucore"]
 head = []
-init = ["fnv"]
 sh = ["either", "nom", "glob", "rustyline"]
 sleep = ["uucore"]
 posix = [
     "cat",
     "chmod",
     "head",
-    "init",
     "sh",
     "sleep"
 ]
 
-default = ["gnu", "loginutils", "lsb", "networking", "posix"]
+init = ["fnv"]
+sysinit = [
+    "init"
+]
+
+default = ["gnu", "loginutils", "lsb", "networking", "posix", "sysinit"]
 
 [dependencies]
 clap = "2.31.2"

Cargo.toml

@@ -1,7 +1,7 @@
 MesaBox
 =======
 
-[![Build Status](https://ci.mesalock-linux.org/api/badges/mesalock-linux/mesabox/status.svg?branch=master)](https://ci.mesalock-linux.org/mesalock-linux/mesabox)
+[![Build Status](https://api.travis-ci.org/mesalock-linux/mesabox.svg?branch=master)](https://travis-ci.org/mesalock-linux/mesabox)
 [![License](https://img.shields.io/badge/license-BSD-blue.svg)](LICENSE)
 [![Coverage Status](https://codecov.io/gh/mesalock-linux/mesabox/branch/master/graphs/badge.svg)](https://codecov.io/gh/mesalock-linux/mesabox/branch/master)
 [![](https://tokei.rs/b1/github/mesalock-linux/mesabox)](https://github.com/mesalock-linux/mesabox).

README.md

@@ -29,11 +29,12 @@ fn create_util_map() -> HashMap<&'static str, &'static str> {
     hashmap.insert("cat", "posix");
     hashmap.insert("chmod", "posix");
     hashmap.insert("head", "posix");
-    hashmap.insert("init", "posix");
     hashmap.insert("sh", "posix");
     hashmap.insert("sleep", "posix");
     hashmap.insert("nc", "networking");
 
+    hashmap.insert("init", "sysinit");
+
     hashmap
 }
 
@@ -98,6 +99,22 @@ where
     }
     writeln!(output, "Ok(())\n}}").unwrap();
 
+    for util in &utils {
+        writeln!(
+            output,
+            "pub fn {}<T, U, V>(args: T) -> Result<()>
+where
+    T: IntoIterator<IntoIter = V, Item = U>,
+    U: Into<OsString> + Clone,
+    V: ArgsIter<ArgItem = U>,
+{{
+    let mut args = iter::once(OsString::from({0:?})).chain(args.into_iter().map(|s| s.into()));
+    EasyUtil::new().execute(&mut args, {0}::execute)
+}}",
+            util
+        ).unwrap();
+    }
+
     let app_path = Path::new(&outdir).join("generate_app.rs");
     let app_file = File::create(app_path).expect("could not open generate_app.rs for writing");
     let mut app_output = BufWriter::new(app_file);

build.rs

@@ -0,0 +1,6 @@
+#!/bin/sh -e
+
+if [ ! -e lcov/ ] ; then
+  git clone https://github.com/linux-test-project/lcov.git
+  cd lcov && sudo make install
+fi

ci/build-lcov

@@ -1,10 +1,10 @@
 #!/bin/bash -e
 
 export COVERAGE_OPTIONS="-Zprofile -Copt-level=1 -Clink-dead-code -Ccodegen-units=1 -Zno-landing-pads"
-export RUSTC_WRAPPER="./util/cov-rustc"
+export RUSTC_WRAPPER="./ci/cov-rustc"
 export CARGO_INCREMENTAL=0
 
-LCOVOPT="--gcov-tool ./util/llvm-gcov --rc lcov_branch_coverage=1 --rc lcov_excl_line=assert"
+LCOVOPT="--gcov-tool ./ci/llvm-gcov --rc lcov_branch_coverage=1 --rc lcov_excl_line=assert"
 
 # cleanup all
 rm -rf *.info *.gcda *.gcno
@@ -29,5 +29,7 @@ lcov ${LCOVOPT} --capture --directory . --base-directory . -o tests.info
 lcov ${LCOVOPT} --add mesabox.info --add tests.info -o coverage.info
 lcov ${LCOVOPT} --extract coverage.info `find "$(cd src; pwd)" -name "*.rs"` -o final.info
 
-# generate report
-genhtml --branch-coverage --demangle-cpp --legend final.info -o target/coverage/ --ignore-errors source
+# generate report if not in CI
+if [[ "$CI" != true ]]; then
+  genhtml --branch-coverage --demangle-cpp --legend final.info -o target/coverage/ --ignore-errors source
+fi

util/cov-rustc renamed to ci/cov-rustc

@@ -20,6 +20,8 @@ extern crate byteorder;
 extern crate chrono;
 #[cfg(feature = "crossbeam")]
 extern crate crossbeam;
+#[cfg(feature = "either")]
+extern crate either;
 #[cfg(feature = "fnv")]
 extern crate fnv;
 #[cfg(feature = "globset")]
@@ -38,22 +40,21 @@ extern crate trust_dns_resolver;
 extern crate uucore;
 #[cfg(feature = "walkdir")]
 extern crate walkdir;
-#[cfg(feature = "either")]
-extern crate either;
 #[cfg(feature = "nom")]
 #[macro_use]
 extern crate nom;
-#[cfg(feature = "rustyline")]
-extern crate rustyline;
 #[cfg(feature = "glob")]
 extern crate glob;
 #[cfg(feature = "tempfile")]
 extern crate tempfile;
+#[cfg(feature = "rustyline")]
+extern crate rustyline;
 
 use clap::{App, SubCommand};
 use libc::EXIT_FAILURE;
+use std::env::{self, VarsOs};
 use std::ffi::{OsStr, OsString};
-use std::io::{BufRead, Read, Write};
+use std::io::{self, BufRead, Read, Stderr, Stdin, Stdout, Write};
 use std::iter;
 use std::os::unix::io::RawFd;
 use std::path::{Path, PathBuf};
@@ -96,7 +97,13 @@ where
     E: for<'a> UtilWrite<'a>,
     T: Iterator<Item = (OsString, OsString)>,
 {
-    pub fn new(stdin: &'b mut I, stdout: &'c mut O, stderr: &'d mut E, env: T, current_dir: Option<PathBuf>) -> Self {
+    pub fn new(
+        stdin: &'b mut I,
+        stdout: &'c mut O,
+        stderr: &'d mut E,
+        env: T,
+        current_dir: Option<PathBuf>,
+    ) -> Self {
         Self {
             stdin: stdin,
             stdout: stdout,
@@ -217,6 +224,42 @@ fn generate_app() -> App<'static, 'static> {
     include!(concat!(env!("OUT_DIR"), "/generate_app.rs"))
 }
 
+// used by functions generated in build.rs for each utility (the functions allow a user to call
+// utilities like cat(&mut ["file", "anotherfile"].iter()), although this could probably be
+// simplified)
+struct EasyUtil {
+    stdin: Stdin,
+    stdout: Stdout,
+    stderr: Stderr,
+}
+
+impl EasyUtil {
+    pub fn new() -> Self {
+        Self {
+            stdin: io::stdin(),
+            stdout: io::stdout(),
+            stderr: io::stderr(),
+        }
+    }
+
+    pub fn execute<'a, T, U, V, F>(&'a mut self, args: T, func: F) -> Result<()>
+    where
+        T: IntoIterator<IntoIter = V, Item = U>,
+        U: Into<OsString> + Clone,
+        V: ArgsIter<ArgItem = U>,
+        F: Fn(&mut UtilData<'a, 'a, 'a, Stdin, Stdout, Stderr, VarsOs>, V) -> Result<()>,
+    {
+        let mut data = UtilData::new(
+            &mut self.stdin,
+            &mut self.stdout,
+            &mut self.stderr,
+            env::vars_os(),
+            None,
+        );
+        func(&mut data, args.into_iter())
+    }
+}
+
 pub fn execute<S, T, U, V>(setup: &mut S, args: T) -> Result<()>
 where
     S: UtilSetup,