RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-28 11:37:44 +00:00
Code Issues Activity

seq: change default value for -t and remove dubious escape sequences

Browse source 
GNU seq does not support -t, but always outputs a newline at the end.
Therefore, our default for -t should be \n.

Also removes support for escape sequences (interpreting a literal "\n"
as a newline). This is not what GNU seq is doing, and unexpected.
This commit is contained in:
Michael Debertol 2021-05-31 21:19:19 +02:00
parent c78cc65421
commit 4cf18e96f3
2 changed files with 22 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/uu/seq/src/seq.rs
View file

@ -34,7 +34,7 @@ fn get_usage() -> String {
#[derive(Clone)] #[derive(Clone)]
struct SeqOptions { struct SeqOptions {
separator: String, separator: String,
terminator: Option<String>, terminator: String,
widths: bool, widths: bool,
} }
@ -81,10 +81,6 @@ impl FromStr for Number {
} }
} }
fn escape_sequences(s: &str) -> String {
s.replace("\\n", "\n").replace("\\t", "\t")
}
pub fn uumain(args: impl uucore::Args) -> i32 { pub fn uumain(args: impl uucore::Args) -> i32 {
let usage = get_usage(); let usage = get_usage();
let matches = App::new(executable!()) let matches = App::new(executable!())
@ -104,7 +100,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
Arg::with_name(OPT_TERMINATOR) Arg::with_name(OPT_TERMINATOR)
.short("t") .short("t")
.long("terminator") .long("terminator")
.help("Terminator character (defaults to separator)") .help("Terminator character (defaults to \\n)")
.takes_value(true) .takes_value(true)
.number_of_values(1), .number_of_values(1),
) )
@ -126,14 +122,11 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
let numbers = matches.values_of(ARG_NUMBERS).unwrap().collect::<Vec<_>>(); let numbers = matches.values_of(ARG_NUMBERS).unwrap().collect::<Vec<_>>();
let mut options = SeqOptions { let options = SeqOptions {
separator: "\n".to_owned(), separator: matches.value_of(OPT_SEPARATOR).unwrap_or("\n").to_string(),
terminator: None, terminator: matches.value_of(OPT_TERMINATOR).unwrap_or("\n").to_string(),
widths: false, widths: matches.is_present(OPT_WIDTHS),
}; };
options.separator = matches.value_of(OPT_SEPARATOR).unwrap_or("\n").to_string();
options.terminator = matches.value_of(OPT_TERMINATOR).map(String::from);
options.widths = matches.is_present(OPT_WIDTHS);
let mut largest_dec = 0; let mut largest_dec = 0;
let mut padding = 0; let mut padding = 0;
@ -187,11 +180,6 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
if largest_dec > 0 { if largest_dec > 0 {
largest_dec -= 1; largest_dec -= 1;
} }
let separator = escape_sequences(&options.separator[..]);
let terminator = match options.terminator {
Some(term) => escape_sequences(&term[..]),
None => separator.clone(),
};
match (first, last, increment) { match (first, last, increment) {
(Number::BigInt(first), Number::BigInt(last), Number::BigInt(increment)) => { (Number::BigInt(first), Number::BigInt(last), Number::BigInt(increment)) => {
@ -199,8 +187,8 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
first, first,
increment, increment,
last, last,
separator, options.separator,
terminator, options.terminator,
options.widths, options.widths,
padding, padding,
) )
@ -210,8 +198,8 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
increment.into_f64(), increment.into_f64(),
last.into_f64(), last.into_f64(),
largest_dec, largest_dec,
separator, options.separator,
terminator, options.terminator,
options.widths, options.widths,
padding, padding,
), ),

12
tests/by-util/test_seq.rs
View file

@ -28,6 +28,18 @@ fn test_separator_and_terminator() {
.args(&["-s", ",", "-t", "!", "2", "6"]) .args(&["-s", ",", "-t", "!", "2", "6"])
.run() .run()
.stdout_is("2,3,4,5,6!"); .stdout_is("2,3,4,5,6!");
new_ucmd!()
.args(&["-s", ",", "2", "6"])
.run()
.stdout_is("2,3,4,5,6\n");
new_ucmd!()
.args(&["-s", "\n", "2", "6"])
.run()
.stdout_is("2\n3\n4\n5\n6\n");
new_ucmd!()
.args(&["-s", "\\n", "2", "6"])
.run()
.stdout_is("2\\n3\\n4\\n5\\n6\n");
} }
#[test] #[test]