Skip to content

Commit

Permalink
Allow colons in Windows host paths (#235)
Browse files Browse the repository at this point in the history
  • Loading branch information
mrowqa authored and sunfishcode committed Aug 6, 2019
1 parent ef1890a commit 17d676e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion docs/WASI-tutorial.md
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ links as well.
command-line option:

```
$ wasmtime --dir=. --mapdir=/tmp:/var/tmp demo.wasm test.txt /tmp/somewhere.txt
$ wasmtime --dir=. --mapdir=/tmp::/var/tmp demo.wasm test.txt /tmp/somewhere.txt
$ cat /var/tmp/somewhere.txt
hello world
```
Expand Down
6 changes: 3 additions & 3 deletions src/wasmtime.rs
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ Options:
--preload=<wasm> load an additional wasm module before loading the main module
--env=<env> pass an environment variable (\"key=value\") to the program
--dir=<dir> grant access to the given host directory
--mapdir=<mapping> where <mapping> has the form <wasmdir>:<hostdir>, grant access to
--mapdir=<mapping> where <mapping> has the form <wasmdir>::<hostdir>, grant access to
the given host directory with the given wasm directory name
-h, --help print this help message
--version print the Cranelift version
Expand Down Expand Up @@ -135,9 +135,9 @@ fn compute_preopen_dirs(flag_dir: &[String], flag_mapdir: &[String]) -> Vec<(Str
}

for mapdir in flag_mapdir {
let parts: Vec<&str> = mapdir.split(':').collect();
let parts: Vec<&str> = mapdir.split("::").collect();
if parts.len() != 2 {
println!("--mapdir argument must contain exactly one colon, separating a guest directory name and a host directory name");
println!("--mapdir argument must contain exactly one double colon ('::'), separating a guest directory name and a host directory name");
exit(1);
}
let (key, value) = (parts[0], parts[1]);
Expand Down

0 comments on commit 17d676e

Please sign in to comment.