Add transitional message

.github/workflows/rust.yml

@@ -33,6 +33,7 @@ jobs:
       fail-fast: false
       matrix:
         environment: [ubuntu-latest, macos-latest]
+        package: [afl, cargo-afl]
         toolchain: [stable, nightly]
         cc: [cc, clang]
         include:
@@ -65,9 +66,9 @@ jobs:
             sudo launchctl unload -w ${SL}/LaunchDaemons/${PL}.Root.plist
           fi
       - name: Build examples (with AFL instrumentation)
-        run: cargo run afl build --examples -vv
+        run: cargo run -p ${{ matrix.package }} -- afl build --examples -vv
       - name: Run tests (with AFL instrumentation)
-        run: cargo run afl test -vv
+        run: cargo run -p ${{ matrix.package }} -- afl test -vv
   all-checks:
     needs: [lint, build]
     runs-on: ubuntu-latest

Cargo.toml

@@ -1,34 +1,6 @@
-[package]
-name = "afl"
-version = "0.13.1"
-readme = "README.md"
-license = "Apache-2.0"
-authors = ["Keegan McAllister <mcallister.keegan@gmail.com>",
-           "Corey Farwell <coreyf@rwell.org>"]
-description = "Fuzzing Rust code with american-fuzzy-lop"
-repository = "https://github.com/rust-fuzz/afl.rs"
-homepage = "https://github.com/rust-fuzz/afl.rs"
-edition = "2021"
-
-[build-dependencies]
-fs_extra = "1.3"
-home = "0.5"
-rustc_version = "0.4"
-tempfile = "3.6"
-xdg = "2.4"
-
-[dependencies]
-clap = { version = "4.3", features = ["cargo"] }
-lazy_static = { version = "1.4.0", optional = true }
-libc = "0.2.147"
-rustc_version = "0.4"
-xdg = "2.4"
-
-[dev-dependencies]
-arbitrary = { version = "1", features = ["derive"] }
-assert_cmd = "2.0"
-tempfile = "3.6"
-
-[features]
-reset_lazy_static = ["lazy_static"]
-no_cfg_fuzzing = []
+[workspace]
+members = [
+    "afl",
+    "cargo-afl",
+]
+resolver = "2"

afl/Cargo.toml

@@ -0,0 +1,35 @@
+[package]
+name = "afl"
+version = "0.13.1"
+readme = "../README.md"
+license = "Apache-2.0"
+authors = ["Keegan McAllister <mcallister.keegan@gmail.com>",
+           "Corey Farwell <coreyf@rwell.org>"]
+description = "Fuzzing Rust code with american-fuzzy-lop"
+repository = "https://github.com/rust-fuzz/afl.rs"
+homepage = "https://github.com/rust-fuzz/afl.rs"
+edition = "2021"
+
+[build-dependencies]
+fs_extra = "1.3"
+home = "0.5"
+libc = "0.2"
+rustc_version = "0.4"
+tempfile = "3.6"
+xdg = "2.4"
+
+[dependencies]
+clap = { version = "4.3", features = ["cargo"] }
+lazy_static = { version = "1.4", optional = true }
+libc = "0.2"
+rustc_version = "0.4"
+xdg = "2.4"
+
+[dev-dependencies]
+arbitrary = { version = "1", features = ["derive"] }
+assert_cmd = "2.0"
+tempfile = "3.6"
+
+[features]
+reset_lazy_static = ["lazy_static"]
+no_cfg_fuzzing = []

build.rs → afl/build.rs

@@ -2,7 +2,7 @@ use std::env;
 use std::path::{Path, PathBuf};
 use std::process::Command;
 
-static AFL_SRC_PATH: &str = "AFLplusplus";
+static AFL_SRC_PATH: &str = "../AFLplusplus";
 
 // https://github.com/rust-fuzz/afl.rs/issues/148
 #[cfg(target_os = "macos")]
