Merge branch 'master' of github.com:uutils/coreutils into feature/preserve_timestamps_#1758

src/uu/ptx/src/ptx.rs

@@ -95,12 +95,21 @@ impl WordFilter {
         if matches.opt_present("b") {
             crash!(1, "-b not implemented yet");
         }
-        let reg = if matches.opt_present("W") {
+        // Ignore empty string regex from cmd-line-args
-            matches.opt_str("W").expect("parsing options failed!")
+        let arg_reg: Option<String> = if matches.opt_present("W") {
-        } else if config.gnu_ext {
+            matches.opt_str("W").filter(|reg| !reg.is_empty())
-            "\\w+".to_owned()
         } else {
-            "[^ \t\n]+".to_owned()
+            None
+        };
+        let reg = match arg_reg {
+            Some(arg_reg) => arg_reg,
+            None => {
+                if config.gnu_ext {
+                    "\\w+".to_owned()
+                } else {
+                    "[^ \t\n]+".to_owned()
+                }
+            }
         };
         WordFilter {
             only_specified: o,

tests/by-util/test_ptx.rs

@@ -8,6 +8,22 @@ fn gnu_ext_disabled_roff_no_ref() {
         .stdout_only_fixture("gnu_ext_disabled_roff_no_ref.expected");
 }
 
+#[test]
+fn gnu_ext_disabled_roff_no_ref_empty_word_regexp() {
+    new_ucmd!()
+        .args(&["-G", "-R", "-W", "", "input"])
+        .succeeds()
+        .stdout_only_fixture("gnu_ext_disabled_roff_no_ref.expected");
+}
+
+#[test]
+fn gnu_ext_disabled_roff_no_ref_word_regexp_exc_space() {
+    new_ucmd!()
+        .args(&["-G", "-R", "-W", "[^\t\n]+", "input"])
+        .succeeds()
+        .stdout_only_fixture("gnu_ext_disabled_roff_no_ref_word_regexp_exc_space.expected");
+}
+
 #[test]
 fn gnu_ext_disabled_roff_input_ref() {
     new_ucmd!()

tests/common/util.rs

@@ -261,6 +261,7 @@ impl AtPath {
     }
 
     pub fn write(&self, name: &str, contents: &str) {
+        log_info("open(write)", self.plus_as_string(name));
         let _ = std::fs::write(self.plus(name), contents);
     }
 

tests/fixtures/ptx/gnu_ext_disabled_roff_no_ref_word_regexp_exc_space.expected

@@ -0,0 +1,7 @@
+.xx "" "" """quotes"", for roff" ""
+.xx "" "" "and some other like %a, b#, c$c" ""
+.xx "" "" "hello world!" ""
+.xx "" "" "let's check special characters:" ""
+.xx "" "" "maybe also~or^" ""
+.xx "" "" "oh, and back\slash" ""
+.xx "" "" "{brackets} for tex" ""