Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add hidden option to specify command name #351

Merged
merged 3 commits into from
Apr 12, 2019
+19 −7
Merged

add hidden option to specify command name #351

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9ae3559
add hidden option to specify command name
Apr 12, 2019
9c12b3f
update changelog
Apr 12, 2019
73be6c7
Merge branch 'master' into feature/add-command-name-opt
MarkMcCaskey Apr 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,5 @@ All PRs to the Wasmer repository must add to this file.
Blocks of changes will separated by version increments.

## **[Unreleased]**
- [#351](https://github.com/wasmerio/wasmer/pull/351) Add hidden option to specify wasm program name (can be used to improve error messages)
- [#349](https://github.com/wasmerio/wasmer/pull/349) Add [CHANGELOG.md](https://github.com/wasmerio/wasmer/blob/master/CHANGELOG.md).
Empty file removed lib/emscripten/a.txt
View file
Open in desktop
Empty file.
Empty file removed lib/emscripten/foo.txt
View file
Open in desktop
Empty file.
25 changes: 18 additions & 7 deletions src/bin/wasmer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,9 @@ struct Run {
#[structopt(long = "em-symbol-map", parse(from_os_str))]
em_symbol_map: Option<PathBuf>,

#[structopt(long = "command-name", hidden = true)]
command_name: Option<String>,

/// Application arguments
#[structopt(name = "--", raw(multiple = "true"))]
args: Vec<String>,
Expand Down Expand Up @@ -300,12 +303,16 @@ fn execute_wasm(options: &Run) -> Result<(), String> {
(
InstanceABI::WASI,
wasmer_wasi::generate_import_object(
[options.path.to_str().unwrap().to_owned()]
.iter()
.chain(options.args.iter())
.cloned()
.map(|arg| arg.into_bytes())
.collect(),
if let Some(cn) = &options.command_name {
[cn.clone()]
} else {
[options.path.to_str().unwrap().to_owned()]
}
.iter()
.chain(options.args.iter())
.cloned()
.map(|arg| arg.into_bytes())
.collect(),
env::vars()
.map(|(k, v)| format!("{}={}", k, v).into_bytes())
.collect(),
Expand All @@ -329,7 +336,11 @@ fn execute_wasm(options: &Run) -> Result<(), String> {
&module,
&mut instance,
abi,
options.path.to_str().unwrap(),
if let Some(cn) = &options.command_name {
cn
} else {
options.path.to_str().unwrap()
},
options.args.iter().map(|arg| arg.as_str()).collect(),
)
.map_err(|e| format!("{:?}", e))?;
Expand Down