uutils · sylvestre · Jan 23, 2022 · Jan 10, 2022
diff --git a/src/find/matchers/mod.rs b/src/find/matchers/mod.rs
@@ -116,7 +116,8 @@ pub fn build_top_level_matcher(
     if !top_level_matcher.has_side_effects() {
         let mut new_and_matcher = logical_matchers::AndMatcherBuilder::new();
         new_and_matcher.new_and_condition(top_level_matcher);
-        new_and_matcher.new_and_condition(printer::Printer::new_box());
+        new_and_matcher
+            .new_and_condition(printer::Printer::new_box(printer::PrintDelimiter::Newline));
         return Ok(new_and_matcher.build());
     }
     Ok(top_level_matcher)
@@ -206,7 +207,8 @@ fn build_matcher_tree(
     let mut invert_next_matcher = false;
     while i < args.len() {
         let possible_submatcher = match args[i] {
-            "-print" => Some(printer::Printer::new_box()),
+            "-print" => Some(printer::Printer::new_box(printer::PrintDelimiter::Newline)),
+            "-print0" => Some(printer::Printer::new_box(printer::PrintDelimiter::Null)),
             "-printf" => {
                 if i >= args.len() - 1 {
                     return Err(From::from(format!("missing argument to {}", args[i])));

diff --git a/src/find/matchers/printer.rs b/src/find/matchers/printer.rs
@@ -8,27 +8,46 @@ use walkdir::DirEntry;
 
 use super::{Matcher, MatcherIO};
 
+pub enum PrintDelimiter {
+    Newline,
+    Null,
+}
+
+impl std::fmt::Display for PrintDelimiter {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            PrintDelimiter::Newline => writeln!(f),
+            PrintDelimiter::Null => write!(f, "\0"),
+        }
+    }
+}
+
 /// This matcher just prints the name of the file to stdout.
-pub struct Printer;
+pub struct Printer {
+    delimiter: PrintDelimiter,
+}
 
 impl Printer {
-    pub fn new() -> Printer {
-        Printer {}
+    pub fn new(delimiter: PrintDelimiter) -> Printer {
+        Printer { delimiter }
     }
 
-    pub fn new_box() -> Box<dyn Matcher> {
-        Box::new(Printer::new())
+    pub fn new_box(delimiter: PrintDelimiter) -> Box<dyn Matcher> {
+        Box::new(Printer::new(delimiter))
     }
 }
 
 impl Matcher for Printer {
     fn matches(&self, file_info: &DirEntry, matcher_io: &mut MatcherIO) -> bool {
-        writeln!(
-            matcher_io.deps.get_output().borrow_mut(),
-            "{}",
-            file_info.path().to_string_lossy()
+        let mut out = matcher_io.deps.get_output().borrow_mut();
+        write!(
+            out,
+            "{}{}",
+            file_info.path().to_string_lossy(),
+            self.delimiter
         )
         .unwrap();
+        out.flush().unwrap();
         true
     }
 
@@ -47,15 +66,28 @@ mod tests {
     use crate::find::tests::FakeDependencies;
 
     #[test]
-    fn prints() {
+    fn prints_newline() {
         let abbbc = get_dir_entry_for("./test_data/simple", "abbbc");
 
-        let matcher = Printer::new();
+        let matcher = Printer::new(PrintDelimiter::Newline);
         let deps = FakeDependencies::new();
         assert!(matcher.matches(&abbbc, &mut deps.new_matcher_io()));
         assert_eq!(
             fix_up_slashes("./test_data/simple/abbbc\n"),
             deps.get_output_as_string()
         );
     }
+
+    #[test]
+    fn prints_null() {
+        let abbbc = get_dir_entry_for("./test_data/simple", "abbbc");
+
+        let matcher = Printer::new(PrintDelimiter::Null);
+        let deps = FakeDependencies::new();
+        assert!(matcher.matches(&abbbc, &mut deps.new_matcher_io()));
+        assert_eq!(
+            fix_up_slashes("./test_data/simple/abbbc\0"),
+            deps.get_output_as_string()
+        );
+    }
 }
diff --git a/src/find/mod.rs b/src/find/mod.rs
@@ -172,6 +172,7 @@ If no path is supplied then the current working directory is used by default.
 
 Early alpha implementation. Currently the only expressions supported are
  -print
+ -print0
  -printf
  -name case-sensitive_filename_pattern
  -iname case-insensitive_filename_pattern
-Original file line number
+Diff line change
@@ Expand Up @@
     Early alpha implementation. Currently the only expressions supported are
      -print
+     -print0
      -printf
      -name case-sensitive_filename_pattern
      -iname case-insensitive_filename_pattern
@@ Expand Down @@