10139N/A/jds/bin/diff -uprN gnome-utils-2.26.0.old/baobab/src/baobab-utils.c gnome-utils-2.26.0/baobab/src/baobab-utils.c

10139N/A--- gnome-utils-2.26.0.old/baobab/src/baobab-utils.c 2009-03-19 15:18:55.422186000 +0000

10139N/A+++ gnome-utils-2.26.0/baobab/src/baobab-utils.c 2009-03-19 15:24:04.344024000 +0000

10139N/A@@ -43,36 +43,14 @@

10139N/A void

10139N/A baobab_get_filesystem (baobab_fs *fs)

10139N/A {

12353N/A- size_t i;

10139N/A- glibtop_mountlist mountlist;

17178N/A- glibtop_mountentry *mountentries;

17178N/A+ glibtop_fsusage fsusage;

17178N/A

10139N/A+ /* OpenSolaris using ZFS filesystem , just need to get slash usage stats */

10139N/A+ glibtop_get_fsusage (&fsusage, "/");

10139N/A memset (fs, 0, sizeof *fs);

12556N/A-

10139N/A- mountentries = glibtop_get_mountlist (&mountlist, FALSE);

10139N/A-

10139N/A- for (i = 0; i < mountlist.number; ++i) {

10139N/A- GFile *file;

10139N/A- glibtop_fsusage fsusage;

10139N/A-

10139N/A- file = g_file_new_for_path(mountentries[i].mountdir);

10139N/A-

10139N/A- if (baobab_is_excluded_location (file)){

10139N/A- g_object_unref(file);

10139N/A- continue;

10139N/A- }

10139N/A-

10139N/A- glibtop_get_fsusage (&fsusage, mountentries[i].mountdir);

10139N/A-

10139N/A- /* v.1.1.1 changed bavail with bfree) */

10139N/A- fs->total += fsusage.blocks * fsusage.block_size;

10139N/A- fs->avail += fsusage.bfree * fsusage.block_size;

10139N/A- fs->used += (fsusage.blocks - fsusage.bfree) * fsusage.block_size;

10139N/A- g_object_unref(file);

10139N/A-

10139N/A- }

10139N/A-

10139N/A- g_free (mountentries);

10139N/A+ fs->total = fsusage.blocks * fsusage.block_size;

10139N/A+ fs->avail = fsusage.bfree * fsusage.block_size;

10139N/A+ fs->used = (fsusage.blocks - fsusage.bfree) * fsusage.block_size;

10139N/A }

10139N/A

10139N/A void

10139N/A