From 680d6bb596c8ffe6a0da7ae6c55ff7f35a9f7b1a Mon Sep 17 00:00:00 2001
From: Amanieu d'Antras <amanieu@gmail.com>
Date: Fri, 5 Nov 2021 00:16:52 +0000
Subject: [PATCH] Fix argument parsing of --dir and --mapdir

Previously in "wasmer --dir foo bar.wasm" the "bar.wasm" was being
treated as another directory instead of the module to run.

Fixes #2445
---
 lib/cli/src/commands/compile.rs    |  2 +-
 lib/cli/src/commands/create_exe.rs |  4 ++--
 lib/cli/src/commands/run.rs        |  2 +-
 lib/cli/src/commands/run/wasi.rs   | 23 ++++++++++++++++++++---
 4 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/lib/cli/src/commands/compile.rs b/lib/cli/src/commands/compile.rs
index 865b0d4e3e2..26b60ba8634 100644
--- a/lib/cli/src/commands/compile.rs
+++ b/lib/cli/src/commands/compile.rs
@@ -27,7 +27,7 @@ pub struct Compile {
     #[structopt(flatten)]
     store: StoreOptions,
 
-    #[structopt(short = "m", multiple = true)]
+    #[structopt(short = "m", multiple = true, number_of_values = 1)]
     cpu_features: Vec<CpuFeature>,
 }
 
diff --git a/lib/cli/src/commands/create_exe.rs b/lib/cli/src/commands/create_exe.rs
index c05eaed21b3..bfdded6fab2 100644
--- a/lib/cli/src/commands/create_exe.rs
+++ b/lib/cli/src/commands/create_exe.rs
@@ -29,12 +29,12 @@ pub struct CreateExe {
     #[structopt(flatten)]
     compiler: CompilerOptions,
 
-    #[structopt(short = "m", multiple = true)]
+    #[structopt(short = "m", multiple = true, number_of_values = 1)]
     cpu_features: Vec<CpuFeature>,
 
     /// Additional libraries to link against.
     /// This is useful for fixing linker errors that may occur on some systems.
-    #[structopt(short = "l", multiple = true)]
+    #[structopt(short = "l", multiple = true, number_of_values = 1)]
     libraries: Vec<String>,
 }
 
diff --git a/lib/cli/src/commands/run.rs b/lib/cli/src/commands/run.rs
index 653ea4e72f6..879ba3a2881 100644
--- a/lib/cli/src/commands/run.rs
+++ b/lib/cli/src/commands/run.rs
@@ -68,7 +68,7 @@ pub struct Run {
     verbose: u8,
 
     /// Application arguments
-    #[structopt(name = "--", multiple = true)]
+    #[structopt(value_name = "ARGS")]
     args: Vec<String>,
 }
 
diff --git a/lib/cli/src/commands/run/wasi.rs b/lib/cli/src/commands/run/wasi.rs
index 60fa39c1013..a6e1fd418c9 100644
--- a/lib/cli/src/commands/run/wasi.rs
+++ b/lib/cli/src/commands/run/wasi.rs
@@ -11,15 +11,32 @@ use structopt::StructOpt;
 /// WASI Options
 pub struct Wasi {
     /// WASI pre-opened directory
-    #[structopt(long = "dir", name = "DIR", multiple = true, group = "wasi")]
+    #[structopt(
+        long = "dir",
+        name = "DIR",
+        multiple = true,
+        group = "wasi",
+        number_of_values = 1
+    )]
     pre_opened_directories: Vec<PathBuf>,
 
     /// Map a host directory to a different location for the Wasm module
-    #[structopt(long = "mapdir", name = "GUEST_DIR:HOST_DIR", multiple = true, parse(try_from_str = parse_mapdir))]
+    #[structopt(
+        long = "mapdir",
+        name = "GUEST_DIR:HOST_DIR",
+        multiple = true,
+        parse(try_from_str = parse_mapdir),
+        number_of_values = 1,
+    )]
     mapped_dirs: Vec<(String, PathBuf)>,
 
     /// Pass custom environment variables
-    #[structopt(long = "env", name = "KEY=VALUE", multiple = true, parse(try_from_str = parse_envvar))]
+    #[structopt(
+        long = "env",
+        name = "KEY=VALUE",
+        multiple = true,
+        parse(try_from_str = parse_envvar),
+    )]
     env_vars: Vec<(String, String)>,
 
     /// Enable experimental IO devices