Merge pull request #262 from c410-f3r/stuff

Relax fuzz dir name constraint

Author: fitzgen

src/options.rs

@@ -13,8 +13,8 @@ pub use self::{
     run::Run, tmin::Tmin,
 };
 
-use std::fmt as stdfmt;
 use std::str::FromStr;
+use std::{fmt as stdfmt, path::PathBuf};
 use structopt::StructOpt;
 
 #[derive(Debug, Clone, Copy, PartialEq)]
@@ -186,6 +186,23 @@ impl stdfmt::Display for BuildOptions {
     }
 }
 
+#[derive(Clone, Debug, StructOpt, PartialEq)]
+pub struct FuzzDirWrapper {
+    /// The path to the fuzz project directory.
+    #[structopt(long = "fuzz-dir")]
+    pub fuzz_dir: Option<PathBuf>,
+}
+
+impl stdfmt::Display for FuzzDirWrapper {
+    fn fmt(&self, f: &mut stdfmt::Formatter) -> stdfmt::Result {
+        if let Some(ref elem) = self.fuzz_dir {
+            write!(f, " --fuzz-dir={}", elem.display())?;
+        }
+
+        Ok(())
+    }
+}
+
 #[cfg(test)]
 mod test {
     use super::*;

src/options/add.rs

@@ -1,16 +1,19 @@
-use crate::{project::FuzzProject, RunCommand};
+use crate::{options::FuzzDirWrapper, project::FuzzProject, RunCommand};
 use anyhow::Result;
 use structopt::StructOpt;
 
 #[derive(Clone, Debug, StructOpt)]
 pub struct Add {
+    #[structopt(flatten)]
+    pub fuzz_dir_wrapper: FuzzDirWrapper,
+
     /// Name of the new fuzz target
     pub target: String,
 }
 
 impl RunCommand for Add {
     fn run_command(&mut self) -> Result<()> {
-        let project = FuzzProject::find_existing()?;
+        let project = FuzzProject::new(self.fuzz_dir_wrapper.fuzz_dir.to_owned())?;
         project.add_target(self)
     }
 }

src/options/build.rs

@@ -1,4 +1,8 @@
-use crate::{options::BuildOptions, project::FuzzProject, RunCommand};
+use crate::{
+    options::{BuildOptions, FuzzDirWrapper},
+    project::FuzzProject,
+    RunCommand,
+};
 use anyhow::Result;
 use structopt::StructOpt;
 
@@ -7,13 +11,16 @@ pub struct Build {
     #[structopt(flatten)]
     pub build: BuildOptions,
 
+    #[structopt(flatten)]
+    pub fuzz_dir_wrapper: FuzzDirWrapper,
+
     /// Name of the fuzz target to build, or build all targets if not supplied
     pub target: Option<String>,
 }
 
 impl RunCommand for Build {
     fn run_command(&mut self) -> Result<()> {
-        let project = FuzzProject::find_existing()?;
+        let project = FuzzProject::new(self.fuzz_dir_wrapper.fuzz_dir.to_owned())?;
         project.exec_build(&self.build, self.target.as_deref().map(|s| s))
     }
 }

src/options/cmin.rs

@@ -1,4 +1,8 @@
-use crate::{options::BuildOptions, project::FuzzProject, RunCommand};
+use crate::{
+    options::{BuildOptions, FuzzDirWrapper},
+    project::FuzzProject,
+    RunCommand,
+};
 use anyhow::Result;
 use std::path::PathBuf;
 use structopt::StructOpt;
@@ -8,6 +12,9 @@ pub struct Cmin {
     #[structopt(flatten)]
     pub build: BuildOptions,
 
+    #[structopt(flatten)]
+    pub fuzz_dir_wrapper: FuzzDirWrapper,
+
     /// Name of the fuzz target
     pub target: String,
 
@@ -22,7 +29,7 @@ pub struct Cmin {
 
 impl RunCommand for Cmin {
     fn run_command(&mut self) -> Result<()> {
-        let project = FuzzProject::find_existing()?;
+        let project = FuzzProject::new(self.fuzz_dir_wrapper.fuzz_dir.to_owned())?;
         project.exec_cmin(self)
     }
 }

src/options/coverage.rs

@@ -1,4 +1,8 @@
-use crate::{options::BuildOptions, project::FuzzProject, RunCommand};
+use crate::{
+    options::{BuildOptions, FuzzDirWrapper},
+    project::FuzzProject,
+    RunCommand,
+};
 use anyhow::Result;
 use structopt::StructOpt;
 
@@ -7,6 +11,9 @@ pub struct Coverage {
     #[structopt(flatten)]
     pub build: BuildOptions,
 
+    #[structopt(flatten)]
+    pub fuzz_dir_wrapper: FuzzDirWrapper,
+
     /// Name of the fuzz target
     pub target: String,
 
@@ -20,7 +27,7 @@ pub struct Coverage {
 
 impl RunCommand for Coverage {
     fn run_command(&mut self) -> Result<()> {
-        let project = FuzzProject::find_existing()?;
+        let project = FuzzProject::new(self.fuzz_dir_wrapper.fuzz_dir.to_owned())?;
         self.build.coverage = true;
         project.exec_coverage(self)
     }

src/options/fmt.rs

@@ -1,4 +1,8 @@
-use crate::{options::BuildOptions, project::FuzzProject, RunCommand};
+use crate::{
+    options::{BuildOptions, FuzzDirWrapper},
+    project::FuzzProject,
+    RunCommand,
+};
 use anyhow::Result;
 use structopt::StructOpt;
 
@@ -9,6 +13,9 @@ pub struct Fmt {
     #[structopt(flatten)]
     pub build: BuildOptions,
 
+    #[structopt(flatten)]
+    pub fuzz_dir_wrapper: FuzzDirWrapper,
+
     /// Name of fuzz target
     pub target: String,
 
@@ -18,7 +25,7 @@ pub struct Fmt {
 
 impl RunCommand for Fmt {
     fn run_command(&mut self) -> Result<()> {
-        let project = FuzzProject::find_existing()?;
+        let project = FuzzProject::new(self.fuzz_dir_wrapper.fuzz_dir.to_owned())?;
         project.debug_fmt_input(self)
     }
 }

src/options/init.rs

@@ -1,4 +1,4 @@
-use crate::{project::FuzzProject, RunCommand};
+use crate::{options::FuzzDirWrapper, project::FuzzProject, RunCommand};
 use anyhow::Result;
 use structopt::StructOpt;
 
@@ -12,11 +12,14 @@ pub struct Init {
     )]
     /// Name of the first fuzz target to create
     pub target: String,
+
+    #[structopt(flatten)]
+    pub fuzz_dir_wrapper: FuzzDirWrapper,
 }
 
 impl RunCommand for Init {
     fn run_command(&mut self) -> Result<()> {
-        FuzzProject::init(self)?;
+        FuzzProject::init(self, self.fuzz_dir_wrapper.fuzz_dir.to_owned())?;
         Ok(())
     }
 }

src/options/list.rs

@@ -1,13 +1,16 @@
-use crate::{project::FuzzProject, RunCommand};
+use crate::{options::FuzzDirWrapper, project::FuzzProject, RunCommand};
 use anyhow::Result;
 use structopt::StructOpt;
 
 #[derive(Clone, Debug, StructOpt)]
-pub struct List {}
+pub struct List {
+    #[structopt(flatten)]
+    pub fuzz_dir_wrapper: FuzzDirWrapper,
+}
 
 impl RunCommand for List {
     fn run_command(&mut self) -> Result<()> {
-        let project = FuzzProject::find_existing()?;
+        let project = FuzzProject::new(self.fuzz_dir_wrapper.fuzz_dir.to_owned())?;
         project.list_targets()
     }
 }

src/options/run.rs

@@ -1,4 +1,8 @@
-use crate::{options::BuildOptions, project::FuzzProject, RunCommand};
+use crate::{
+    options::{BuildOptions, FuzzDirWrapper},
+    project::FuzzProject,
+    RunCommand,
+};
 use anyhow::Result;
 use structopt::StructOpt;
 
@@ -13,6 +17,9 @@ pub struct Run {
     /// Custom corpus directories or artifact files.
     pub corpus: Vec<String>,
 
+    #[structopt(flatten)]
+    pub fuzz_dir_wrapper: FuzzDirWrapper,
+
     #[structopt(
         short = "j",
         long = "jobs",
@@ -33,7 +40,7 @@ pub struct Run {
 
 impl RunCommand for Run {
     fn run_command(&mut self) -> Result<()> {
-        let project = FuzzProject::find_existing()?;
+        let project = FuzzProject::new(self.fuzz_dir_wrapper.fuzz_dir.to_owned())?;
         project.exec_fuzz(self)
     }
 }

src/options/tmin.rs

@@ -1,4 +1,8 @@
-use crate::{options::BuildOptions, project::FuzzProject, RunCommand};
+use crate::{
+    options::{BuildOptions, FuzzDirWrapper},
+    project::FuzzProject,
+    RunCommand,
+};
 use anyhow::Result;
 use std::path::PathBuf;
 use structopt::StructOpt;
@@ -8,6 +12,9 @@ pub struct Tmin {
     #[structopt(flatten)]
     pub build: BuildOptions,
 
+    #[structopt(flatten)]
+    pub fuzz_dir_wrapper: FuzzDirWrapper,
+
     /// Name of the fuzz target
     pub target: String,
 
@@ -35,7 +42,7 @@ pub struct Tmin {
 
 impl RunCommand for Tmin {
     fn run_command(&mut self) -> Result<()> {
-        let project = FuzzProject::find_existing()?;
+        let project = FuzzProject::new(self.fuzz_dir_wrapper.fuzz_dir.to_owned())?;
         project.exec_tmin(self)
     }
 }