Merge pull request #136 from refi64/xdev

sylvestre · web-flow · commit 78eba7efbc7f · 2022-01-27T09:15:25.000+01:00
Add support for -xdev
diff --git a/src/find/matchers/mod.rs b/src/find/matchers/mod.rs
@@ -400,6 +400,11 @@ fn build_matcher_tree(
                 config.depth_first = true;
                 None
             }
+            "-xdev" => {
+                // TODO add warning if it appears after actual testing criterion
+                config.same_file_system = true;
+                None
+            }
             "-sorted" => {
                 // TODO add warning if it appears after actual testing criterion
                 config.sorted_output = true;
diff --git a/src/find/mod.rs b/src/find/mod.rs
@@ -14,6 +14,7 @@ use std::time::SystemTime;
 use walkdir::WalkDir;
 
 pub struct Config {
+    same_file_system: bool,
     depth_first: bool,
     min_depth: usize,
     max_depth: usize,
@@ -25,6 +26,7 @@ pub struct Config {
 impl Default for Config {
     fn default() -> Config {
         Config {
+            same_file_system: false,
             depth_first: false,
             min_depth: 0,
             max_depth: usize::max_value(),
@@ -115,7 +117,8 @@ fn process_dir<'a>(
     let mut walkdir = WalkDir::new(dir)
         .contents_first(config.depth_first)
         .max_depth(config.max_depth)
-        .min_depth(config.min_depth);
+        .min_depth(config.min_depth)
+        .same_file_system(config.same_file_system);
     if config.sorted_output {
         walkdir = walkdir.sort_by(|a, b| a.file_name().cmp(b.file_name()));
     }
@@ -196,6 +199,7 @@ Early alpha implementation. Currently the only expressions supported are
  -maxdepth N
  -mindepth N
  -d[epth]
+ -xdev
  -ctime [+-]N
  -atime [+-]N
  -mtime [+-]N
