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

cat: address cognitive_complexity lint

Browse source 
Signed-off-by: Paul  Houssel <paul.houssel@telecom-sudparis.eu>
This commit is contained in:
Paul Houssel 2023-12-26 09:52:32 +01:00
parent 6d2486c096
commit da43183fc7
No known key found for this signature in database
1 changed files with 55 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

83
src/uu/cat/src/cat.rs
View file

@ -463,7 +463,6 @@ fn write_fast<R: FdReadable>(handle: &mut InputHandle<R>) -> CatResult<()> {
/// Outputs file contents to stdout in a line-by-line fashion, /// Outputs file contents to stdout in a line-by-line fashion,
/// propagating any errors that might occur. /// propagating any errors that might occur.
#[allow(clippy::cognitive_complexity)]
fn write_lines<R: FdReadable>( fn write_lines<R: FdReadable>(
handle: &mut InputHandle<R>, handle: &mut InputHandle<R>,
options: &OutputOptions, options: &OutputOptions,
@ -482,22 +481,7 @@ fn write_lines<R: FdReadable>(
while pos < n { while pos < n {
// skip empty line_number enumerating them if needed // skip empty line_number enumerating them if needed
if in_buf[pos] == b'\n' { if in_buf[pos] == b'\n' {
// \r followed by \n is printed as ^M when show_ends is enabled, so that \r\n prints as ^M$ write_new_line(&mut writer, options, state, handle.is_interactive)?;
if state.skipped_carriage_return && options.show_ends {
writer.write_all(b"^M")?;
state.skipped_carriage_return = false;
}
if !state.at_line_start || !options.squeeze_blank || !state.one_blank_kept {
state.one_blank_kept = true;
if state.at_line_start && options.number == NumberingMode::All {
write!(writer, "{0:6}\t", state.line_number)?;
state.line_number += 1;
}
writer.write_all(options.end_of_line().as_bytes())?;
if handle.is_interactive {
writer.flush()?;
}
}
state.at_line_start = true; state.at_line_start = true;
pos += 1; pos += 1;
continue; continue;
@ -514,13 +498,8 @@ fn write_lines<R: FdReadable>(
} }
// print to end of line or end of buffer // print to end of line or end of buffer
let offset = if options.show_nonprint { let offset = write_end(&mut writer, &in_buf[pos..], options);
write_nonprint_to_end(&in_buf[pos..], &mut writer, options.tab().as_bytes())
} else if options.show_tabs {
write_tab_to_end(&in_buf[pos..], &mut writer)
} else {
write_to_end(&in_buf[pos..], &mut writer)
};
// end of buffer? // end of buffer?
if offset + pos == in_buf.len() { if offset + pos == in_buf.len() {
state.at_line_start = false; state.at_line_start = false;
@ -531,10 +510,11 @@ fn write_lines<R: FdReadable>(
} else { } else {
assert_eq!(in_buf[pos + offset], b'\n'); assert_eq!(in_buf[pos + offset], b'\n');
// print suitable end of line // print suitable end of line
writer.write_all(options.end_of_line().as_bytes())?; write_end_of_line(
if handle.is_interactive { &mut writer,
writer.flush()?; options.end_of_line().as_bytes(),
} handle.is_interactive,
)?;
state.at_line_start = true; state.at_line_start = true;
} }
pos += offset + 1; pos += offset + 1;
@ -544,6 +524,41 @@ fn write_lines<R: FdReadable>(
Ok(()) Ok(())
} }
// \r followed by \n is printed as ^M when show_ends is enabled, so that \r\n prints as ^M$
fn write_new_line<W: Write>(
writer: &mut W,
options: &OutputOptions,
state: &mut OutputState,
is_interactive: bool,
) -> CatResult<()> {
if state.skipped_carriage_return && options.show_ends {
writer.write_all(b"^M")?;
state.skipped_carriage_return = false;
}
if !state.at_line_start || !options.squeeze_blank || !state.one_blank_kept {
state.one_blank_kept = true;
if state.at_line_start && options.number == NumberingMode::All {
write!(writer, "{0:6}\t", state.line_number)?;
state.line_number += 1;
}
writer.write_all(options.end_of_line().as_bytes())?;
if is_interactive {
writer.flush()?;
}
}
Ok(())
}
fn write_end<W: Write>(writer: &mut W, in_buf: &[u8], options: &OutputOptions) -> usize {
if options.show_nonprint {
write_nonprint_to_end(in_buf, writer, options.tab().as_bytes())
} else if options.show_tabs {
write_tab_to_end(in_buf, writer)
} else {
write_to_end(in_buf, writer)
}
}
// write***_to_end methods // write***_to_end methods
// Write all symbols till \n or \r or end of buffer is reached // Write all symbols till \n or \r or end of buffer is reached
// We need to stop at \r because it may be written as ^M depending on the byte after and settings; // We need to stop at \r because it may be written as ^M depending on the byte after and settings;
@ -610,6 +625,18 @@ fn write_nonprint_to_end<W: Write>(in_buf: &[u8], writer: &mut W, tab: &[u8]) ->
count count
} }
fn write_end_of_line<W: Write>(
writer: &mut W,
end_of_line: &[u8],
is_interactive: bool,
) -> CatResult<()> {
writer.write_all(end_of_line)?;
if is_interactive {
writer.flush()?;
}
Ok(())
}
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use std::io::{stdout, BufWriter}; use std::io::{stdout, BufWriter};