diff options
author | David Peter <mail@david-peter.de> | 2023-03-21 20:55:03 +0100 |
---|---|---|
committer | David Peter <sharkdp@users.noreply.github.com> | 2023-03-21 21:03:34 +0100 |
commit | 80ec1c5ddf814feff7a3cae26384e5f2bd868dcb (patch) | |
tree | 4670375196fa209ff25a93a1c875a01ff8c85977 | |
parent | fbe9ca666925689b263b87fc4dfd0afb098d14d0 (diff) |
Fix usage of --input=null
-rw-r--r-- | CHANGELOG.md | 7 | ||||
-rw-r--r-- | src/options.rs | 16 |
2 files changed, 17 insertions, 6 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index ba2b65f..17a1e76 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,13 @@ ## Other +# v1.16.1 + +## Bugfixes + +- Fix line-wrapping of `--help` text (@sharkdp) +- Fix `--input=null` (@sharkdp) + # v1.16.0 diff --git a/src/options.rs b/src/options.rs index eee51e0..15fb68e 100644 --- a/src/options.rs +++ b/src/options.rs @@ -379,13 +379,17 @@ impl Options { } options.command_input_policy = if let Some(path_str) = matches.get_one::<String>("input") { - let path = PathBuf::from(path_str); - if !path.exists() { - return Err(OptionsError::StdinDataFileDoesNotExist( - path_str.to_string(), - )); + if path_str == "null" { + CommandInputPolicy::Null + } else { + let path = PathBuf::from(path_str); + if !path.exists() { + return Err(OptionsError::StdinDataFileDoesNotExist( + path_str.to_string(), + )); + } + CommandInputPolicy::File(path) } - CommandInputPolicy::File(path) } else { CommandInputPolicy::Null }; |