Updated.

* am.po:
	* ar.po:
	* az.po:
	* be.po:
	* bg.po:
	* bn.po:
	* ca.po:
	* cs.po:
	* cy.po:
	* da.po:
	* de.po:
	* el.po:
	* en_CA.po:
	* en_GB.po:
	* es.po:
	* et.po:
	* eu.po:
	* fa.po:
	* fi.po:
	* fr.po:
	* ga.po:
	* gl.po:
	* gu.po:
	* he.po:
	* hi.po:
	* hr.po:
	* hu.po:
	* id.po:
	* it.po:
	* ja.po:
	* ko.po:
	* lt.po:
	* lv.po:
	* mk.po:
	* ml.po:
	* mn.po:
	* ms.po:
	* nl.po:
	* nn.po:
	* no.po:
	* pa.po:
	* pl.po:
	* pt.po:
	* pt_BR.po:
	* ro.po:
	* ru.po:
	* sk.po:
	* sl.po:
	* sq.po:
	* sr.po:
	* sr@Latn.po:
	* sv.po:
	* ta.po:
	* tr.po:
	* uk.po:
	* vi.po:
	* zh_CN.po:
	* zh_TW.po: Updated.

.cvsignore

@@ -34,3 +34,8 @@ libgtop*.tar.gz
 *-debstamp
 libgtop*.pc
 autom4te.cache
+COPYING
+INSTALL
+install-sh
+missing
+mkinstalldirs

ChangeLog

@@ -1,3 +1,297 @@
+2004-06-13  Benoît Dejean  <tazforever@dlfp.org>
+
+	* configure.in: version 2.6.1
+
+2004-06-13  Benoît Dejean  <tazforever@dlfp.org>
+
+	* include/glibtop/sysinfo.h: Changed get_sysinfo prototype so that it
+	returns a const pointer. Added missing macro.
+
+2004-06-12  Benoît Dejean  <tazforever@dlfp.org>
+
+	* include/glibtop/fsusage.h: block_size is now defined as a guint32
+	instead of a fuzzy gint.
+	
+	* lib/sysdeps.c: (glibtop_get_sysdeps_r): Small cleanup.
+
+2004-06-12  Benoît Dejean  <tazforever@dlfp.org>
+
+	* lib/init.c: Added missing initializer.
+
+2004-06-09  Benoît Dejean <TazForEver@dlfp.org>
+
+	* *.{c,h} : whitespace clean up.
+
+2004-06-07  Benoît Dejean  <tazforever@dlfp.org>
+
+	* lib/parameter.c:
+	* support/popt.c: (poptGetContext): Cleaned.
+	
+	* support/vsnprintf.c: s/strncpy/g_strlcpy
+
+2004-05-28  Benoît Dejean <TazForEver@free.fr>
+
+	* examples/*: Added missing #include.
+	* ChangeLog: Converted to UTF-8.
+
+2004-04-16  Iñaki Larrañaga  <dooteo@euskalgnu.org>
+
+	* configure.in: Added "eu" (Basque) to ALL_LINGUAS.
+
+2004-04-09  Guntupalli Karunakar  <karunakar@freedomink.org>
+
+        * configure.in: Added "gu" (Gujarati) to ALL_LINGUAS.
+
+2004-04-07  Bastien Nocera  <hadess@hadess.net>
+
+	* configure.in: version 2.6.0
+
+2004-04-07  Bastien Nocera  <hadess@hadess.net>
+
+	* include/glibtop/fsusage.h: fix typo in the #defines for
+	FSUSAGE_BLOCK_SIZE (patch by Benoît Dejean <TazForEver@free.fr>)
+
+2004-03-30  Adam Weinberger  <adamw@gnome.org>
+
+	* configure.in: Added en_CA (Canadian English) to ALL_LINGUAS.
+
+2004-03-22  Gareth Owen  <gowen72@yahoo.com>
+
+	* configure.in: Added en_GB to ALL_LINGUAS
+
+2004-03-22  Guntupalli Karunakar  <karunakar@freedomink.org>
+
+        * configure.in: Added "pa" (Punjabi) to ALL_LINGUAS.
+
+2004-03-15  Bastien Nocera  <hadess@hadess.net>
+
+	* include/glibtop/fsusage.h: set GLIBTOP_MAX_FSUSAGE properly,
+	use gint in the headers instead of int (Closes: #125049)
+
+2004-03-11  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* configure.in: Up versions etc.
+	* po/am.po: Update foo.
+	* po/ar.po:
+	* po/az.po:
+	* po/be.po:
+	* po/bg.po:
+	* po/bn.po:
+	* po/ca.po:
+	* po/cs.po:
+	* po/cy.po:
+	* po/da.po:
+	* po/de.po:
+	* po/el.po:
+	* po/es.po:
+	* po/et.po:
+	* po/fa.po:
+	* po/fi.po:
+	* po/fr.po:
+	* po/ga.po:
+	* po/gl.po:
+	* po/he.po:
+	* po/hi.po:
+	* po/hr.po:
+	* po/hu.po:
+	* po/id.po:
+	* po/it.po:
+	* po/ja.po:
+	* po/ko.po:
+	* po/lt.po:
+	* po/lv.po:
+	* po/mk.po:
+	* po/ml.po:
+	* po/mn.po:
+	* po/ms.po:
+	* po/nl.po:
+	* po/nn.po:
+	* po/no.po:
+	* po/pl.po:
+	* po/pt.po:
+	* po/pt_BR.po:
+	* po/ro.po:
+	* po/ru.po:
+	* po/sk.po:
+	* po/sl.po:
+	* po/sq.po:
+	* po/sr.po:
+	* po/sr@Latn.po:
+	* po/sv.po:
+	* po/ta.po:
+	* po/tr.po:
+	* po/uk.po:
+	* po/vi.po:
+	* po/zh_CN.po:
+	* po/zh_TW.po:
+
+2004-03-11  Bastien Nocera  <hadess@hadess.net>
+
+	* NEWS: update the NEWS file for the release
+
+2004-03-11  Bastien Nocera  <hadess@hadess.net>
+
+	* include/Makefile.am: fix distchecking
+
+2003-12-27  Ole Laursen  <olau@hardworking.dk>
+
+	* include/glibtop/fsusage.h: Added block_size field. (Closes: #125049)
+
+2004-03-05  Bastien Nocera  <hadess@hadess.net>
+
+	* include/glibtop/procmap.h: patch by Benoit Dejean <bnet@ifrance.com>
+	to break the API, I mean, to make it easier to generate Python bindings
+	(Closes: #129701)
+
+2004-03-04  Bastien Nocera  <hadess@hadess.net>
+
+	* configure.in:
+	* include/libgtop-i18n.h:
+	* lib/lib.pl:
+	* lib/read.c:
+	* lib/read_data.c:
+	* lib/write.c:
+	* sysdeps/names/cpu.c:
+	* sysdeps/names/fsusage.c:
+	* sysdeps/names/loadavg.c:
+	* sysdeps/names/mem.c:
+	* sysdeps/names/mountlist.c:
+	* sysdeps/names/msg_limits.c:
+	* sysdeps/names/netload.c:
+	* sysdeps/names/ppp.c:
+	* sysdeps/names/procargs.c:
+	* sysdeps/names/prockernel.c:
+	* sysdeps/names/proclist.c:
+	* sysdeps/names/procmap.c:
+	* sysdeps/names/procmem.c:
+	* sysdeps/names/procsegment.c:
+	* sysdeps/names/procsignal.c:
+	* sysdeps/names/procstate.c:
+	* sysdeps/names/proctime.c:
+	* sysdeps/names/procuid.c:
+	* sysdeps/names/sem_limits.c:
+	* sysdeps/names/shm_limits.c:
+	* sysdeps/names/swap.c:
+	* sysdeps/names/sysdeps.c:
+	* sysdeps/names/uptime.c: remove dependency on libgnome,
+	check for linux/isdn.h for distros using the 2.6 kernel headers
+
+2004-02-07  Kevin Vandersloot
+
+	* configure.in: release 2.5.1
+
+2004-02-02  Sebastien Bacher  <seb128@debian.org>
+
+	* sysdeps/linux/mem.c: (glibtop_get_mem_s): patch from 
+	Benoît Dejean <bnet@ifrance.com> to fix libtop_mem.used 
+	and glibtop_mem.shared values (Closes: #129863).
+
+Wed Jan  7 02:23:28 2004  Jonathan Blandford  <jrb@gnome.org>
+
+	* libgtop-2.0.pc.in: Should be -lgtop-2.0, #130506
+
+2004-01-05  Frederic Crozat  <fcrozat@mandrakesoft.com>
+
+	* libgtop.spec.in: License is GPL, not LGPL.
+
+2004-01-05  Malcolm Tredinnick <malcolm@commsecure.com.au>
+
+	* libgtop-2.0.pc.in: Include -lgtop in the linking flags.
+	Bug #130506.
+
+2004-01-03  Robert Sedak  <robert.sedak@sk.htnet.hr>
+
+        * configure.in: Added "hr" in ALL_LINGUAS.
+
+2003-12-22  Bastien Nocera  <hadess@hadess.net>
+
+	* acinclude.m4:
+	* configure.in: remove linking to libgtop and checks for 64-bit
+	integer bytes (fixes warning on build on glib 2.0 systems)
+
+2003-11-02  Ćœygimantas Beručka  <uid0@tuxfamily.org>
+
+	* configure.in: Added "lt" to ALL_LINGUAS.
+
+2003-10-21  Bastien Nocera  <hadess@hadess.net>
+
+	* Makefile.am:
+	* configure.in:
+	* src/inodedb/.cvsignore:
+	* sysdeps/names/Makefile.am:
+	install only one library, libgtop-2.0
+	Fix build-time warnings due to the redefinition of guint64
+
+2003-10-20  Bastien Nocera  <hadess@hadess.net>
+
+	* lib/read.c: (glibtop_read_l):
+	* lib/read_data.c: (glibtop_read_data_l):
+	* lib/write.c: (glibtop_write_l): apply patch for ngettext support
+	by Christian Neumair <chris@gnome-de.org>
+
+2003-10-20  Bastien Nocera  <hadess@hadess.net>
+
+	* include/glibtop/cpu.h:
+	* include/glibtop/procstate.h:
+	* include/glibtop/procuid.h:
+	* include/glibtop/uptime.h:
+	* lib/sysdeps.c:
+	* sysdeps/names/cpu.c:
+	* sysdeps/names/procstate.c:
+	* sysdeps/names/procuid.c:
+	* sysdeps/names/uptime.c: Apply patch by the_h1ghlander@yahoo.com and
+	Cory Omand <cory.omand@Sun.com> for Solaris support
+
+2003-10-20  Bastien Nocera  <hadess@hadess.net>
+
+	* src/inodedb/Makefile.am: link to libgtop_suid_common-2.0.la
+	(Closes: #107990)
+
+2003-10-20  Bastien Nocera  <hadess@hadess.net>
+
+	* acconfig.h:
+	* acinclude.m4:
+	* include/glibtop/array.h:
+	* include/glibtop/command.h:
+	* include/glibtop/cpu.h:
+	* include/glibtop/fsusage.h:
+	* include/glibtop/glibtop-backend-info.h:
+	* include/glibtop/glibtop-backend.h:
+	* include/glibtop/glibtop-client.h:
+	* include/glibtop/inodedb.h:
+	* include/glibtop/interfaces.h:
+	* include/glibtop/limits.h:
+	* include/glibtop/loadavg.h:
+	* include/glibtop/mem.h:
+	* include/glibtop/mountlist.h:
+	* include/glibtop/msg_limits.h:
+	* include/glibtop/netinfo.h:
+	* include/glibtop/netload.h:
+	* include/glibtop/ppp.h:
+	* include/glibtop/procargs.h:
+	* include/glibtop/proccwd.h:
+	* include/glibtop/prockernel.h:
+	* include/glibtop/proclist.h:
+	* include/glibtop/procmap.h:
+	* include/glibtop/procmem.h:
+	* include/glibtop/procsegment.h:
+	* include/glibtop/procsignal.h:
+	* include/glibtop/procstate.h:
+	* include/glibtop/proctime.h:
+	* include/glibtop/procuid.h:
+	* include/glibtop/sem_limits.h:
+	* include/glibtop/shm_limits.h:
+	* include/glibtop/swap.h:
+	* include/glibtop/sysdeps.h:
+	* include/glibtop/sysinfo.h:
+	* include/glibtop/uptime.h:
+	* lib/glibtop-backend.c: (glibtop_backend_get):
+	* lib/glibtop-client.c: (glibtop_client_open_backend):
+	* lib/inodedb.c: (glibtop_inodedb_lookup_s):
+	* lib/lib.pl:
+	* src/inodedb/README.inodedb:
+	* src/inodedb/mkinodedb2.c: (main): s/u_int64_t/guint64/
+
 2003-10-20  Bastien Nocera  <hadess@hadess.net>
 
 	* Makefile.am: fix distchecking, release 2.5.0
@@ -134,13 +428,13 @@
 
 	* configure.in: make it compile
 
-2003-10-19  Carlos Perelló Marín <carlos@gnome.org>
+2003-10-19  Carlos PerellĂł MarĂ­n <carlos@gnome.org>
 
 	* support/*: Reverted libgtop changes. It's a common module
 	and I should not modify it.
 	* Added/removed files. Now the move should be done.
 
-2003-10-19  Carlos Perelló Marín <carlos@gnome.org>
+2003-10-19  Carlos PerellĂł MarĂ­n <carlos@gnome.org>
 
 	* libgtop-GNOME-2-0-branch moved to HEAD.
 
@@ -152,7 +446,7 @@
 
 	* configure.in: Added "ta" (Tamil) to the languages' list.
 
-2003-09-13  Carlos Perelló Marín <carlos@gnome.org>
+2003-09-13  Carlos PerellĂł MarĂ­n <carlos@gnome.org>
 
 	* configure.in (ALL_LINGUAS):  Removed es_ES.
 
@@ -205,7 +499,7 @@
 
 	* configure.in: release 2.0.2
 
-2003-05-10  Danilo Šegan  <dsegan@gmx.net>
+2003-05-10  Danilo Ć egan  <dsegan@gmx.net>
 
 	* configure.in: Added "sr" and "sr@Latn" to ALL_LINGUAS.
 
@@ -225,7 +519,7 @@
 
 	* configure.in: Added he to ALL_LINGUAS.
 
-2003-02-25  T?µivo Leedj?¤rv  <toivo@linux.ee>
+2003-02-25  T?”ivo Leedj?€rv  <toivo@linux.ee>
 
 	* configure.in: Added et to ALL_LINGUAS.
 
@@ -929,7 +1223,7 @@
 1998-10-20  Martin Baulig  <martin@home-of-linux.org>
 
 	* include/glibtop/proc_signal.h: Use a 2-element-array of
-	type `u_int64_t' for all signal masks instead of just
+	type `guint64' for all signal masks instead of just
 	scalar numbers. This avoids problems on systems with more
 	than 64 signals.
 
@@ -939,7 +1233,7 @@
 
 	[NOTE for people porting libgtop:
 	
- 	 Please use all 64 bits of the `u_int64_t' and not just 32 - the
+ 	 Please use all 64 bits of the `guint64' and not just 32 - the
 	 signal number (as it is used in calls to kill () ...) should be
 	 a bit-index into this field; if a process ignores for instance
 	 signal 64, it has the 0-bit of sigcatch[1] set, if it ignores 63,
@@ -1280,14 +1574,14 @@
 
 1998-07-30  Martin Baulig  <martin@home-of-linux.org>
 
-	* acconfig.h (u_int64_t, int64_t): Added.
+	* acconfig.h (guint64, int64_t): Added.
 
 	* lib/lib.awk: Using correct `(1 << GLIBTOP_SYSDEPS_<feature>)'
 	in call to `glibtop_init_r'.
 
 	* configure.in (GNOME_LIBGTOP_TYPES): New check.
 
-	* include/glibtop/*.h: Using `u_int64_t' instead of `unsigned long'
+	* include/glibtop/*.h: Using `guint64' instead of `unsigned long'
 	and `long' to avoid problems when client is on a 32bit system and
 	the server on a 64bit system.
 

Makefile.am

@@ -1,13 +1,5 @@
-## Process this file with automake to produce Makefile.in.
 
-if EXAMPLES
-examples_SUBDIRS = examples
-else
-examples_SUBDIRS =
-endif
-
-SUBDIRS = . po misc include sysdeps lib src \
-	  $(examples_SUBDIRS) doc
+SUBDIRS = po misc include sysdeps lib src examples doc
 
 libgtopinclude_HEADERS = glibtop.h
 libgtopincludedir = $(includedir)/libgtop-2.0
@@ -20,9 +12,6 @@ EXTRA_DIST = autogen.sh libgtop.spec.in copyright.txt \
 dist-hook:
 	cp libgtop.spec $(distdir)
 
-release:
-	$(MAKE) dist distdir=$(PACKAGE)-$(VERSION)
-
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libgtop-2.0.pc
 

NEWS

@@ -1,3 +1,32 @@
+July 11, 2004:
+==============
+
+* Released LibGTop 2.6.1
+
+  - code cleanups.
+  
+  - glibtop_mountlist()'s all_fs parameter now works.
+  
+  - glibtop_uptime.boot_time is set on every arch.
+  
+  - linux SMP support is fixed.
+  
+  - Replaced unsafe strcpy by g_strlcpy.
+
+March 11, 2004:
+===============
+
+* Released LibGTop 2.5.99 "Gross Work", dedicated to people who do push-ups
+  in the loos.
+
+  - plenty of code cleanups
+
+  - removed the dependency on libgnome, only glib required now
+
+  - Linux 2.6 support, NetBSD support and better FreeBSD support
+
+  - Make the block size available for filesystem statistics
+
 February 27, 2001:
 =================
 

acconfig.h

@@ -126,7 +126,7 @@
 #undef HAVE_GUILE
 
 #undef ssize_t
-#undef u_int64_t
+#undef guint64
 #undef int64_t
 
 #undef HAVE_GLIBTOP_MACHINE_H

acinclude.m4

@@ -43,8 +43,6 @@ dnl
 AC_DEFUN([GNOME_LIBGTOP_TYPES],
 [
         AC_CHECK_HEADERS(sys/bitypes.h)
-        AC_LIBGTOP_CHECK_TYPE(u_int64_t, unsigned long long int)
-        AC_LIBGTOP_CHECK_TYPE(int64_t, signed long long int)
 ])
 
 dnl See whether we need a declaration for a function.

backends/common/ChangeLog

@@ -1,3 +1,7 @@
+2003-10-20  Bastien Nocera  <hadess@hadess.net>
+
+	* backend-common.c: (_open_common): s/u_int64_t/guint64/
+
 2003-10-20  Bastien Nocera  <hadess@hadess.net>
 
 	* backend-common.h: fixed compilation

backends/common/backend-common.c

@@ -26,7 +26,7 @@
 #include <backend-common.h>
 
 static int
-_open_common (glibtop_server *, glibtop_backend *, u_int64_t, const char **);
+_open_common (glibtop_server *, glibtop_backend *, guint64, const char **);
 
 static int
 _close_common (glibtop_server *, glibtop_backend *, void *closure);
@@ -47,7 +47,7 @@ glibtop_backend_info LibGTopBackendInfo_Common = {
 
 static int
 _open_common (glibtop_server *server, glibtop_backend *backend,
-	      u_int64_t features, const char **backend_args)
+	      guint64 features, const char **backend_args)
 {
     return 0;
 }

backends/server/ChangeLog

@@ -1,3 +1,18 @@
+2004-03-09  Bastien Nocera  <hadess@hadess.net>
+
+	* command.c: (glibtop_call_i):
+	* demarshal.pl:
+	* marshal.pl:
+	* read_data.c: (glibtop_read_data_i):
+	* server.c: (handle_slave_connection): fix g_malloc usage on non-Linux
+	platforms (patch by Benoit Dejean <bnet@ifrance.com>)
+
+2003-10-20  Bastien Nocera  <hadess@hadess.net>
+
+	* backend-server.c: (_open_server):
+	* backend-server.h:
+	* command.h.in: s/u_int64_t/guint64/
+
 2003-10-20  Bastien Nocera  <hadess@hadess.net>
 
 	* backend-server.h:

backends/server/backend-server.c

@@ -26,7 +26,7 @@
 #include <backend-server.h>
 
 static int
-_open_server (glibtop_server *, glibtop_backend *, u_int64_t, const char **);
+_open_server (glibtop_server *, glibtop_backend *, guint64, const char **);
 
 static int
 _close_server (glibtop_server *, glibtop_backend *, void *);
@@ -47,7 +47,7 @@ glibtop_backend_info LibGTopBackendInfo_Server = {
 
 static int
 _open_server (glibtop_server *server, glibtop_backend *backend,
-	      u_int64_t features, const char **backend_args)
+	      guint64 features, const char **backend_args)
 {
     backend_server_private *priv;
 

backends/server/backend-server.h

@@ -37,7 +37,7 @@ typedef struct _backend_server_private backend_server_private;
 
 struct _backend_server_private
 {
-    u_int64_t flags;
+    guint64 flags;
     int input [2];		/* Pipe client <- server */
     int output [2];		/* Pipe client -> server */
     pid_t pid;			/* PID of the server */

