asa, expand: PathBuf conversion

Author: jgarzik

text/src/asa.rs

@@ -17,15 +17,15 @@ extern crate plib;
 use clap::Parser;
 use gettextrs::{bind_textdomain_codeset, gettext, textdomain};
 use plib::PROJECT_NAME;
-use std::fs;
-use std::io::{self, BufRead, Read};
+use std::io::{self, BufRead};
+use std::path::PathBuf;
 
 /// asa - interpret carriage-control characters
 #[derive(Parser, Debug)]
 #[command(author, version, about, long_about)]
 struct Args {
     /// Files to read as input.
-    files: Vec<String>,
+    files: Vec<PathBuf>,
 }
 
 struct AsaState {
@@ -69,14 +69,8 @@ impl AsaState {
     }
 }
 
-fn asa_file(filename: &str) -> io::Result<()> {
-    let file: Box<dyn Read>;
-    if filename == "" {
-        file = Box::new(io::stdin().lock());
-    } else {
-        file = Box::new(fs::File::open(filename)?);
-    }
-    let mut reader = io::BufReader::new(file);
+fn asa_file(pathname: &PathBuf) -> io::Result<()> {
+    let mut reader = plib::io::input_reader(pathname, false)?;
     let mut line_no: usize = 0;
     let mut state = AsaState::new();
 
@@ -142,15 +136,15 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
 
     // if no files, read from stdin
     if args.files.is_empty() {
-        args.files.push(String::new());
+        args.files.push(PathBuf::new());
     }
 
     let mut exit_code = 0;
 
     for filename in &args.files {
         if let Err(e) = asa_file(filename) {
             exit_code = 1;
-            eprintln!("{}: {}", filename, e);
+            eprintln!("{}: {}", filename.display(), e);
         }
     }
 

text/src/expand.rs

@@ -13,8 +13,8 @@ extern crate plib;
 use clap::Parser;
 use gettextrs::{bind_textdomain_codeset, textdomain};
 use plib::PROJECT_NAME;
-use std::fs;
 use std::io::{self, BufWriter, Read, Write};
+use std::path::PathBuf;
 
 /// expand - convert tabs to spaces
 #[derive(Parser, Debug)]
@@ -25,7 +25,7 @@ struct Args {
     tablist: Option<String>,
 
     /// Files to read as input.
-    files: Vec<String>,
+    files: Vec<PathBuf>,
 }
 
 enum TabList {
@@ -67,14 +67,9 @@ fn space_out(column: &mut usize, writer: &mut BufWriter<dyn Write>) -> io::Resul
     Ok(())
 }
 
-fn expand_file(tablist: &TabList, filename: &str) -> io::Result<()> {
+fn expand_file(tablist: &TabList, pathname: &PathBuf) -> io::Result<()> {
     // open file, or stdin
-    let mut file: Box<dyn Read>;
-    if filename == "" {
-        file = Box::new(io::stdin().lock());
-    } else {
-        file = Box::new(fs::File::open(filename)?);
-    }
+    let mut file = plib::io::input_stream(pathname, false)?;
 
     let mut raw_buffer = [0; plib::BUFSZ];
     let mut writer = BufWriter::new(io::stdout());
@@ -160,15 +155,15 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
 
     // if no files, read from stdin
     if args.files.is_empty() {
-        args.files.push(String::new());
+        args.files.push(PathBuf::new());
     }
 
     let mut exit_code = 0;
 
     for filename in &args.files {
         if let Err(e) = expand_file(&tablist, filename) {
             exit_code = 1;
-            eprintln!("{}: {}", filename, e);
+            eprintln!("{}: {}", filename.display(), e);
         }
     }