windows: handle filesystem info query errors for all fs types (fix #130)

Author: valpackett

src/platform/windows/disk.rs

@@ -1,14 +1,16 @@
 use winapi::ctypes::c_ulong;
 use winapi::shared::minwindef::FALSE;
-use winapi::um::fileapi::{GetDiskFreeSpaceExW, GetLogicalDriveStringsW, GetVolumeInformationW, GetDriveTypeW};
+use winapi::um::fileapi::{
+    GetDiskFreeSpaceExW, GetDriveTypeW, GetLogicalDriveStringsW, GetVolumeInformationW,
+};
 use winapi::um::winnt::ULARGE_INTEGER;
 
 use super::{last_os_error, u16_array_to_string};
 use crate::data::*;
 
 use std::char::{decode_utf16, REPLACEMENT_CHARACTER};
-use std::{io, ptr};
 use std::mem::MaybeUninit;
+use std::{io, ptr};
 
 pub fn drives() -> io::Result<Vec<Filesystem>> {
     let logical_drives = unsafe { GetLogicalDriveStringsW(0, ptr::null_mut()) };
@@ -48,7 +50,7 @@ pub fn drives() -> io::Result<Vec<Filesystem>> {
                 free: ByteSize::b(0),
                 files: 0,
                 files_total: 0,
-                files_avail: 0
+                files_avail: 0,
             }
         } else {
             let (total, avail, free) = get_disk_space_ext(us)?;
@@ -89,35 +91,35 @@ fn get_volume_information(name: &[u16]) -> io::Result<(c_ulong, String, String)>
     let mut max_component_length: c_ulong = 0;
     let mut fs_flags: c_ulong = 0;
 
-    if FALSE == unsafe {
-        GetVolumeInformationW(
-            p_name,
-            p_volume_name,
-            255,
-            p_volume_serial,
-            &mut max_component_length as *mut _,
-            &mut fs_flags as *mut _,
-            p_fs_name,
-            255,
-        )
-    } {
-        match unsafe { GetDriveTypeW(p_name) } {
-            2 => { // REMOVABLE DRIVE (Floppy, USB, etc)
-                return Ok((
-                    max_component_length,
-                    String::from("REM"),
-                    u16_array_to_string(p_volume_name)
-                ))
-            },
-            5 => { // DRIVE_CDROM
-                return Ok((
-                    max_component_length,
-                    String::from("CDROM"),
-                    u16_array_to_string(p_volume_name)
-                ))
-            },
-            _ => last_os_error()?
+    if FALSE
+        == unsafe {
+            GetVolumeInformationW(
+                p_name,
+                p_volume_name,
+                255,
+                p_volume_serial,
+                &mut max_component_length as *mut _,
+                &mut fs_flags as *mut _,
+                p_fs_name,
+                255,
+            )
+        }
+    {
+        // Let's not cause the entire query to fail due to just one filesystem..
+        let fs_name = match unsafe { GetDriveTypeW(p_name) } {
+            1 => "NO_ROOT_DIR",
+            2 => "REMOVABLE",
+            3 => "FIXED",
+            4 => "REMOTE",
+            5 => "CDROM",
+            6 => "RAMDISK",
+            _ => "UNKNOWN",
         };
+        return Ok((
+            max_component_length,
+            String::from(fs_name),
+            u16_array_to_string(p_volume_name),
+        ));
     }
 
     Ok((
@@ -134,14 +136,16 @@ fn get_disk_space_ext(name: &[u16]) -> io::Result<(u64, u64, u64)> {
     let mut total: MaybeUninit<ULARGE_INTEGER> = MaybeUninit::uninit();
     let mut free: MaybeUninit<ULARGE_INTEGER> = MaybeUninit::uninit();
 
-    if FALSE == unsafe {
-        GetDiskFreeSpaceExW(
-            p_name,
-            avail.as_mut_ptr(),
-            total.as_mut_ptr(),
-            free.as_mut_ptr(),
-        )
-    } {
+    if FALSE
+        == unsafe {
+            GetDiskFreeSpaceExW(
+                p_name,
+                avail.as_mut_ptr(),
+                total.as_mut_ptr(),
+                free.as_mut_ptr(),
+            )
+        }
+    {
         last_os_error()?;
     }