Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions text/sort.rs
Original file line number Diff line number Diff line change
Expand Up @@ -223,12 +223,10 @@ fn update_range_field(mut field1: RangeField, mut field2: RangeField) -> (RangeF
/// the second RangeField object based on their field numbers and first characters.
///
fn compare_range_fields(field1: &RangeField, field2: &RangeField) -> bool {
if field1.field_number < field2.field_number {
true
} else if field1.field_number == field2.field_number {
field1.first_character <= field2.first_character
} else {
false
match field1.field_number.cmp(&field2.field_number) {
Ordering::Less => true,
Ordering::Equal => field1.first_character <= field2.first_character,
Ordering::Greater => false,
}
}

Expand Down
21 changes: 14 additions & 7 deletions users/talk.rs
Original file line number Diff line number Diff line change
Expand Up @@ -745,6 +745,7 @@ fn handle_character<W: Write>(
handle.flush().unwrap();
Ok(())
}

/// Handles user input from stdin, sending it over a TCP stream.
///
/// # Arguments
Expand All @@ -762,18 +763,24 @@ fn handle_stdin_input(
top_line: Arc<Mutex<u16>>,
output_buffer: &mut String,
) -> Result<(), io::Error> {
let mut buffer: [u8; 1] = [0; 1]; // Buffer for raw input
// Buffer for raw input
let mut buffer: [u8; 1] = [0; 1];
let mut line_buffer = String::new();
loop {
// Read one byte from stdin
let result =
unsafe { libc::read(STDIN_FILENO, buffer.as_mut_ptr() as *mut libc::c_void, 1) };
if result < 0 {
eprintln!("Error reading from stdin: {}", io::Error::last_os_error());
break;
} else if result == 0 {
// EOF reached
break;

match result.cmp(&0) {
std::cmp::Ordering::Less => {
eprintln!("Error reading from stdin: {}", io::Error::last_os_error());
break;
}
std::cmp::Ordering::Equal => {
// EOF reached
break;
}
_ => {}
}

let input_char = char::from(buffer[0]);
Expand Down