Mirrors/coreutils
2
0
Fork 0
mirror of https://github.com/uutils/coreutils synced 2024-12-14 23:32:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

pr: fix printing form feed

Browse source
This commit is contained in:
Tilak Patidar 2018-12-30 20:42:48 +05:30 committed by Max Semenik
parent 847046f3de
commit 87227addc1
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/pr/pr.rs
View file

@ -62,6 +62,7 @@ static READ_BUFFER_SIZE: usize = 1024 * 64;
static DEFAULT_COLUMN_WIDTH: usize = 72;
static DEFAULT_COLUMN_SEPARATOR: &char = &TAB;
static BLANK_STRING: &str = "";
static FF: u8 = 0x0C as u8;
struct OutputOptions {
/// Line numbering mode
@ -630,10 +631,12 @@ fn build_options(
page_length - (HEADER_LINES_PER_PAGE + TRAILER_LINES_PER_PAGE)
};
let page_separator_char: String = matches
.opt_str(FORM_FEED_OPTION)
.map(|_i| '\u{000A}'.to_string())
.unwrap_or(NEW_LINE.to_string());
let page_separator_char: String = if matches.opt_present(FORM_FEED_OPTION) {
let bytes = vec![FF];
String::from_utf8(bytes).unwrap()
} else {
NEW_LINE.to_string()
};
let column_width: usize =
parse_usize(matches, COLUMN_WIDTH_OPTION).unwrap_or(Ok(DEFAULT_COLUMN_WIDTH))?;