Fix tree permissions bug

ogham · ogham · commit f4ddbf384990 · 2017-07-04T17:48:30.000+01:00
There was a bug where if you tried to recurse into a directory you didn’t have permission to read the contents of, the error would be ignored.

It now displays the errors.
diff --git a/src/output/details.rs b/src/output/details.rs
@@ -209,8 +209,9 @@ impl<'a> Render<'a> {
 
                     if let Some(r) = self.recurse {
                         if file.is_directory() && r.tree && !r.is_too_deep(depth.0) {
-                            if let Ok(d) = file.to_dir(false) {
-                                dir = Some(d);
+                            match file.to_dir(false) {
+                                Ok(d)  => { dir = Some(d); },
+                                Err(e) => { errors.push((e, None)) },
                             }
                         }
                     };
diff --git a/xtests/attributes b/xtests/attributes
@@ -2,40 +2,49 @@
 [1;34md[33mr[31mw[32mx[0m[33mr[31mw[32mx[33mr[38;5;244m-[32mx[0m  [38;5;244m-[0m cassowary [34m 1 Jan 12:34[0m [38;5;244m├──[0m [1;34mdirs[0m
 [1;34md[33mr[31mw[32mx[0m[33mr[31mw[32mx[33mr[38;5;244m-[32mx[0m  [38;5;244m-[0m cassowary [34m 1 Jan 12:34[0m [38;5;244m│  ├──[0m [1;34mno-xattrs_empty[0m
 [1;34md[0m[38;5;244m---------[0m  [38;5;244m-[0m cassowary [34m 1 Jan 12:34[0m [38;5;244m│  ├──[0m [1;34mno-xattrs_empty_forbidden[0m
+                                     [38;5;244m│  │  └──[0m [31m<Permission denied (os error 13)>[0m
 [1;34md[33mr[31mw[32mx[0m[33mr[31mw[32mx[33mr[38;5;244m-[32mx[0m  [38;5;244m-[0m cassowary [34m 1 Jan 12:34[0m [38;5;244m│  ├──[0m [1;34mno-xattrs_one-file[0m
 .[1;33mr[31mw[0m[38;5;244m-[33mr[31mw[38;5;244m-[33mr[38;5;244m--[0m  [1;32m0[0m cassowary [34m 1 Jan 12:34[0m [38;5;244m│  │  └──[0m file-in-question
 [1;34md[0m[38;5;244m---------[0m  [38;5;244m-[0m cassowary [34m 1 Jan 12:34[0m [38;5;244m│  ├──[0m [1;34mno-xattrs_one-file_forbidden[0m
+                                     [38;5;244m│  │  └──[0m [31m<Permission denied (os error 13)>[0m
 [1;34md[33mr[31mw[32mx[0m[33mr[31mw[32mx[33mr[38;5;244m-[32mx[0m  [38;5;244m-[0m cassowary [34m 1 Jan 12:34[0m [38;5;244m│  ├──[0m [1;34mno-xattrs_two-files[0m
 .[1;33mr[31mw[0m[38;5;244m-[33mr[31mw[38;5;244m-[33mr[38;5;244m--[0m  [1;32m0[0m cassowary [34m 1 Jan 12:34[0m [38;5;244m│  │  ├──[0m that-file
 .[1;33mr[31mw[0m[38;5;244m-[33mr[31mw[38;5;244m-[33mr[38;5;244m--[0m  [1;32m0[0m cassowary [34m 1 Jan 12:34[0m [38;5;244m│  │  └──[0m this-file
 [1;34md[0m[38;5;244m---------[0m  [38;5;244m-[0m cassowary [34m 1 Jan 12:34[0m [38;5;244m│  ├──[0m [1;34mno-xattrs_two-files_forbidden[0m
+                                     [38;5;244m│  │  └──[0m [31m<Permission denied (os error 13)>[0m
 [1;34md[33mr[31mw[32mx[0m[33mr[31mw[32mx[33mr[38;5;244m-[32mx[0m@ [38;5;244m-[0m cassowary [34m 1 Jan 12:34[0m [38;5;244m│  ├──[0m [1;34mone-xattr_empty[0m
                                      [38;5;244m│  │  └──[0m user.greeting (len 5)
 [1;34md[0m[38;5;244m---------[0m  [38;5;244m-[0m cassowary [34m 1 Jan 12:34[0m [38;5;244m│  ├──[0m [1;34mone-xattr_empty_forbidden[0m
+                                     [38;5;244m│  │  └──[0m [31m<Permission denied (os error 13)>[0m
 [1;34md[33mr[31mw[32mx[0m[33mr[31mw[32mx[33mr[38;5;244m-[32mx[0m@ [38;5;244m-[0m cassowary [34m 1 Jan 12:34[0m [38;5;244m│  ├──[0m [1;34mone-xattr_one-file[0m
                                      [38;5;244m│  │  ├──[0m user.greeting (len 5)
 .[1;33mr[31mw[0m[38;5;244m-[33mr[31mw[38;5;244m-[33mr[38;5;244m--[0m  [1;32m0[0m cassowary [34m 1 Jan 12:34[0m [38;5;244m│  │  └──[0m file-in-question
 [1;34md[0m[38;5;244m---------[0m  [38;5;244m-[0m cassowary [34m 1 Jan 12:34[0m [38;5;244m│  ├──[0m [1;34mone-xattr_one-file_forbidden[0m
+                                     [38;5;244m│  │  └──[0m [31m<Permission denied (os error 13)>[0m
 [1;34md[33mr[31mw[32mx[0m[33mr[31mw[32mx[33mr[38;5;244m-[32mx[0m@ [38;5;244m-[0m cassowary [34m 1 Jan 12:34[0m [38;5;244m│  ├──[0m [1;34mone-xattr_two-files[0m
                                      [38;5;244m│  │  ├──[0m user.greeting (len 5)
 .[1;33mr[31mw[0m[38;5;244m-[33mr[31mw[38;5;244m-[33mr[38;5;244m--[0m  [1;32m0[0m cassowary [34m 1 Jan 12:34[0m [38;5;244m│  │  ├──[0m that-file
 .[1;33mr[31mw[0m[38;5;244m-[33mr[31mw[38;5;244m-[33mr[38;5;244m--[0m  [1;32m0[0m cassowary [34m 1 Jan 12:34[0m [38;5;244m│  │  └──[0m this-file
 [1;34md[0m[38;5;244m---------[0m  [38;5;244m-[0m cassowary [34m 1 Jan 12:34[0m [38;5;244m│  ├──[0m [1;34mone-xattr_two-files_forbidden[0m
+                                     [38;5;244m│  │  └──[0m [31m<Permission denied (os error 13)>[0m
 [1;34md[33mr[31mw[32mx[0m[33mr[31mw[32mx[33mr[38;5;244m-[32mx[0m@ [38;5;244m-[0m cassowary [34m 1 Jan 12:34[0m [38;5;244m│  ├──[0m [1;34mtwo-xattrs_empty[0m
                                      [38;5;244m│  │  ├──[0m user.greeting (len 5)
                                      [38;5;244m│  │  └──[0m user.another_greeting (len 2)
 [1;34md[0m[38;5;244m---------[0m  [38;5;244m-[0m cassowary [34m 1 Jan 12:34[0m [38;5;244m│  ├──[0m [1;34mtwo-xattrs_empty_forbidden[0m
+                                     [38;5;244m│  │  └──[0m [31m<Permission denied (os error 13)>[0m
 [1;34md[33mr[31mw[32mx[0m[33mr[31mw[32mx[33mr[38;5;244m-[32mx[0m@ [38;5;244m-[0m cassowary [34m 1 Jan 12:34[0m [38;5;244m│  ├──[0m [1;34mtwo-xattrs_one-file[0m
                                      [38;5;244m│  │  ├──[0m user.greeting (len 5)
                                      [38;5;244m│  │  ├──[0m user.another_greeting (len 2)
 .[1;33mr[31mw[0m[38;5;244m-[33mr[31mw[38;5;244m-[33mr[38;5;244m--[0m  [1;32m0[0m cassowary [34m 1 Jan 12:34[0m [38;5;244m│  │  └──[0m file-in-question
 [1;34md[0m[38;5;244m---------[0m  [38;5;244m-[0m cassowary [34m 1 Jan 12:34[0m [38;5;244m│  ├──[0m [1;34mtwo-xattrs_one-file_forbidden[0m
+                                     [38;5;244m│  │  └──[0m [31m<Permission denied (os error 13)>[0m
 [1;34md[33mr[31mw[32mx[0m[33mr[31mw[32mx[33mr[38;5;244m-[32mx[0m@ [38;5;244m-[0m cassowary [34m 1 Jan 12:34[0m [38;5;244m│  ├──[0m [1;34mtwo-xattrs_two-files[0m
                                      [38;5;244m│  │  ├──[0m user.greeting (len 5)
                                      [38;5;244m│  │  ├──[0m user.another_greeting (len 2)
 .[1;33mr[31mw[0m[38;5;244m-[33mr[31mw[38;5;244m-[33mr[38;5;244m--[0m  [1;32m0[0m cassowary [34m 1 Jan 12:34[0m [38;5;244m│  │  ├──[0m that-file
 .[1;33mr[31mw[0m[38;5;244m-[33mr[31mw[38;5;244m-[33mr[38;5;244m--[0m  [1;32m0[0m cassowary [34m 1 Jan 12:34[0m [38;5;244m│  │  └──[0m this-file
 [1;34md[0m[38;5;244m---------[0m  [38;5;244m-[0m cassowary [34m 1 Jan 12:34[0m [38;5;244m│  └──[0m [1;34mtwo-xattrs_two-files_forbidden[0m
+                                     [38;5;244m│     └──[0m [31m<Permission denied (os error 13)>[0m
 [1;34md[33mr[31mw[32mx[0m[33mr[31mw[32mx[33mr[38;5;244m-[32mx[0m  [38;5;244m-[0m cassowary [34m 1 Jan 12:34[0m [38;5;244m└──[0m [1;34mfiles[0m
 .[1;33mr[31mw[0m[38;5;244m-[33mr[31mw[38;5;244m-[33mr[38;5;244m--[0m  [1;32m0[0m cassowary [34m 1 Jan 12:34[0m [38;5;244m   ├──[0m no-xattrs
 .[38;5;244m---------[0m  [1;32m0[0m cassowary [34m 1 Jan 12:34[0m [38;5;244m   ├──[0m no-xattrs_forbidden

Original file line number	Diff line number	Diff line change
`@@ -209,8 +209,9 @@ impl<'a> Render<'a> {`
`209`	`209`
`210`	`210`	`if let Some(r) = self.recurse {`
`211`	`211`	`if file.is_directory() && r.tree && !r.is_too_deep(depth.0) {`
`212`		`- if let Ok(d) = file.to_dir(false) {`
`213`		`- dir = Some(d);`
	`212`	`+ match file.to_dir(false) {`
	`213`	`+ Ok(d) => { dir = Some(d); },`
	`214`	`+ Err(e) => { errors.push((e, None)) },`
`214`	`215`	`}`
`215`	`216`	`}`
`216`	`217`	`};`
-Original file line number
+Diff line change
 [1;34md[33mr[31mw[32mx[0m[33mr[31mw[32mx[33mr[38;5;244m-[32mx[0m  [38;5;244m-[0m cassowary [34m 1 Jan 12:34[0m [38;5;244m├──[0m [1;34mdirs[0m
 [1;34md[33mr[31mw[32mx[0m[33mr[31mw[32mx[33mr[38;5;244m-[32mx[0m  [38;5;244m-[0m cassowary [34m 1 Jan 12:34[0m [38;5;244m│  ├──[0m [1;34mno-xattrs_empty[0m
 [1;34md[0m[38;5;244m---------[0m  [38;5;244m-[0m cassowary [34m 1 Jan 12:34[0m [38;5;244m│  ├──[0m [1;34mno-xattrs_empty_forbidden[0m
 +                                     [38;5;244m│  │  └──[0m [31m<Permission denied (os error 13)>[0m
 [1;34md[33mr[31mw[32mx[0m[33mr[31mw[32mx[33mr[38;5;244m-[32mx[0m  [38;5;244m-[0m cassowary [34m 1 Jan 12:34[0m [38;5;244m│  ├──[0m [1;34mno-xattrs_one-file[0m
 .[1;33mr[31mw[0m[38;5;244m-[33mr[31mw[38;5;244m-[33mr[38;5;244m--[0m  [1;32m0[0m cassowary [34m 1 Jan 12:34[0m [38;5;244m│  │  └──[0m file-in-question
 [1;34md[0m[38;5;244m---------[0m  [38;5;244m-[0m cassowary [34m 1 Jan 12:34[0m [38;5;244m│  ├──[0m [1;34mno-xattrs_one-file_forbidden[0m
 +                                     [38;5;244m│  │  └──[0m [31m<Permission denied (os error 13)>[0m
 [1;34md[33mr[31mw[32mx[0m[33mr[31mw[32mx[33mr[38;5;244m-[32mx[0m  [38;5;244m-[0m cassowary [34m 1 Jan 12:34[0m [38;5;244m│  ├──[0m [1;34mno-xattrs_two-files[0m
 .[1;33mr[31mw[0m[38;5;244m-[33mr[31mw[38;5;244m-[33mr[38;5;244m--[0m  [1;32m0[0m cassowary [34m 1 Jan 12:34[0m [38;5;244m│  │  ├──[0m that-file
 .[1;33mr[31mw[0m[38;5;244m-[33mr[31mw[38;5;244m-[33mr[38;5;244m--[0m  [1;32m0[0m cassowary [34m 1 Jan 12:34[0m [38;5;244m│  │  └──[0m this-file
 [1;34md[0m[38;5;244m---------[0m  [38;5;244m-[0m cassowary [34m 1 Jan 12:34[0m [38;5;244m│  ├──[0m [1;34mno-xattrs_two-files_forbidden[0m
 +                                     [38;5;244m│  │  └──[0m [31m<Permission denied (os error 13)>[0m
 [1;34md[33mr[31mw[32mx[0m[33mr[31mw[32mx[33mr[38;5;244m-[32mx[0m@ [38;5;244m-[0m cassowary [34m 1 Jan 12:34[0m [38;5;244m│  ├──[0m [1;34mone-xattr_empty[0m
                                      [38;5;244m│  │  └──[0m user.greeting (len 5)
 [1;34md[0m[38;5;244m---------[0m  [38;5;244m-[0m cassowary [34m 1 Jan 12:34[0m [38;5;244m│  ├──[0m [1;34mone-xattr_empty_forbidden[0m
 +                                     [38;5;244m│  │  └──[0m [31m<Permission denied (os error 13)>[0m
 [1;34md[33mr[31mw[32mx[0m[33mr[31mw[32mx[33mr[38;5;244m-[32mx[0m@ [38;5;244m-[0m cassowary [34m 1 Jan 12:34[0m [38;5;244m│  ├──[0m [1;34mone-xattr_one-file[0m
                                      [38;5;244m│  │  ├──[0m user.greeting (len 5)
 .[1;33mr[31mw[0m[38;5;244m-[33mr[31mw[38;5;244m-[33mr[38;5;244m--[0m  [1;32m0[0m cassowary [34m 1 Jan 12:34[0m [38;5;244m│  │  └──[0m file-in-question
 [1;34md[0m[38;5;244m---------[0m  [38;5;244m-[0m cassowary [34m 1 Jan 12:34[0m [38;5;244m│  ├──[0m [1;34mone-xattr_one-file_forbidden[0m
 +                                     [38;5;244m│  │  └──[0m [31m<Permission denied (os error 13)>[0m
 [1;34md[33mr[31mw[32mx[0m[33mr[31mw[32mx[33mr[38;5;244m-[32mx[0m@ [38;5;244m-[0m cassowary [34m 1 Jan 12:34[0m [38;5;244m│  ├──[0m [1;34mone-xattr_two-files[0m
                                      [38;5;244m│  │  ├──[0m user.greeting (len 5)
 .[1;33mr[31mw[0m[38;5;244m-[33mr[31mw[38;5;244m-[33mr[38;5;244m--[0m  [1;32m0[0m cassowary [34m 1 Jan 12:34[0m [38;5;244m│  │  ├──[0m that-file
 .[1;33mr[31mw[0m[38;5;244m-[33mr[31mw[38;5;244m-[33mr[38;5;244m--[0m  [1;32m0[0m cassowary [34m 1 Jan 12:34[0m [38;5;244m│  │  └──[0m this-file
 [1;34md[0m[38;5;244m---------[0m  [38;5;244m-[0m cassowary [34m 1 Jan 12:34[0m [38;5;244m│  ├──[0m [1;34mone-xattr_two-files_forbidden[0m
 +                                     [38;5;244m│  │  └──[0m [31m<Permission denied (os error 13)>[0m
 [1;34md[33mr[31mw[32mx[0m[33mr[31mw[32mx[33mr[38;5;244m-[32mx[0m@ [38;5;244m-[0m cassowary [34m 1 Jan 12:34[0m [38;5;244m│  ├──[0m [1;34mtwo-xattrs_empty[0m
                                      [38;5;244m│  │  ├──[0m user.greeting (len 5)
                                      [38;5;244m│  │  └──[0m user.another_greeting (len 2)
 [1;34md[0m[38;5;244m---------[0m  [38;5;244m-[0m cassowary [34m 1 Jan 12:34[0m [38;5;244m│  ├──[0m [1;34mtwo-xattrs_empty_forbidden[0m
 +                                     [38;5;244m│  │  └──[0m [31m<Permission denied (os error 13)>[0m
 [1;34md[33mr[31mw[32mx[0m[33mr[31mw[32mx[33mr[38;5;244m-[32mx[0m@ [38;5;244m-[0m cassowary [34m 1 Jan 12:34[0m [38;5;244m│  ├──[0m [1;34mtwo-xattrs_one-file[0m
                                      [38;5;244m│  │  ├──[0m user.greeting (len 5)
                                      [38;5;244m│  │  ├──[0m user.another_greeting (len 2)
 .[1;33mr[31mw[0m[38;5;244m-[33mr[31mw[38;5;244m-[33mr[38;5;244m--[0m  [1;32m0[0m cassowary [34m 1 Jan 12:34[0m [38;5;244m│  │  └──[0m file-in-question
 [1;34md[0m[38;5;244m---------[0m  [38;5;244m-[0m cassowary [34m 1 Jan 12:34[0m [38;5;244m│  ├──[0m [1;34mtwo-xattrs_one-file_forbidden[0m
 +                                     [38;5;244m│  │  └──[0m [31m<Permission denied (os error 13)>[0m
 [1;34md[33mr[31mw[32mx[0m[33mr[31mw[32mx[33mr[38;5;244m-[32mx[0m@ [38;5;244m-[0m cassowary [34m 1 Jan 12:34[0m [38;5;244m│  ├──[0m [1;34mtwo-xattrs_two-files[0m
                                      [38;5;244m│  │  ├──[0m user.greeting (len 5)
                                      [38;5;244m│  │  ├──[0m user.another_greeting (len 2)
 .[1;33mr[31mw[0m[38;5;244m-[33mr[31mw[38;5;244m-[33mr[38;5;244m--[0m  [1;32m0[0m cassowary [34m 1 Jan 12:34[0m [38;5;244m│  │  ├──[0m that-file
 .[1;33mr[31mw[0m[38;5;244m-[33mr[31mw[38;5;244m-[33mr[38;5;244m--[0m  [1;32m0[0m cassowary [34m 1 Jan 12:34[0m [38;5;244m│  │  └──[0m this-file
 [1;34md[0m[38;5;244m---------[0m  [38;5;244m-[0m cassowary [34m 1 Jan 12:34[0m [38;5;244m│  └──[0m [1;34mtwo-xattrs_two-files_forbidden[0m
 +                                     [38;5;244m│     └──[0m [31m<Permission denied (os error 13)>[0m
 [1;34md[33mr[31mw[32mx[0m[33mr[31mw[32mx[33mr[38;5;244m-[32mx[0m  [38;5;244m-[0m cassowary [34m 1 Jan 12:34[0m [38;5;244m└──[0m [1;34mfiles[0m
 .[1;33mr[31mw[0m[38;5;244m-[33mr[31mw[38;5;244m-[33mr[38;5;244m--[0m  [1;32m0[0m cassowary [34m 1 Jan 12:34[0m [38;5;244m   ├──[0m no-xattrs
 .[38;5;244m---------[0m  [1;32m0[0m cassowary [34m 1 Jan 12:34[0m [38;5;244m   ├──[0m no-xattrs_forbidden