backends/server/command.c

@@ -57,7 +57,7 @@ glibtop_call_i (glibtop_server *server, backend_server_private *priv,
     }
 
     cmnd.data_size = data_size;
-	
+
     glibtop_write_i (priv, sizeof (glibtop_command), &cmnd);
 
     if (data_size) {
@@ -75,7 +75,7 @@ glibtop_call_i (glibtop_server *server, backend_server_private *priv,
 	     (long) resp.recv_size, (long) resp.data_size,
 	     recv_ptr, (long) recv_size);
 #endif
-    
+
     if (retval_ptr)
 	*retval_ptr = resp.glibtop_errno;
 
@@ -89,7 +89,7 @@ glibtop_call_i (glibtop_server *server, backend_server_private *priv,
 	glibtop_read_i (priv, recv_size, recv_ptr);
 
     if (resp.data_size) {
-	void *ptr = g_malloc (server, resp.data_size);
+	void *ptr = g_malloc (resp.data_size);
 
 	glibtop_read_i (priv, resp.data_size, ptr);
 

backends/server/command.h.in

@@ -42,8 +42,8 @@ typedef struct _glibtop_response	glibtop_response;
 
 struct _glibtop_command
 {
-    u_int64_t	command;
-    u_int64_t	param_size, send_size, data_size;
+    guint64	command;
+    guint64	param_size, send_size, data_size;
     char	parameter [_GLIBTOP_PARAM_SIZE];
 };
 
@@ -51,7 +51,7 @@ struct _glibtop_response
 {
     int retval;
     int glibtop_errno;
-    u_int64_t recv_size, data_size;
+    guint64 recv_size, data_size;
 };
 
 G_END_DECLS

backends/server/demarshal.pl

@@ -246,7 +246,7 @@ sub output {
   if ($line_fields[3] eq '') {
     $size_code .= "\t_LIBGTOP_RECV_buf = NULL;\n";
   } else {
-    $size_code .= "\t_LIBGTOP_RECV_buf = g_malloc (server, _LIBGTOP_RECV_len);\n";
+    $size_code .= "\t_LIBGTOP_RECV_buf = g_malloc (_LIBGTOP_RECV_len);\n";
   }
   $size_code .= "\t_LIBGTOP_RECV_ptr = _LIBGTOP_RECV_buf;\n\n";
 
@@ -298,7 +298,7 @@ sub output {
     $recv_buf_code .= "\n";
     $recv_buf_code .= "\t_LIBGTOP_TEMP_len += sizeof (off_t) + 1;\n";
     $recv_buf_code .= "\t_LIBGTOP_TEMP_len += array.number * sizeof (off_t);\n";
-    $recv_buf_code .= "\t_LIBGTOP_ARRAY_base = g_malloc (server, _LIBGTOP_TEMP_len);";
+    $recv_buf_code .= "\t_LIBGTOP_ARRAY_base = g_malloc (_LIBGTOP_TEMP_len);";
     $recv_buf_code .= "\t_LIBGTOP_ARRAY_ptr = _LIBGTOP_ARRAY_base;\n";
     $recv_buf_code .= "\t_LIBGTOP_ARRAY_offset = array.number * sizeof (off_t);\n";
     $recv_buf_code .= "\t_LIBGTOP_ARRAY_offset += sizeof (off_t);\n";

backends/server/marshal.pl

@@ -181,7 +181,7 @@ sub output {
     $send_buf_code = "\t/* send buffer */\n";
     $send_buf_code .= "\t_LIBGTOP_SEND_buf = ";
     if ($need_temp_storage) {
-      $send_buf_code .= "g_malloc (server, _LIBGTOP_SEND_len+1)";
+      $send_buf_code .= "g_malloc (_LIBGTOP_SEND_len+1)";
     } else {
       $send_buf_code .= '(void *) &'.$first_param_name;
     }
@@ -190,7 +190,7 @@ sub output {
     $send_buf_code .= "\t/* data buffer */\n";
     $send_buf_code .= "\t_LIBGTOP_DATA_buf = ";
     if ($need_temp_storage) {
-      $send_buf_code .= "g_malloc (server, _LIBGTOP_DATA_len+1)";
+      $send_buf_code .= "g_malloc (_LIBGTOP_DATA_len+1)";
     } else {
       $send_buf_code .= 'NULL';
     }
@@ -231,7 +231,7 @@ sub output {
       $local_var_code .= "\tchar *_LIBGTOP_ARRAY_ptr, **ptrlist;\n";
       $local_var_code .= "\toff_t *_LIBGTOP_ARRAY_off_ptr;\n";
       $local_var_code .= "\tint i;\n";
-      $call_code .= "\tptrlist = g_malloc (server, array->number+1 * sizeof (char *));\n";
+      $call_code .= "\tptrlist = g_malloc (array->number+1 * sizeof (char *));\n";
       $call_code .= "\t_LIBGTOP_ARRAY_off_ptr = (off_t *) retval;\n";
       $call_code .= "\t_LIBGTOP_ARRAY_ptr = (char *) retval;\n";
       $call_code .= "\t_LIBGTOP_ARRAY_off_ptr++;\n\n";

backends/server/read_data.c

@@ -45,10 +45,10 @@ glibtop_read_data_i (backend_server_private *priv)
     fprintf (stderr, "LIBRARY: really reading %d data bytes (ret = %d).\n", size, ret);
 #endif
 
-    if (!size) return NULL;	
+    if (!size) return NULL;
+
+    ptr = g_malloc (size);
 
-    ptr = g_malloc (priv->server, size);
-	
     ret = read (priv->input [0], ptr, size);
 
     if (ret < 0)

backends/server/server.c

@@ -86,7 +86,7 @@ main(int argc, char *argv[])
     }
 
     server = glibtop_global_server;
-	
+
     if (!server->_priv)
 	server->_priv = g_malloc (sizeof (glibtop_server_private));
 
@@ -155,7 +155,7 @@ handle_slave_connection (int input, int output)
 		     cmnd->data_size);
 #endif
 
-	    data_ptr = g_malloc (server, cmnd->data_size);
+	    data_ptr = g_malloc (cmnd->data_size);
 	    do_read (input, data_ptr, cmnd->data_size);
 	}
 
@@ -185,5 +185,5 @@ handle_slave_connection (int input, int output)
 	resp.data_size = recv_data_size;
 
 	do_output (output, &resp, recv_ptr, recv_data_ptr);
-    }		
+    }
 }

backends/server/version.c

@@ -37,7 +37,7 @@ glibtop_send_version_i (glibtop *server, int fd)
 	     sizeof (glibtop_response),
 	     sizeof (glibtop_union),
 	     sizeof (glibtop_sysdeps));
-	
+
     size = strlen (buffer) + 1;
 
 #ifdef DEBUG

backends/sysdeps/ChangeLog

@@ -1,3 +1,7 @@
+2003-10-20  Bastien Nocera  <hadess@hadess.net>
+
+	* backend-sysdeps.c: (_open_sysdeps): s/u_int64_t/guint64/
+
 2003-10-20  Bastien Nocera  <hadess@hadess.net>
 
 	* backend-sysdeps.h: fixed compilation

backends/sysdeps/backend-sysdeps.c

@@ -26,7 +26,7 @@
 #include <backend-sysdeps.h>
 
 static int
-_open_sysdeps (glibtop_server *, glibtop_backend *, u_int64_t, const char **);
+_open_sysdeps (glibtop_server *, glibtop_backend *, guint64, const char **);
 
 static int
 _close_sysdeps (glibtop_server *, glibtop_backend *, void *);
@@ -47,7 +47,7 @@ glibtop_backend_info LibGTopBackendInfo_Sysdeps = {
 
 static int
 _open_sysdeps (glibtop_server *server, glibtop_backend *backend,
-	       u_int64_t features, const char **backend_args)
+	       guint64 features, const char **backend_args)
 {
     glibtop_init_func_t *init_fkt;
 
@@ -60,7 +60,7 @@ _open_sysdeps (glibtop_server *server, glibtop_backend *backend,
 	    (*init_fkt) (server);
 
 	server->info->sysdeps.pointer_size = sizeof (void*)*8;
-		
+
 	server->flags |= _GLIBTOP_INIT_STATE_SYSDEPS;
     }
 

configure.in

@@ -7,14 +7,22 @@ AM_CONFIG_HEADER(config.h)
 AC_CANONICAL_SYSTEM
 
 LIBGTOP_MAJOR_VERSION=2
-LIBGTOP_MINOR_VERSION=5
-LIBGTOP_MICRO_VERSION=0
+LIBGTOP_MINOR_VERSION=6
+LIBGTOP_MICRO_VERSION=1
 LIBGTOP_VERSION=$LIBGTOP_MAJOR_VERSION.$LIBGTOP_MINOR_VERSION.$LIBGTOP_MICRO_VERSION
 AM_INIT_AUTOMAKE(libgtop, $LIBGTOP_VERSION)
 
-LIBGTOP_CURRENT=1
+dnl  increment if the interface has additions, changes, removals.
+LIBGTOP_CURRENT=3
+
+dnl  increment any time the source changes; set to
+dnl  0 if you increment CURRENT
 LIBGTOP_REVISION=0
-LIBGTOP_AGE=0
+
+dnl  increment if any interfaces have been added; set to 0
+dnl  if any interfaces have been removed. removal has
+dnl  precedence over adding, so set to 0 if both happened.
+LIBGTOP_AGE=1
 
 # you can set this to `-snap' for instance to create
 # a `libgtop-1.x.y-snap.tar.gz' tarball.
@@ -83,11 +91,6 @@ export cross_compiling
 
 AM_PROG_LIBTOOL
 
-dnl Let the user enable compiler warnings
-dnl GNOME_COMPILE_WARNINGS
-
-dnl GNOME_INIT_HOOK(gnome_found=yes)
-
 AM_CONDITIONAL(CROSS_COMPILING, test "x$cross_compiling" = xyes)
 
 GNOME_LIBGTOP_SYSDEPS
@@ -133,11 +136,17 @@ AC_SUBST(smp_examples)
 
 GLIB_REQUIRED=2.0.0
 
-PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED libgnome-2.0)
+PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED)
 AC_SUBST(GLIB_CFLAGS)
 AC_SUBST(GLIB_LIBS)
 
-dnl (1.2.0,,AC_MSG_ERROR(GLIB >= 1.2.0 is required for LibGTop))
+AC_CHECK_HEADER(popt.h,[POPT=yes],[POPT=no])
+AC_MSG_CHECKING(for popt.h)
+if test x$POPT = xyes ; then
+   AC_MSG_RESULT(yes)
+else
+   AC_MSG_ERROR([libgtop requires the popt development libraries])
+fi
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
@@ -171,6 +180,12 @@ AC_CHECK_FUNCS(dlerror,,)
 LIBS="$oLIBS"
 AC_SUBST(DL_LIB)
 
+dnl Linux
+AC_CHECK_HEADER(linux/isdn.h,[HAVE_ISDN_H=yes],[HAVE_ISDN_H=no])
+if test x$HAVE_ISDN_H = xyes ; then
+	AC_DEFINE(HAVE_ISDN_H, 1, [defined if you have linux/isdn.h])
+fi
+
 dnl AIX
 AH_TEMPLATE(HAVE_VMGETINFO, [Define to 1 if you have the 'vmgetinfo' function in libperfstat])
 AC_CHECK_LIB(perfstat, vmgetinfo, AC_DEFINE(HAVE_VMGETINFO))
@@ -235,7 +250,7 @@ AC_TYPE_SIGNAL
 AC_FUNC_STRFTIME
 AC_CHECK_FUNCS(getcwd gettimeofday getwd putenv strdup strtoul uname)
 
-ALL_LINGUAS="am ar az be bg bn ca cs cy da de el es et fa fi fr ga gl he hi hu id it ja ko lv mk ml mn ms nl nn no pl pt pt_BR ro ru sk sl sq sr sr@Latn sv ta tr uk vi zh_CN zh_TW"
+ALL_LINGUAS="am ar az be bg bn ca cs cy da de el en_CA en_GB es et eu fa fi fr ga gl gu he hi hr hu id it ja ko lt lv mk ml mn ms nl nn no pa pl pt pt_BR ro ru sk sl sq sr sr@Latn sv ta tr uk vi zh_CN zh_TW"
 
 GETTEXT_PACKAGE=libgtop-2.0
 AC_SUBST(GETTEXT_PACKAGE)
@@ -317,8 +332,8 @@ fi
 
 LIBGTOP_EXTRA_LIBS="$LIBGTOP_EXTRA_LIBS $GLIB_LIBS"
 
-LIBGTOP_LIBS="$LIBGTOP_LIBS -lgtop-2.0 -lgtop_sysdeps-2.0 -lgtop_common-2.0"
-LIBGTOP_NAMES_LIBS="$LIBGTOP_LIBS -lgtop_names-2.0"
+LIBGTOP_LIBS="$LIBGTOP_LIBS"
+LIBGTOP_NAMES_LIBS="$LIBGTOP_LIBS"
 
 LIBGTOP_LIBS="$LIBGTOP_LIBS" 
 LIBGTOP_NAMES_LIBS="$LIBGTOP_NAMES_LIBS"
@@ -329,6 +344,16 @@ machine_incs="-I\$(top_srcdir)/sysdeps/$sysdeps_dir"
 
 AC_SUBST(machine_incs)
 
+if test "$GCC" = "yes" ; then
+        CFLAGS="\
+	-Wall \
+	-Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes \
+	-Wnested-externs -Wpointer-arith \
+	-Wcast-align -Wsign-compare \
+	-fno-strict-aliasing \
+	$CFLAGS"
+fi
+
 INCLUDES="-D_IN_LIBGTOP -D_GNU_SOURCE -DGLIBTOP_NAMES -I\$(top_builddir) -I\$(top_srcdir) -I\$(top_srcdir)/sysdeps/$sysdeps_dir -I\$(top_srcdir)/include $GLIB_CFLAGS $CFLAGS $X_CFLAGS "'-DGTOPLOCALEDIR=\"$(datadir)/locale\" -DLIBGTOP_VERSION=\"'"$LIBGTOP_VERSION"'\" -DLIBGTOP_SERVER_VERSION=\"'"$LIBGTOP_SERVER_VERSION"'\" -DLIBGTOP_VERSION_CODE='$LIBGTOP_VERSION_CODE' -DLIBGTOP_SERVER=\"'"$LIBGTOP_SERVER"'\"'
 
 AC_SUBST(INCLUDES)

doc/.cvsignore

@@ -8,3 +8,4 @@ auto-macros.texi
 version.texi
 stamp-vti
 *.html *.pdf
+mdate-sh

doc/ChangeLog

@@ -1,3 +1,11 @@
+2004-03-05  Bastien Nocera  <hadess@hadess.net>
+
+	* reference.texi: update for new API
+
+2003-10-20  Bastien Nocera  <hadess@hadess.net>
+
+	* reference.texi: s/u_int64_t/guint64/
+
 2003-10-20  Bastien Nocera  <hadess@hadess.net>
 
 	* Makefile.am: removed traces of guile, intllibs and libgnomesupport

doc/reference.texi

