summaryrefslogtreecommitdiffstats
path: root/src/args.rs
diff options
context:
space:
mode:
authorAndrew Gallant <jamslam@gmail.com>2018-02-01 21:11:02 -0500
committerAndrew Gallant <jamslam@gmail.com>2018-02-01 21:11:02 -0500
commite36b65a11a7fa72e4b43f89c71441884269f0522 (patch)
treea5689bc6178f6665e0c441bc7f2243f0fff49cf7 /src/args.rs
parent11ad7ab204f415d6e3af35b9e8c8907092857266 (diff)
windows: fix OneDrive traversals
This commit fixes a bug on Windows where directory traversals were completely broken when attempting to scan OneDrive directories that use the "file on demand" strategy. The specific problem was that Rust's standard library treats OneDrive directories as reparse points instead of directories, which causes methods like `FileType::is_file` and `FileType::is_dir` to always return false, even when retrieved via methods like `metadata` that purport to follow symbolic links. We fix this by peppering our code with checks on the underlying file attributes exposed by Windows. We consider an entry a directory if and only if the directory bit is set on the attributes. We are careful to make sure that the code remains the same on non-Windows platforms. Note that we also bump the dependency on `walkdir`, which contains a similar fix for its traversals. This bug is recorded upstream: https://github.com/rust-lang/rust/issues/46484 Upstream also has a pending PR: https://github.com/rust-lang/rust/pull/47956 Fixes #705
Diffstat (limited to 'src/args.rs')
-rw-r--r--src/args.rs47
1 files changed, 44 insertions, 3 deletions
diff --git a/src/args.rs b/src/args.rs
index 030adf0f..a0c1d7db 100644
--- a/src/args.rs
+++ b/src/args.rs
@@ -209,7 +209,7 @@ impl Args {
/// Returns true if there is exactly one file path given to search.
pub fn is_one_path(&self) -> bool {
self.paths.len() == 1
- && (self.paths[0] == Path::new("-") || self.paths[0].is_file())
+ && (self.paths[0] == Path::new("-") || path_is_file(&self.paths[0]))
}
/// Create a worker whose configuration is taken from the
@@ -562,7 +562,7 @@ impl<'a> ArgMatches<'a> {
self.is_present("with-filename")
|| self.is_present("vimgrep")
|| paths.len() > 1
- || paths.get(0).map_or(false, |p| p.is_dir())
+ || paths.get(0).map_or(false, |p| path_is_dir(p))
}
}
@@ -609,7 +609,7 @@ impl<'a> ArgMatches<'a> {
} else {
// If we're only searching a few paths and all of them are
// files, then memory maps are probably faster.
- paths.len() <= 10 && paths.iter().all(|p| p.is_file())
+ paths.len() <= 10 && paths.iter().all(|p| path_is_file(p))
})
}
@@ -1036,3 +1036,44 @@ fn stdin_is_readable() -> bool {
// always return true.
true
}
+
+/// Returns true if and only if this path points to a directory.
+///
+/// This works around a bug in Rust's standard library:
+/// https://github.com/rust-lang/rust/issues/46484
+#[cfg(windows)]
+fn path_is_dir(path: &Path) -> bool {
+ fs::metadata(path).map(|md| metadata_is_dir(&md)).unwrap_or(false)
+}
+
+/// Returns true if and only if this entry points to a directory.
+#[cfg(not(windows))]
+fn path_is_dir(path: &Path) -> bool {
+ path.is_dir()
+}
+
+/// Returns true if and only if this path points to a file.
+///
+/// This works around a bug in Rust's standard library:
+/// https://github.com/rust-lang/rust/issues/46484
+#[cfg(windows)]
+fn path_is_file(path: &Path) -> bool {
+ !path_is_dir(path)
+}
+
+/// Returns true if and only if this entry points to a directory.
+#[cfg(not(windows))]
+fn path_is_file(path: &Path) -> bool {
+ path.is_file()
+}
+
+/// Returns true if and only if the given metadata points to a directory.
+///
+/// This works around a bug in Rust's standard library:
+/// https://github.com/rust-lang/rust/issues/46484
+#[cfg(windows)]
+fn metadata_is_dir(md: &fs::Metadata) -> bool {
+ use std::os::windows::fs::MetadataExt;
+ use winapi::um::winnt::FILE_ATTRIBUTE_DIRECTORY;
+ md.file_attributes() & FILE_ATTRIBUTE_DIRECTORY != 0
+}