Merge pull request #244 from fox0/main

jgarzik · web-flow · commit cb88f8b0542d · 2024-09-23T09:09:09.000-04:00
[PATCH] df: fix work with type fuse.portal
diff --git a/fs/df.rs b/fs/df.rs
@@ -161,7 +161,8 @@ fn read_mount_info() -> io::Result<MountList> {
             let mut mount: libc::statfs = std::mem::zeroed();
             let rc = libc::statfs(dirname.as_ptr(), &mut mount);
             if rc < 0 {
-                return Err(io::Error::last_os_error());
+                eprintln!("{}: {}", dirname.to_str().unwrap(), io::Error::last_os_error());
+                continue;
             }
 
             info.push(&mount, devname, dirname);

Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,8 @@ fn read_mount_info() -> io::Result<MountList> {`
`161`	`161`	`let mut mount: libc::statfs = std::mem::zeroed();`
`162`	`162`	`let rc = libc::statfs(dirname.as_ptr(), &mut mount);`
`163`	`163`	`if rc < 0 {`
`164`		`- return Err(io::Error::last_os_error());`
	`164`	`+ eprintln!("{}: {}", dirname.to_str().unwrap(), io::Error::last_os_error());`
	`165`	`+ continue;`
`165`	`166`	`}`
`166`	`167`
`167`	`168`	`info.push(&mount, devname, dirname);`