Check result of read_until, and return Error if 0, which indicates EOF was found before delimeter.

This commit is contained in:
Reid Wagner 2019-02-02 11:59:32 -08:00 committed by David Peter
parent f3f9f10f05
commit 61e888de7f
3 changed files with 15 additions and 9 deletions

View File

@ -43,6 +43,7 @@ impl<'b> Controller<'b> {
for input_file in &self.config.files {
match input_file.get_reader(&stdin) {
Err(Error(ErrorKind::ImmediateEOF, _)) => (),
Err(error) => {
handle_error(&error);
no_errors = false;

View File

@ -14,9 +14,11 @@ pub struct InputFileReader<'a> {
}
impl<'a> InputFileReader<'a> {
fn new<R: BufRead + 'a>(mut reader: R) -> InputFileReader<'a> {
fn new<R: BufRead + 'a>(mut reader: R) -> Result<InputFileReader<'a>> {
let mut first_line = vec![];
reader.read_until(b'\n', &mut first_line).ok();
if reader.read_until(b'\n', &mut first_line)? == 0 {
return Err(ErrorKind::ImmediateEOF.into());
}
let content_type = content_inspector::inspect(&first_line[..]);
@ -24,11 +26,11 @@ impl<'a> InputFileReader<'a> {
reader.read_until(0x00, &mut first_line).ok();
}
InputFileReader {
Ok(InputFileReader {
inner: Box::new(reader),
first_line,
content_type,
}
})
}
pub fn read_line(&mut self, buf: &mut Vec<u8>) -> io::Result<bool> {
@ -57,7 +59,7 @@ pub enum InputFile<'a> {
impl<'a> InputFile<'a> {
pub fn get_reader(&self, stdin: &'a io::Stdin) -> Result<InputFileReader> {
match self {
InputFile::StdIn => Ok(InputFileReader::new(stdin.lock())),
InputFile::StdIn => InputFileReader::new(stdin.lock()),
InputFile::Ordinary(filename) => {
let file = File::open(filename).map_err(|e| format!("'{}': {}", filename, e))?;
@ -65,9 +67,9 @@ impl<'a> InputFile<'a> {
return Err(format!("'{}' is a directory.", filename).into());
}
Ok(InputFileReader::new(BufReader::new(file)))
InputFileReader::new(BufReader::new(file))
}
InputFile::ThemePreviewFile => Ok(InputFileReader::new(THEME_PREVIEW_FILE)),
InputFile::ThemePreviewFile => InputFileReader::new(THEME_PREVIEW_FILE),
}
}
}
@ -75,7 +77,7 @@ impl<'a> InputFile<'a> {
#[test]
fn basic() {
let content = b"#!/bin/bash\necho hello";
let mut reader = InputFileReader::new(&content[..]);
let mut reader = InputFileReader::new(&content[..]).unwrap();
assert_eq!(b"#!/bin/bash\n", &reader.first_line[..]);
@ -104,7 +106,7 @@ fn basic() {
#[test]
fn utf16le() {
let content = b"\xFF\xFE\x73\x00\x0A\x00\x64\x00";
let mut reader = InputFileReader::new(&content[..]);
let mut reader = InputFileReader::new(&content[..]).unwrap();
assert_eq!(b"\xFF\xFE\x73\x00\x0A\x00", &reader.first_line[..]);

View File

@ -63,6 +63,9 @@ mod errors {
SyntectError(::syntect::LoadingError);
ParseIntError(::std::num::ParseIntError);
}
errors {
ImmediateEOF
}
}
pub fn handle_error(error: &Error) {