bughz
/
sigar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[SIGAR-40] Change win32 file_system_list to ignore removable disks

This commit is contained in:
Doug MacEachern 2007-02-02 19:11:47 +00:00
parent 6742c80134
commit 85a5f105e4
2 changed files with 32 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -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> 2007-01-29 Doug MacEachern <dougm@hyperic.com>
* [SIGAR-38] Change win32 swap_get to use GlobalMemoryStatusEx * [SIGAR-38] Change win32 swap_get to use GlobalMemoryStatusEx

52
src/os/win32/win32_sigar.c
View File

@ -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_DECLARE(int) sigar_file_system_list_get(sigar_t *sigar,
sigar_file_system_list_t *fslist) sigar_file_system_list_t *fslist)
{ {
sigar_file_system_t *fsp;
char name[256]; char name[256];
char *ptr = name; char *ptr = name;
/* XXX: hmm, Find{First,Next}Volume not available in my sdk */ /* 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); sigar_file_system_list_create(fslist);
while (*ptr) { while (*ptr) {
sigar_file_system_t *fsp;
DWORD flags, serialnum=0; DWORD flags, serialnum=0;
char fsname[1024]; 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'; fsname[0] = '\0';
GetVolumeInformation(ptr, NULL, 0, &serialnum, NULL, GetVolumeInformation(ptr, NULL, 0, &serialnum, NULL,
&flags, fsname, sizeof(fsname)); &flags, fsname, sizeof(fsname));
type = GetDriveType(ptr); if (!serialnum && (drive_type == DRIVE_FIXED)) {
if (!serialnum && (type == DRIVE_FIXED)) {
ptr += strlen(ptr)+1; ptr += strlen(ptr)+1;
continue; /* ignore unformatted partitions */ 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 = &fslist->data[fslist->number++];
fsp->type = type;
SIGAR_SSTRCPY(fsp->dir_name, ptr); SIGAR_SSTRCPY(fsp->dir_name, ptr);
SIGAR_SSTRCPY(fsp->dev_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] */ /* we set fsp->type, just looking up sigar.c:fstype_names[type] */
sigar_fs_type_get(fsp); sigar_fs_type_get(fsp);