Enable non-printable chars for redirected output (#1061)

This commit is contained in:
Evgeniy Andreev (gsomix) committed 2020-07-02 09:36:58 +04:00
1 parent 62b4452057
commit 3c5ce9f86c
5 files changed
+30 -7

No files matched your search

+16 -6
View File
@@ -52,15 +52,17 @@ pub(crate) trait Printer {
) -> Result<()>;
}
pub struct SimplePrinter;
pub struct SimplePrinter<'a> {
config: &'a Config<'a>
}
impl SimplePrinter {
pub fn new() -> Self {
SimplePrinter {}
impl<'a> SimplePrinter<'a> {
pub fn new(config: &'a Config) -> Self {
SimplePrinter { config }
}
}
impl Printer for SimplePrinter {
impl<'a> Printer for SimplePrinter<'a> {
fn print_header(
&mut self,
_handle: &mut dyn Write,
@@ -86,7 +88,15 @@ impl Printer for SimplePrinter {
line_buffer: &[u8],
) -> Result<()> {
if !out_of_range {
handle.write_all(line_buffer)?;
if self.config.show_nonprintable {
let line = replace_nonprintable(line_buffer, self.config.tab_width);
write!(handle, "{}", line)?;
if line_buffer.last() == Some(&b'\n') {
writeln!(handle)?;
}
} else {
handle.write_all(line_buffer)?
};
}
Ok(())
}