mirror of
https://github.com/RGBCube/uutils-coreutils
synced 2025-07-28 11:37:44 +00:00
Merge pull request #3583 from cakebaker/ticket_3574
expand: show error if --tabs arg has invalid chars
This commit is contained in:
commit
e2782e2f75
2 changed files with 102 additions and 22 deletions
|
@ -13,12 +13,14 @@
|
|||
extern crate uucore;
|
||||
|
||||
use clap::{crate_version, Arg, ArgMatches, Command};
|
||||
use std::error::Error;
|
||||
use std::fmt;
|
||||
use std::fs::File;
|
||||
use std::io::{stdin, stdout, BufRead, BufReader, BufWriter, Read, Write};
|
||||
use std::str::from_utf8;
|
||||
use unicode_width::UnicodeWidthChar;
|
||||
use uucore::display::Quotable;
|
||||
use uucore::error::{FromIo, UResult};
|
||||
use uucore::error::{FromIo, UError, UResult};
|
||||
use uucore::format_usage;
|
||||
|
||||
static ABOUT: &str = "Convert tabs in each FILE to spaces, writing to standard output.
|
||||
|
@ -57,6 +59,36 @@ fn is_space_or_comma(c: char) -> bool {
|
|||
c == ' ' || c == ','
|
||||
}
|
||||
|
||||
/// Errors that can occur when parsing a `--tabs` argument.
|
||||
#[derive(Debug)]
|
||||
enum ParseError {
|
||||
InvalidCharacter(String),
|
||||
SpecifierNotAtStartOfNumber(String, String),
|
||||
TabSizeCannotBeZero,
|
||||
TabSizesMustBeAscending,
|
||||
}
|
||||
|
||||
impl Error for ParseError {}
|
||||
impl UError for ParseError {}
|
||||
|
||||
impl fmt::Display for ParseError {
|
||||
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
|
||||
match self {
|
||||
Self::InvalidCharacter(s) => {
|
||||
write!(f, "tab size contains invalid character(s): {}", s.quote())
|
||||
}
|
||||
Self::SpecifierNotAtStartOfNumber(specifier, s) => write!(
|
||||
f,
|
||||
"{} specifier not at start of number: {}",
|
||||
specifier.quote(),
|
||||
s.quote(),
|
||||
),
|
||||
Self::TabSizeCannotBeZero => write!(f, "tab size cannot be 0"),
|
||||
Self::TabSizesMustBeAscending => write!(f, "tab sizes must be ascending"),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Parse a list of tabstops from a `--tabs` argument.
|
||||
///
|
||||
/// This function returns both the vector of numbers appearing in the
|
||||
|
@ -65,14 +97,14 @@ fn is_space_or_comma(c: char) -> bool {
|
|||
/// in the list. This mode defines the strategy to use for computing the
|
||||
/// number of spaces to use for columns beyond the end of the tab stop
|
||||
/// list specified here.
|
||||
fn tabstops_parse(s: &str) -> (RemainingMode, Vec<usize>) {
|
||||
fn tabstops_parse(s: &str) -> Result<(RemainingMode, Vec<usize>), ParseError> {
|
||||
// Leading commas and spaces are ignored.
|
||||
let s = s.trim_start_matches(is_space_or_comma);
|
||||
|
||||
// If there were only commas and spaces in the string, just use the
|
||||
// default tabstops.
|
||||
if s.is_empty() {
|
||||
return (RemainingMode::None, vec![DEFAULT_TABSTOP]);
|
||||
return Ok((RemainingMode::None, vec![DEFAULT_TABSTOP]));
|
||||
}
|
||||
|
||||
let mut nums = vec![];
|
||||
|
@ -89,23 +121,34 @@ fn tabstops_parse(s: &str) -> (RemainingMode, Vec<usize>) {
|
|||
}
|
||||
_ => {
|
||||
// Parse a number from the byte sequence.
|
||||
let num = from_utf8(&bytes[i..]).unwrap().parse::<usize>().unwrap();
|
||||
let s = from_utf8(&bytes[i..]).unwrap();
|
||||
if let Ok(num) = s.parse::<usize>() {
|
||||
// Tab size must be positive.
|
||||
if num == 0 {
|
||||
return Err(ParseError::TabSizeCannotBeZero);
|
||||
}
|
||||
|
||||
// Tab size must be positive.
|
||||
if num == 0 {
|
||||
crash!(1, "tab size cannot be 0");
|
||||
}
|
||||
// Tab sizes must be ascending.
|
||||
if let Some(last_stop) = nums.last() {
|
||||
if *last_stop >= num {
|
||||
return Err(ParseError::TabSizesMustBeAscending);
|
||||
}
|
||||
}
|
||||
|
||||
// Tab sizes must be ascending.
|
||||
if let Some(last_stop) = nums.last() {
|
||||
if *last_stop >= num {
|
||||
crash!(1, "tab sizes must be ascending");
|
||||
// Append this tab stop to the list of all tabstops.
|
||||
nums.push(num);
|
||||
break;
|
||||
} else {
|
||||
let s = s.trim_start_matches(char::is_numeric);
|
||||
if s.starts_with('/') || s.starts_with('+') {
|
||||
return Err(ParseError::SpecifierNotAtStartOfNumber(
|
||||
s[0..1].to_string(),
|
||||
s.to_string(),
|
||||
));
|
||||
} else {
|
||||
return Err(ParseError::InvalidCharacter(s.to_string()));
|
||||
}
|
||||
}
|
||||
|
||||
// Append this tab stop to the list of all tabstops.
|
||||
nums.push(num);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -115,7 +158,7 @@ fn tabstops_parse(s: &str) -> (RemainingMode, Vec<usize>) {
|
|||
if nums.is_empty() {
|
||||
nums = vec![DEFAULT_TABSTOP];
|
||||
}
|
||||
(remaining_mode, nums)
|
||||
Ok((remaining_mode, nums))
|
||||
}
|
||||
|
||||
struct Options {
|
||||
|
@ -131,9 +174,9 @@ struct Options {
|
|||
}
|
||||
|
||||
impl Options {
|
||||
fn new(matches: &ArgMatches) -> Self {
|
||||
fn new(matches: &ArgMatches) -> Result<Self, ParseError> {
|
||||
let (remaining_mode, tabstops) = match matches.values_of(options::TABS) {
|
||||
Some(s) => tabstops_parse(&s.collect::<Vec<&str>>().join(",")),
|
||||
Some(s) => tabstops_parse(&s.collect::<Vec<&str>>().join(","))?,
|
||||
None => (RemainingMode::None, vec![DEFAULT_TABSTOP]),
|
||||
};
|
||||
|
||||
|
@ -158,14 +201,14 @@ impl Options {
|
|||
None => vec!["-".to_owned()],
|
||||
};
|
||||
|
||||
Self {
|
||||
Ok(Self {
|
||||
files,
|
||||
tabstops,
|
||||
tspaces,
|
||||
iflag,
|
||||
uflag,
|
||||
remaining_mode,
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -173,7 +216,7 @@ impl Options {
|
|||
pub fn uumain(args: impl uucore::Args) -> UResult<()> {
|
||||
let matches = uu_app().get_matches_from(args);
|
||||
|
||||
expand(&Options::new(&matches)).map_err_context(|| "failed to write output".to_string())
|
||||
expand(&Options::new(&matches)?).map_err_context(|| "failed to write output".to_string())
|
||||
}
|
||||
|
||||
pub fn uu_app<'a>() -> Command<'a> {
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
use crate::common::util::*;
|
||||
use uucore::display::Quotable;
|
||||
// spell-checker:ignore (ToDO) taaaa tbbbb tcccc
|
||||
|
||||
#[test]
|
||||
|
@ -179,6 +180,14 @@ fn test_tabs_must_be_ascending() {
|
|||
.stderr_contains("tab sizes must be ascending");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_tabs_cannot_be_zero() {
|
||||
new_ucmd!()
|
||||
.arg("--tabs=0")
|
||||
.fails()
|
||||
.stderr_contains("tab size cannot be 0");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_tabs_keep_last_trailing_specifier() {
|
||||
// If there are multiple trailing specifiers, use only the last one
|
||||
|
@ -200,3 +209,31 @@ fn test_tabs_comma_separated_no_numbers() {
|
|||
.succeeds()
|
||||
.stdout_is(" a b c");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_tabs_with_specifier_not_at_start() {
|
||||
fn run_cmd(arg: &str, expected_prefix: &str, expected_suffix: &str) {
|
||||
let expected_msg = format!(
|
||||
"{} specifier not at start of number: {}",
|
||||
expected_prefix.quote(),
|
||||
expected_suffix.quote()
|
||||
);
|
||||
new_ucmd!().arg(arg).fails().stderr_contains(expected_msg);
|
||||
}
|
||||
run_cmd("--tabs=1/", "/", "/");
|
||||
run_cmd("--tabs=1/2", "/", "/2");
|
||||
run_cmd("--tabs=1+", "+", "+");
|
||||
run_cmd("--tabs=1+2", "+", "+2");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_tabs_with_invalid_chars() {
|
||||
new_ucmd!()
|
||||
.arg("--tabs=x")
|
||||
.fails()
|
||||
.stderr_contains("tab size contains invalid character(s): 'x'");
|
||||
new_ucmd!()
|
||||
.arg("--tabs=1x2")
|
||||
.fails()
|
||||
.stderr_contains("tab size contains invalid character(s): 'x2'");
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue