From 85a5f105e471aed55ca3f23d9d56f56f3cb6fd6b Mon Sep 17 00:00:00 2001
From: Doug MacEachern <dougm@hyperic.com>
Date: Fri, 2 Feb 2007 19:11:47 +0000
Subject: [PATCH] [SIGAR-40] Change win32 file_system_list to ignore removable
 disks

---
 ChangeLog                  |  5 ++++
 src/os/win32/win32_sigar.c | 52 ++++++++++++++++++++------------------
 2 files changed, 32 insertions(+), 25 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9d3a0cba..6c34e2df 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-02-02  Doug MacEachern  <dougm@hyperic.net>
+
+        * [SIGAR-40] Change win32 file_system_list to ignore removable disks
+          such as floppy, usb, etc.
+        
 2007-01-29  Doug MacEachern  <dougm@hyperic.com>
 
         * [SIGAR-38] Change win32 swap_get to use GlobalMemoryStatusEx
diff --git a/src/os/win32/win32_sigar.c b/src/os/win32/win32_sigar.c
index 05bc6ff6..a09d10df 100644
--- a/src/os/win32/win32_sigar.c
+++ b/src/os/win32/win32_sigar.c
@@ -1624,7 +1624,6 @@ int sigar_os_fs_type_get(sigar_file_system_t *fsp)
 SIGAR_DECLARE(int) sigar_file_system_list_get(sigar_t *sigar,
                                               sigar_file_system_list_t *fslist)
 {
-    sigar_file_system_t *fsp;
     char name[256];
     char *ptr = name;
     /* XXX: hmm, Find{First,Next}Volume not available in my sdk */
@@ -1637,18 +1636,40 @@ SIGAR_DECLARE(int) sigar_file_system_list_get(sigar_t *sigar,
     sigar_file_system_list_create(fslist);
 
     while (*ptr) {
+        sigar_file_system_t *fsp;
         DWORD flags, serialnum=0;
         char fsname[1024];
-        UINT type;
+        UINT drive_type = GetDriveType(ptr);
+        int type;
+
+        switch (drive_type) {
+          case DRIVE_FIXED:
+            type = SIGAR_FSTYPE_LOCAL_DISK;
+            break;
+          case DRIVE_REMOTE:
+            type = SIGAR_FSTYPE_NETWORK;
+            break;
+          case DRIVE_CDROM:
+            type = SIGAR_FSTYPE_CDROM;
+            break;
+          case DRIVE_RAMDISK:
+            type = SIGAR_FSTYPE_RAM_DISK;
+            break;
+          case DRIVE_REMOVABLE:
+            /* skip floppy, usb, etc. drives */
+            ptr += strlen(ptr)+1;
+            continue;
+          default:
+            type = SIGAR_FSTYPE_NONE;
+            break;
+        }
 
         fsname[0] = '\0';
 
         GetVolumeInformation(ptr, NULL, 0, &serialnum, NULL,
                              &flags, fsname, sizeof(fsname));
 
-        type = GetDriveType(ptr);
-
-        if (!serialnum && (type == DRIVE_FIXED)) {
+        if (!serialnum && (drive_type == DRIVE_FIXED)) {
             ptr += strlen(ptr)+1;
             continue; /* ignore unformatted partitions */
         }
@@ -1657,29 +1678,10 @@ SIGAR_DECLARE(int) sigar_file_system_list_get(sigar_t *sigar,
 
         fsp = &fslist->data[fslist->number++];
 
+        fsp->type = type;
         SIGAR_SSTRCPY(fsp->dir_name, ptr);
         SIGAR_SSTRCPY(fsp->dev_name, ptr);
 
-        switch (type) {
-          case DRIVE_FIXED:
-            fsp->type = SIGAR_FSTYPE_LOCAL_DISK;
-            break;
-          case DRIVE_REMOTE:
-            fsp->type = SIGAR_FSTYPE_NETWORK;
-            break;
-          case DRIVE_CDROM:
-            fsp->type = SIGAR_FSTYPE_CDROM;
-            break;
-          case DRIVE_RAMDISK:
-            fsp->type = SIGAR_FSTYPE_RAM_DISK;
-            break;
-          case DRIVE_REMOVABLE:
-            /* XXX */
-          default:
-            fsp->type = SIGAR_FSTYPE_NONE;
-            break;
-        }
-
         /* we set fsp->type, just looking up sigar.c:fstype_names[type] */
         sigar_fs_type_get(fsp);