--- projects/pystatgrab/_statgrab.pyx	2004/08/24 20:43:47	1.15
+++ projects/pystatgrab/_statgrab.pyx	2005/09/14 18:15:44	1.18
@@ -17,7 +17,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
-# $Id: _statgrab.pyx,v 1.15 2004/08/24 20:43:47 tdb Exp $
+# $Id: _statgrab.pyx,v 1.18 2005/09/14 18:15:44 ats Exp $
 #
 
 ctypedef long time_t
@@ -140,6 +140,13 @@ cdef extern from "statgrab.h":
         long long total_inodes
         long long used_inodes
         long long free_inodes
+        long long avail_inodes
+        long long io_size
+        long long block_size
+        long long total_blocks
+        long long free_blocks
+        long long used_blocks
+        long long avail_blocks
 
     cdef extern sg_fs_stats *sg_get_fs_stats(int *entries)
 
@@ -174,7 +181,7 @@ cdef extern from "statgrab.h":
     ctypedef struct sg_network_iface_stats:
         char *interface_name
         int speed
-        sg_iface_duplex dup
+        sg_iface_duplex duplex
         int up
 
     cdef extern sg_network_iface_stats *sg_get_network_iface_stats(int *entries)
@@ -448,6 +455,13 @@ def py_sg_get_fs_stats():
              'total_inodes': s.total_inodes,
              'used_inodes': s.used_inodes,
              'free_inodes': s.free_inodes,
+             'avail_inodes': s.avail_inodes,
+             'io_size': s.io_size,
+             'block_size': s.block_size,
+             'total_blocks': s.total_blocks,
+             'free_blocks': s.free_blocks,
+             'used_blocks': s.used_blocks,
+             'avail_blocks': s.avail_blocks,
             }
         ))
         s = s + 1
@@ -546,7 +560,7 @@ def py_sg_get_network_iface_stats():
         list.append(Result(
             {'interface_name': s.interface_name,
              'speed': s.speed,
-             'dup': s.dup,
+             'duplex': s.duplex,
              'up' : s.up,
             }
         ))
@@ -583,13 +597,17 @@ def py_sg_get_process_stats():
         raise StatgrabException, 'sg_get_process_stats() returned NULL'
     list = []
     for i from 0 <= i < entries:
-        if s.process_name == NULL:
-            s.process_name = ''
-        if s.proctitle == NULL:
-            s.proctitle = ''
+        if s.process_name is NULL:
+            process_name = ''
+        else:
+            process_name = s.process_name
+        if s.proctitle is NULL:
+            proctitle = ''
+        else:
+            proctitle = s.proctitle
         list.append(Result(
-            {'process_name': s.process_name,
-             'proctitle' : s.proctitle,
+            {'process_name': process_name,
+             'proctitle' : proctitle,
              'pid' : s.pid,
              'parent' : s.parent,
              'pgid' : s.pgid,