@@ -16,11 +16,25 @@ mod common;
 fn main() {
     let installing = home::cargo_home()
         .map(|path| Path::new(env!("CARGO_MANIFEST_DIR")).starts_with(path))
-        .unwrap();
+        .unwrap()
+        || env::var("TESTING_INSTALL").is_ok();
+
+    let building_cargo_afl = env::var("CARGO_PKG_NAME") == Ok(String::from("cargo-afl"));
+
+    let building_on_docs_rs = env::var("DOCS_RS").is_ok();
+
     let out_dir = env::var("OUT_DIR").unwrap();
 
+    if installing && !building_cargo_afl {
+        println!("cargo:warning=You appear to be installing `cargo-afl` with:");
+        println!("cargo:warning=    cargo install afl");
+        println!("cargo:warning=A future version of afl.rs will require you to use:");
+        println!("cargo:warning=    cargo install cargo-afl");
+        println!("cargo:warning=You can use the new command now, if you like.");
+    }
+
     // smoelius: Build AFLplusplus in a temporary directory when installing or when building on docs.rs.
-    let work_dir = if installing || env::var("DOCS_RS").is_ok() {
+    let work_dir = if installing || building_on_docs_rs {
         let tempdir = tempfile::tempdir_in(&out_dir).unwrap();
         if Path::new(AFL_SRC_PATH).join(".git").is_dir() {
             let status = Command::new("git")
@@ -44,12 +58,16 @@ fn main() {
         PathBuf::from(AFL_SRC_PATH)
     };
 
-    let base = if env::var("DOCS_RS").is_ok() {
+    let base = if building_on_docs_rs {
         Some(PathBuf::from(out_dir))
     } else {
         None
     };
 
+    // smoelius: Lock `work_dir` until the build script exits.
+    #[cfg(unix)]
+    let _file = sys::lock_path(&work_dir).unwrap();
+
     build_afl(&work_dir, base.as_deref());
     build_afl_llvm_runtime(&work_dir, base.as_deref());
 }
@@ -85,3 +103,33 @@ fn build_afl_llvm_runtime(work_dir: &Path, base: Option<&Path>) {
         .expect("could not run 'ar'");
     assert!(status.success());
 }
+
+#[cfg(unix)]
+mod sys {
+    use std::fs::File;
+    use std::io::{Error, Result};
+    use std::os::unix::io::AsRawFd;
+    use std::path::Path;
+
+    pub fn lock_path(path: &Path) -> Result<File> {
+        let file = File::open(path)?;
+        lock_exclusive(&file)?;
+        Ok(file)
+    }
+
+    // smoelius: `lock_exclusive` and `flock` were copied from:
+    // https://github.com/rust-lang/cargo/blob/ae91d4ed41da98bdfa16041dbc6cd30287920120/src/cargo/util/flock.rs
+
+    fn lock_exclusive(file: &File) -> Result<()> {
+        flock(file, libc::LOCK_EX)
+    }
+
+    fn flock(file: &File, flag: libc::c_int) -> Result<()> {
+        let ret = unsafe { libc::flock(file.as_raw_fd(), flag) };
+        if ret < 0 {
+            Err(Error::last_os_error())
+        } else {
+            Ok(())
+        }
+    }
+}

cargo-afl/Cargo.toml

@@ -0,0 +1,37 @@
+[package]
+name = "cargo-afl"
+version = "0.13.1"
+readme = "../README.md"
+license = "Apache-2.0"
+authors = ["Keegan McAllister <mcallister.keegan@gmail.com>",
+           "Corey Farwell <coreyf@rwell.org>",
+           "Samuel Moelius <sam@moeli.us>"]
+description = "Fuzzing Rust code with american-fuzzy-lop"
+repository = "https://github.com/rust-fuzz/afl.rs"
+homepage = "https://github.com/rust-fuzz/afl.rs"
+edition = "2021"
+
+build = "../afl/build.rs"
+
+[[bin]]
+name = "cargo-afl"
+path = "../afl/src/bin/cargo-afl.rs"
+
+[build-dependencies]
+fs_extra = "1.3"
+home = "0.5"
+libc = "0.2"
+rustc_version = "0.4"
+tempfile = "3.6"
+xdg = "2.4"
+
+[dependencies]
+clap = { version = "4.3", features = ["cargo"] }
+libc = "0.2"
+rustc_version = "0.4"
+xdg = "2.4"
+
+[dev-dependencies]
+assert_cmd = "2.0"
+predicates = "3.0"
+tempfile = "3.6"