ls: Limit value of --width to maximum value if overflowing#5074
Merged
sylvestre merged 2 commits intouutils:mainfrom Jul 12, 2023
Merged
ls: Limit value of --width to maximum value if overflowing#5074sylvestre merged 2 commits intouutils:mainfrom
sylvestre merged 2 commits intouutils:mainfrom
Conversation
sylvestre
reviewed
Jul 12, 2023
src/uu/ls/src/ls.rs
Outdated
| match u16::from_str_radix(x, 8) { | ||
| Ok(v) => v, | ||
| Err(_) => return Err(LsError::InvalidLineWidth(x.into()).into()), | ||
| Err(err) => { |
Contributor
There was a problem hiding this comment.
what about moving this into a function like:
fn parse_width(x: &str, is_octal: bool) -> Result<u16, LsError> {
let parse_result = if x.starts_with('0') && x.len() > 1 {
u16::from_str_radix(x, 8)
} else {
x.parse::<u16>()
};
match parse_result {
Ok(v) => Ok(v),
Err(err) => match err {
ParseIntError::Overflow => {
eprintln!("The width value provided is too large. It has been set to the maximum possible value.");
Ok(u16::MAX)
},
_ => Err(LsError::InvalidLineWidth(x.into()).into()),
}
}
}
Contributor
Author
There was a problem hiding this comment.
Yeah, I thought what I did looked pretty ugly. This should look much cleaner now.
4764c8b to
8fcd245
Compare
8fcd245 to
9e26534
Compare
Contributor
|
indeed, fails a bit later now: |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This change will clamp --width value to u16::MAX if the number passed is too large. The present behaviour results in invalid line width error. This lets gnu/tests/ls/w-option.sh progress a bit further till the last test.
The actual correct behaviour would have been to set the limit to u64::MAX as per the GNU test but all the logic related to formatting seems to be heavily reliant on u16 values, including one crate terminal_size and that would probably take a while for me to sift through. In all practical cases, this should be indistinguishable unless you are printing on a billboard maybe.