fixed #1889, .DS_Store is no longer treated as key file

openethereum · Aug 9, 2016 · 51d6b9e · 51d6b9e
1 parent 73c19fd
commit 51d6b9e
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/ethstore/src/dir/disk.rs b/ethstore/src/dir/disk.rs
@@ -22,6 +22,8 @@ use ethkey::Address;
 use {json, SafeAccount, Error};
 use super::KeyDirectory;
 
+const IGNORED_FILES: &'static [&'static str] = &[".DS_Store"];
+
 #[cfg(not(windows))]
 fn restrict_permissions_to_owner(file_path: &Path) -> Result<(), i32>  {
 	use std::ffi;
@@ -62,7 +64,9 @@ impl DiskDirectory {
 			.flat_map(Result::ok)
 			.filter(|entry| {
 				let metadata = entry.metadata();
-				metadata.is_ok() && !metadata.unwrap().is_dir()
+				let file_name = entry.file_name();
+				metadata.is_ok() && !metadata.unwrap().is_dir() &&
+				!IGNORED_FILES.contains(&file_name.to_str().unwrap())
 			})
 			.map(|entry| entry.path())
 			.collect::<Vec<PathBuf>>();