@@ -50,7 +50,7 @@ typedef struct _glibtop_cpu     glibtop_cpu;
 
 struct _glibtop_cpu
 @{
-    u_int64_t   flags,
+    guint64   flags,
         total,
         user,
         nice,
@@ -139,7 +139,7 @@ typedef struct _glibtop_mem     glibtop_mem;
 
 struct _glibtop_mem
 @{
-    u_int64_t   flags,
+    guint64   flags,
         total,
         used,
         free,
@@ -207,7 +207,7 @@ typedef struct _glibtop_swap    glibtop_swap;
 
 struct _glibtop_swap
 @{
-    u_int64_t   flags,
+    guint64   flags,
         total,
         used,
         free,
@@ -266,10 +266,10 @@ typedef struct _glibtop_uptime  glibtop_uptime;
 
 struct _glibtop_uptime
 @{
-    u_int64_t flags;
+    guint64 flags;
     double uptime,
         idletime;
-    u_int64_t boot_time;
+    guint64 boot_time;
 @};
 @end cartouche
 @end example
@@ -318,9 +318,9 @@ typedef struct _glibtop_loadavg glibtop_loadavg;
 
 struct _glibtop_loadavg
 @{
-    u_int64_t flags;
+    guint64 flags;
     double loadavg [3];
-    u_int64_t nr_running,
+    guint64 nr_running,
         nr_tasks,
         last_pid;
 @};
@@ -395,7 +395,7 @@ typedef struct _glibtop_proclist        glibtop_proclist;
 
 struct _glibtop_proclist
 @{
-    u_int64_t   flags,
+    guint64   flags,
         number,
         total,
         size;
@@ -492,7 +492,7 @@ typedef struct _glibtop_proc_state      glibtop_proc_state;
 
 struct _glibtop_proc_state
 @{
-    u_int64_t flags;
+    guint64 flags;
     char cmd[40];
 @ifset LIBGTOP-1-1
     unsigned state;
@@ -618,7 +618,7 @@ typedef struct _glibtop_proc_uid        glibtop_proc_uid;
 
 struct _glibtop_proc_uid
 @{
-    u_int64_t flags;
+    guint64 flags;
     int uid,
         euid,
         gid,
@@ -698,7 +698,7 @@ typedef struct _glibtop_proc_mem        glibtop_proc_mem;
 
 struct _glibtop_proc_mem
 @{
-    u_int64_t   flags,
+    guint64   flags,
         size,
         vsize,
         resident,
@@ -813,7 +813,7 @@ typedef struct _glibtop_proc_time       glibtop_proc_time;
 
 struct _glibtop_proc_time
 @{
-    u_int64_t   flags,
+    guint64   flags,
         start_time,
         rtime,
         utime,
@@ -881,7 +881,7 @@ typedef struct _glibtop_proc_signal     glibtop_proc_signal;
 
 struct _glibtop_proc_signal
 @{
-    u_int64_t   flags,
+    guint64   flags,
         signal [2],
         blocked [2],
         sigignore [2],
@@ -902,7 +902,7 @@ Mask of caught signals
 @end table
 
 All signal masks are interpreted as bit mask; it is an array of two
-@code{u_int64_t}'s so we can save 128 signals there.
+@code{guint64}'s so we can save 128 signals there.
 
 @page
 @node glibtop_proc_kernel, glibtop_proc_segment, glibtop_proc_signal, System Dependent
@@ -929,8 +929,8 @@ typedef struct _glibtop_proc_kernel     glibtop_proc_kernel;
 
 struct _glibtop_proc_kernel
 @{
-    u_int64_t flags;
-    u_int64_t k_flags,
+    guint64 flags;
+    guint64 k_flags,
         min_flt,
         maj_flt,
         cmin_flt,
@@ -1029,7 +1029,7 @@ typedef struct _glibtop_proc_segment    glibtop_proc_segment;
 
 struct _glibtop_proc_segment
 @{
-    u_int64_t   flags,
+    guint64   flags,
         text_rss,
         shlib_rss,
         data_rss,
@@ -1096,7 +1096,7 @@ typedef struct _glibtop_proc_args       glibtop_proc_args;
 
 struct _glibtop_proc_args
 @{
-    u_int64_t   flags,
+    guint64   flags,
         size;
 @};
 @end cartouche
@@ -1135,7 +1135,7 @@ typedef struct _glibtop_proc_map        glibtop_proc_map;
 
 struct _glibtop_proc_map
 @{
-    u_int64_t   flags,
+    guint64   flags,
         number,
         total,
         size;
@@ -1164,7 +1164,7 @@ typedef struct _glibtop_map_entry       glibtop_map_entry;
 
 struct _glibtop_map_entry
 @{
-    u_int64_t flags, start, end, offset, perm, inode, device;
+    guint64 flags, start, end, offset, perm, inode, device;
     char filename [GLIBTOP_MAP_FILENAME_LEN+1];
 @};
 @end cartouche
@@ -1175,13 +1175,13 @@ fields are valid:
 
 @example
 @cartouche
-#define GLIBTOP_MAP_ENTRY_START         1
-#define GLIBTOP_MAP_ENTRY_END           2
-#define GLIBTOP_MAP_ENTRY_OFFSET        3
-#define GLIBTOP_MAP_ENTRY_PERM          4
-#define GLIBTOP_MAP_ENTRY_INODE         5
-#define GLIBTOP_MAP_ENTRY_DEVICE        6
-#define GLIBTOP_MAP_ENTRY_FILENAME      7
+#define GLIBTOP_MAP_ENTRY_START         0
+#define GLIBTOP_MAP_ENTRY_END           1
+#define GLIBTOP_MAP_ENTRY_OFFSET        2
+#define GLIBTOP_MAP_ENTRY_PERM          3
+#define GLIBTOP_MAP_ENTRY_INODE         4
+#define GLIBTOP_MAP_ENTRY_DEVICE        5
+#define GLIBTOP_MAP_ENTRY_FILENAME      6
 @end cartouche
 @end example
 
@@ -1222,7 +1222,7 @@ typedef struct _glibtop_netload glibtop_netload;
 
 struct _glibtop_netload
 @{
-    u_int64_t   flags,
+    guint64   flags,
         if_flags,
         mtu,
         subnet,
@@ -1329,7 +1329,7 @@ typedef struct _glibtop_ppp     glibtop_ppp;
 
 struct _glibtop_ppp
 @{
-    u_int64_t   flags,
+    guint64   flags,
         state,
         bytes_in,
         bytes_out;
@@ -1409,7 +1409,7 @@ typedef struct _glibtop_mountlist       glibtop_mountlist;
 
 struct _glibtop_mountlist
 @{
-    u_int64_t   flags,
+    guint64   flags,
         number,
         total,
         size;
@@ -1438,7 +1438,7 @@ typedef struct _glibtop_mountentry      glibtop_mountentry;
 
 struct _glibtop_mountentry
 @{
-    u_int64_t dev;
+    guint64 dev;
     char devname [GLIBTOP_MOUNTENTRY_LEN+1];
     char mountdir [GLIBTOP_MOUNTENTRY_LEN+1];
     char type [GLIBTOP_MOUNTENTRY_LEN+1];
@@ -1488,7 +1488,7 @@ typedef struct _glibtop_fsusage         glibtop_fsusage;
 
 struct _glibtop_fsusage
 @{
-    u_int64_t   flags,
+    guint64   flags,
         blocks,
         bfree,
         bavail,
@@ -1639,7 +1639,7 @@ typedef struct _glibtop_sysdeps         glibtop_sysdeps;
 
 struct _glibtop_sysdeps
 @{
-    u_int64_t flags,
+    guint64 flags,
         features,
         pointer_size,
         cpu,

examples/ChangeLog

@@ -1,3 +1,19 @@
+2003-12-27  Ole Laursen  <olau@hardworking.dk>
+
+	* mountlist.c: Updated to display block size too.
+
+2004-03-04  Bastien Nocera  <hadess@hadess.net>
+
+	* smp.c: use libgtop-i18n.h
+
+2003-10-21  Bastien Nocera  <hadess@hadess.net>
+
+	* Makefile.am:
+	* smp.c:
+	* sysdeps.c: (main): install only one library, libgtop-2.0
+	Fix build-time warnings due to the redefinition of guint64
+	Fix building smp.c and sysdeps.c
+
 2003-10-20  Bastien Nocera  <hadess@hadess.net>
 
 	* first.c:

examples/Makefile.am

@@ -6,12 +6,7 @@ INCLUDES		= @INCLUDES@
 
 DEFS			= @DEFS@
 
-# We install it in `libexec' since this will make it more easy
-# to put the examples into an extra RPM package.
-
-libgtopdir		= $(libexecdir)/libgtop
-
-libgtop_PROGRAMS	= first second\
+noinst_PROGRAMS	= 	first second\
 			  mountlist procmap netload sysdeps timings \
 			  @static_targets@ @smp_examples@
 
@@ -22,45 +17,35 @@ EXTRA_PROGRAMS		= first_static second_static \
 			  timings_static
 
 first_SOURCES		= first.c
-first_LDADD		= $(top_builddir)/lib/libgtop-2.0.la \
-			  $(top_builddir)/sysdeps/common/libgtop_common-2.0.la \
-			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la
+first_LDADD		= $(top_builddir)/lib/libgtop-2.0.la
 
 first_static_SOURCES	= $(first_SOURCES)
 first_static_LDADD	= $(first_LDADD)
 first_static_LDFLAGS	= -static
 
 second_SOURCES		= second.c
-second_LDADD		= $(top_builddir)/lib/libgtop-2.0.la \
-			  $(top_builddir)/sysdeps/common/libgtop_common-2.0.la \
-			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la
+second_LDADD		= $(top_builddir)/lib/libgtop-2.0.la
 
 second_static_SOURCES	= $(second_SOURCES)
 second_static_LDADD	= $(second_LDADD)
 second_static_LDFLAGS	= -static
 
 procmap_SOURCES		= procmap.c
-procmap_LDADD		= $(top_builddir)/lib/libgtop-2.0.la \
-			  $(top_builddir)/sysdeps/common/libgtop_common-2.0.la \
-			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la
+procmap_LDADD		= $(top_builddir)/lib/libgtop-2.0.la
 
 procmap_static_SOURCES	= $(procmap_SOURCES)
 procmap_static_LDADD	= $(procmap_LDADD)
 procmap_static_LDFLAGS	= -static
 
 netload_SOURCES		= netload.c
-netload_LDADD		= $(top_builddir)/lib/libgtop-2.0.la \
-			  $(top_builddir)/sysdeps/common/libgtop_common-2.0.la \
-			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la
+netload_LDADD		= $(top_builddir)/lib/libgtop-2.0.la
 
 netload_static_SOURCES	= $(netload_SOURCES)
 netload_static_LDADD	= $(netload_LDADD)
 netload_static_LDFLAGS	= -static
 
 sysdeps_SOURCES		= sysdeps.c
-sysdeps_LDADD		= $(top_builddir)/lib/libgtop-2.0.la \
-			  $(top_builddir)/sysdeps/common/libgtop_common-2.0.la \
-			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la
+sysdeps_LDADD		= $(top_builddir)/lib/libgtop-2.0.la
 
 sysdeps_static_SOURCES	= $(sysdeps_SOURCES)
 sysdeps_static_LDADD	= $(sysdeps_LDADD)
@@ -71,8 +56,6 @@ third_names_LIBS	= $(top_builddir)/sysdeps/names/libgtop_names-2.0.la
 third_SOURCES		= third.c
 third_LDADD		= $(third_names_LIBS) \
 			  $(top_builddir)/lib/libgtop-2.0.la \
-			  $(top_builddir)/sysdeps/common/libgtop_common-2.0.la \
-			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la \
 			  @INTLLIBS@
 
 third_static_SOURCES	= $(third_SOURCES)
@@ -80,9 +63,7 @@ third_static_LDADD	= $(third_LDADD)
 third_static_LDFLAGS	= -static
 
 mountlist_SOURCES	= mountlist.c
-mountlist_LDADD		= $(top_builddir)/lib/libgtop-2.0.la \
-			  $(top_builddir)/sysdeps/common/libgtop_common-2.0.la \
-			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la
+mountlist_LDADD		= $(top_builddir)/lib/libgtop-2.0.la
 
 mountlist_static_SOURCES= $(mountlist_SOURCES)
 mountlist_static_LDADD	= $(mountlist_LDADD)
@@ -90,18 +71,14 @@ mountlist_static_LDFLAGS= -static
 
 
 smp_SOURCES		= smp.c
-smp_LDADD		= $(top_builddir)/lib/libgtop-2.0.la \
-			  $(top_builddir)/sysdeps/common/libgtop_common-2.0.la \
-			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la
+smp_LDADD		= $(top_builddir)/lib/libgtop-2.0.la
 
 smp_static_SOURCES	= $(smp_SOURCES)
 smp_static_LDADD	= $(smp_LDADD)
 smp_static_LDFLAGS	= -static
 
 timings_SOURCES		= timings.c
-timings_LDADD		= $(top_builddir)/lib/libgtop-2.0.la \
-			  $(top_builddir)/sysdeps/common/libgtop_common-2.0.la \
-			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la
+timings_LDADD		= $(top_builddir)/lib/libgtop-2.0.la
 
 timings_static_SOURCES	= $(timings_SOURCES)
 timings_static_LDADD	= $(timings_LDADD)

examples/first.c

@@ -22,6 +22,8 @@
 */
 
 #include <locale.h>
+#include <libintl.h>
+#include <stdio.h>
 
 #include <glibtop.h>
 #include <glibtop/open.h>
@@ -53,7 +55,7 @@ main (int argc, char *argv [])
 	setlocale (LC_ALL, "");
 	bindtextdomain (GETTEXT_PACKAGE, GTOPLOCALEDIR);
 	textdomain (GETTEXT_PACKAGE);
-	
+
 	glibtop_init_r (&glibtop_global_server, 0, GLIBTOP_INIT_NO_OPEN);
 
 	glibtop_get_parameter (GLIBTOP_PARAM_METHOD, &method, sizeof (method));
@@ -133,7 +135,7 @@ main (int argc, char *argv [])
 
 	for (c = 0; c < PROFILE_COUNT; c++)
 		glibtop_get_shm_limits (&data.shm_limits);
-	
+
 	printf ("Shm Limits   (0x%08lx): %lu, %lu, %lu, %lu, %lu\n",
 		(unsigned long) data.shm_limits.flags,
 		(unsigned long) data.shm_limits.shmmax,
@@ -157,7 +159,7 @@ main (int argc, char *argv [])
 
 	for (c = 0; c < PROFILE_COUNT; c++)
 		glibtop_get_sem_limits (&data.sem_limits);
-	
+
 	printf ("Sem Limits   (0x%08lx): "
 		"%lu, %lu, %lu, %lu, %lu, %lu, %lu, %lu, %lu, %lu\n",
 		(unsigned long) data.sem_limits.flags,
@@ -215,7 +217,7 @@ main (int argc, char *argv [])
 		(unsigned long) sysdeps.ppp);
 
 	printf ("\n");
-	
+
 	ptr = glibtop_get_proclist (&data.proclist, 0, 0);
 
 	printf ("Proclist     (0x%08lx): %lu, %lu, %lu\n",
@@ -306,7 +308,7 @@ main (int argc, char *argv [])
 
 	for (c = 0; c < PROFILE_COUNT; c++)
 		glibtop_get_proc_signal (&data.proc_signal, pid);
-	
+
 	printf ("Proc_Signal  PID  %5d (0x%08lx): "
 		"%lu %lu %lu %lu\n", (int) pid,
 		(unsigned long) data.proc_signal.flags,

examples/mountlist.c

@@ -22,6 +22,8 @@
 */
 
 #include <locale.h>
+#include <libintl.h>
+#include <stdio.h>
 
 #include <glibtop.h>
 #include <glibtop/open.h>
@@ -48,11 +50,11 @@ main (int argc, char *argv [])
 	setlocale (LC_ALL, "");
 	bindtextdomain (GETTEXT_PACKAGE, GTOPLOCALEDIR);
 	textdomain (GETTEXT_PACKAGE);
-	
+
 	glibtop_init_r (&glibtop_global_server, 0, GLIBTOP_INIT_NO_OPEN);
 
 	glibtop_get_parameter (GLIBTOP_PARAM_METHOD, &method, sizeof (method));
-	
+
 	printf ("Method = %d\n", method);
 
 	count = glibtop_get_parameter (GLIBTOP_PARAM_COMMAND, buffer, BUFSIZ);
@@ -88,18 +90,18 @@ main (int argc, char *argv [])
 			mount_entries [index].type,
 			mount_entries [index].devname);
 
-	printf ("\n\n%-23s %9s %9s %9s %9s %9s\n\n",
-		"", "Blocks", "Free", "Avail", "Files", "Free");
+	printf ("\n\n%-16s %9s %9s %9s %9s %9s %9s\n",
+		"Mount", "Blocks", "Free", "Avail", "Files", "Free", "BlockSz");
 
 	for (index = 0; index < mount_list.number; index++) {
 		glibtop_get_fsusage (&fsusage,
 				     mount_entries [index].mountdir);
 
-		printf ("Usage: %-16s %9Lu %9Lu %9Lu %9Lu %9Lu\n",
+		printf ("%-16s %9Lu %9Lu %9Lu %9Lu %9Lu %9d\n",
 			mount_entries [index].mountdir,
 			fsusage.blocks, fsusage.bfree,
 			fsusage.bavail, fsusage.files,
-			fsusage.ffree);
+			fsusage.ffree, fsusage.block_size);
 	}
 
 	g_free (mount_entries);

examples/netload.c

@@ -22,6 +22,8 @@
 */
 
 #include <locale.h>
+#include <libintl.h>
+#include <stdio.h>
 
 #include <glibtop.h>
 #include <glibtop/open.h>
@@ -52,7 +54,7 @@ main (int argc, char *argv [])
 	setlocale (LC_ALL, "");
 	bindtextdomain (GETTEXT_PACKAGE, GTOPLOCALEDIR);
 	textdomain (GETTEXT_PACKAGE);
-	
+
 	glibtop_init_r (&glibtop_global_server, 0, GLIBTOP_INIT_NO_OPEN);
 
 	glibtop_get_parameter (GLIBTOP_PARAM_METHOD, &method, sizeof (method));
@@ -75,7 +77,7 @@ main (int argc, char *argv [])
 
 	if (argc != 2)
 		glibtop_error ("Usage: %s interface", argv [0]);
-	
+
 	glibtop_get_netload (&netload, argv [1]);
 
 	addr.s_addr = netload.address;

examples/procargs.c

@@ -0,0 +1,30 @@
+#include <glibtop/procargs.h>
+
+#include <stdlib.h>
+
+#include <unistd.h>
+
+int main(int argc, char **argv)
+{
+  while(*++argv)
+    {
+      glibtop_proc_args buf;
+      pid_t pid = strtol(*argv, NULL, 10);
+      char ** const pargv = glibtop_get_proc_argv(&buf, pid, 20);
+
+      char **parg = pargv;
+
+      printf("<%ld>\t", (long)pid);
+
+      while(*parg)
+	{
+	  printf("\"%s\"\t", *parg);
+	  parg++;
+	}
+
+      putchar('\n');
+
+      g_strfreev(pargv);
+    }
+}
+

examples/procmap.c

@@ -22,6 +22,8 @@
 */
 
 #include <locale.h>
+#include <libintl.h>
+#include <stdio.h>
 
 #include <glibtop.h>
 #include <glibtop/open.h>
@@ -59,7 +61,7 @@ main (int argc, char *argv [])
 	setlocale (LC_ALL, "");
 	bindtextdomain (GETTEXT_PACKAGE, GTOPLOCALEDIR);
 	textdomain (GETTEXT_PACKAGE);
-	
+
 	glibtop_init_r (&glibtop_global_server, 0, GLIBTOP_INIT_NO_OPEN);
 
 	glibtop_get_parameter (GLIBTOP_PARAM_METHOD, &method, sizeof (method));
@@ -95,7 +97,7 @@ main (int argc, char *argv [])
 		const char *filename = NULL;
 		unsigned device, device_major, device_minor;
 		char perm [5];
-		
+
 		if (maps [i].flags & (1L << GLIBTOP_MAP_ENTRY_FILENAME))
 			filename = maps [i].filename;
 
@@ -152,7 +154,7 @@ main (int argc, char *argv [])
 		}
 
 		if (filename && (filename != maps [i].filename))
-			g_free (filename);
+			g_free ((void*)filename);
 	}
 
 	g_free (maps);

examples/second.c

@@ -23,6 +23,8 @@
 
 #include <locale.h>
 #include <math.h>
+#include <stdio.h>
+#include <libintl.h>
 
 #include <glibtop.h>
 #include <glibtop/open.h>
@@ -44,11 +46,11 @@ output (pid_t pid)
 	double b_total, b_utime, b_stime;
 	double s_total, s_utime, s_stime;
 	double my_utime, my_stime;
-	int ncpu;
+	unsigned int ncpu;
 #endif
 
 	printf ("\n");
-		
+
 	glibtop_get_proc_state (&data.proc_state, pid);
 
 	printf ("Proc_State   PID  %5d (0x%08lx): "
@@ -57,9 +59,9 @@ output (pid_t pid)
 		data.proc_state.cmd, data.proc_state.state,
 		(unsigned long) data.proc_state.uid,
 		(unsigned long) data.proc_state.gid);
-		
+
 	glibtop_get_proc_uid (&data.proc_uid, pid);
-	
+
 	printf ("Proc_Uid     PID  %5d (0x%08lx): "
 		"%d %d %d %d %d %d %d %d %d %d %d %d\n", (int) pid,
 		(unsigned long) data.proc_uid.flags,
@@ -71,7 +73,7 @@ output (pid_t pid)
 		data.proc_uid.priority, data.proc_uid.nice);
 
 	glibtop_get_proc_mem (&data.proc_mem, pid);
-		
+
 	printf ("Proc_Mem     PID  %5d (0x%08lx): "
 		"%lu %lu %lu %lu %lu %lu\n", (int) pid,
 		(unsigned long) data.proc_mem.flags,
@@ -81,7 +83,7 @@ output (pid_t pid)
 		(unsigned long) data.proc_mem.share,
 		(unsigned long) data.proc_mem.rss,
 		(unsigned long) data.proc_mem.rss_rlim);
-		
+
 	glibtop_get_proc_segment (&data.proc_segment, pid);
 
 	printf ("Proc_Segment PID  %5d (0x%08lx): "
@@ -97,7 +99,7 @@ output (pid_t pid)
 		(unsigned long) data.proc_segment.start_stack);
 
 	glibtop_get_proc_time (&data.proc_time, pid);
-		
+
 	printf ("Proc_Time    PID  %5d (0x%08lx): "
 		"%lu %lu %lu %lu %lu %lu %lu %lu %lu\n", (int) pid,
 		(unsigned long) data.proc_time.flags,
@@ -112,7 +114,7 @@ output (pid_t pid)
 		(unsigned long) data.proc_time.frequency);
 
 	glibtop_get_proc_signal (&data.proc_signal, pid);
-	
+
 	printf ("Proc_Signal  PID  %5d (0x%08lx): "
 		"%lu %lu %lu %lu\n", (int) pid,
 		(unsigned long) data.proc_signal.flags,
@@ -158,7 +160,7 @@ output (pid_t pid)
 	ncpu = glibtop_global_server->ncpu;
 
 	glibtop_get_proc_time (&data.proc_time, pid);
-		
+
 	total = (unsigned long) data.proc_time.utime +
 		(unsigned long) data.proc_time.stime;
 
@@ -240,7 +242,7 @@ main (int argc, char *argv [])
 	setlocale (LC_ALL, "");
 	bindtextdomain (GETTEXT_PACKAGE, GTOPLOCALEDIR);
 	textdomain (GETTEXT_PACKAGE);
-	
+
 	glibtop_init ();
 
 	glibtop_get_sysdeps (&sysdeps);
@@ -286,7 +288,7 @@ main (int argc, char *argv [])
 	for (i = 0; i < proclist.number; i++) {
 
 		pid = ptr [i];
-		
+
 		output (pid);
 	}
 

examples/smp.c

@@ -21,12 +21,18 @@
    Boston, MA 02111-1307, USA.
 */
 
+#include <config.h>
+
 #include <locale.h>
+#include <libintl.h>
 #include <math.h>
+#include <stdio.h>
 
 #include <glibtop.h>
 #include <glibtop/cpu.h>
 
+#include "libgtop-i18n.h"
+
 int
 main (int argc, char *argv [])
 {
@@ -41,7 +47,7 @@ main (int argc, char *argv [])
 	setlocale (LC_ALL, "");
 	bindtextdomain (GETTEXT_PACKAGE, GTOPLOCALEDIR);
 	textdomain (GETTEXT_PACKAGE);
-	
+
 	glibtop_init();
 
 	glibtop_get_cpu (&cpu);
@@ -96,7 +102,7 @@ main (int argc, char *argv [])
 	printf ("%-26s %12s %12s %12s %12s %12s\n%s\n", _("Percent:"),
 		_("Total (%)"), _("User (%)"), _("Nice (%)"), _("Sys (%)"),
 		_("Idle (%)"), separator);
-	
+
 	printf (_("CPU          (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n\n"),
 		(unsigned long) cpu.flags, (double) total * 100.0 / total,
 		(double) user  * 100.0 / total,

examples/sysdeps.c

@@ -22,10 +22,13 @@
 */
 
 #include <locale.h>
+#include <libintl.h>
+#include <stdio.h>
 
 #include <glibtop.h>
 #include <glibtop/open.h>
 #include <glibtop/close.h>
+#include <glibtop/sysdeps.h>
 
 #include <glibtop/parameter.h>
 
@@ -45,7 +48,7 @@ main (int argc, char *argv [])
 	setlocale (LC_ALL, "");
 	bindtextdomain (GETTEXT_PACKAGE, GTOPLOCALEDIR);
 	textdomain (GETTEXT_PACKAGE);
-	
+
 	glibtop_init_r (&glibtop_global_server, 0, GLIBTOP_INIT_NO_OPEN);
 
 	glibtop_get_parameter (GLIBTOP_PARAM_METHOD, &method, sizeof (method));
@@ -68,7 +71,7 @@ main (int argc, char *argv [])
 
 	glibtop_get_sysdeps (&sysdeps);
 
-#define FEATURE_CHECK(f) ((sysdeps.features & (1L << GLIBTOP_SYSDEPS_##f##)) ? 1 : 0)
+#define FEATURE_CHECK(f) ((sysdeps.features & (1L << GLIBTOP_SYSDEPS_##f)) ? 1 : 0)
 
 	printf ("Sysdeps (0x%08lx):\n\n"
 		"\tfeatures:\t\t0x%08lx\n\n"

examples/third.c

@@ -22,9 +22,11 @@
 */
 
 #include <locale.h>
+#include <libintl.h>
+#include <stdio.h>
 
 #include <glibtop.h>
-     
+
 #include <glibtop/open.h>
 #include <glibtop/close.h>
 
@@ -33,7 +35,7 @@
 
 void main_prog(int argc, char *argv[]);
 
-int     
+int
 main (int argc, char *argv[])
 {
 	setlocale (LC_ALL, "");

examples/timings.c

@@ -22,6 +22,8 @@
 */
 
 #include <locale.h>
+#include <stdio.h>
+#include <libintl.h>
 
 #include <glibtop.h>
 #include <glibtop/open.h>
@@ -85,7 +87,7 @@ main (int argc, char *argv [])
 		"Feature", "Flags", "Count", "utime", "stime");
 	printf ("-------------------------------------------"
 		"---------------\n");
-	
+
 	glibtop_init_r (&glibtop_global_server, 0, 0);
 
 	getrusage (RUSAGE_SELF, &total_start);
@@ -301,7 +303,7 @@ main (int argc, char *argv [])
 
 	for (c = 0; c < PROFILE_COUNT; c++)
 		glibtop_get_proc_signal (&data.proc_signal, pid);
-	
+
 	getrusage (RUSAGE_SELF, &rusage_end);
 
 	libgtop_timersub (&rusage_end.ru_utime, &rusage_start.ru_utime,
@@ -332,7 +334,7 @@ main (int argc, char *argv [])
 		(unsigned long) data.proc_kernel.flags, PROFILE_COUNT,
 		(long double) ELAPSED_UTIME / PROFILE_COUNT,
 		(long double) ELAPSED_STIME / PROFILE_COUNT);
-	
+
 	getrusage (RUSAGE_SELF, &total_end);
 
 	libgtop_timersub (&total_end.ru_utime, &total_start.ru_utime,

include/Makefile.am

@@ -1,2 +1,4 @@
 SUBDIRS		= glibtop
 
+EXTRA_DIST	= libgtop-i18n.h
+

include/glibtop/array.h

@@ -41,7 +41,7 @@ typedef struct _glibtop_array	glibtop_array;
 
 struct _glibtop_array
 {
-    u_int64_t flags,
+    guint64 flags,
 	number,		/* GLIBTOP_ARRAY_NUMBER	*/
 	size,		/* GLIBTOP_ARRAY_SIZE	*/
 	total;		/* GLIBTOP_ARRAY_TOTAL	*/

include/glibtop/command.h

@@ -69,8 +69,8 @@ typedef union  _glibtop_response_union	glibtop_response_union;
 
 struct _glibtop_command
 {
-	u_int64_t	command;
-	u_int64_t	size, data_size;
+	guint64	command;
+	guint64	size, data_size;
 	char		parameter [_GLIBTOP_PARAM_SIZE];
 };
 
@@ -83,7 +83,7 @@ union _glibtop_response_union
 struct _glibtop_response
 {
 	int64_t offset;
-	u_int64_t size, data_size;
+	guint64 size, data_size;
 	glibtop_response_union u;
 };
 

include/glibtop/cpu.h

@@ -41,8 +41,9 @@ G_BEGIN_DECLS
 #define GLIBTOP_XCPU_NICE	8
 #define GLIBTOP_XCPU_SYS	9
 #define GLIBTOP_XCPU_IDLE	10
+#define GLIBTOP_XCPU_FLAGS  11
 
-#define GLIBTOP_MAX_CPU		11
+#define GLIBTOP_MAX_CPU		12
 
 /* Nobody should really be using more than 4 processors. */
 #define GLIBTOP_NCPU		4
@@ -51,7 +52,7 @@ typedef struct _glibtop_cpu	glibtop_cpu;
 
 struct _glibtop_cpu
 {
-	u_int64_t	flags,
+	guint64	flags,
 		total,				/* GLIBTOP_CPU_TOTAL		*/
 		user,				/* GLIBTOP_CPU_USER		*/
 		nice,				/* GLIBTOP_CPU_NICE		*/
@@ -62,7 +63,8 @@ struct _glibtop_cpu
 		xcpu_user [GLIBTOP_NCPU],	/* GLIBTOP_XCPU_USER		*/
 		xcpu_nice [GLIBTOP_NCPU],	/* GLIBTOP_XCPU_NICE		*/
 		xcpu_sys  [GLIBTOP_NCPU],	/* GLIBTOP_XCPU_SYS		*/
-		xcpu_idle [GLIBTOP_NCPU];	/* GLIBTOP_XCPU_IDLE		*/
+		xcpu_idle [GLIBTOP_NCPU],	/* GLIBTOP_XCPU_IDLE		*/
+		xcpu_flags;	                /* GLIBTOP_XCPU_IDLE		*/
 };
 
 #define glibtop_get_cpu(cpu)	glibtop_get_cpu_l(glibtop_global_server, cpu)

include/glibtop/fsusage.h

@@ -1,7 +1,6 @@
 /* $Id$ */
 
 /* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
 
    Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
 
@@ -34,19 +33,22 @@ G_BEGIN_DECLS
 #define GLIBTOP_FSUSAGE_BAVAIL		2
 #define GLIBTOP_FSUSAGE_FILES		3
 #define GLIBTOP_FSUSAGE_FFREE		4
+#define GLIBTOP_FSUSAGE_BLOCK_SIZE	5
+
+#define GLIBTOP_MAX_FSUSAGE		6
 
-#define GLIBTOP_MAX_FSUSAGE		5
 
 typedef struct _glibtop_fsusage		glibtop_fsusage;
 
 struct _glibtop_fsusage
 {
-	u_int64_t	flags,
-		blocks,		/* Total blocks. */
+	guint64	flags,
+		blocks,		/* Total number of blocks. */
 		bfree,		/* Free blocks available to superuser. */
 		bavail,		/* Free blocks available to non-superuser. */
 		files,		/* Total file nodes. */
 		ffree;		/* Free file nodes. */
+	guint32	block_size;	/* Size of a block in bytes. */
 };
 
 #define glibtop_get_fsusage(fsusage,disk)	glibtop_get_fsusage_l(glibtop_global_server, fsusage, disk)

include/glibtop/glibtop-backend-info.h

@@ -40,7 +40,7 @@ typedef struct _glibtop_backend_module	glibtop_backend_module;
 typedef struct _glibtop_call_vector	glibtop_call_vector;
 
 typedef int (*glibtop_backend_open_func_t)  (glibtop_server *, glibtop_backend *,
-					     u_int64_t, const char **);
+					     guint64, const char **);
 typedef int (*glibtop_backend_close_func_t) (glibtop_server *, glibtop_backend *,
 					     glibtop_closure *);
 

include/glibtop/glibtop-backend.h

@@ -65,7 +65,7 @@ GType
 glibtop_backend_get_type (void);
 
 glibtop_backend *
-glibtop_backend_get (const char *backend_name, u_int64_t features,
+glibtop_backend_get (const char *backend_name, guint64 features,
 		     const char **backend_args, GError **error);
 
 void

include/glibtop/glibtop-client.h

@@ -82,7 +82,7 @@ glibtop_client_propagate_warning (glibtop_client *client, GError *error);
 
 void
 glibtop_client_open_backend (glibtop_client *client, const char *backend_name,
-			     u_int64_t features, const char **backend_args);
+			     guint64 features, const char **backend_args);
 
 void
 glibtop_client_add_backend (glibtop_client *client,

include/glibtop/gnuserv.h

@@ -9,15 +9,15 @@
 
  Copyright (C) 1989 Free Software Foundation, Inc.
 
- Author: Andy Norman (ange@hplb.hpl.hp.com), based on 
+ Author: Andy Norman (ange@hplb.hpl.hp.com), based on
          'etc/server.c' and 'etc/emacsclient.c' from the 18.52 GNU
          Emacs distribution.
 
  Please mail bugs and suggestions to the author at the above address.
 */
 
-/* HISTORY 
- * 11-Nov-1990		bristor@simba	
+/* HISTORY
+ * 11-Nov-1990		bristor@simba
  *    Added EOT stuff.
  */
 
@@ -76,7 +76,7 @@ static char header_rcsid [] = "!Header: gnuserv.h,v 2.4 95/02/16 11:58:11 arup a
  */
 
 #if 0
-#define MCOOKIE_SCREEN "42980"   /* screen # to use as the gnuserv cookie */ 
+#define MCOOKIE_SCREEN "42980"   /* screen # to use as the gnuserv cookie */
 #endif
 #define MCOOKIE_NAME   "MAGIC-1" /* authentication protocol name */
 #define MCOOKIE_X_NAME "MIT-MAGIC-COOKIE-1"  /* as needed by X */
@@ -106,7 +106,7 @@ static char header_rcsid [] = "!Header: gnuserv.h,v 2.4 95/02/16 11:58:11 arup a
  * since it limits the size of requests and responses. Don't make it bigger
  * than your system's max message size though (usually a couple of k) or else
  * msgsend will start failing. For sockets, using the system BUFSIZ is usually
- * what you want. 
+ * what you want.
  */
 
 #if defined(INTERNET_DOMAIN_SOCKETS) || defined(UNIX_DOMAIN_SOCKETS)

include/glibtop/inodedb.h

@@ -39,7 +39,7 @@ typedef struct _glibtop_inodedb_key	glibtop_inodedb_key;
 
 struct _glibtop_inodedb_key
 {
-	u_int64_t device, inode;
+	guint64 device, inode;
 };
 
 struct _glibtop_inodedb
@@ -57,7 +57,7 @@ glibtop_inodedb_open_s (glibtop *server, unsigned databases, unsigned long cache
 const char *
 glibtop_inodedb_lookup_s (glibtop *server,
 			  glibtop_inodedb *inodedb,
-			  u_int64_t device, u_int64_t inode);
+			  guint64 device, guint64 inode);
 
 void
 glibtop_inodedb_close_s (glibtop *server, glibtop_inodedb *inodedb);

include/glibtop/interfaces.h

@@ -151,17 +151,17 @@ enum _glibtop_interface_flags {
 
 struct _glibtop_ifaddr
 {
-    u_int64_t	flags,
+    guint64	flags,
 	transport;			/* GLIBTOP_IFADDR_TRANSPORT	*/
     u_int8_t	addr_len,		/* GLIBTOP_IFADDR_ADDR_LEN	*/
 	address [GLIBTOP_IFADDR_LEN];	/* GLIBTOP_IFADDR_ADDRESS	*/
-    u_int64_t	subnet,			/* GLIBTOP_IFADDR_SUBNET	*/
+    guint64	subnet,			/* GLIBTOP_IFADDR_SUBNET	*/
 	scope;				/* GLIBTOP_IFADDR_SCOPE	*/
 };
 
 struct _glibtop_interface
 {
-    u_int64_t	flags,
+    guint64	flags,
 	if_flags,		/* GLIBTOP_INTERFACE_IF_FLAGS		*/
 	transport,		/* GLIBTOP_INTERFACE_TRANSPORT		*/
 	type,			/* GLIBTOP_INTERFACE_TYPE		*/
@@ -177,14 +177,14 @@ struct _glibtop_interface
 #define glibtop_get_interface_names_r	glibtop_get_interface_names_s
 #endif
 
-glibtop_interface *glibtop_get_interface_names_l (glibtop_client *client, glibtop_array *array, u_int64_t interface, u_int64_t number, u_int64_t instance, u_int64_t strategy);
+glibtop_interface *glibtop_get_interface_names_l (glibtop_client *client, glibtop_array *array, guint64 interface, guint64 number, guint64 instance, guint64 strategy);
 
 #if GLIBTOP_SUID_INTERFACE_NAMES
 int glibtop_init_interface_names_p (glibtop_server *server, glibtop_closure *closure);
-glibtop_interface *glibtop_get_interface_names_p (glibtop_server *server, glibtop_closure *closure, glibtop_array *array, u_int64_t interface, u_int64_t number, u_int64_t instance, u_int64_t strategy);
+glibtop_interface *glibtop_get_interface_names_p (glibtop_server *server, glibtop_closure *closure, glibtop_array *array, guint64 interface, guint64 number, guint64 instance, guint64 strategy);
 #else
 int glibtop_init_interface_names_s (glibtop_server *server, glibtop_closure *closure);
-glibtop_interface *glibtop_get_interface_names_s (glibtop_server *server, glibtop_closure *closure, glibtop_array *array, u_int64_t interface, u_int64_t number, u_int64_t instance, u_int64_t strategy);
+glibtop_interface *glibtop_get_interface_names_s (glibtop_server *server, glibtop_closure *closure, glibtop_array *array, guint64 interface, guint64 number, guint64 instance, guint64 strategy);
 #endif
 
 #ifdef GLIBTOP_NAMES

include/glibtop/limits.h

@@ -45,8 +45,8 @@ G_BEGIN_DECLS
 /* Length of a network interface address in bytes. */
 #define GLIBTOP_IFADDR_LEN	16
 
-/* This is ((u_int64_t)-1) */
-#define GLIBTOP_UNLIMITED	(~(u_int64_t)0)
+/* This is ((guint64)-1) */
+#define GLIBTOP_UNLIMITED	(~(guint64)0)
 
 /* Maximum length of a backend name. */
 #define GLIBTOP_BACKEND_NAME_LEN	40

include/glibtop/loadavg.h

@@ -40,9 +40,9 @@ typedef struct _glibtop_loadavg	glibtop_loadavg;
 
 struct _glibtop_loadavg
 {
-	u_int64_t flags;
+	guint64 flags;
 	double loadavg [3];		/* GLIBTOP_LOADAVG_LOADAVG	*/
-	u_int64_t nr_running,		/* GLIBTOP_LOADAVG_NR_RUNNING	*/
+	guint64 nr_running,		/* GLIBTOP_LOADAVG_NR_RUNNING	*/
 		nr_tasks,		/* GLIBTOP_LOADAVG_NR_TASKS	*/
 		last_pid;		/* GLIBTOP_LOADAVG_LAST_PID	*/
 };

include/glibtop/mem.h

@@ -44,7 +44,7 @@ typedef struct _glibtop_mem	glibtop_mem;
 
 struct _glibtop_mem
 {
-	u_int64_t	flags,
+	guint64	flags,
 		total,		/* GLIBTOP_MEM_TOTAL	*/
 		used,		/* GLIBTOP_MEM_USED	*/
 		free,		/* GLIBTOP_MEM_FREE	*/

include/glibtop/mountlist.h

@@ -41,7 +41,7 @@ typedef struct _glibtop_mountlist	glibtop_mountlist;
 
 struct _glibtop_mountentry
 {
-	u_int64_t dev;
+	guint64 dev;
 	char devname [GLIBTOP_MOUNTENTRY_LEN+1];
 	char mountdir [GLIBTOP_MOUNTENTRY_LEN+1];
 	char type [GLIBTOP_MOUNTENTRY_LEN+1];
@@ -49,7 +49,7 @@ struct _glibtop_mountentry
 
 struct _glibtop_mountlist
 {
-	u_int64_t	flags,
+	guint64	flags,
 		number,			/* GLIBTOP_MOUNTLIST_NUMBER	*/
 		total,			/* GLIBTOP_MOUNTLIST_TOTAL	*/
 		size;			/* GLIBTOP_MOUNTLIST_SIZE	*/

include/glibtop/msg_limits.h

@@ -43,7 +43,7 @@ typedef struct _glibtop_msg_limits	glibtop_msg_limits;
 
 struct _glibtop_msg_limits
 {
-	u_int64_t	flags,
+	guint64	flags,
 		msgpool,	/* GLIBTOP_IPC_MSGPOOL	*/
 		msgmap,		/* GLIBTOP_IPC_MSGMAP	*/
 		msgmax,		/* GLIBTOP_IPC_MSGMAX	*/

include/glibtop/netinfo.h

@@ -45,7 +45,7 @@ typedef struct _glibtop_netinfo	glibtop_netinfo;
 
 struct _glibtop_netinfo
 {
-    u_int64_t	flags,
+    guint64	flags,
 	if_flags,			/* GLIBTOP_NETINFO_IF_FLAGS	*/
 	transport,			/* GLIBTOP_NETINFO_TRANSPORT	*/
 	mtu;				/* GLIBTOP_NETINFO_MTU		*/
@@ -57,14 +57,14 @@ struct _glibtop_netinfo
 #define glibtop_get_netinfo_r		glibtop_get_netinfo_s
 #endif
 
-glibtop_ifaddr *glibtop_get_netinfo_l (glibtop_client *client, glibtop_array *array, glibtop_netinfo *buf, const char *interface, u_int64_t transport);
+glibtop_ifaddr *glibtop_get_netinfo_l (glibtop_client *client, glibtop_array *array, glibtop_netinfo *buf, const char *interface, guint64 transport);
 
 #if GLIBTOP_SUID_NETINFO
 int glibtop_init_netinfo_p (glibtop_server *server, glibtop_closure *closure);
-glibtop_ifaddr *glibtop_get_netinfo_p (glibtop_server *server, glibtop_closure *closure, glibtop_array *array, glibtop_netinfo *buf, const char *interface, u_int64_t transport);
+glibtop_ifaddr *glibtop_get_netinfo_p (glibtop_server *server, glibtop_closure *closure, glibtop_array *array, glibtop_netinfo *buf, const char *interface, guint64 transport);
 #else
 int glibtop_init_netinfo_s (glibtop_server *server, glibtop_closure *closure);
-glibtop_ifaddr *glibtop_get_netinfo_s (glibtop_server *server, glibtop_closure *closure, glibtop_array *array, glibtop_netinfo *buf, const char *interface, u_int64_t transport);
+glibtop_ifaddr *glibtop_get_netinfo_s (glibtop_server *server, glibtop_closure *closure, glibtop_array *array, glibtop_netinfo *buf, const char *interface, guint64 transport);
 #endif
 
 #ifdef GLIBTOP_NAMES

include/glibtop/netload.h

@@ -69,7 +69,7 @@ enum {
 
 struct _glibtop_netload
 {
-	u_int64_t	flags,
+	guint64	flags,
 		if_flags,		/* GLIBTOP_NETLOAD_IF_FLAGS	*/
 		mtu,			/* GLIBTOP_NETLOAD_MTU		*/
 		subnet,			/* GLIBTOP_NETLOAD_SUBNET	*/

include/glibtop/ppp.h

@@ -30,7 +30,7 @@
 G_BEGIN_DECLS
 
 #define GLIBTOP_PPP_STATE	0
-#define GLIBTOP_PPP_BYTES_IN	1	
+#define GLIBTOP_PPP_BYTES_IN	1
 #define GLIBTOP_PPP_BYTES_OUT	2
 
 #define GLIBTOP_MAX_PPP		3
@@ -45,7 +45,7 @@ enum {
 
 struct _glibtop_ppp
 {
-	u_int64_t	flags,
+	guint64	flags,
 		state,			/* GLIBTOP_PPP_STATE		*/
 		bytes_in,		/* GLIBTOP_PPP_BYTES_IN		*/
 		bytes_out;		/* GLIBTOP_PPP_BYTES_OUT	*/

include/glibtop/procargs.h

@@ -37,7 +37,7 @@ typedef struct _glibtop_proc_args	glibtop_proc_args;
 
 struct _glibtop_proc_args
 {
-	u_int64_t	flags,
+	guint64	flags,
 		size;			/* GLIBTOP_PROC_ARGS_SIZE	*/
 };
 

include/glibtop/proccwd.h

@@ -45,7 +45,7 @@ typedef struct _glibtop_proc_cwd	glibtop_proc_cwd;
 
 struct _glibtop_proc_cwd
 {
-    u_int64_t	flags,
+    guint64	flags,
 	size,
 	device,
 	inode;

include/glibtop/prockernel.h

@@ -47,8 +47,8 @@ typedef struct _glibtop_proc_kernel	glibtop_proc_kernel;
 
 struct _glibtop_proc_kernel
 {
-	u_int64_t flags;
-	u_int64_t k_flags,	/* kernel flags for the process */
+	guint64 flags;
+	guint64 k_flags,	/* kernel flags for the process */
 		min_flt,	/* number of minor page faults since
 				 * process start */
 		maj_flt,	/* number of major page faults since

include/glibtop/proclist.h

@@ -56,7 +56,7 @@ typedef struct _glibtop_proclist	glibtop_proclist;
 
 struct _glibtop_proclist
 {
-	u_int64_t	flags,
+	guint64	flags,
 		number,			/* GLIBTOP_PROCLIST_NUMBER	*/
 		total,			/* GLIBTOP_PROCLIST_TOTAL	*/
 		size;			/* GLIBTOP_PROCLIST_SIZE	*/

include/glibtop/procmap.h

@@ -35,15 +35,15 @@ G_BEGIN_DECLS
 
 #define GLIBTOP_MAX_PROC_MAP		3
 
-#define GLIBTOP_MAP_ENTRY_START		1
-#define GLIBTOP_MAP_ENTRY_END		2
-#define GLIBTOP_MAP_ENTRY_OFFSET	3
-#define GLIBTOP_MAP_ENTRY_PERM		4
-#define GLIBTOP_MAP_ENTRY_INODE		5
-#define GLIBTOP_MAP_ENTRY_DEVICE	6
-#define GLIBTOP_MAP_ENTRY_FILENAME	7
+#define GLIBTOP_MAP_ENTRY_START		0
+#define GLIBTOP_MAP_ENTRY_END		1
+#define GLIBTOP_MAP_ENTRY_OFFSET	2
+#define GLIBTOP_MAP_ENTRY_PERM		3
+#define GLIBTOP_MAP_ENTRY_INODE		4
+#define GLIBTOP_MAP_ENTRY_DEVICE	5
+#define GLIBTOP_MAP_ENTRY_FILENAME	6
 
-#define GLIBTOP_MAX_MAP_ENTRY		8
+#define GLIBTOP_MAX_MAP_ENTRY		7
 
 #define GLIBTOP_MAP_FILENAME_LEN	215
 
@@ -59,13 +59,13 @@ typedef struct _glibtop_proc_map	glibtop_proc_map;
 
 struct _glibtop_map_entry
 {
-	u_int64_t flags, start, end, offset, perm, inode, device;
+	guint64 flags, start, end, offset, perm, inode, device;
 	char filename [GLIBTOP_MAP_FILENAME_LEN+1];
 };
 
 struct _glibtop_proc_map
 {
-	u_int64_t	flags,
+	guint64	flags,
 		number,			/* GLIBTOP_PROC_MAP_NUMBER	*/
 		total,			/* GLIBTOP_PROC_MAP_TOTAL	*/
 		size;			/* GLIBTOP_PROC_MAP_SIZE	*/

include/glibtop/procmem.h

@@ -44,7 +44,7 @@ typedef struct _glibtop_proc_mem	glibtop_proc_mem;
 
 struct _glibtop_proc_mem
 {
-	u_int64_t	flags,
+	guint64	flags,
 		size,		/* total # of pages of memory */
 		vsize,		/* number of pages of virtual memory ... */
 		resident,	/* number of resident set

include/glibtop/procsegment.h

@@ -46,7 +46,7 @@ typedef struct _glibtop_proc_segment	glibtop_proc_segment;
 
 struct _glibtop_proc_segment
 {
-	u_int64_t	flags,
+	guint64	flags,
 		text_rss,	/* text resident set size */
 		shlib_rss,	/* shared-lib resident set size */
 		data_rss,	/* data resident set size */

include/glibtop/procsignal.h

@@ -42,7 +42,7 @@ typedef struct _glibtop_proc_signal	glibtop_proc_signal;
 
 struct _glibtop_proc_signal
 {
-	u_int64_t	flags,
+	guint64	flags,
 		signal [2],		/* mask of pending signals */
 		blocked [2],		/* mask of blocked signals */
 		sigignore [2],		/* mask of ignored signals */

include/glibtop/procstate.h

@@ -33,8 +33,20 @@ G_BEGIN_DECLS
 #define GLIBTOP_PROC_STATE_STATE	1
 #define GLIBTOP_PROC_STATE_UID		2
 #define GLIBTOP_PROC_STATE_GID		3
+#define GLIBTOP_PROC_STATE_RUID     4
+#define GLIBTOP_PROC_STATE_RGID     5
+#define GLIBTOP_PROC_STATE_HAS_CPU  6
+#define GLIBTOP_PROC_STATE_PROCESSOR 7
+#define GLIBTOP_PROC_STATE_LAST_PROCESSOR 8
 
-#define GLIBTOP_MAX_PROC_STATE		4
+#define GLIBTOP_MAX_PROC_STATE		9
+
+#define GLIBTOP_PROCESS_RUNNING                 1
+#define GLIBTOP_PROCESS_INTERRUPTIBLE           2
+#define GLIBTOP_PROCESS_UNINTERRUPTIBLE         4
+#define GLIBTOP_PROCESS_ZOMBIE                  8
+#define GLIBTOP_PROCESS_STOPPED                 16
+#define GLIBTOP_PROCESS_SWAPPING                32
 
 typedef struct _glibtop_proc_state	glibtop_proc_state;
 
@@ -42,10 +54,10 @@ typedef struct _glibtop_proc_state	glibtop_proc_state;
 
 struct _glibtop_proc_state
 {
-	u_int64_t flags;
-	char cmd[40],		/* basename of executable file in 
+	guint64 flags;
+	char cmd[40];		/* basename of executable file in
 				 * call to exec(2) */
-		state;		/* single-char code for process state
+	unsigned state;		/* single-char code for process state
 				 * (S=sleeping) */
 	/* NOTE: when porting the library, TRY HARD to implement the
 	 *       following two fields. */
@@ -53,7 +65,12 @@ struct _glibtop_proc_state
 	 *                   only to set the flags value for those two
 	 *                   fields if their values are corrent ! */
 	int uid,		/* UID of process */
-		gid;		/* GID of process */
+		gid,		/* GID of process */
+        ruid,
+        rgid;
+    int has_cpu,
+        processor,
+        last_processor;
 };
 
 #define glibtop_get_proc_state(p1, p2)	glibtop_get_proc_state_l(glibtop_global_server, p1, p2)
@@ -73,7 +90,7 @@ void glibtop_get_proc_state_p (glibtop *server, glibtop_proc_state *buf, pid_t p
 void glibtop_init_proc_state_s (glibtop *server);
 void glibtop_get_proc_state_s (glibtop *server, glibtop_proc_state *buf, pid_t pid);
 #endif
-     
+
 #ifdef GLIBTOP_NAMES
 
 /* You need to link with -lgtop_names to get this stuff here. */

include/glibtop/proctime.h

@@ -50,15 +50,15 @@ typedef struct _glibtop_proc_time	glibtop_proc_time;
 
 struct _glibtop_proc_time
 {
-	u_int64_t	flags,
-		start_time,	/* start time of process -- 
+	guint64	flags,
+		start_time,	/* start time of process --
 				 * seconds since 1-1-70 */
 		rtime,		/* real time accumulated by process */
 		utime,		/* user-mode CPU time accumulated by process */
 		stime,		/* kernel-mode CPU time accumulated by process */
-		cutime,		/* cumulative utime of process and 
+		cutime,		/* cumulative utime of process and
 				 * reaped children */
-		cstime,		/* cumulative stime of process and 
+		cstime,		/* cumulative stime of process and
 				 * reaped children */
 		timeout,	/* The time (in jiffies) of the process's
 				 * next timeout */

include/glibtop/procuid.h

@@ -33,28 +33,40 @@ G_BEGIN_DECLS
 #define GLIBTOP_PROC_UID_EUID		1
 #define GLIBTOP_PROC_UID_GID		2
 #define GLIBTOP_PROC_UID_EGID		3
-#define GLIBTOP_PROC_UID_PID		4
-#define GLIBTOP_PROC_UID_PPID		5
-#define GLIBTOP_PROC_UID_PGRP		6
-#define GLIBTOP_PROC_UID_SESSION	7
-#define GLIBTOP_PROC_UID_TTY		8
-#define GLIBTOP_PROC_UID_TPGID		9
-#define GLIBTOP_PROC_UID_PRIORITY	10
-#define GLIBTOP_PROC_UID_NICE		11
+#define GLIBTOP_PROC_UID_SUID		4
+#define GLIBTOP_PROC_UID_SGID		5
+#define GLIBTOP_PROC_UID_FSUID		6
+#define GLIBTOP_PROC_UID_FSGID		7
+#define GLIBTOP_PROC_UID_PID		8
+#define GLIBTOP_PROC_UID_PPID		9
+#define GLIBTOP_PROC_UID_PGRP		10
+#define GLIBTOP_PROC_UID_SESSION	11
+#define GLIBTOP_PROC_UID_TTY		12
+#define GLIBTOP_PROC_UID_TPGID		13
+#define GLIBTOP_PROC_UID_PRIORITY	14
+#define GLIBTOP_PROC_UID_NICE		15
+#define GLIBTOP_PROC_UID_NGROUPS    16
+#define GLIBTOP_PROC_UID_GROUPS     17
 
-#define GLIBTOP_MAX_PROC_UID		12
+#define GLIBTOP_MAX_PROC_UID		18
 
 typedef struct _glibtop_proc_uid	glibtop_proc_uid;
 
+#define GLIBTOP_MAX_GROUPS          64
+
 /* User, Group, Terminal and session */
 
 struct _glibtop_proc_uid
 {
-	u_int64_t flags;
+	guint64 flags;
 	int uid,		/* user id */
 		euid,		/* effective user id */
 		gid,		/* group id */
 		egid,		/* effective group id */
+        suid,       /* set user id */
+        sgid,       /* set group id */
+        fsuid,      /* ??? user id */
+        fsgid,      /* ??? group id */
 		pid,		/* process id */
 		ppid,		/* pid of parent process */
 		pgrp,		/* process group id */
@@ -62,7 +74,10 @@ struct _glibtop_proc_uid
 		tty,		/* full device number of controlling terminal */
 		tpgid,		/* terminal process group id */
 		priority,	/* kernel scheduling priority */
-		nice;		/* standard unix nice level of process */
+		nice,		/* standard unix nice level of process */
+		ngroups,
+        groups [GLIBTOP_MAX_GROUPS];
+
 };
 
 #define glibtop_get_proc_uid(p1, p2)	glibtop_get_proc_uid_l(glibtop_global_server, p1, p2)

include/glibtop/sem_limits.h

@@ -46,7 +46,7 @@ typedef struct _glibtop_sem_limits	glibtop_sem_limits;
 
 struct _glibtop_sem_limits
 {
-	u_int64_t	flags,
+	guint64	flags,
 		semmap,		/* GLIBTOP_IPC_SEMMAP	*/
 		semmni,		/* GLIBTOP_IPC_SEMMNI	*/
 		semmns,		/* GLIBTOP_IPC_SEMMNS	*/

include/glibtop/shm_limits.h

@@ -41,7 +41,7 @@ typedef struct _glibtop_shm_limits	glibtop_shm_limits;
 
 struct _glibtop_shm_limits
 {
-	u_int64_t	flags,
+	guint64	flags,
 		shmmax,		/* GLIBTOP_IPC_SHMMAX	*/
 		shmmin,		/* GLIBTOP_IPC_SHMMIN	*/
 		shmmni,		/* GLIBTOP_IPC_SHMMNI	*/

include/glibtop/swap.h

@@ -41,7 +41,7 @@ typedef struct _glibtop_swap	glibtop_swap;
 
 struct _glibtop_swap
 {
-	u_int64_t	flags,
+	guint64	flags,
 		total,		/* GLIBTOP_SWAP_TOTAL	*/
 		used,		/* GLIBTOP_SWAP_USED	*/
 		free,		/* GLIBTOP_SWAP_FREE	*/

include/glibtop/sysdeps.h

@@ -64,7 +64,7 @@ typedef struct _glibtop_sysdeps	glibtop_sysdeps;
 
 struct _glibtop_sysdeps
 {
-	u_int64_t flags,
+	guint64 flags,
 		features,		/* server features	*/
 		cpu,			/* glibtop_cpu		*/
 		mem,			/* glibtop_mem		*/

include/glibtop/sysinfo.h

@@ -32,9 +32,10 @@
 
 G_BEGIN_DECLS
 
-#define GLIBTOP_SYSINFO_CPUINFO		0
+#define GLIBTOP_SYSINFO_NCPU		0
+#define GLIBTOP_SYSINFO_CPUINFO		1
 
-#define GLIBTOP_MAX_SYSINFO		1
+#define GLIBTOP_MAX_SYSINFO		2
 
 typedef struct _glibtop_sysinfo	glibtop_sysinfo;
 
@@ -43,21 +44,21 @@ typedef struct _glibtop_entry	glibtop_entry;
 struct _glibtop_entry
 {
 	GPtrArray	*labels;
-	GHashTable	*values;
-	GHashTable	*descriptions;
+	GHashTable	*values; /* key -> description */
+	GHashTable	*descriptions; /* unused */
 };
 
 struct _glibtop_sysinfo
 {
-	u_int64_t	flags, ncpu;
-	glibtop_entry	cpuinfo [GLIBTOP_NCPU];
+	guint64	flags, ncpu;
+	glibtop_entry cpuinfo [GLIBTOP_NCPU];
 };
 
 #define glibtop_get_sysinfo()	glibtop_get_sysinfo_s(glibtop_global_server)
 
 #define glibtop_get_sysinfo_r	glibtop_get_sysinfo_s
 
-glibtop_sysinfo *glibtop_get_sysinfo_s (glibtop *server);
+const glibtop_sysinfo *glibtop_get_sysinfo_s (glibtop *server);
 
 G_END_DECLS
 

include/glibtop/uptime.h

@@ -31,16 +31,18 @@ G_BEGIN_DECLS
 
 #define GLIBTOP_UPTIME_UPTIME		0
 #define GLIBTOP_UPTIME_IDLETIME		1
+#define GLIBTOP_UPTIME_BOOT_TIME    2
 
-#define GLIBTOP_MAX_UPTIME		2
+#define GLIBTOP_MAX_UPTIME		3
 
 typedef struct _glibtop_uptime	glibtop_uptime;
 
 struct _glibtop_uptime
 {
-	u_int64_t flags;
+	guint64 flags;
 	double uptime,		/* GLIBTOP_UPTIME_UPTIME	*/
 		idletime;	/* GLIBTOP_UPTIME_IDLETIME	*/
+	guint64 boot_time;
 };
 
 #define glibtop_get_uptime(uptime)	glibtop_get_uptime_l(glibtop_global_server, uptime)

include/libgtop-i18n.h

@@ -0,0 +1,11 @@
+
+#include <config.h>
+
+#include <libintl.h>
+#define _(String) gettext (String)
+#ifdef gettext_noop
+#   define N_(String) gettext_noop (String)
+#else
+#   define N_(String) (String)
+#endif
+

kernel/sysctl/libgtop.c

@@ -212,7 +212,7 @@ get_wchan (struct task_struct *p)
 	    return ((unsigned long *)schedule_frame)[12];
 	}
 	return pc;
-    }	
+    }
 #elif defined(__mc68000__)
     {
 	unsigned long fp, pc;
@@ -318,7 +318,7 @@ static inline void
 task_mem (struct task_struct *p, libgtop_proc_segment_t *proc_segment)
 {
     struct mm_struct * mm = p->mm;
-    
+
     if (mm && mm != &init_mm) {
 	struct vm_area_struct * vma = mm->mmap;
 	unsigned long data = 0, stack = 0;
@@ -486,7 +486,7 @@ get_statm (struct task_struct *tsk, libgtop_proc_mem_t *proc_mem)
 	}
     }
 
-    proc_mem->segment.vsize = vsize;    
+    proc_mem->segment.vsize = vsize;
     proc_mem->segment.data = data;
     proc_mem->segment.stack = stack;
     proc_mem->segment.exec = exec;
@@ -498,7 +498,7 @@ get_statm (struct task_struct *tsk, libgtop_proc_mem_t *proc_mem)
     proc_mem->trs = trs;
     proc_mem->lrs = lrs;
     proc_mem->drs = drs;
-    proc_mem->dt = dt; 
+    proc_mem->dt = dt;
 }
 
 static void
@@ -522,7 +522,7 @@ collect_sigign_sigcatch (struct task_struct *p, sigset_t *ign,
     }
 }
 
-static void 
+static void
 task_sig (struct task_struct *p, libgtop_proc_signal_t *proc_signal)
 {
     sigset_t ignore, catch;
@@ -670,7 +670,7 @@ libgtop_sysctl (ctl_table *table, int nlen, int *name)
 
 	    if ((which & LIBGTOP_EXCLUDE_NOTTY) && (tsk->tty == NULL))
 		continue;
-			
+
 	    proclist->pids [tindex++] = tsk->pid;
 	}
 
@@ -702,7 +702,7 @@ libgtop_sysctl_proc (ctl_table *table, int nlen, int *name,
     case LIBGTOP_PROC_STATE:
 	proc_state = table->data;
 	memset (proc_state, 0, sizeof (libgtop_proc_state_t));
-	
+
 	proc_state->uid = tsk->uid;
 	proc_state->gid = tsk->gid;
 	proc_state->flags = tsk->flags;
@@ -711,12 +711,12 @@ libgtop_sysctl_proc (ctl_table *table, int nlen, int *name,
 	proc_state->euid = tsk->euid;
 	proc_state->suid = tsk->suid;
 	proc_state->fsuid = tsk->fsuid;
-		
+
 	proc_state->gid = tsk->gid;
 	proc_state->egid = tsk->egid;
 	proc_state->sgid = tsk->sgid;
 	proc_state->fsgid = tsk->fsgid;
-		
+
 	proc_state->pid = tsk->pid;
 	proc_state->pgrp = tsk->pgrp;
 	proc_state->ppid = tsk->p_pptr->pid;
@@ -757,12 +757,12 @@ libgtop_sysctl_proc (ctl_table *table, int nlen, int *name,
 	proc_state->it_real_incr = tsk->it_real_incr;
 	proc_state->it_prof_incr = tsk->it_prof_incr;
 	proc_state->it_virt_incr = tsk->it_virt_incr;
-	
+
 	proc_state->min_flt = tsk->min_flt;
 	proc_state->cmin_flt = tsk->cmin_flt;
 	proc_state->maj_flt = tsk->maj_flt;
 	proc_state->cmaj_flt = tsk->cmaj_flt;
-		
+
 	proc_state->nswap = tsk->nswap;
 	proc_state->cnswap = tsk->cnswap;
 
@@ -794,7 +794,7 @@ libgtop_sysctl_proc (ctl_table *table, int nlen, int *name,
 	proc_state->ngroups = tsk->ngroups;
 	for (i = 0; i < min (tsk->ngroups, LIBGTOP_MAX_GROUPS); i++)
 	    proc_state->groups [i] = tsk->groups [i];
-	
+
 	if (tsk->state & TASK_INTERRUPTIBLE)
 	    proc_state->state |= LIBGTOP_TASK_INTERRUPTIBLE;
 	if (tsk->state & TASK_UNINTERRUPTIBLE)
@@ -1023,7 +1023,7 @@ proc_args_ctl_handler (ctl_table *table, int *name, int nlen,
 
     if (put_user (len, oldlenp))
 	goto err_fault_free_page;
-    
+
     if (copy_to_user (oldval, (void *) page, len))
 	goto err_fault_free_page;
 
@@ -1113,7 +1113,7 @@ proc_maps_ctl_handler (ctl_table *table, int *name, int nlen,
 	    proc_maps->filename [LIBGTOP_MAP_PATH_LEN-1] = '\0';
 	    proc_maps->header.filename_offset = line - proc_maps->filename;
 
-	    proc_maps->header.device = 
+	    proc_maps->header.device =
 		map->vm_file->f_dentry->d_inode->i_dev;
 	    proc_maps->header.inode =
 		map->vm_file->f_dentry->d_inode->i_ino;
@@ -1243,13 +1243,13 @@ proc_net_ctl_handler (ctl_table *table, int *name, int nlen,
     netload.rx_frame_errors = stats->rx_frame_errors;
     netload.rx_fifo_errors = stats->rx_fifo_errors;
     netload.rx_missed_errors = stats->rx_missed_errors;
-    
+
     netload.tx_aborted_errors = stats->tx_aborted_errors;
     netload.tx_carrier_errors = stats->tx_carrier_errors;
     netload.tx_fifo_errors = stats->tx_fifo_errors;
     netload.tx_heartbeat_errors = stats->tx_heartbeat_errors;
     netload.tx_window_errors = stats->tx_window_errors;
-    
+
     netload.rx_compressed = stats->rx_compressed;
     netload.tx_compressed = stats->tx_compressed;
 

kernel/sysctl/libgtop.h

@@ -218,7 +218,7 @@ struct libgtop_netload
     unsigned long tx_dropped;		/* no space available in linux	*/
     unsigned long multicast;		/* multicast packets received	*/
     unsigned long collisions;
-    
+
     /* detailed rx_errors: */
     unsigned long rx_length_errors;
     unsigned long rx_over_errors;	/* receiver ring buff overflow	*/
@@ -226,14 +226,14 @@ struct libgtop_netload
     unsigned long rx_frame_errors;	/* recv'd frame alignment error */
     unsigned long rx_fifo_errors;	/* recv'r fifo overrun		*/
     unsigned long rx_missed_errors;	/* receiver missed packet	*/
-    
+
     /* detailed tx_errors */
     unsigned long tx_aborted_errors;
     unsigned long tx_carrier_errors;
     unsigned long tx_fifo_errors;
     unsigned long tx_heartbeat_errors;
     unsigned long tx_window_errors;
-    
+
     /* for cslip etc */
     unsigned long rx_compressed;
     unsigned long tx_compressed;

kernel/table.h

@@ -15,7 +15,7 @@
 #define TABLE_KERN_PROC_UID		5
 #define TABLE_KERN_PROC_RUID		6
 
-#define TABLE_KERN_PROC_MASK		15	
+#define TABLE_KERN_PROC_MASK		15
 
 #define TABLE_EXCLUDE_IDLE		0x1000
 #define TABLE_EXCLUDE_SYSTEM		0x2000
@@ -178,7 +178,7 @@ union table
 	struct table_proc_mem proc_mem;
 	struct table_proc_segment proc_segment;
 	struct table_proc_time proc_time;
-	struct table_proc_state proc_state;	
+	struct table_proc_state proc_state;
 	struct table_proc_signal proc_signal;
 	struct table_proc_kernel proc_kernel;
 };

kernel/table20/main.c

@@ -50,7 +50,7 @@ static struct task_struct *
 get_task (pid_t pid)
 {
 	struct task_struct ** p;
-	
+
 	p = task;
 	while (++p < task+NR_TASKS) {
 		if (*p && (*p)->pid == pid)
@@ -171,7 +171,7 @@ get_wchan (struct task_struct *p)
 	{
 		unsigned long schedule_frame;
 		unsigned long pc;
-		
+
 		pc = thread_saved_pc(&p->tss);
 		if (pc >= (unsigned long) interruptible_sleep_on && pc < (unsigned long) add_timer) {
 			schedule_frame = ((unsigned long *)p->tss.ksp)[6];
@@ -246,7 +246,7 @@ sys_table (int type, union table *buf, const void *param)
 		tbl.proclist.last_pid = last_pid;
 		break;
 	case TABLE_CPU:
-		tbl.cpu.total = jiffies;    
+		tbl.cpu.total = jiffies;
 		tbl.cpu.user  = kstat.cpu_user;
 		tbl.cpu.nice  = kstat.cpu_nice;
 		tbl.cpu.sys   = kstat.cpu_system;
@@ -294,21 +294,21 @@ sys_table (int type, union table *buf, const void *param)
 		tbl.proc_uid.euid = tsk->euid;
 		tbl.proc_uid.suid = tsk->suid;
 		tbl.proc_uid.fsuid = tsk->fsuid;
-		
+
 		tbl.proc_uid.gid = tsk->gid;
 		tbl.proc_uid.egid = tsk->egid;
 		tbl.proc_uid.sgid = tsk->sgid;
 		tbl.proc_uid.fsgid = tsk->fsgid;
-		
+
 		tbl.proc_uid.pid = tsk->pid;
 		tbl.proc_uid.pgrp = tsk->pgrp;
 		tbl.proc_uid.ppid = tsk->p_pptr->pid;
-		
+
 		tbl.proc_uid.session = tsk->session;
 	        tbl.proc_uid.tty = tsk->tty ?
 			kdev_t_to_nr (tsk->tty->device) : 0;
 		tbl.proc_uid.tpgid = tsk->tty ? tsk->tty->pgrp : -1;
-		
+
 		tbl.proc_uid.priority = tsk->priority;
 		tbl.proc_uid.counter = tsk->counter;
 		tbl.proc_uid.def_priority = DEF_PRIORITY;
@@ -322,7 +322,7 @@ sys_table (int type, union table *buf, const void *param)
 			unsigned long sig_ign = 0, sig_caught = 0;
 			unsigned long bit = 1;
 			int i;
-			
+
 			for (i = 0; i < 32; i++) {
 				switch((unsigned long) action->sa_handler) {
 				case 0:
@@ -376,7 +376,7 @@ sys_table (int type, union table *buf, const void *param)
 			while (vma) {
 				pgd_t *pgd = pgd_offset(tsk->mm, vma->vm_start);
 				int pages = 0, shared = 0, dirty = 0, total = 0;
-				
+
 				vsize += vma->vm_end - vma->vm_start;
 
 				statm_pgd_range (pgd, vma->vm_start, vma->vm_end,
@@ -428,10 +428,10 @@ sys_table (int type, union table *buf, const void *param)
 		tbl.proc_kernel.cmin_flt = tsk->cmin_flt;
 		tbl.proc_kernel.maj_flt = tsk->maj_flt;
 		tbl.proc_kernel.cmaj_flt = tsk->cmaj_flt;
-		
+
 		tbl.proc_kernel.kesp = tsk->kernel_stack_page ? KSTK_EIP(tsk) : 0;
 		tbl.proc_kernel.keip = tsk->kernel_stack_page ? KSTK_ESP(tsk) : 0;
-		
+
 		tbl.proc_kernel.nswap = tsk->nswap;
 		tbl.proc_kernel.cnswap = tsk->cnswap;
 
@@ -442,10 +442,10 @@ sys_table (int type, union table *buf, const void *param)
 			for (rule = chain->chain; rule; rule = rule->next) {
 				const char *name = rule->ipfw.fw_vianame;
 				int k;
-				
+
 				if (name [0] && !strncmp (param, name, 5))
 					continue;
-				
+
 				for (k = 0; k < NUM_SLOTS; k++) {
 					tbl.netacct.packets +=
 						rule->counters[k].pcnt;

kernel/table20/unistd-i386.h

@@ -237,7 +237,7 @@ if (__res>=0) \
 	return (type) __res; \
 errno=-__res; \
 return -1; \
-} 
+}
 
 #define _syscall5(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4, \
 	  type5,arg5) \

kernel/table21/module.c

@@ -140,7 +140,7 @@ static unsigned long get_wchan(struct task_struct *p)
 		return ((unsigned long *)schedule_frame)[12];
 	    }
 	    return pc;
-	}	
+	}
 #elif defined(__mc68000__)
 	{
 	    unsigned long fp, pc;
@@ -388,7 +388,7 @@ table_fkt (int type, union table *buf, const void *param)
 			if ((plistargs.which & TABLE_EXCLUDE_NOTTY) &&
 			    (tsk->tty == NULL))
 				continue;
-			
+
 			tbl.proclist.pids [tindex++] = tsk->pid;
 		}
 		tbl.proclist.nr_running = nr_running;
@@ -397,7 +397,7 @@ table_fkt (int type, union table *buf, const void *param)
 		read_unlock(&tasklist_lock);
 		break;
 	case TABLE_CPU:
-		tbl.cpu.total = jiffies;    
+		tbl.cpu.total = jiffies;
 		tbl.cpu.user  = kstat.cpu_user;
 		tbl.cpu.nice  = kstat.cpu_nice;
 		tbl.cpu.sys   = kstat.cpu_system;
@@ -446,21 +446,21 @@ table_fkt (int type, union table *buf, const void *param)
 		tbl.proc_uid.euid = tsk->euid;
 		tbl.proc_uid.suid = tsk->suid;
 		tbl.proc_uid.fsuid = tsk->fsuid;
-		
+
 		tbl.proc_uid.gid = tsk->gid;
 		tbl.proc_uid.egid = tsk->egid;
 		tbl.proc_uid.sgid = tsk->sgid;
 		tbl.proc_uid.fsgid = tsk->fsgid;
-		
+
 		tbl.proc_uid.pid = tsk->pid;
 		tbl.proc_uid.pgrp = tsk->pgrp;
 		tbl.proc_uid.ppid = tsk->p_pptr->pid;
-		
+
 		tbl.proc_uid.session = tsk->session;
 	        tbl.proc_uid.tty = tsk->tty ?
 			kdev_t_to_nr (tsk->tty->device) : 0;
 		tbl.proc_uid.tpgid = tsk->tty ? tsk->tty->pgrp : -1;
-		
+
 		tbl.proc_uid.priority = tsk->priority;
 		tbl.proc_uid.counter = tsk->counter;
 		tbl.proc_uid.def_priority = DEF_PRIORITY;
@@ -520,7 +520,7 @@ table_fkt (int type, union table *buf, const void *param)
 			while (vma) {
 				pgd_t *pgd = pgd_offset(tsk->mm, vma->vm_start);
 				int pages = 0, shared = 0, dirty = 0, total = 0;
-				
+
 				vsize += vma->vm_end - vma->vm_start;
 
 				statm_pgd_range (pgd, vma->vm_start, vma->vm_end,
@@ -584,10 +584,10 @@ table_fkt (int type, union table *buf, const void *param)
 		tbl.proc_kernel.cmin_flt = tsk->cmin_flt;
 		tbl.proc_kernel.maj_flt = tsk->maj_flt;
 		tbl.proc_kernel.cmaj_flt = tsk->cmaj_flt;
-		
+
 		tbl.proc_kernel.kesp = KSTK_ESP(tsk);
 		tbl.proc_kernel.keip = KSTK_EIP(tsk);
-		
+
 		tbl.proc_kernel.nswap = tsk->nswap;
 		tbl.proc_kernel.cnswap = tsk->cnswap;
 

kernel/table21/unistd-i386.h

@@ -259,7 +259,7 @@ __asm__ volatile ("int $0x80" \
 	: "0" (__NR_##name),"b" ((long)(arg1)),"c" ((long)(arg2)), \
 	  "d" ((long)(arg3)),"S" ((long)(arg4))); \
 __syscall_return(type,__res); \
-} 
+}
 
 #define _syscall5(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4, \
 	  type5,arg5) \

lib/command.c

@@ -50,7 +50,7 @@ glibtop_call_l (glibtop *server, unsigned command, size_t send_size,
 	} else {
 		cmnd.data_size = send_size;
 	}
-	
+
 	glibtop_write_l (server, sizeof (glibtop_command), &cmnd);
 
 	glibtop_read_l (server, sizeof (glibtop_response), &response);

lib/error.c

@@ -32,7 +32,7 @@
 static void
 print_server_name (glibtop_server *server)
 {
-    fprintf (stderr, "%s: ", server ? 
+    fprintf (stderr, "%s: ", server ?
 	     (server->name ? server->name : DEFAULT_NAME)
 	     : DEFAULT_NAME);
 }
@@ -40,7 +40,7 @@ print_server_name (glibtop_server *server)
 void
 glibtop_error_vr (glibtop_server *server, char *format, va_list args)
 {
-    print_server_name (server);	
+    print_server_name (server);
     vfprintf (stderr, format, args);
     fprintf (stderr, "\n");
 

lib/glibtop-backend.c

@@ -53,7 +53,7 @@ GType
 glibtop_backend_get_type (void)
 {
     static GType glibtop_backend_type = 0;
-  
+
     if (!glibtop_backend_type) {
 	static const GTypeInfo glibtop_backend_info = {
 	    sizeof (glibtop_backend_class),
@@ -66,7 +66,7 @@ glibtop_backend_get_type (void)
 	    16,			/* n_preallocs */
 	    (GInstanceInitFunc) glibtop_backend_init,
 	};
-      
+
 	glibtop_backend_type = g_type_register_static
 	    (G_TYPE_OBJECT, "glibtop_backend", &glibtop_backend_info, 0);
     }
@@ -80,7 +80,7 @@ glibtop_backend_class_init (glibtop_backend_class *class)
     GObjectClass *gobject_class;
 
     gobject_class = (GObjectClass *) class;
-  
+
     parent_class = g_type_class_ref (G_TYPE_OBJECT);
 
     gobject_class->finalize = glibtop_backend_finalize;
@@ -100,12 +100,12 @@ glibtop_backend_finalize (GObject *object)
 {
     glibtop_backend *glibtop;
     glibtop_backend_private *priv = NULL;
-  
+
     glibtop = GLIBTOP_BACKEND (object);
     priv = glibtop->_priv;
 
     g_free (priv);
-  
+
     if (G_OBJECT_CLASS (parent_class)->finalize)
 	G_OBJECT_CLASS (parent_class)->finalize (object);
 }
@@ -146,7 +146,7 @@ load_extra_libs (glibtop_backend_entry *entry, GError **error)
 }
 
 glibtop_backend *
-glibtop_backend_get (const char *backend_name, u_int64_t features,
+glibtop_backend_get (const char *backend_name, guint64 features,
 		     const char **backend_args, GError **error)
 {
     const glibtop_backend_info *info;

lib/glibtop-client.c

@@ -47,7 +47,7 @@ GType
 glibtop_client_get_type (void)
 {
     static GType glibtop_client_type = 0;
-  
+
     if (!glibtop_client_type) {
 	static const GTypeInfo glibtop_client_info = {
 	    sizeof (glibtop_client_class),
@@ -60,7 +60,7 @@ glibtop_client_get_type (void)
 	    16,			/* n_preallocs */
 	    (GInstanceInitFunc) glibtop_client_init,
 	};
-      
+
 	glibtop_client_type = g_type_register_static
 	    (G_TYPE_OBJECT, "glibtop_client", &glibtop_client_info, 0);
     }
@@ -99,7 +99,7 @@ glibtop_client_class_init (glibtop_client_class *klass)
     GObjectClass *gobject_class;
 
     gobject_class = (GObjectClass *) klass;
-  
+
     parent_class = g_type_class_peek_parent (klass);
 
     glibtop_client_signals [GLIBTOP_CLIENT_SIGNAL_ERROR] =
@@ -122,7 +122,7 @@ glibtop_client_class_init (glibtop_client_class *klass)
 
     klass->error = glibtop_client_error_handler;
     klass->warning = glibtop_client_warning_handler;
-  
+
     gobject_class->finalize = glibtop_client_finalize;
 }
 
@@ -130,7 +130,7 @@ static void
 glibtop_client_init (glibtop_client *glibtop)
 {
     glibtop_client_private *priv;
-  
+
     priv = g_new0 (glibtop_client_private, 1);
     glibtop->_priv = priv;
 }
@@ -141,16 +141,16 @@ glibtop_client_finalize (GObject *object)
     glibtop_client *glibtop;
     glibtop_client_private *priv = NULL;
     GSList *c;
-  
+
     glibtop = GLIBTOP_CLIENT (object);
     priv = glibtop->_priv;
 
     for (c = priv->backend_list; c; c = c->next)
 	g_object_unref (G_OBJECT (c->data));
     g_slist_free (priv->backend_list);
-  
+
     g_free (priv);
-  
+
     if (G_OBJECT_CLASS (parent_class)->finalize)
 	G_OBJECT_CLASS (parent_class)->finalize (object);
 }
@@ -180,7 +180,7 @@ glibtop_client_propagate_error (glibtop_client *client, GError *error)
     g_signal_emitv (params,
 		    glibtop_client_signals [GLIBTOP_CLIENT_SIGNAL_ERROR],
 		    0, NULL);
-  
+
     g_value_unset (params + 1);
     g_value_unset (params + 0);
 }
@@ -204,14 +204,14 @@ glibtop_client_propagate_warning (glibtop_client *client, GError *error)
     g_signal_emitv (params,
 		    glibtop_client_signals [GLIBTOP_CLIENT_SIGNAL_WARNING],
 		    0, NULL);
-  
+
     g_value_unset (params + 1);
     g_value_unset (params + 0);
 }
 
 void
 glibtop_client_open_backend (glibtop_client *client, const char *backend_name,
-			     u_int64_t features, const char **backend_args)
+			     guint64 features, const char **backend_args)
 {
     glibtop_backend *backend;
     GError *error = NULL;

lib/init.c

@@ -29,7 +29,7 @@
 #define DEFAULT_PORT 42800
 #endif
 
-static glibtop _glibtop_global_server;
+static glibtop _glibtop_global_server = { .flags = 0 };
 glibtop *glibtop_global_server = &_glibtop_global_server;
 
 static void
@@ -50,7 +50,7 @@ _init_server (glibtop *server, const unsigned features)
 	if (server->server_rsh == NULL) {
 		const char *temp = getenv ("LIBGTOP_RSH") ?
 			getenv ("LIBGTOP_RSH") : "/usr/bin/ssh";
-		
+
 		server->server_rsh = g_strdup (temp);
 	}
 
@@ -78,15 +78,15 @@ _init_server (glibtop *server, const unsigned features)
 
 	/* If the first character of 'server_command' is a colon,
 	 * the first field is the method to connect to the server. */
-	
+
 	/* Everything up to the next colon is the method. */
-	
+
 	command = g_strdup (server->server_command+1);
 	temp = strstr (command, ":");
 	if (temp) *temp = 0;
-	
+
 	/* Dispatch method. */
-			
+
 	if (!strcmp (command, "direct")) {
 		/* Use sysdeps dir instead of connecting to server
 		 * even if using the server would be required on
@@ -106,16 +106,16 @@ _init_server (glibtop *server, const unsigned features)
 		} else {
 			char *temp2 = strstr (temp+1, ":");
 			if (temp2) *temp2 = 0;
-					
+
 			/* Override default. */
 			if (server->server_host)
 				g_free ((char *) server->server_host);
 
 			server->server_host = g_strdup (temp+1);
-					
+
 			temp = temp2;
 		}
-			
+
 		if (temp == NULL) {
 			/* If no value was set, we use DEFAULT_PORT. */
 			if (server->server_port == 0)
@@ -123,10 +123,10 @@ _init_server (glibtop *server, const unsigned features)
 		} else {
 			char *temp2 = strstr (temp+1, ":");
 			if (temp2) *temp2 = 0;
-					
+
 			if (sscanf (temp+1, "%ld", &server->server_port) != 1)
 				server->server_port = DEFAULT_PORT;
-					
+
 			temp = temp2 ? temp2 + 1 : temp2;
 		}
 
@@ -146,7 +146,7 @@ _init_server (glibtop *server, const unsigned features)
 				 server->server_command+1);
 
 	}
-			
+
 	g_free (command);
 }
 
@@ -173,27 +173,27 @@ glibtop_init_r (glibtop **server_ptr, unsigned long features, unsigned flags)
 	if ((server->flags & _GLIBTOP_INIT_STATE_INIT) == 0) {
 		if (flags & GLIBTOP_FEATURES_EXCEPT)
 			features = ~features & GLIBTOP_SYSDEPS_ALL;
-		
+
 		if (features == 0)
 			features = GLIBTOP_SYSDEPS_ALL;
-		
+
 		if (flags & GLIBTOP_FEATURES_NO_SERVER) {
 			server->method = GLIBTOP_METHOD_DIRECT;
 			features = 0;
 		}
-		
+
 		server->features = features;
-		
+
 		_init_server (server, features);
-		
+
 		server->flags |= _GLIBTOP_INIT_STATE_INIT;
-		
+
 		switch (server->method) {
 		case GLIBTOP_METHOD_PIPE:
 		case GLIBTOP_METHOD_UNIX:
 			if (glibtop_server_features & features)
 				break;
-			
+
 			server->method = GLIBTOP_METHOD_DIRECT;
 			break;
 		}
@@ -205,11 +205,11 @@ glibtop_init_r (glibtop **server_ptr, unsigned long features, unsigned flags)
 		return server;
 
 	/* Open server, but only if not already opened. */
-	
+
 	if ((server->flags & _GLIBTOP_INIT_STATE_OPEN) == 0)
 		glibtop_open_l (glibtop_global_server, "glibtop",
 				features, flags);
-	
+
 	return server;
 }
 
@@ -218,7 +218,7 @@ glibtop_init_s (glibtop **server_ptr, unsigned long features, unsigned flags)
 {
 	glibtop *server;
 	glibtop_init_func_t *init_fkt;
-	
+
 	if (server_ptr == NULL)
 		return NULL;
 
@@ -239,7 +239,7 @@ glibtop_init_s (glibtop **server_ptr, unsigned long features, unsigned flags)
 
 		for (init_fkt = _glibtop_init_hook_s; *init_fkt; init_fkt++)
 			(*init_fkt) (server);
-		
+
 		server->flags |= _GLIBTOP_INIT_STATE_SYSDEPS;
 	}
 

lib/inodedb.c

@@ -59,9 +59,9 @@ glibtop_inodedb_open_s (glibtop *server, unsigned databases,
 
 	pwd = getpwuid (getuid ());
 	if (!pwd) glibtop_error_io_r (server, "getpwuid");
-	
+
 	sprintf (filename, "%s/var/libgtop/inodedb.db", pwd->pw_dir);
-	
+
 	if (stat (filename, &statb))
 		databases &= ~GLIBTOP_INODEDB_USER;
 
@@ -79,7 +79,7 @@ glibtop_inodedb_open_s (glibtop *server, unsigned databases,
 const char *
 glibtop_inodedb_lookup_s (glibtop *server,
 			  glibtop_inodedb *inodedb,
-			  u_int64_t device, u_int64_t inode)
+			  guint64 device, guint64 inode)
 {
 	glibtop_inodedb_key key;
 	datum d_key, d_content;
@@ -108,7 +108,7 @@ glibtop_inodedb_close_s (glibtop *server, glibtop_inodedb *inodedb)
 {
 	if (inodedb->system_dbf)
 		gdbm_close (inodedb->system_dbf);
-	
+
 	if (inodedb->user_dbf)
 		gdbm_close (inodedb->user_dbf);
 

lib/lib.pl

@@ -27,7 +27,7 @@ print '#include <glibtop/open.h>';
 print '';
 print '#include <glibtop/sysdeps.h>';
 print '#include <glibtop/union.h>';
-print '#include <libgnome/gnome-i18n.h>';
+print '#include "libgtop-i18n.h"';
 print '';
 print '#include <glibtop/command.h>';
 
@@ -37,9 +37,9 @@ print '';
 
 print 'static void';
 print '_glibtop_missing_feature (glibtop *server, const char *feature,';
-print "\t\t\t  const u_int64_t present, u_int64_t *required)";
+print "\t\t\t  const guint64 present, guint64 *required)";
 print '{';
-print "\tu_int64_t old_required = *required;\n";
+print "\tguint64 old_required = *required;\n";
 print "\t/* Return if we have all required fields. */";
 print "\tif ((~present & old_required) == 0)";
 print "\t\treturn;\n";
@@ -68,7 +68,7 @@ print '/* Library functions. */';
 print '';
 
 $convert{'long'} = 'int64_t';
-$convert{'ulong'} = 'u_int64_t';
+$convert{'ulong'} = 'guint64';
 $convert{'pid_t'} = 'pid_t';
 $convert{'int'} = 'int';
 $convert{'ushort'} = 'unsigned short';

lib/open.c

@@ -62,17 +62,17 @@ glibtop_open_l (glibtop *server, const char *program_name,
 		fprintf (stderr, "Connecting to '%s' port %ld.\n",
 			 server->server_host, server->server_port);
 #endif
-		
+
 		connect_type = glibtop_make_connection
 			(server->server_host, server->server_port,
 			 &server->socket);
-		
+
 #ifdef DEBUG
 		fprintf (stderr, "Connect Type is %d.\n", connect_type);
 #endif
-		
+
 		server->flags |= _GLIBTOP_INIT_STATE_SERVER;
-		
+
 		server->features = -1;
 		break;
 	case GLIBTOP_METHOD_UNIX:
@@ -83,7 +83,7 @@ glibtop_open_l (glibtop *server, const char *program_name,
 		connect_type = glibtop_make_connection
 			("unix", 0, &server->socket);
 
-#ifdef DEBUG		
+#ifdef DEBUG
 		fprintf (stderr, "Connect Type is %d.\n", connect_type);
 #endif
 
@@ -101,7 +101,7 @@ glibtop_open_l (glibtop *server, const char *program_name,
 			glibtop_error_io_r (server, "cannot make a pipe");
 
 		server->pid  = fork ();
-		
+
 		if (server->pid < 0) {
 			glibtop_error_io_r (server, "fork failed");
 		} else if (server->pid == 0) {
@@ -119,7 +119,7 @@ glibtop_open_l (glibtop *server, const char *program_name,
 		close (server->output [0]);
 
 		server->flags |= _GLIBTOP_INIT_STATE_SERVER;
-		
+
 		server->features = -1;
 		break;
 	}
@@ -141,25 +141,25 @@ glibtop_open_l (glibtop *server, const char *program_name,
 			 sizeof (glibtop_sysdeps));
 
 		size = strlen (version) + 1;
-	
+
 		glibtop_read_l (server, sizeof (nbytes), &nbytes);
 
 		if (nbytes != size)
 			glibtop_error_r (server,
 					 "Requested %u bytes but got %u.",
 					 size, nbytes);
-		
+
 		glibtop_read_l (server, nbytes, buffer);
-		
+
 		if (memcmp (version, buffer, size))
 			glibtop_error_r (server, "server version is not %s",
 					 LIBGTOP_VERSION);
 
 		/* Now ask it for its features. */
-		
+
 		glibtop_call_l (server, GLIBTOP_CMND_SYSDEPS, 0, NULL,
 				sizeof (glibtop_sysdeps), &sysdeps);
-		
+
 		server->features = sysdeps.features;
 
 		memcpy (&server->sysdeps, &sysdeps, sizeof (glibtop_sysdeps));
@@ -176,6 +176,6 @@ glibtop_open_l (glibtop *server, const char *program_name,
 #ifdef DEBUG
 	fprintf (stderr, "Calling sysdeps open function.\n");
 #endif
-	
+
 	glibtop_init_s (&server, features, flags);
 }

lib/parameter.c

@@ -26,7 +26,7 @@
 
 #define _write_data(ptr,size)	\
 	if ((data_ptr == NULL) || (data_size < size)) return -size; \
-	if (ptr == NULL) { strcpy (data_ptr, ""); return 1; } \
+	if (ptr == NULL) { char * const p = data_ptr; *p = '\0'; return 1; } \
 	memcpy (data_ptr, ptr, size);	\
 	return size;
 

lib/read.c

@@ -23,7 +23,7 @@
 
 #include <config.h>
 #include <glibtop/read.h>
-#include <libgnome/gnome-i18n.h>
+#include "libgtop-i18n.h"
 
 
 /* Reads some data from server. */
@@ -34,7 +34,7 @@ do_read (int s, void *ptr, size_t total_size)
 	int nread;
 	size_t already_read = 0, remaining = total_size;
 	char *tmp_ptr;
-	
+
 	while (already_read < total_size) {
 		nread = recv (s, ptr, remaining, 0);
 
@@ -42,12 +42,12 @@ do_read (int s, void *ptr, size_t total_size)
 			close (s);
 			continue;
 		}
-		
+
 		if (nread <= 0) {
 			glibtop_error_io ("recv");
 			return;
 		}
-		
+
 		already_read += nread;
 		remaining -= nread;
 		/* (char *) ptr += nread; */
@@ -75,5 +75,5 @@ glibtop_read_l (glibtop *server, size_t size, void *buf)
 	}
 
 	if (ret < 0)
-		glibtop_error_io_r (server, _("read %d bytes"), size);
+		glibtop_error_io_r (server, ngettext ("read %d byte", "read %d bytes", size), size);
 }

lib/read_data.c

@@ -24,7 +24,7 @@
 #include <config.h>
 
 #include <glibtop/read_data.h>
-#include <libgnome/gnome-i18n.h>
+#include "libgtop-i18n.h"
 
 /* Reads some data from server. */
 
@@ -54,10 +54,10 @@ glibtop_read_data_l (glibtop *server)
 	fprintf (stderr, "LIBRARY: really reading %d data bytes (ret = %d).\n", size, ret);
 #endif
 
-	if (!size) return NULL;	
+	if (!size) return NULL;
 
 	ptr = g_malloc (size);
-	
+
 	if (server->socket) {
 		ret = recv (server->socket, ptr, size, 0);
 	} else {
@@ -65,7 +65,7 @@ glibtop_read_data_l (glibtop *server)
 	}
 
 	if (ret < 0)
-		glibtop_error_io_r (server, _("read data %d bytes"));
+		glibtop_error_io_r (server, ngettext ("read data %d byte", "read data %d bytes", size));
 
 	return ptr;
 }

lib/sysdeps.c

@@ -109,10 +109,74 @@ glibtop_init_func_t _glibtop_init_hook_s [] = {
 	NULL
 };
 
+glibtop_init_func_t _glibtop_init_hook_p [] = {
+#if GLIBTOP_SUID_CPU
+	glibtop_init_cpu_p,
+#endif
+#if GLIBTOP_SUID_MEM
+	glibtop_init_mem_p,
+#endif
+#if GLIBTOP_SUID_SWAP
+	glibtop_init_swap_p,
+#endif
+#if GLIBTOP_SUID_UPTIME
+	glibtop_init_uptime_p,
+#endif
+#if GLIBTOP_SUID_LOADAVG
+	glibtop_init_loadavg_p,
+#endif
+#if GLIBTOP_SUID_SHM_LIMITS
+	glibtop_init_shm_limits_p,
+#endif
+#if GLIBTOP_SUID_MSG_LIMITS
+	glibtop_init_msg_limits_p,
+#endif
+#if GLIBTOP_SUID_SEM_LIMITS
+	glibtop_init_sem_limits_p,
+#endif
+#if GLIBTOP_SUID_PROCLIST
+	glibtop_init_proclist_p,
+#endif
+#if GLIBTOP_SUID_PROC_STATE
+	glibtop_init_proc_state_p,
+#endif
+#if GLIBTOP_SUID_PROC_UID
+	glibtop_init_proc_uid_p,
+#endif
+#if GLIBTOP_SUID_PROC_MEM
+	glibtop_init_proc_mem_p,
+#endif
+#if GLIBTOP_SUID_PROC_TIME
+	glibtop_init_proc_time_p,
+#endif
+#if GLIBTOP_SUID_PROC_SIGNAL
+	glibtop_init_proc_signal_p,
+#endif
+#if GLIBTOP_SUID_PROC_KERNEL
+	glibtop_init_proc_kernel_p,
+#endif
+#if GLIBTOP_SUID_PROC_SEGMENT
+	glibtop_init_proc_segment_p,
+#endif
+#if GLIBTOP_SUID_PROC_ARGS
+	glibtop_init_proc_args_p,
+#endif
+#if GLIBTOP_SUID_PROC_MAP
+	glibtop_init_proc_map_p,
+#endif
+#if GLIBTOP_SUID_NETLOAD
+	glibtop_init_netload_p,
+#endif
+#if GLIBTOP_SUID_PPP
+	glibtop_init_ppp_p,
+#endif
+	NULL
+};
+
 /* Checks which features are implemented. */
 
 void
 glibtop_get_sysdeps_r (glibtop *server, glibtop_sysdeps *buf)
 {
-	memcpy (buf, &server->sysdeps, sizeof (glibtop_sysdeps));
+	*buf = server->sysdeps;
 }

lib/write.c

@@ -24,7 +24,7 @@
 #include <config.h>
 
 #include <glibtop/write.h>
-#include <libgnome/gnome-i18n.h>
+#include "libgtop-i18n.h"
 
 /* Writes some data to server. */
 
@@ -48,5 +48,5 @@ glibtop_write_l (glibtop *server, size_t size, void *buf)
 	}
 
 	if (ret < 0)
-		glibtop_error_io_r (server, _("write %d bytes"), size);
+		glibtop_error_io_r (server, ngettext ("write %d byte", "write %d bytes", size), size);
 }

libgtop-2.0.pc.in

@@ -7,7 +7,7 @@ Name: libgtop
 Description: Portable System Access Library
 Requires: glib-2.0
 Version: @VERSION@
-Libs: -L${libdir} @LIBGTOP_LIBS@ @LIBGTOP_EXTRA_LIBS@
+Libs: -L${libdir} @LIBGTOP_LIBS@ @LIBGTOP_EXTRA_LIBS@ -lgtop-2.0
 Cflags: -I${includedir}/libgtop-2.0
 
 

libgtop.spec.in

@@ -8,7 +8,7 @@ Summary: LibGTop library
 Name: libgtop
 Version: %ver
 Release: %rel
-Copyright: LGPL
+License: GPL
 Group: X11/Libraries
 Source: ftp://ftp.gnome.org/pub/GNOME/sources/libgtop/libgtop-%{ver}.tar.gz
 BuildRoot: /tmp/libgtop-root

misc/i4b_acct.h

@@ -23,7 +23,7 @@
  *      without specific prior written permission.
  *   4. Altered versions must be plainly marked as such, and must not be
  *      misrepresented as being the original software and/or documentation.
- *   
+ *
  *   THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  *   ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  *   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

po/ChangeLog

@@ -1,3 +1,294 @@
+2004-07-13  Benoît Dejean  <tazforever@dlfp.org>
+
+	* am.po:
+	* ar.po:
+	* az.po:
+	* be.po:
+	* bg.po:
+	* bn.po:
+	* ca.po:
+	* cs.po:
+	* cy.po:
+	* da.po:
+	* de.po:
+	* el.po:
+	* en_CA.po:
+	* en_GB.po:
+	* es.po:
+	* et.po:
+	* eu.po:
+	* fa.po:
+	* fi.po:
+	* fr.po:
+	* ga.po:
+	* gl.po:
+	* gu.po:
+	* he.po:
+	* hi.po:
+	* hr.po:
+	* hu.po:
+	* id.po:
+	* it.po:
+	* ja.po:
+	* ko.po:
+	* lt.po:
+	* lv.po:
+	* mk.po:
+	* ml.po:
+	* mn.po:
+	* ms.po:
+	* nl.po:
+	* nn.po:
+	* no.po:
+	* pa.po:
+	* pl.po:
+	* pt.po:
+	* pt_BR.po:
+	* ro.po:
+	* ru.po:
+	* sk.po:
+	* sl.po:
+	* sq.po:
+	* sr.po:
+	* sr@Latn.po:
+	* sv.po:
+	* ta.po:
+	* tr.po:
+	* uk.po:
+	* vi.po:
+	* zh_CN.po:
+	* zh_TW.po: Updated.
+
+2004-05-14  Baris Cicek <baris@teamforce.name.tr>
+
+	* tr.po: Updated Turkish Translation
+	
+2004-04-16  Iñaki Larrañaga  <dooteo@euskalgnu.org>
+
+	* eu.po: Added Basque translation.
+
+2004-04-15  Andras Timar  <timar@gnome.hu>
+
+	* hu.po: Updated Hungarian translation.
+
+2004-04-09  Guntupalli Karunakar  <karunakar@freedomink.org>
+
+        * gu.po: Added Gujurati translation by
+        Gujarati Team <magnet@magnet-i.com>.
+
+2004-03-30  Adam Weinberger  <adamw@gnome.org>
+
+	* en_CA.po: Added Canadian English translation.
+
+2004-03-23  Åsmund Skjæveland  <aasmunds@fys.uio.no>
+
+	* nn.po: Updated Norwegian Nynorsk translation.
+
+2004-03-22  Gareth Owen  <gowen72@yahoo.com>
+
+	* en_GB.po: Added British translation
+
+2004-03-22  Guntupalli Karunakar  <karunakar@freedomink.org>
+
+        * pa.po: Punjabi translation by 
+        Amanpreet Singh Alam <amanlinux@netscape.net>.
+
+2004-03-21  Andras Timar  <timar@gnome.hu>
+
+	* hu.po: Added Hungarian translation.
+
+2004-03-18  Mugurel Tudor  <mugurelu@go.ro>
+
+	* ro.po: Updated Romanian translation by
+	Mişu Moldovan  <dumol@go.ro>
+
+2004-03-16  Dafydd Harries  <daf@muse.19inch.net>
+
+	* cy.po: Updated Welsh translation.
+
+2004-03-15  Alessio Frusciante  <algol@firenze.linux.it>
+
+	* it.po: Updated Italian translation.
+
+2004-03-15  Yuriy Syrota  <rasta@cvs.gnome.org>
+
+	* uk.po: Updated Ukrainian translation.
+
+2004-03-13  Ales Nyakhaychyk  <nab@mail.by>
+
+	* be.po: Updated Belarusian translation.
+
+2004-03-12  Tomasz Kłoczko <kloczek@pld.org.pl>
+
+	* hr.po: added Plural-Forms field in header and missing empty
+	entries.
+
+2004-03-11  Gustavo Maciel Dias Vieira  <gdvieira@zaz.com.br>
+
+	* pt_BR.po: Updated Brazilian Portuguese translation done by
+	Medina <afmedina@uol.com.br>.
+
+2004-03-11  Dmitry G. Mastrukov  <dmitry@taurussoft.org>
+
+	* ru.po: Updated Russian translation
+	from Russian team <gnome-cyr@gnome.org>.
+
+2004-03-10  Alessio Frusciante  <algol@firenze.linux.it>
+
+	* it.po: Updated Italian translation.
+
+2004-03-07  Funda Wang  <fundawang@linux.net.cn>
+
+	* zh_CN.po: Updated Simplified Chinese translation.
+
+2004-03-06  Mətin Əmirov  <metin@karegen.com>
+
+	* az.po: Translation updated.
+
+2004-02-26  Guntupalli Karunakar  <karunakar@freedomink.org>
+
+	* hi.po: Updated Hindi translation.
+
+2004-02-23  Laurent Dhima  <laurenti@alblinux.net>
+
+	* sq.po: Fixed Albanian translation.
+
+2004-02-21  Nikos Charonitakis  <frolix68@yahoo.gr>
+
+	* el.po: Updated Greek translation.
+
+2004-02-08  Changwoo Ryu  <cwryu@debian.org>
+
+	* ko.po: Updated Korean translation.
+
+2004-02-07  Robert Sedak  <robert.sedak@sk.htnet.hr>
+
+	* hr.po: Updated Croatian translation.
+
+2004-02-05  Pauli Virtanen  <pauli.virtanen@hut.fi>
+
+	* fi.po: Updated Finnish translation.
+
+2004-02-02  Laurent Dhima  <laurenti@alblinux.net>
+
+	* sq.po: Updated Albanian translation.
+
+2004-01-31  Mətin Əmirov  <metin@karegen.com>
+
+	* az.po: Translation updated.
+
+2004-01-28  Miloslav Trmac  <mitr@volny.cz>
+
+	* cs.po: Fixed Czech translation.
+
+2004-01-26 Alastair McKinstry <mckinstry@computer.org>
+
+	* ga.po: Updated Irish translation.
+
+2004-01-24  Alessio Frusciante  <algol@firenze.linux.it>
+
+	* it.po: Updated Italian translation.
+
+2004-01-17  Changwoo Ryu  <cwryu@debian.org>
+
+	* ko.po: Updated Korean translation.
+
+2004-01-15  Laurent Dhima  <laurenti@alblinux.net>
+
+	* sq.po: Updated Albanian translation.
+
+2004-01-13  Artur Flinta  <aflinta@cvs.gnome.org>
+
+	* pl.po: Updated Polish translation by GNOME PL Team.
+
+2004-01-13  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* no.po: Updated Norwegian translation.
+
+2004-01-06  Christian Rose  <menthos@menthos.com>
+
+	* sv.po: Updated Swedish translation.
+
+2004-01-06  Åsmund Skjæveland  <aasmunds@fys.uio.no>
+
+	* nn.po: Updated Norwegian Nynorsk translation.
+
+2004-01-04  Sanlig Badral  <badral@openmn.org>
+
+	* mn.po: Updated Mongolian translation.
+
+2004-01-04  Christian Neumair  <chris@gnome-de.org>
+
+	* de.po: Updated German translation.
+
+2004-01-04  Christophe Merlet  <redfox@redfoxcenter.org>
+
+	* fr.po: Updated French translation.
+
+2004-01-04  Duarte Loreto <happyguy_pt@hotmail.com>
+
+	* pt.po: Updated and revised Portuguese translation.
+
+2004-01-03  Robert Sedak  <robert.sedak@sk.htnet.hr>
+
+	* hr.po: Updated Croatian translation.
+
+2004-01-02  Sanlig Badral  <Badral@openmn.org>
+
+    * mn.po: Updated Mongolian translation.
+    
+2003-12-14  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
+
+	* es.po: Updated Spanish translation.
+
+2003-12-03  Sanlig Badral  <badral@openmn.org>
+
+        * mn.po: Updated Mongolian translation.
+
+2003-12-02  Miloslav Trmac  <mitr@volny.cz>
+
+	* cs.po: Updated Czech translation.
+
+2003-11-20  Ole Laursen  <olau@hardworking.dk>
+
+	* da.po: Updated Danish translation.
+
+2002-03-10  Hasbullah Bin Pit <sebol@ikhlas.com>
+
+	* ms.po: Updated Malay translation.
+
+2003-11-07   Vincent van Adrighem  <adrighem@gnome.org>
+
+	* nl.po: Dutch translation updated by Jeroen van der Vegt.
+
+2003-11-04   Vincent van Adrighem  <adrighem@gnome.org>
+
+	* nl.po: Dutch translation updated by Jeroen van der Vegt.
+
+2003-11-03  Jordi Mallach  <jordi@sindominio.net>
+
+	* ca.po: Updated Catalan translation.
+
+2003-11-02  Žygimantas Beručka  <uid0@tuxfamily.org>
+
+	* lt.po: Added Lithuanian translation.
+
+2003-11-02  KAMAGASAKO Masatoshi  <emerald@gnome.gr.jp>
+
+	* ja.po: Updated Japanese translation.
+
+2003-11-01  Marcel Telka  <marcel@telka.sk>
+
+	* sk.po: Updated Slovak translation.
+
+2003-10-30  Kostas Papadimas <pkst@gnome.org>
+
+	* el.po: Updated Greek translation.
+
+2003-10-22  Danilo Šegan  <dsegan@gmx.net>
+
+	* sr.po, sr@Latn.po: Updated Serbian translation.
+
 2003-10-20  Bastien Nocera  <hadess@hadess.net>
 
 	* POTFILES.in: fixed distchecking