@@ -54,20 +54,30 @@ impl<'a> InputFileReader<'a> {
5454
5555#[derive(Debug, Clone, Copy, PartialEq)]
5656pub struct OrdinaryFile<'a> {
57− filename: &'a OsStr,
57+ path: &'a OsStr,
5858 user_provided_name: Option<&'a OsStr>,
5959}
6060
6161impl<'a> OrdinaryFile<'a> {
62− pub fn new(filename: &'a OsStr, user_provided_name: Option<&'a OsStr>) -> OrdinaryFile<'a> {
62+ pub fn from_path(path: &'a OsStr) -> OrdinaryFile<'a> {
6363 OrdinaryFile {
64− filename: filename,
65− user_provided_name: user_provided_name,
64+ path,
65+ user_provided_name: None,
66+ }
67+ }
68+
69+ pub fn from_path_with_name(
70+ path: &'a OsStr,
71+ user_provided_name: Option<&'a OsStr>,
72+ ) -> OrdinaryFile<'a> {
73+ OrdinaryFile {
74+ path,
75+ user_provided_name,
6676 }
6777 }
6878
6979 pub fn filename(&self) -> &'a OsStr {
70− self.user_provided_name.unwrap_or_else(|| self.filename)
80+ self.user_provided_name.unwrap_or_else(|| self.path)
7181 }
7282}
7383
@@ -83,12 +93,12 @@ impl<'a> InputFile<'a> {
8393 match self {
8494 InputFile::StdIn(_) => Ok(InputFileReader::new(stdin.lock())),
8595 InputFile::Ordinary(ofile) => {
86− let file = File::open(ofile.filename)
87− .map_err(|e| format!("'{}': {}", ofile.filename.to_string_lossy(), e))?;
96+ let file = File::open(ofile.path)
97+ .map_err(|e| format!("'{}': {}", ofile.path.to_string_lossy(), e))?;
8898
8999 if file.metadata()?.is_dir() {
90100 return Err(
91− format!("'{}' is a directory.", ofile.filename.to_string_lossy()).into(),
101+ format!("'{}' is a directory.", ofile.path.to_string_lossy()).into(),
92102 );
93103 }
94104