ptx: name the missing file in break/ignore/only file errors

src/uu/ptx/src/ptx.rs

@@ -77,6 +77,14 @@ impl Default for Config {
     }
 }
 
+/// The name of the file given to `option`, for error messages.
+fn filter_file_name(matches: &clap::ArgMatches, option: &str) -> String {
+    matches
+        .get_one::<OsString>(option)
+        .map(|name| name.maybe_quote().to_string())
+        .unwrap_or_default()
+}
+
 fn read_word_filter_file(
     matches: &clap::ArgMatches,
     option: &str,
@@ -129,24 +137,24 @@ impl WordFilter {
     #[allow(clippy::cognitive_complexity)]
     fn new(matches: &clap::ArgMatches, config: &Config) -> UResult<Self> {
         let (o, oset): (bool, FxHashSet<String>) = if matches.contains_id(options::ONLY_FILE) {
-            let words =
-                read_word_filter_file(matches, options::ONLY_FILE).map_err_context(String::new)?;
+            let words = read_word_filter_file(matches, options::ONLY_FILE)
+                .map_err_context(|| filter_file_name(matches, options::ONLY_FILE))?;
             (true, words)
         } else {
             (false, FxHashSet::default())
         };
         let (i, iset): (bool, FxHashSet<String>) = if matches.contains_id(options::IGNORE_FILE) {
             let words = read_word_filter_file(matches, options::IGNORE_FILE)
-                .map_err_context(String::new)?;
+                .map_err_context(|| filter_file_name(matches, options::IGNORE_FILE))?;
             (true, words)
         } else {
             (false, FxHashSet::default())
         };
         let break_set: Option<FxHashSet<char>> = if matches.contains_id(options::BREAK_FILE)
             && !matches.contains_id(options::WORD_REGEXP)
         {
-            let mut chars =
-                read_char_filter_file(matches, options::BREAK_FILE).map_err_context(String::new)?;
+            let mut chars = read_char_filter_file(matches, options::BREAK_FILE)
+                .map_err_context(|| filter_file_name(matches, options::BREAK_FILE))?;
             if !config.gnu_ext {
                 // GNU off means at least these are considered
                 chars.extend([' ', '\t', '\n']);

tests/by-util/test_ptx.rs

@@ -500,3 +500,16 @@ fn test_nullable_word_regexp_no_empty_matches() {
         .succeeds()
         .stdout_only(expected);
 }
+
+// A missing break, ignore or only file is named in the error, as in GNU.
+#[test]
+fn test_missing_filter_file_is_named_in_error() {
+    for option in ["-b", "-i", "-o"] {
+        new_ucmd!()
+            .args(&[option, "nonexistent"])
+            .pipe_in("x\n")
+            .fails_with_code(1)
+            .no_stdout()
+            .stderr_contains("ptx: nonexistent: ");
+    }
+}