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

Prevent --terminal-width=0 and invalid forms of --terminal-width. #559

Merged
merged 3 commits into from
May 10, 2019
Merged

Prevent --terminal-width=0 and invalid forms of --terminal-width. #559

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
61f87c0
Add validation for --terminal-width option
eth-p May 9, 2019
0a980e5
Cleaned up terminal-width validation slightly
eth-p May 10, 2019
2e1c8ab
Cleaned up terminal-width validation even more
eth-p May 10, 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
18 changes: 18 additions & 0 deletions src/clap_app.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,6 +329,24 @@ pub fn build_app(interactive_output: bool) -> ClapApp<'static, 'static> {
.takes_value(true)
.value_name("width")
.hidden_short_help(true)
.validator(
|t| {
let sign = t.chars().next().unwrap();
eth-p marked this conversation as resolved.
Show resolved Hide resolved
let num = if (sign == '+') || (sign == '-') {
eth-p marked this conversation as resolved.
Show resolved Hide resolved
t.chars().skip(1).collect()
} else {
t
};

num.parse::<u32>()
.map_err(|_e| "must be an offset or number")
.and_then(|v| if v == 0 && sign != '+' && sign != '-' {
Err("terminal width cannot be zero".into())
} else {
Ok(())
})
.map_err(|e| e.to_string())
})
.help(
"Explicitly set the width of the terminal instead of determining it \
automatically. If prefixed with '+' or '-', the value will be treated \
Expand Down