RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-29 12:07:46 +00:00
Code Issues Activity

Merge pull request #205 from ebfe/comm

Browse source 
comm: handle final lines without \n
This commit is contained in:
Heather 2014-06-03 14:16:27 +04:00
commit 74bca57c8b
1 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
comm/comm.rs
View file

@ -38,6 +38,13 @@ fn mkdelim(col: uint, opts: &getopts::Matches) -> String {
s s
} }
fn ensure_nl(line: String) -> String {
match line.as_slice().chars().last() {
Some('\n') => line,
_ => line.append("\n"),
}
}
fn comm(a: &mut Box<Buffer>, b: &mut Box<Buffer>, opts: &getopts::Matches) { fn comm(a: &mut Box<Buffer>, b: &mut Box<Buffer>, opts: &getopts::Matches) {
let delim = Vec::from_fn(4, |col| mkdelim(col, opts)); let delim = Vec::from_fn(4, |col| mkdelim(col, opts));
@ -56,19 +63,19 @@ fn comm(a: &mut Box<Buffer>, b: &mut Box<Buffer>, opts: &getopts::Matches) {
match ord { match ord {
Less => { Less => {
if !opts.opt_present("1") { if !opts.opt_present("1") {
print!("{}{}", delim.get(1), ra.unwrap()); print!("{}{}", delim.get(1), ra.map(ensure_nl).unwrap());
} }
ra = a.read_line(); ra = a.read_line();
} }
Greater => { Greater => {
if !opts.opt_present("2") { if !opts.opt_present("2") {
print!("{}{}", delim.get(2), rb.unwrap()); print!("{}{}", delim.get(2), rb.map(ensure_nl).unwrap());
} }
rb = b.read_line(); rb = b.read_line();
} }
Equal => { Equal => {
if !opts.opt_present("3") { if !opts.opt_present("3") {
print!("{}{}", delim.get(3), ra.unwrap()); print!("{}{}", delim.get(3), ra.map(ensure_nl).unwrap());
} }
ra = a.read_line(); ra = a.read_line();
rb = b.read_line(); rb = b.read_line();