updated Catalan file

Added several po files from CVS HEAD
corrected some po files headers or syntax errors
2001-02-27 19:27:03 +00:00 · 2001-02-26 14:57:36 +00:00 · 2001-02-16 02:21:26 +00:00 · 2001-02-13 11:12:50 +00:00 · 2001-02-13 11:10:28 +00:00 · 2000-10-11 04:14:23 +00:00
519 changed files with 14502 additions and 42538 deletions
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,45 +0,0 @@
-Makefile
-Makefile.in
-call-vector.h
-call-vector.h
-aclocal.m4
-config.cache
-config.h
-config.h.in
-config.log
-config.sub
-config.guess
-config.status
-configure
-gtopConf.sh
-i386-bsdi
-i686-pc-linux-gnu
-intl
-libgtop-1.*.*.tar.gz
-libgtop-1.*.*
-libgtop-mirror.sh.swp
-libgtopConf.sh
-libtool
-ltconfig
-ltmain.sh
-macros
-stamp-h
-stamp-h.in
-sun4
-sun4sol2
-support
-i386-freebsd
-alpha-dec-osf3.0
-i686-pc-linux-gnu-linux
-libgtop-config
-ABOUT-NLS
-libgtop.spec
-install-sh
-mkinstalldirs
-missing
-INSTALL
-COPYING
-glibtop-config.h
-stamp-gc-h
-build-debstamp
-install-debstamp
--- a/2
+++ b/2
@@ -1,2 +0,0 @@
-Martin Baulig (martin@home-of-linux.org)
-Drazen Kacar (dave@srce.hr)
--- a/497
+++ b/497
@@ -1,25 +1,17 @@
-2000-01-18  Martin Baulig  <martin@home-of-linux.org>
+2001-02-26  Pablo Saratxaga  <pablo@mandrakesoft.com>

-	* lib/sysdeps-init-osf1.c: New file. Added sysdeps initialization
-	code from DEC OSF/1.
+	<EFBFBD> configure.in,po/*.po: added various languages from CVS head

-2000-01-16  Martin Baulig  <martin@home-of-linux.org>
+2001-02-13  Stanislav Visnovsky  <visnovsky@nenya.ms.mff.cuni.cz>

-	We now use `@LIBGTOP_PACKAGE@' as the translation domain so
-	installed `libgtop-1.1.mo' files won't conflict with the ones
-	from LibGTop 1.0 and you can keep both versions installed.
+	* configure.in: Added sk to ALL_LINGUAS.

-	* po/Makefile.in.in.in: New file. This is a modified version of
-	the usual `Makefile.in.in' which is created by gettextize; we
-	copy this over `Makefile.in.in' in autogen.sh after gettextize'ing.
+2000-02-16  Martin Baulig  <martin@home-of-linux.org>

-	* autogen.sh: Copy `po/Makefile.in.in.in' over `po/Makefile.in.in'
-	after running `macros/autogen.sh'.
+	Released LibGTop 1.1.2.1 "Hardangervidda goes Paris".

-	* configure.in (LIBGTOP_PACKAGE): AC_SUBST and AC_DEFINE this.
-
-	* include/glibtop/global.h (_): Use `LIBGTOP_PACKAGE' as our
-	translation domain.
+	* LIBGTOP-VERSION: Set version number to 1.1.2.1 and let the
+	tarball be called `libgtop-1.1.2.1-solaris.tar.gz'.

 2000-01-16  Martin Baulig  <martin@home-of-linux.org>

@@ -31,479 +23,6 @@
 	* Makefile.am: Make `aclocal.m4' also depend on `LIBGTOP-VERSION'
 	when in maintainer-mode.

-2000-01-15  Martin Baulig  <martin@home-of-linux.org>
-
-	* LIBGTOP-VERSION: Set version number to 1.1.5, binary age 0,
-	interface age 0 and increase LIBGTOP_SERVER_VERSION to 53.
-
-2000-01-14  Martin Baulig  <martin@home-of-linux.org>
-
-	Released LibGTop 1.1.4 "Earthquake".
-
-1999-01-13  Yuri Syrota  <rasta@renome.rovno.ua>
-
-	* configure.in: Added Ukrainian (uk) to ALL_LINGUAS
-
-2000-01-13  Martin Baulig  <martin@home-of-linux.org>
-
-	* include/glibtop/compat_10.h: Add compatibility #defines for
-	`GLIBTOP_XCPU_TOTAL', `GLIBTOP_XCPU_USER', `GLIBTOP_XCPU_NICE',
-	`GLIBTOP_XCPU_SYS', `GLIBTOP_XCPU_IDLE' and `GLIBTOP_XCPU_FLAGS'
-
-	* LIBGTOP-VERSION: Set version number to 1.1.4, binary age 0,
-	interface age 0 and increased LIBGTOP_SERVER_VERSION to 52.
-
-2000-01-13  Martin Baulig  <martin@home-of-linux.org>
-
-	* lib/sysdeps-init-freebsd.c: New file.
-	* lib/sysdeps-init-kernel.c: New file.
-	* lib/sysdeps-init-linux.c: New file.
-	* lib/sysdeps-init-solaris.c: New file.
-	* lib/sysdeps-init-stub-suid.c: New file.
-	* lib/sysdeps-init-stub.c: New file.
-
-	* lib/open.c (glibtop_open_l): Call glibtop_init_backend () and
-	_glibtop_open_sysdeps () here.
-
-	* lib/init.c (glibtop_init_s): Call `_glibtop_open_sysdeps'.
-
-	* include/glibtop/open.h (_glibtop_open_sysdeps): Declare this
-	when we are _IN_LIBGTOP.
-
-	* configure.in (sysdeps_name): Define and AC_SUBST this.
-	(sysdeps_init_file): Define and AC_SUBST this to
-	`sysdeps-init-${sysdeps_name}.c'.
-
-	* libgtop-sysdeps.m4 (GNOME_LIBGTOP_SYSDEPS): Define and AC_SUBST
-	`libgtop_sysdeps_name'.
-
-2000-01-12  Martin Baulig  <martin@home-of-linux.org>
-
-	* include/glibtop/errors.h (GLIBTOP_ERROR_NO_BACKEND_OPENED):
-	New error constant.
-
-	* lib/lib.pl (glibtop_get_<feature>_l): Don't dump core when there
-	is no backend opened, but return GLIBTOP_ERROR_NO_BACKEND_OPENED.
-
-	* include/glibtop/backend.h (glibtop_backend): Added `_priv_module'
-	pointer (type glibtop_backend_module). Made the `info' field const
-	since this now points to gmodule loaded memory
-	(glibtop_backend_entry): Made the `info' field const since it points
-	to gmodule loaded memory.
-
-	* lib/close.c (glibtop_close_r): Close all currently opened backends.
-
-2000-01-12  Martin Baulig  <martin@home-of-linux.org>
-
-	* include/glibtop/backend.h (glibtop_backend_entry): New type.
-	(glibtop_backend_module): New private type.
-
-	* lib/backend.c (glibtop_register_backend): This now takes a
-	`glibtop_backend_entry' argument, not a `glibtop_backend_info' one.
-	(glibtop_backend_by_id): Return a `glibtop_backend_entry' type,
-	not a `glibtop_backend_info' one.
-	(glibtop_backend_by_name): Likewise.
-
-	* lib/init-backends.c: If we have libxml, read all `.backend' files
-	in $(LIBGTOP_BACKEND_DIR), XML parse them and register them via
-	`glibtop_backend_register'. This builds a list of all currently
-	supported backends without actually loading them into memory.
-
-	* lib/open-backend.c (glibtop_open_backend_l): GModule load the
-	backend if it's not already in memory.
-
-2000-01-12  Martin Baulig  <martin@home-of-linux.org>
-
-	* lib/init.c (glibtop_init_s): Comment out `_glibtop_init_hook_s'.
-
-	* configure.in: We now require libxml.
-	(LIBGTOP_LIBS): Remove all backend libraries.
-	(LIBGTOP_EXTRA_LIBS): Add $(LIBGTOP_XML_LIB) here.
-
-	* configure.in: Don't check for -lXau any longer.
-
-	* configure.in (LIBGTOP_BACKEND_DIR): Define this to be
-	`$(datadir)/libgtop/backends' and AC_SUBST it.
-
-	* libgtopConf.sh.in (LIBGTOP_BACKEND_DIR): Added.
-
-2000-01-12  Martin Baulig  <martin@home-of-linux.org>
-
-	* xml.m4: New file to check for libxml.
-
-	* acconfig.h (HAVE_LIBXML): Define this if we have libxml.
-
-	* configure.in: Call `LIBGTOP_XML_HOOK' from `xml.m4' and
-	add libxml libraries to `LIBGTOP_EXTRA_LIBS' when found.
-
-2000-01-12  Martin Baulig  <martin@home-of-linux.org>
-
-	* lib/sysdeps.c (_glibtop_init_hook_s): This has been moved
-	into the sysdeps backend.
-
-	* configure.in (LIBGTOP_LIBS): Added `-lgtop_backend_common'.
-	* lib/init-backends.c (glibtop_init_backends): Initialize
-	`glibtop_backend_common' backend.
-
-	* backends/common/: New directory.
-
-2000-01-10  Martin Baulig  <martin@home-of-linux.org>
-
-	* src/daemon/: Removed everything in this directory. This has
-	been obsoleted by the new server code in backends/server.
-
-2000-01-09  Martin Baulig  <martin@bergen.home-of-linux.org>
-
-	* include/glibtop/global.h: Unconditionally #include <sys/types.h>.
-
-2000-01-02  Martin Baulig  <martin@home-of-linux.org>
-
-	* include/glibtop/errors.h
-	(GLIBTOP_ERROR_DEMARSHAL_ERROR): New error constant.
-
-	* src/Makefile.am: Disable compilation of the `daemon' directory.
-
-	* include/glibtop/command.h: Removed.
-	* include/glibtop/version.h: Removed.
-
-2000-01-02  Martin Baulig  <martin@home-of-linux.org>
-
-	* include/glibtop/call-vector.pl: All functions in the
-	`glibtop_call_vector' now take an additional `glibtop_backend *'
-	argument.
-
-2000-01-01  Martin Baulig  <martin@home-of-linux.org>
-
-	* backends/: New directory.
-	* backends/server/: New directory.
-	* backends/sysdeps/: New directory.
-
-	* include/glibtop/backend.h: New file.
-
-	* include/glibtop/call-vector.h.in: New file. Template file
-	for `call-vector.h'.
-	* include/glibtop/call-vector.pl: New file. Creates 'call-vector.h'
-	from `call-vector.h.in'.
-
-	* include/glibtop/errors.h
-	(GLIBTOP_ERROR_NO_SUCH_BACKEND): New error constant.
-        (GLIBTOP_ERROR_NOT_IMPLEMENTED): New error constant.
-
-	* include/glibtop/limits.h
-	(GLIBTOP_BACKEND_NAME_LEN): New constant.
-
-	* glibtop-server-private.h (glibtop_server_private):
-	Added `GSList *backend_list' and removed `input', `output',
-	`socket' and `pid'.
-
-	* lib/command.c: Removed. Moved to `backends/server/'.
-	* lib/read.c: Removed. Moved to `backends/server/'.
-	* lib/read_data.c: Removed. Moved to `backends/server/'.
-	* lib/write.c: Removed. Moved to `backends/server/'.
-
-	* include/glibtop/read.h: Removed.
-	* include/glibtop/read_data.h: Removed.
-	* include/glibtop/write.h: Removed.
-
-1999-12-26  Martin Baulig  <martin@home-of-linux.org>
-
-	* libgtop-sysdeps.m4 (LIBGTOP_CHECK_SYSDEPS_DIR): New macro;
-	moved check for the sysdeps directory here.
-	(--with-sysdeps-dir): New hacker mode command line option to
-	manually override the sysdeps dir. Use of this option is highly
-	deprecated; I only added it to be able to do `stub_suid' hackings
-	on my GNU/Linux machine.
-
-1999-12-23  Martin Baulig  <martin@home-of-linux.org>
-
-	Removed all remote communication support from LibGTop.
-
-	* include/glibtop/gnuserv.h: Removed.
-
-	* sysdeps/common/gnuslib.c: Removed.
-
-	* src/daemon/Makefile.am: Don't build the `libgtop_daemon'
-	binary any longer.
-
-	* src/daemon/server_config.pl: Removed.
-	* src/daemon/server_config.h.in: Removed.
-	* src/daemon/server_config.h: Removed.
-
-1999-12-22  Martin Baulig  <martin@home-of-linux.org>
-
-	* lib/errors.c (glibtop_get_errno_l): New global function
-	to return `server->glibtop_errno'.
-	(glibtop_clear_errno_l): New global function to return
-	`server->glibtop_errno' and set it back to 0.
-
-	* include/glibtop/errors.h
-	(GLIBTOP_ERROR_SERVER_COMM_FAILURE): New error constant.
-	(GLIBTOP_ERROR_NO_SUCH_PROCESS): New error constant.
-	(GLIBTOP_ERROR_NO_KERNEL_SUPPORT): New error constant.
-	(GLIBTOP_ERROR_INCOMPATIBLE_KERNEL): New error constant.
-
-	* lib/lib.pl: For functions with a `retval' return type, set
-	`server->glibtop_errno' to the error code on error or to zero
-	on success.
-
-	* glibtop.h (glibtop): Added `glibtop_errno' field.
-
-1999-12-19  Martin Baulig  <martin@home-of-linux.org>
-
-	* include/glibtop/glib-arrays.h: New file.
-
-	* lib/glib-arrays.c: New file.
-	(glibtop_get_proclist_as_array_l): New function.
-	(glibtop_get_proc_args_as_array_l): New function.
-	(glibtop_get_proc_map_as_array_l): New function.
-	(glibtop_get_mountlist_as_array_l): New function.
-
-1999-12-19  Martin Baulig  <martin@home-of-linux.org>
-
-	* glibtop-server-private.h: New file. This is a private header
-	file which defines `struct _glibtop_server_private'.
-
-	* glibtop.h (glibtop): Added `glibtop_server_private *_priv' field
-	and moved some private fields there.
-
-1999-12-12  Martin Baulig  <martin@home-of-linux.org>
-
-	* include/glibtop/procargs.h (glibtop_proc_args): Removed.
-	(glibtop_get_proc_args_*): This now takes a `glibtop_array' parameter
-	instead of a `glibtop_proc_args one and returns a `char **'.
-
-1999-12-13  Martin Baulig  <martin@home-of-linux.org>
-
-	* configure.in (LIBGTOP_LIBS): Put `-lgtop' after `-lgtop_common'.
-
-1999-12-19  Martin Baulig  <martin@home-of-linux.org>
-
-	* include/glibtop/errors.h: New file. We define `GLIBTOP_ERROR_*'
-	error constants here.
-
-	* lib/errors.c: New file.
-	(glibtop_error_strings): Array of error messages.
-	(glibtop_get_error_string_l): Get error message.
-
-	* include/glibtop/parameter.h: Added `GLIBTOP_PARAM_REMOTE_USER' and
-	`GLIBTOP_PARAM_PATH_RSH'.
-
-	* lib/parameter.c (glibtop_get_parameter_l): Changed return value
-	from `size_t' to `ssize_t' and let it return an error constant.
-	(glibtop_get_parameter_size_l): New function.
-	(glibtop_set_parameter_l): Changed return value from `void' to `int'
-	and let it return an error constant on error.
-
-	* structures.def (glibtop_sysdeps): Added.
-
-1999-12-12  Martin Baulig  <martin@home-of-linux.org>
-
-	All functions which return an array now take a `glibtop_array *array'
-	parameter instead of a `glibtop_<feature> *buf' one.
-
-	For compatibility, we typedef the corresponding `glibtop_<feature>'s
-	to `glibtop_array' in <glibtop/compat_10.h>.
-
-	This has the advantage that scripting languages like Guile with an
-	array implementation which stores the length of an array in the
-	array don't need the `glibtop_array' parameter at all any longer.
-
-	We'll also add convenient functions which return GPtrArray's here.
-
-	* include/glibtop/proclist.h (glibtop_proclist): Removed.
-	(glibtop_get_proclist_*): This now takes a `glibtop_array' parameter
-	instead of a `glibtop_proclist' one.
-
-	* include/glibtop/procmap.h (glibtop_proc_map): Removed.
-	(glibtop_get_proc_map_*): This now takes a `glibtop_array' parameter
-	instead of a `glibtop_proc_map' one.
-
-	* include/glibtop/mountlist.h (glibtop_mountlist): Removed.
-	(glibtop_get_mountlist_*): This now takes a `glibtop_array' parameter
-	instead of a `glibtop_mountlist' one.
-
-	* include/glibtop/interfaces.h (glibtop_interface_names): Removed.
-	(glibtop_get_interface_names_*): This now takes a `glibtop_array'
-	parameter instead of a `glibtop_interface_name' one.
-
-	* include/glibtop/compat_10.h: New file. Contains some typedefs and
-	#defines to keep compatibility until the big restructurement is
-	completely done.
-
-1999-12-12  Martin Baulig  <martin@home-of-linux.org>
-
-	* include/glibtop/array.h: New file.
-
-1999-12-11  Martin Baulig  <martin@home-of-linux.org>
-
-	This is a larger source-incompatible commit, but it'll make it
-	easier to write automatically generated code (for instance for
-	scripting languages).
-
-	Renamed all constants for the flags field to match the field names
-	from the features.def and structures.def where this was not already
-	the case.
-
-	* include/glibtop/cpu.h: s/GLIBTOP_XCPU_/GLIBTOP_CPU_XCPU_/g.
-	* include/glibtop/shm_limits.h: s/GLIBTOP_IPC_/GLIBTOP_SHM_LIMITS_/g.
-	* include/glibtop/sem_limits.h: s/GLIBTOP_IPC_/GLIBTOP_SEM_LIMITS_/g.
-	* include/glibtop/msg_limits.h: s/GLIBTOP_IPC_/GLIBTOP_MSG_LIMITS_/g.
-
-1999-12-11  Martin Baulig  <martin@home-of-linux.org>
-
-	* features.def: Use `string' instead of `str' as type name.
-
-1999-12-05  Martin Baulig  <martin@home-of-linux.org>
-
-	Moved all Guile code to the libgtop-bindings module.
-
-	* sysdeps/guile/*: Removed.
-	* sysdeps/guile/names/*: Removed.
-
-	* libgtopConf.sh.in: Removed all guile variables.
-
-	* configure.in: Don't check for guile any longer.
-
-1999-12-05  Martin Baulig  <martin@home-of-linux.org>
-
-	* lib/structures.pl: New script to create `structures.h' which will
-	be used in language bindings code.
-
-1999-12-05  Martin Baulig  <martin@home-of-linux.org>
-
-	* features.def: Use `pointer(<type>)' as return value for functions
-	returning an array of scalar values (such as `unsigned' etc.).
-
-	* features.def: Use `array(<type>)' as return value for functions
-	returning an array of structures.
-
-1999-12-05  Martin Baulig  <martin@home-of-linux.org>
-
-	* includes/glibtop/interfaces.h (glibtop_get_interface_names):
-	Return array of `glibtop_interface' structures.
-	(glibtop_interface): New structure.
-
-1999-12-05  Martin Baulig  <martin@home-of-linux.org>
-
-	* include/glibtop/limits.h (GLIBTOP_INTERFACE_LEN): New #define.
-	(GLIBTOP_UNLIMITED): #define this to be `(~(u_int64_t)0)'.
-
-	* glibtop.h (glibtop): Added `refcount' field.
-	* lib/init.c (glibtop_server_ref, glibtop_server_unref): New
-	functions to deal with refcounts.
-
-	* structures.def: New file. This is used by the language bindings
-	code to get the definitions of some of LibGTop's structures.
-
-1999-11-28  Martin Baulig  <martin@home-of-linux.org>
-
-	* include/glibtop/netload.h (glibtop_get_netload): Added
-	`transport' and `protocol' argument to specify transport method
-	and protocol.
-
-	* include/glibtop/netinfo.h (glibtop_get_netinfo): Added
-	`transport' argument to specify the transport method.
-
-1999-11-28  Martin Baulig  <martin@home-of-linux.org>
-
-	* include/glibtop/netinfo.h (glibtop_netinfo): Added `transport'
-	field for the transport method.
-
-1999-11-28  Martin Baulig  <martin@home-of-linux.org>
-
-	Split netload into netload and netinfo.
-
-	* include/glibtop/netinfo.h: New file.
-
-	* include/glibtop/netload.h (glibtop_netload): Moved `if_flags',
-	`mtu', `subnet' and `address' into the new `glibtop_netinfo'.
-
-	* include/glibtop/sysdeps.h (GLIBTOP_SYSDEPS_NETINFO): Added.
-	(glibtop_sysdeps): Added `netinfo.
-	* include/glibtop/union.h (glibtop_union): Added `netinfo.
-	* include/glibtop/command.h (GLIBTOP_CMND_NETINFO): Added.
-
-1999-11-28  Martin Baulig  <martin@home-of-linux.org>
-
-	* include/glibtop/interfaces.h (glibtop_get_interface_names):
-	Added `instance' argument.
-
-1999-11-28  Martin Baulig  <martin@home-of-linux.org>
-
-	* lib/lib.pl: We now have a new, more extensible client/server
-	communication model. Include `$(top_srcdir)/scripts/c_types.pl' here.
-
-1999-11-21  Martin Baulig  <martin@home-of-linux.org>
-
-	Added new feature to get a list of network interface names.
-
-	* features.def: Added `interface_names' feature.
-
-	* include/glibtop/interfaces.h: New file.
-
-	* include/glibtop/sysdeps.h (GLIBTOP_SYSDEPS_INTERFACE_NAMES): Added.
-	(glibtop_sysdeps): Added `interface_names'.
-	* include/glibtop/union.h (glibtop_union): Added `interface_names'.
-	* include/glibtop/command.h (GLIBTOP_CMND_INTERFACE_NAMES): Added.
-
-1999-11-21  Martin Baulig  <martin@home-of-linux.org>
-
-	* include/glibtop/sysdeps.h (glibtop_init_func_t): Use `int'
-	as return type, not `void'.
-
-	* include/glibtop/proclist.h (GLIBTOP_KERN_PROC_PPID): On a
-	suggestion from Sebastian Fischmeister added a way to return
-	all children of a given process.
-
-1999-11-02  Jesus Bravo Alvarez  <jba@pobox.com>
-
-	* configure.in: Added Galician (gl) to ALL_LINGUAS
-
-1999-10-24  Martin Baulig  <martin@home-of-linux.org>
-
-	* features.def: Use `retval' for the default retval.
-
-	* include/glibtop/command.h (glibtop_command_h): Added
-	`int *retval_ptr' parameter to return the retval from the
-	sysdeps functions.
-
-	* include/glibtop/*.h (glibtop_get_*, glibtop_init*): Changed
-	the return value of all `glibtop_get_<feature>_* ()' and all
- 	`glibtop_init_<feature>_* ()' functions from void to int.
-
-	* features.def: Reflect changes of the return values.
-	* sysdeps/*/*.c: Reflect changes of the return values.
-
-1999-10-24  Martin Baulig  <martin@home-of-linux.org>
-
-	* acconfig.h (LIBGTOP_USE_GLIB_MALLOC): Added.
-	* configure.in (--enable-glib-malloc): New configure parameter
-	to use glib's malloc functions.
-
-	* sysdeps/common/ChangeLog: New file.
-
-1999-10-24  Martin Baulig  <martin@home-of-linux.org>
-
-	The LibGTop examples have been moved into their own top-level
-	module libgtop-examples.
-
-	* examples/*: Removed.
-	* configure.in: Removed all checks for the examples.
-	* libgtop-sysdeps.m4: Removed --with-libgtop-examples parameter.
-	* Makefile.am: Removed examples from the subdir list.
-
-1999-10-24  Martin Baulig  <martin@home-of-linux.org>
-
-	* libgtop-sysdeps.m4: Check for <osreldate.h> on *BSD* systems.
-
-1999-10-19  Martin Baulig  <martin@home-of-linux.org>
-
-	* LIBGTOP-VERSION: Set version number to 1.1.3, binary age 0,
-	interface age 0 and increased LIBGTOP_SERVER_VERSION to 51.
-
- 	This implies that we can now break as much compatibility as
- 	we want.
-
 1999-10-19  Martin Baulig  <martin@home-of-linux.org>

 	Released LibGTop 1.1.2 "Hardangervidda".
--- a/13
+++ b/13
@@ -8,17 +8,17 @@
 #
 LIBGTOP_MAJOR_VERSION=1
 LIBGTOP_MINOR_VERSION=1
-LIBGTOP_MICRO_VERSION=5
+LIBGTOP_MICRO_VERSION=2

 # you can set this to `-snap' for instance to create
 # a `libgtop-1.x.y-snap.tar.gz' tarball.
-LIBGTOP_VERSION_SUFFIX=
+LIBGTOP_VERSION_SUFFIX=.1-solaris

-LIBGTOP_INTERFACE_AGE=0
-LIBGTOP_BINARY_AGE=0
+LIBGTOP_INTERFACE_AGE=2
+LIBGTOP_BINARY_AGE=2

 # Increase each time you change the client/server protocol.
-LIBGTOP_SERVER_VERSION=53
+LIBGTOP_SERVER_VERSION=50

 # Don't change this
 LIBGTOP_VERSION=$LIBGTOP_MAJOR_VERSION.$LIBGTOP_MINOR_VERSION.$LIBGTOP_MICRO_VERSION
@@ -27,6 +27,3 @@ LIBGTOP_VERSION_CODE=`echo "$LIBGTOP_MAJOR_VERSION 1000000 * $LIBGTOP_MINOR_VERS
 # For automake.
 VERSION=$LIBGTOP_VERSION$LIBGTOP_VERSION_SUFFIX
 PACKAGE=libgtop
-
-# This is the default translation domain for LibGTop
-LIBGTOP_PACKAGE=libgtop-$LIBGTOP_MAJOR_VERSION.$LIBGTOP_MINOR_VERSION
--- a/2
+++ b/2
@@ -1,2 +0,0 @@
-Email: martin@home-of-linux.org
-Email: dave@srce.hr
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,20 +1,24 @@
 ## Process this file with automake to produce Makefile.in.

+if EXAMPLES
+examples_SUBDIRS = examples
+else
+examples_SUBDIRS =
+endif
+
 if BUILD_GNOME_SUPPORT
 support = support
 endif

-SUBDIRS = po intl $(support) macros misc include sysdeps backends lib \
-	  src doc scripts
+SUBDIRS = po intl $(support) macros misc include sysdeps lib src \
+	  $(examples_SUBDIRS) doc

 include_HEADERS = glibtop.h
 configincludedir = $(pkglibdir)/include

-noinst_HEADERS = glibtop-server-private.h
-
 EXTRA_DIST = autogen.sh libgtop.spec.in copyright.txt libgtopConf.sh.in \
-	LIBGTOP-VERSION features.def structures.def libgtop-config.in \
-	RELNOTES-0.25 RELNOTES-1.0 RELNOTES-1.1.x libgtop-sysdeps.m4 README \
+	LIBGTOP-VERSION features.def libgtop-config.in RELNOTES-0.25 \
+	RELNOTES-1.0 RELNOTES-1.1.x libgtop-sysdeps.m4 README \
 	libgtop-mirror.sh

 configinclude_DATA = \
@@ -37,8 +41,7 @@ release:
 ## `install-exec', not `install-data'.
 confexecdir	= $(libdir)
 confexec_DATA	= $(top_builddir)/libgtopConf.sh \
-		  $(top_builddir)/libgtop-features.def \
-		  $(top_builddir)/libgtop-structures.def
+		  $(top_builddir)/libgtop-features.def

 CLEANFILES=libgtopConf.sh

@@ -61,12 +64,15 @@ libgtopConf.sh: libgtopConf.sh.in Makefile
 	sed -e 's#\@LIBGTOP_LIBDIR\@#$(libdir)#g' \
 	  -e 's#\@LIBGTOP_INCLUDEDIR\@#$(includedir)#g' \
 	  -e 's#\@LIBGTOP_DATADIR\@#$(datadir)#g' \
-	  -e 's#\@LIBGTOP_BACKEND_DIR\@#$(LIBGTOP_BACKEND_DIR)#g' \
 	  -e 's#\@LIBGTOP_EXTRA_LIBS\@#$(LIBGTOP_EXTRA_LIBS)#g' \
 	  -e 's#\@LIBGTOP_LIBS\@#$(LIBGTOP_LIBS)#g' \
 	  -e 's#\@LIBGTOP_INCS\@#$(LIBGTOP_INCS)#g' \
 	  -e 's#\@LIBGTOP_NAMES_LIBS\@#$(LIBGTOP_NAMES_LIBS)#g' \
 	  -e 's#\@LIBGTOP_NAMES_INCS\@#$(LIBGTOP_NAMES_INCS)#g' \
+	  -e 's#\@LIBGTOP_GUILE_LIBS\@#$(LIBGTOP_GUILE_LIBS)#g' \
+	  -e 's#\@LIBGTOP_GUILE_INCS\@#$(LIBGTOP_GUILE_INCS)#g' \
+	  -e 's#\@LIBGTOP_GUILE_NAMES_LIBS\@#$(LIBGTOP_GUILE_NAMES_LIBS)#g' \
+	  -e 's#\@LIBGTOP_GUILE_NAMES_INCS\@#$(LIBGTOP_GUILE_NAMES_INCS)#g' \
 	  -e 's#\@LIBGTOP_BINDIR\@#$(LIBGTOP_BINDIR)#g' \
 	  -e 's#\@LIBGTOP_SERVER\@#$(LIBGTOP_SERVER)#g' \
 	  -e 's#\@LIBGTOP_MAJOR_VERSION\@#$(LIBGTOP_MAJOR_VERSION)#g' \
@@ -75,10 +81,11 @@ libgtopConf.sh: libgtopConf.sh.in Makefile
 	  -e 's#\@LIBGTOP_VERSION\@#$(LIBGTOP_VERSION)#g' \
 	  -e 's#\@LIBGTOP_VERSION_CODE\@#$(LIBGTOP_VERSION_CODE)#g' \
 	  -e 's#\@LIBGTOP_SERVER_VERSION\@#$(LIBGTOP_SERVER_VERSION)#g' \
-	  -e 's#\@LIBGTOP_PACKAGE\@#$(LIBGTOP_PACKAGE)#g' \
 	  -e 's#\@libgtop_sysdeps_dir\@#$(libgtop_sysdeps_dir)#g' \
 	  -e 's#\@libgtop_need_server\@#$(libgtop_need_server)#g' \
 	  -e 's#\@libgtop_use_machine_h\@#$(libgtop_use_machine_h)#g' \
+	  -e 's#\@libgtop_guile_found\@#$(libgtop_guile_found)#g' \
+	  -e 's#\@libgtop_want_examples\@#$(libgtop_want_examples)#g' \
 	      < $(srcdir)/libgtopConf.sh.in > libgtopConf.tmp \
 	  && mv libgtopConf.tmp libgtopConf.sh

@@ -91,6 +98,3 @@ libgtop-config: libgtop-config.in Makefile
 libgtop-features.def: features.def
 	@LN_S@ $< $@

-libgtop-structures.def: structures.def
-	@LN_S@ $< $@
-
--- a/10
+++ b/10
@@ -1,10 +1,10 @@
-January 14, 1999:
-================
+February 16, 2000:
+=================

-* Released LibGTop 1.1.4 "Earthquake"
+* Released LibGTop 1.1.2.1 "Hardangervidda goes Paris"

-  This is the first developer's snapshot release after a
-  longer development period with a lot of interface changes.
+  This is a bug fixed version of 1.1.2 for Solaris users
+  of the GUADEC CD.

 October 19, 1999:
 ================
--- a/32
+++ b/32
@@ -1,32 +0,0 @@
-This is the *development* branch of LibGTop. It is indended
-for people who want to help with the development of LibGTop and
-not for end-users.
-
-Please use the LIBGTOP_STABLE_1_0 branch (which is LibGTop 1.0.x)
-unless you're really a developer.
-
-If you're using LibGTop from CVS simply do a
-
-	cvs update -r LIBGTOP_STABLE_1_0
-
-to get the latest version from the stable branch.
-
-However, I'll periodically make snapshot releases from the development
-branch for Solaris users of LibGTop.
-
-They can be found at
-
-	ftp://ftp.home-of-linux.org/pub/libgtop/1.1/
-
-in near future.
-
-Using released tarballs from the development branch is a lot better than
-compiling directly from CVS since things in CVS may not always work as
-expected.
-
-Note that releases from the developer branch are neither binary
-nor fully source compatible; you'll normally have to recompile
-everything that use them.
-
-October 1999
-Martin Baulig
--- a/RELNOTES-0.25
+++ b/RELNOTES-0.25
@@ -1,146 +0,0 @@
-RELEASE NOTES FOR LIBGTOP 0.25 STABLE
-=====================================
-
-OVERVIEW
--------
-
-LibGTop is a library that read information about processes and the running
-systems. This information include:
-
-General System Information
-
-cpu		- CPU Usage
-mem		- Memory Usage
-swap		- Swap Usage (including paging activity)
-loadavg		- Load average (including nr_running, nr_tasks, last_pid)
-uptime		- Uptime and Idle time, can be calculated from CPU usage
-
-SYS V IPC Limits:
-
-shm_limits	- Shared Memory Limits
-msg_limits	- Message Queue Limits
-sem_limits	- Semaphore Set Limits
-
-Process List:
-
-proclist	- List of processes
-
-Process information:
-
-proc_state	- cmd, state, uid, gid
-proc_uid	- uid,euid,gid,egid,pid,ppid,pgrp
-		  session,tty,tpgid,priority,nice
-proc_mem	- size,vsize,resident,share,rss,rss_rlim
-proc_time	- start_time,rtime,utime,stime,cutime,cstime
-		  timeout,it_real_value,frequency
-proc_signal	- signal,blocked,sigignore,sigcatch
-proc_kernel	- k_flags,min_flt,maj_flt,cmin_flt,cmaj_flt
-		  kstk_esp,kstk_eip,nwchan,wchan
-proc_segment	- text_rss,shlib_rss,data_rss,stack_rss,dirty_size
-		  start_code,end_code,start_stack
-
-Process maps:
-
-proc_map	- Process map (/proc/<pid>/maps under Linux)
-
-File system usage:
-
-mountlist	- List of currently mounted filesystems
-fsusage		- File system usage
-
-PORTABILITY:
-----------
-
-LibGtop is designed to be as portable as possible. None of the functions
-and retrieved information should be specific to a specific operating
-system. So you only need to port the system dependent part of the library
-to a new system and all application programs can then use libgtop on this
-new system.
-
-CLIENT/SERVER MODEL:
-------------------
-
-Some systems like DEC OSF/1 or BSD require special priviledges for the calling
-proces to fetch the required information (SUID root/SGID kmem). To solve this
-problem, I designed a client/server model which makes a call to a SUID/SGID
-server which fetches the required information whenever it is required. This
-server is only called for features that really require priviledges, otherwise
-the sysdeps code is called directory (every user can get the CPU usage on
-DEC OSF/1, but only root can get information about processes other than the
-current one).
-
-There is also some kind of daemon which can be used to fetch information from
-remote systems (still experimental). This daemon normally runs as nobody and
-calls the SUID/SGID itself when needed.
-
-GNOME APPLETS:
--------------
-
-There are some applets and applications which already use LibGTop. They can
-be found in the `libgtop-apps' module in the GNOME CVS tree:
-
-* Applets:  cpuload, cpumemusage - they need LibGTop to get their information
-                                   on all systems other than Linux.
-
-* Applets:  diskusage - just uses the mountlist/fsusage features of LibGTop,
-                        the one in gnome-core also works on other systems.
-
-* Applets:  multiload - I enhanced the cpuload applet a little bit, it is
-                        now a multi applet and can display CPU, Memory and
-                        Swap usages.
-
-GTOP:
----
-
-This cool GNOME app has been ported to use LibGTop. It can be found in
-`libgtop-apps/gtop' in the GNOME CVS tree.
-
-You can now use nearly the full functionality of GTop on FreeBSD !
-
-
-PLATTFORM SPECIFIC NOTES FOR LINUX:
-==================================
-
-Under Linux, LibGTop should work without problems and read everything
-from /proc.
-
-There is also an experimental kernel interface to read this information
-directly from the kernel with a system call - but this is still experimental
-and not well tested while I made this release.
-
-PLATTFORM SPECIFIC NOTES FOR FREEBSD:
-====================================
-
-LibGTop should now work under FreeBSD and give you the full functionality
-of GTop.
-
-There are a few caveats:
-
-* You need to manually make the `$(prefix)/bin/libgtop_server' SGID to kmem
-  after installation and mount the /proc filesystem of FreeBSD
-  (/proc/<pid>/mem is used withing kvm_uread ()).
-
-* To get the filenames of the process maps displayed in GTop, you need to
-  configure with the `--with-libgtop-inodedb' option (you need GDBM for this
-  to work).
-
-* You have then to create an inode database which is used to look up to
-  filenames. This is done using the `mkinodedb' program which comes along
-  with libgtop.
-
-  See the file src/inodedb/README for details:
-
-  The `mkinodedb' program which is build in this directory takes two
-  command line arguments: the full pathname of the database to be created
-  and the name of a configuration file consisting of directory and file names
-  each on a line by itself - see `/etc/ld.so.conf' for an example.
-
-  Putting a directory name in this file means all regular files found in this
-  directory are included in the database, but it will not recursively descend
-  into subdirectories (for instance, we want everythink in `/usr/lib' but not
-  every single file in `/usr/lib/sgml'). You can also use filenames to include
-  a single file.
-
-Have fun,
-
-Martin <martin@home-of-linux.org>
--- a/RELNOTES-1.0
+++ b/RELNOTES-1.0
@@ -1,163 +0,0 @@
-RELEASE NOTES FOR LIBGTOP 1.0 STABLE
-====================================
-
-OVERVIEW
--------
-
-LibGTop is a library that read information about processes and the
-running systems. This information include:
-
-General System Information:
-
-cpu		- CPU Usage
-mem		- Memory Usage
-swap		- Swap Usage (including paging activity)
-loadavg		- Load average (including nr_running, nr_tasks, last_pid)
-uptime		- Uptime and Idle time, can be calculated from CPU usage
-
-SYS V IPC Limits:
-
-shm_limits	- Shared Memory Limits
-msg_limits	- Message Queue Limits
-sem_limits	- Semaphore Set Limits
-
-Network:
-
-netload		- Network load
-ppp		- PPP statistics
-
-Process List:
-
-proclist	- List of processes
-
-Process information:
-
-proc_state	- cmd, state, uid, gid
-proc_uid	- uid,euid,gid,egid,pid,ppid,pgrp
-		  session,tty,tpgid,priority,nice
-proc_mem	- size,vsize,resident,share,rss,rss_rlim
-proc_time	- start_time,rtime,utime,stime,cutime,cstime
-		  timeout,it_real_value,frequency
-proc_signal	- signal,blocked,sigignore,sigcatch
-proc_kernel	- k_flags,min_flt,maj_flt,cmin_flt,cmaj_flt
-		  kstk_esp,kstk_eip,nwchan,wchan
-proc_segment	- text_rss,shlib_rss,data_rss,stack_rss,dirty_size
-		  start_code,end_code,start_stack
-
-Process maps:
-
-proc_args	- Command line arguments
-proc_map	- Process map (/proc/<pid>/maps under Linux)
-
-File system usage:
-
-mountlist	- List of currently mounted filesystems
-fsusage		- File system usage
-
-PORTABILITY:
-----------
-
-LibGTop is designed to be as portable as possible. None of the
-functions and retrieved information should be specific to a specific
-operating system. So you only need to port the system dependent part
-of the library to a new system and all application programs can then
-use libgtop on this new system.
-
-CLIENT/SERVER MODEL:
-------------------
-
-Some systems like DEC OSF/1 or BSD require special privileges for the
-calling process to fetch the required information (SUID root/SGID
-kmem). To solve this problem, I designed a client/server model which
-makes a call to a SUID/SGID server which fetches the required
-information whenever it is required. This server is only called for
-features that really require privileges, otherwise the sysdeps code
-is called directory (every user can get the CPU usage on DEC OSF/1,
-but only root can get information about processes other than the
-current one).
-
-There is also some kind of daemon which can be used to fetch
-information from remote systems (still experimental). This daemon
-normally runs as nobody and calls the SUID/SGID itself when needed.
-
-LIBGTOP AND GNOME:
-----------------
-
-LibGTop is currently used in various places in the GNOME Project,
-for instance in some of the applets in gnome-core and - of cause -
-this ultra-cool application called GTop ...
-
-Although LibGTop is not specific to GNOME and under LGPL license, I
-spent most my time during the last months to work in the GNOME project
-so this is the primary use for LibGTop (and currently the only one).
-
-However, you can also give its configure.in script the `--without-gnome'
-parameter and then use it fully without GNOME in your own applications.
-
-LIBGTOP AND GNOME - PART II:
---------------------------
-
-LibGTop was tested with FreeBSD 3.0 but it should also work with
-FreeBSD 2.2.7, NetBSD and OpenBSD.
-
-Currently my primary aim is to help the GNOME people with our 1.0 release
-so I won't have much time to test it with any other system than Linux.
-
-However, I consider FreeBSD, NetBSD and OpenBSD as supported systems for
-LibGTop and whenever I get bug reports I will do my best to fix them as
-quickly as possible.
-
-PLATFORM SPECIFIC NOTES FOR LINUX:
-==================================
-
-Under Linux, LibGTop should work without problems and read everything
-from /proc.
-
-LibGTop 0.25 also had an experimental kernel interface to read this
-information directly from the kernel with a system call - but I have
-currently dropped support for this as I am too busy with GNOME
-development to keep current with kernel hacking.
-
-PLATFORM SPECIFIC NOTES FOR SOLARIS:
-====================================
-
-Since so many people were asking me about this:
-
-LibGTop currently does not have any support for Solaris, and it will
-never have until some volunteer writes the code for it. I can't do this
-myself since I do not have any machine to test it on.
-
-PLATFORM SPECIFIC NOTES FOR BSD:
-=================================
-
-There are a few caveats:
-
-* You need to manually make the `$(prefix)/bin/libgtop_server' SGID to
-  kmem after installation and mount the /proc file system of FreeBSD
-  (/proc/<pid>/mem is used within kvm_uread ()).
-
-* To get the filenames of the process maps displayed in GTop, you need
-  to configure with the `--with-libgtop-inodedb' option (you need GDBM
-  for this to work).
-
-  You have then to create an inode database which is used to look up
-  filenames. This is done using the `mkinodedb' program which comes
-  along with libgtop.
-
-  See the file src/inodedb/README for details:
-
-  The `mkinodedb' program which is build in this directory takes two
-  command line arguments: the full pathname of the database to be
-  created and the name of a configuration file consisting of directory
-  and file names each on a line by itself - see `/etc/ld.so.conf' for
-  an example.
-
-  Putting a directory name in this file means all regular files found
-  in this directory are included in the database, but it will not
-  recursively descend into subdirectories (for instance, we want
-  everything in `/usr/lib' but not every single file in `/usr/lib/sgml').
-  You can also use filenames to include a single file.
-
-Have fun,
-
-Martin <martin@home-of-linux.org>
--- a/RELNOTES-1.1.x
+++ b/RELNOTES-1.1.x
@@ -1,50 +0,0 @@
-RELEASE NOTES FOR LIBGTOP 1.1.2
-===============================
-
-This is a snapshot release for Solaris users of October GNOME. It contains
-a first version of the Solaris port of LibGTop which works at least on
-Solaris 7.
-
-Please use LibGTop 1.0.x if you're not on a Solaris system
-(look at the README file for details).
-
-IMPORTANT CHANGES SINCE 1.0:
----------------------------
-
-* All `glibtop_get_<feature>_* ()' and all `glibtop_init_<feature>_* ()'
-  functions now have an `int' return value and return 0 on success and -1
-  on failure.
-
-* glibtop_cpu: Added `xcpu_flags'
-
-* glibtop_proc_state: Changed `state' from char to unsigned and added
-    GLIBTOP_PROCESS_RUNNING, GLIBTOP_PROCESS_INTERRUPTIBLE,
-    GLIBTOP_PROCESS_UNINTERRUPTIBLE,  GLIBTOP_PROCESS_ZOMBIE,
-    GLIBTOP_PROCESS_STOPPED, GLIBTOP_PROCESS_SWAPPING constants for it.
-
-* `GLIBTOP_MOUNTENTRY_LEN' and `GLIBTOP_MAX_GROUPS' are now defined in
-  <glibtop/limits.h>
-
-* Removed the `GLIBTOP_SYSDEPS_FEATURES' and `GLIBTOP_SYSDEPS_POINTER_SIZE'
-  constants from <glibtop/sysdeps.h> and let numbering start at zero for
-  `GLIBTOP_SYSDEPS_CPU'.
-
-OTHER CHANGES SINCE 1.0:
-----------------------
-
-* Use G_GNUC_UNUSED in <glibtop/error.h> to avoid compiler warnings.
-
-* The `libgtop-config' script now accepts `--cflags', `--libs' and
-  `--extra-libs' parameter.
-
-* The libraries are now called -lgtop-1.1 etc. so you can use 1.0.x and
-  1.1.x in parallel.
-
-CHANGES SINCE 1.0 MAINLY INTERESTING FOR DEVELOPERS:
---------------------------------------------------
-
-* We create a `glibtop-config.h' now which gets included from <glibtop.h>
-  when we're _IN_LIBGTOP. It contains things such as `u_int64_t' etc.
-
-October 1999
-Martin Baulig
--- a/0
+++ b/0
--- a/acconfig.h
+++ b/acconfig.h
@@ -1,176 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
-
-/* Define if gethostname () must be declared. */
-#undef NEED_DECLARATION_GETHOSTNAME
-
-/* Define if setreuid () must be declared. */
-#undef NEED_DECLARATION_SETREUID
-
-/* Define if setregid () must be declared. */
-#undef NEED_DECLARATION_SETREGID
-
-/* Define if getpagesize () must be declared. */
-#undef NEED_DECLARATION_GETPAGESIZE
-
-/* Define if program_invocation_name must be declared. */
-#undef NEED_DECLARATION_PROGRAM_INVOCATION_NAME
-
-@TOP@
-
-#undef ENABLE_NLS
-#undef HAVE_CATGETS
-#undef HAVE_GETTEXT
-#undef HAVE_LC_MESSAGES
-#undef HAVE_STPCPY
-#undef HAVE_STRUCT_OSOCKADDR
-#undef LIBGTOP_PACKAGE
-#undef PACKAGE
-#undef VERSION
-#undef HAVE_LIBSM
-#undef HAVE_LIBINTL_H
-#undef HAVE_GTK_SIGNAL_HANDLER_PENDING
-
-/* Do not remove this comments and the empty lines; they are needed */
-#undef HAVE_PROGRAM_INVOCATION_SHORT_NAME
-/* Define if you have the Andrew File System.  */
-#undef AFS
-
-/* Define one of the following to indicate how a program can
-   get a list of mounted filesystems.  */
-
-/* Define if there is no specific function for reading the list of
-   mounted filesystems.  fread will be used to read /etc/mnttab.  [SVR2]  */
-#undef MOUNTED_FREAD
-
-/* Define if (like SVR2) there is no specific function for reading the
-   list of mounted filesystems, and your system has these header files:
-   <sys/fstyp.h> and <sys/statfs.h>.  [SVR3]  */
-#undef MOUNTED_FREAD_FSTYP
-
-/* Define if there is a function named getfsstat for reading the list
-   of mounted filesystems.  [DEC Alpha running OSF/1]  */
-#undef MOUNTED_GETFSSTAT
-
-/* Define if there is a function named getmnt for reading the list of
-   mounted filesystems.  [Ultrix]  */
-#undef MOUNTED_GETMNT
-
-/* Define if there is a function named getmntent for reading the list
-   of mounted filesystems, and that function takes a single argument.
-   [4.3BSD, SunOS, HP-UX, Dynix, Irix]  */
-#undef MOUNTED_GETMNTENT1
-
-/* Define if there is a function named getmntent for reading the list of
-   mounted filesystems, and that function takes two arguments.  [SVR4]  */
-#undef MOUNTED_GETMNTENT2
-
-/* Define if there is a function named getmntinfo for reading the list
-   of mounted filesystems.  [4.4BSD]  */
-#undef MOUNTED_GETMNTINFO
-
-/* Define if there is a function named listmntent that can be used to
-   list all mounted filesystems. [UNICOS] */
-#undef MOUNTED_LISTMNTENT
-
-/* Define if there is a function named mntctl that can be used to read
-   the list of mounted filesystems, and there is a system header file
-   that declares `struct vmount.'  [AIX]  */
-#undef MOUNTED_VMOUNT
-
-/* Define one of the following to indicate how a program can obtain
-   filesystems usage information.  */
-
-/*  Define if  statfs takes 3 args.  [DEC Alpha running OSF/1]  */
-#undef STAT_STATFS3_OSF1
-
-/* Define if there is no specific function for reading filesystems usage
-   information and you have the <sys/filsys.h> header file.  [SVR2]  */
-#undef STAT_READ_FILSYS
-
-/* Define if statfs takes 2 args and struct statfs has a field named f_bsize.
-   [4.3BSD, SunOS 4, HP-UX, AIX PS/2]  */
-#undef STAT_STATFS2_BSIZE
-
-/* Define if statfs takes 2 args and struct statfs has a field named f_fsize.
-   [4.4BSD, NetBSD]  */
-#undef STAT_STATFS2_FSIZE
-
-/* Define if statfs takes 2 args and the second argument has
-   type struct fs_data.  [Ultrix]  */
-#undef STAT_STATFS2_FS_DATA
-
-/* Define if statfs takes 4 args.  [SVR3, Dynix, Irix, Dolphin]  */
-#undef STAT_STATFS4
-
-/* Define if there is a function named statvfs.  [SVR4]  */
-#undef STAT_STATVFS
-
-/* Define if the block counts reported by statfs may be truncated to 2GB
-   and the correct values may be stored in the f_spare array.
-   [SunOS 4.1.2, 4.1.3, and 4.1.3_U1 are reported to have this problem.
-   SunOS 4.1.1 seems not to be affected.]  */
-#undef STATFS_TRUNCATES_BLOCK_COUNTS
-
-
-/* to fix a bug in autoheader on DEC OSF1. */
-#undef HAVE_PROGRAM_INVOCATION_NAME
-
-#undef HAVE_SOCKETS
-#undef HAVE_SOCKADDR_SUN_LEN
-
-#undef HAVE_LIBJPEG
-#undef HAVE_LIBGIF
-#undef HAVE_LIBTIFF
-#undef HAVE_LIBZ
-#undef HAVE_LIBPNG
-#undef HAVE_GMP2_INCLUDE_DIR
-
-#undef ssize_t
-#undef u_int64_t
-#undef int64_t
-
-#undef HAVE_GLIBTOP_MACHINE_H
-
-#undef GLIBTOP_NAMES
-#undef GLIBTOP_EXAMPLES
-#undef GLIBTOP_INODEDB
-
-#undef NEED_LIBGTOP
-
-#undef HAVE_LINUX_SYSCTL
-#undef HAVE_LIBGTOP_SMP
-
-#undef HAVE_XAUTH
-
-/* Define if your have the I4B package. */
-#undef HAVE_I4B
-#undef HAVE_I4B_ACCT
-
-/* Define to enable debugging. */
-#undef LIBGTOP_ENABLE_DEBUG
-#undef LIBGTOP_FATAL_WARNINGS
-
-/* Define to use glib's malloc. */
-#undef LIBGTOP_USE_GLIB_MALLOC
-
-/* Same as LINUX_VERSION_CODE either from <linux/version.h> or from
- * the running kernel (if we don't have configured kernel sources).
- */
-#undef GLIBTOP_LINUX_VERSION_CODE
-
-/* Solaris release code (eg. 251 for Solaris 2.5.1). */
-#undef GLIBTOP_SOLARIS_RELEASE
-
-/* Define if you want to use LibGTop without GNOME. */
-#undef WITHOUT_GNOME
-
-/* Define if you have the <procfs.h> header file */
-#undef HAVE_PROCFS_H
-
-/* Define if you have the <sys/procfs.h> header file */
-#undef HAVE_SYS_PROCFS_H
-
-/* Define if you have the libxml library */
-#undef HAVE_LIBXML
-
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,41 +0,0 @@
-#!/bin/sh
-# Run this to generate all the initial makefiles, etc.
-
-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
-
-PKG_NAME="Gnome Top Library"
-
-(test -f $srcdir/configure.in \
-  && test -f $srcdir/copyright.txt \
-  && test -d $srcdir/sysdeps) || {
-    echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
-    echo " top-level gnome directory"
-    exit 1
-}
-
-. $srcdir/macros/autogen.sh
-cp -f $srcdir/po/Makefile.in.in.in $srcdir/po/Makefile.in.in
-
-echo ""
-echo " *** IMPORTANT *** "
-echo ""
-echo "This is a development version of LibGTop.  You should be using a stable"
-echo "version, which is available at ftp://ftp.gnome.org/pub/GNOME/sources/libgtop/"
-echo "The version you just configured is meant for developers of LibGTop only:"
-echo ""
-echo "  * You should not base ANY software on this version of LibGTop."
-echo ""
-echo " *** You should be using LibGTop 1.0.x instead. ***"
-echo ""
-echo "If you are using this source tree from CVS, please run:"
-echo "	cvs update -r LIBGTOP_STABLE_1_0"
-echo "now."
-echo ""
-echo "If you're a Solaris user, you should try out the LibGTop 1.1.2 release."
-echo "You can get it from ftp://ftp.home-of-linux.org/pub/libgtop/1.1/"
-echo ""
-echo "If you are using this source tree from CVS, you can use:"
-echo "	cvs update -r LIBGTOP_1_1_2_PATCHES"
-echo "to get a bug fixed release of 1.1.2."
-echo ""
--- a/backends/.cvsignore
+++ b/backends/.cvsignore
@@ -1,5 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.lo
--- a/backends/Makefile.am
+++ b/backends/Makefile.am
@@ -1 +0,0 @@
-SUBDIRS		= server sysdeps common
--- a/backends/common/.cvsignore
+++ b/backends/common/.cvsignore
@@ -1,7 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.lo
-*.la
-marshal.c
--- a/backends/common/ChangeLog
+++ b/backends/common/ChangeLog
@@ -1,17 +0,0 @@
-2000-01-12  Martin Baulig  <martin@home-of-linux.org>
-
-	* Makefile.am: Install everything in $(LIBGTOP_BACKEND_DIR).
-
-	* libgtop-common.backend: New file.
-
-	* backend-common.c (glibtop_backend_common): Renamed to
-	`LibGTopBackendInfo'.
-
-2000-01-12  Martin Baulig  <martin@home-of-linux.org>
-
-	Initial version of the "glibtop-backend-common" backend.
-
-	* backend-common.c: New file.
-	* glibtop-backend-private.h: New file.
-	* marshal.pl: New file. Automatically creates `marshal.c'.
-
--- a/backends/common/Makefile.am
+++ b/backends/common/Makefile.am
@@ -1,35 +0,0 @@
-LINK		= $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
-
-INCLUDES	= @INCLUDES@
-
-backenddir	= @LIBGTOP_BACKEND_DIR@
-
-backend_DATA = \
-	libgtop-common.backend
-
-noinst_HEADERS = \
-	glibtop-backend-private.h
-
-backend_LTLIBRARIES = \
-	libgtop_backend_common.la
-
-libgtop_backend_common_la_SOURCES = \
-	backend-common.c		\
-	marshal.c
-
-libgtop_backend_common_la_LDFLAGS = \
-	$(LT_VERSION_INFO) -export-dynamic
-
-BUILT_SOURCES = \
-	marshal.c
-
-EXTRA_DIST = \
-	marshal.pl	\
-	libgtop-common.backend
-
-CLEANFILES = $(BUILT_SOURCES)
-
-marshal.c: marshal.pl $(top_builddir)/config.h $(top_srcdir)/features.def $(top_srcdir)/scripts/c_types.pl
-	$(PERL) -I $(top_srcdir)/scripts $(srcdir)/marshal.pl < $(top_srcdir)/features.def > tmp-t
-	mv tmp-t marshal.c
-
--- a/backends/common/backend-common.c
+++ b/backends/common/backend-common.c
@@ -1,62 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
-/* $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.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#include <glibtop.h>
-#include <glibtop/global.h>
-#include <glibtop/xmalloc.h>
-
-#include <glibtop/open.h>
-#include <glibtop/backend.h>
-#include <glibtop-backend-private.h>
-
-static int
-_open_common (glibtop *, glibtop_backend *, u_int64_t, const char **);
-
-static int
-_close_common (glibtop *, glibtop_backend *);
-
-extern glibtop_call_vector glibtop_backend_common_call_vector;
-
-glibtop_backend_info LibGTopBackendInfo = {
-    "glibtop-backend-common", _open_common, _close_common,
-    &glibtop_backend_common_call_vector
-};
-
-static int
-_open_common (glibtop *server, glibtop_backend *backend,
-	      u_int64_t features, const char **backend_args)
-{
-    backend->_priv = glibtop_calloc_r
-	(server, 1, sizeof (glibtop_backend_private));
-
-    return 0;
-}
-
-static int
-_close_common (glibtop *server, glibtop_backend *backend)
-{
-    return -1;
-}
-
--- a/backends/common/glibtop-backend-private.h
+++ b/backends/common/glibtop-backend-private.h
@@ -1,34 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
-/* $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.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __GLIBTOP_BACKEND_PRIVATE_H__
-#define __GLIBTOP_BACKEND_PRIVATE_H__
-
-struct _glibtop_backend_private
-{
-    u_int64_t flags;
-};
-
-#endif
--- a/backends/common/libgtop-common.backend
+++ b/backends/common/libgtop-common.backend
@@ -1,12 +0,0 @@
-<?xml version="1.0"?> <!-- -*-xml-*- -->
-<libgtop:Backends xmlns:libgtop="http://www.home-of-linux.org/libgtop/1.1">
-
-  <libgtop:Backend>
-    <libgtop:Name>glibtop-backend-common</libgtop:Name>
-    <libgtop:Location>
-      <libgtop:LibtoolName>libgtop_backend_common.la</libgtop:LibtoolName>
-      <libgtop:ShlibName>libgtop_backend_common.so</libgtop:ShlibName>
-    </libgtop:Location>
-  </libgtop:Backend>
-
-</libgtop:Backends>
--- a/backends/common/marshal.pl
+++ b/backends/common/marshal.pl
@@ -1,179 +0,0 @@
-#!/usr/bin/perl
-
-require 'c_types.pl';
-
-$[ = 1;			# set array base to 1
-$, = ' ';		# set output field separator
-$\ = "\n";		# set output record separator
-
-$always_use_temp_storage = 1;
-
-sub toupper {
-    local($_) = @_;
-    tr/a-z/A-Z/;
-    return $_;
-}
-
-sub tolower {
-    local($_) = @_;
-    tr/A-Z/a-z/;
-    return $_;
-}
-
-print '/* marshal.c */';
-print "/* This is a generated file.  Please modify `marshal.pl' */";
-print '';
-
-print '#include <glibtop.h>';
-print '#include <glibtop/open.h>';
-print '#include <glibtop/xmalloc.h>';
-print '';
-print '#include <glibtop/sysdeps.h>';
-print '#include <glibtop/union.h>';
-print '';
-print '#include <glibtop/backend.h>';
-print '';
-print '#include <glibtop-backend-private.h>';
-print '';
-
-$feature_count = 0;
-
-while (<>) {
-    chop;	# strip record separator
-
-    if (/^[^#]/) {
-	&output($_);
-    }
-}
-
-sub output {
-    local($line) = @_;
-    @line_fields = split(/\|/, $line, 9999);
-    $retval = $line_fields[1];
-    $feature = $line_fields[2];
-    $param_def = $line_fields[4];
-
-    $orig = $feature;
-    $feature =~ s/^@//;
-    $space = $feature;
-    $space =~ s/./ /g;
-
-    $features{++$feature_count} = $orig;
-
-    return unless $orig =~ /^@/;
-
-    if ($retval eq 'retval') {
-      $retval_param = '&retval';
-      $call_prefix = '';
-      $call_prefix_space = '';
-      $prefix = 'retval = ';
-      $prefix_space = '         ';
-      $retval = 'int';
-    }
-    elsif ($retval !~ /^void$/) {
-      $retval_param = 'NULL';
-      $prefix = 'retval = ';
-      $prefix_space = '         ';
-      $call_prefix = 'retval = ';
-      $call_prefix_space = '         ';
-    }
-    else {
-      $retval_param = 'NULL';
-      $call_prefix = '';
-      $call_prefix_space = '';
-      $prefix = '';
-      $prefix_space = '';
-    }
-
-    if ($retval =~ /^(array|pointer)\((.*)\)$/) {
-      $retval = ($2 eq 'string') ? 'char **' : "$2 *";
-    }
-
-    $need_temp_storage = $always_use_temp_storage;
-    $first_param_name = '';
-
-    $call_param = '';
-    $param_decl = '';
-    $need_temp_len = 0;
-    $nr_params = (@params = split(/:/, $param_def, 9999));
-    for ($param = 1; $param <= $nr_params; $param++) {
-      $list = $params[$param];
-      $type = $params[$param];
-      $type =~ s/\(.*//;
-      $list =~ s/^.*\(//;
-      $list =~ s/\)$//;
-      $count = (@fields = split(/,/, $list, 9999));
-      for ($field = 1; $field <= $count; $field++) {
-	my $c_type = $typeinfo->{$type}->[1];
-
-	if ($first_param_name eq '') {
-	  $first_param_name = $fields[$field];
-	}
-
-	if ($typeinfo->{$type}->[2]) {
-	  $need_temp_storage = 1;
-	}
-
-	if ($param_decl eq '') {
-	  $param_decl = ",\n             " . $space . '    ';
-	}
-	else {
-	  $param_decl = $param_decl . ', ';
-	}
-	$param_decl = $param_decl . $c_type . ' ' . $fields[$field];
-	$call_param = $call_param . ', ' . $fields[$field];
-      }
-    }
-
-    if ($line_fields[3] eq '') {
-      $total_code = sprintf
-	("\treturn glibtop_get_%s_s (server%s);\n", $feature, $call_param);
-    } elsif ($line_fields[3] eq 'array') {
-      $total_code = sprintf
-	("\treturn glibtop_get_%s_s (server, array%s);\n", $feature, $call_param);
-    } elsif ($line_fields[3] =~ /^array/) {
-      $total_code = sprintf
-	("\treturn glibtop_get_%s_s (server, array, buf%s);\n", $feature, $call_param);
-    } else {
-      $total_code = sprintf
-	("\treturn glibtop_get_%s_s (server, buf%s);\n", $feature, $call_param);
-    }
-
-    $func_decl = 'static '.$retval."\n";
-    if ($line_fields[3] eq '') {
-      $func_decl .= sprintf ("_glibtop_get_%s_c (glibtop *server, glibtop_backend *backend%s)\n",
-			     $feature, $param_decl);
-    } elsif ($line_fields[3] eq 'array') {
-      $func_decl .= sprintf ("_glibtop_get_%s_c (glibtop *server, glibtop_backend *backend, glibtop_array *array%s)\n",
-			     $feature, $param_decl);
-    } elsif ($line_fields[3] =~ /^array/) {
-      $func_decl .= sprintf ("_glibtop_get_%s_c (glibtop *server, glibtop_backend *backend, glibtop_array *array, %s *buf%s)\n",
-			     $feature, 'glibtop_'.$feature, $param_decl);
-    } else {
-      $func_decl .= sprintf ("_glibtop_get_%s_c (glibtop *server, glibtop_backend *backend, %s *buf%s)\n",
-			     $feature, 'glibtop_'.$feature, $param_decl);
-    }
-
-    $total_code = sprintf ("%s{\n%s\n%s}\n", $func_decl, $total_code);
-
-    print $total_code;
-}
-
-$call_vector_code = '';
-for ($nr = 1; $nr <= $feature_count; $nr++) {
-  $feature = $features{$nr};
-
-  if ($feature =~ /^@/) {
-    $feature =~ s/^@//;
-
-    $call_vector_code .= sprintf (qq[\t_glibtop_get_%s_c,\n], $feature);
-  } else {
-    $call_vector_code .= sprintf (qq[\tNULL,\n]);
-  }
-}
-
-print 'glibtop_call_vector glibtop_backend_common_call_vector = {';
-print $call_vector_code;
-print '};';
-print '';
-
--- a/backends/server/.cvsignore
+++ b/backends/server/.cvsignore
@@ -1,10 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.lo
-*.la
-marshal.c
-demarshal.c
-libgtop_server
-command.h
--- a/backends/server/ChangeLog
+++ b/backends/server/ChangeLog
@@ -1,50 +0,0 @@
-2000-01-18  Martin Baulig  <martin@home-of-linux.org>
-
-	* demarshal.pl: Only emit code for functions which are
-	really suid/sgid.
-
-2000-01-13  Martin Baulig  <martin@home-of-linux.org>
-
-	* write.c (glibtop_write_i): The buffer which we write is
-	now a `const'.
-
-2000-01-12  Martin Baulig  <martin@home-of-linux.org>
-
-	* Makefile.am: Install everything except the server binary
-	in $(LIBGTOP_BACKEND_DIR).
-
-	* libgtop-server.backend: New file.
-
-	* backend-server.c (glibtop_backend_server): Renamed to
-	`LibGTopBackendInfo'.
-
-2000-01-08  Martin Baulig  <martin@home-of-linux.org>
-
-	* command.h.in (glibtop_response): New structure.
-
-2000-01-02  Martin Baulig  <martin@home-of-linux.org>
-
-	* command.pl: New file. Creates `command.h' from `command.h.in'.
-	* command.h.in: New file. Template file for `command.h'.
-
-	* io.c, version.c: New files. Copied here from `src/daemon'.
-
-	* demarshal.pl: New file. Automatically creates `demarshal.c'.
-	* demarshal.c: This automatically created file handles the
-	demarshalling in the libgtop_server.
-
-	* Makefile.am: Build the `libgtop_server' here.
-	* server.c, server.h: New files. Copied here from `src/daemon'.
-
-2000-01-01  Martin Baulig  <martin@home-of-linux.org>
-
-	Initial version of the "glibtop-backend-server" backend.
-
-	* command.c, read.c, read_data.c, write.c: New files. Moved here
-	from the `lib' directory.
-
-	* backend-server.c: New file.
-	* glibtop-backend-private.h: New file.
-
-	* marshal.pl: New file. Automatically creates `marshal.c'.
-
--- a/backends/server/Makefile.am
+++ b/backends/server/Makefile.am
@@ -1,77 +0,0 @@
-LINK		= $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
-
-INCLUDES	= @INCLUDES@ -D_BSD \
-		  -DLIBGTOP_COMPILE_SYSTEM=\"`uname -s`\" \
-		  -DLIBGTOP_COMPILE_RELEASE=\"`uname -r`\" \
-		  -DLIBGTOP_COMPILE_MACHINE=\"`uname -m`\"
-
-backenddir	= @LIBGTOP_BACKEND_DIR@
-
-backend_DATA = \
-	libgtop-server.backend
-
-noinst_HEADERS = \
-	glibtop-backend-private.h
-
-backend_LTLIBRARIES = \
-	libgtop_backend_server.la
-
-bin_PROGRAMS = \
-	@server_programs@
-
-EXTRA_PROGRAMS = \
-	libgtop_server
-
-libgtop_backend_server_la_SOURCES = \
-	backend-server.c		\
-	marshal.c			\
-	command.c			\
-	read.c				\
-	read_data.c			\
-	write.c
-
-libgtop_backend_server_la_LDFLAGS = \
-	$(LT_VERSION_INFO) -export-dynamic
-
-libgtop_server_SOURCES = \
-	server.c		\
-	server.h		\
-	demarshal.c		\
-	version.c		\
-	io.c
-
-libgtop_server_LDADD = \
-	$(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps_suid.la \
-	$(top_builddir)/sysdeps/common/libgtop_suid_common.la \
-	@LIBSUPPORT@
-
-if ENABLE_STATIC
-libgtop_server_LDFLAGS = -static
-endif
-
-BUILT_SOURCES = \
-	marshal.c		\
-	demarshal.c		\
-	command.h
-
-EXTRA_DIST = \
-	marshal.pl		\
-	demarshal.pl		\
-	command.pl		\
-	command.h.in		\
-	libgtop-server.backend
-
-CLEANFILES = $(BUILT_SOURCES)
-
-marshal.c: marshal.pl $(top_builddir)/config.h $(top_srcdir)/features.def $(top_srcdir)/scripts/c_types.pl
-	$(PERL) -I $(top_srcdir)/scripts $(srcdir)/marshal.pl < $(top_srcdir)/features.def > tmp-t
-	mv tmp-t marshal.c
-
-demarshal.c: demarshal.pl $(top_builddir)/config.h $(top_srcdir)/features.def $(top_srcdir)/scripts/c_types.pl
-	$(PERL) -I $(top_srcdir)/scripts $(srcdir)/demarshal.pl < $(top_srcdir)/features.def > tmp-t
-	mv tmp-t demarshal.c
-
-command.h: command.pl command.h.in $(top_builddir)/config.h $(top_srcdir)/features.def $(top_srcdir)/scripts/c_types.pl
-	$(PERL) -I $(top_srcdir)/scripts $(srcdir)/command.pl $(top_srcdir)/features.def $(srcdir)/command.h.in > tmp-t
-	mv tmp-t command.h
-
--- a/backends/server/backend-server.c
+++ b/backends/server/backend-server.c
@@ -1,101 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
-/* $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.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#include <glibtop.h>
-#include <glibtop/global.h>
-#include <glibtop/xmalloc.h>
-
-#include <glibtop/backend.h>
-#include <glibtop-backend-private.h>
-
-static int
-_open_server (glibtop *, glibtop_backend *, u_int64_t, const char **);
-
-static int
-_close_server (glibtop *, glibtop_backend *);
-
-extern glibtop_call_vector glibtop_backend_server_call_vector;
-
-glibtop_backend_info LibGTopBackendInfo = {
-    "glibtop-backend-server", _open_server, _close_server,
-    &glibtop_backend_server_call_vector
-};
-
-static int
-_open_server (glibtop *server, glibtop_backend *backend,
-	      u_int64_t features, const char **backend_args)
-{
-    backend->_priv = glibtop_calloc_r
-	(server, 1, sizeof (glibtop_backend_private));
-
-#ifdef DEBUG
-    fprintf (stderr, "open_server - %p, %p, %p\n", server, backend,
-	     backend->_priv);
-
-    fprintf (stderr, "Opening pipe to server (%s).\n",
-	     LIBGTOP_SERVER);
-#endif
-
-    if (pipe (backend->_priv->input) ||
-	pipe (backend->_priv->output)) {
-	glibtop_warn_io_r (server, "cannot make a pipe");
-	return -1;
-    }
-
-    backend->_priv->pid  = fork ();
-
-    if (backend->_priv->pid < 0) {
-	glibtop_warn_io_r (server, "fork failed");
-	return -1;
-    } else if (backend->_priv->pid == 0) {
-	close (0); close (1);
-	close (backend->_priv->input [0]);
-	close (backend->_priv->output [1]);
-	dup2 (backend->_priv->input [1], 1);
-	dup2 (backend->_priv->output [0], 0);
-	execl (LIBGTOP_SERVER, "libgtop-server", NULL);
-	glibtop_error_io_r (server, "execl (%s)",
-			    LIBGTOP_SERVER);
-	_exit (2);
-    }
-
-    close (backend->_priv->input [1]);
-    close (backend->_priv->output [0]);
-
-    return 0;
-}
-
-static int
-_close_server (glibtop *server, glibtop_backend *backend)
-{
-    kill (backend->_priv->pid, SIGKILL);
-    close (backend->_priv->input [0]);
-    close (backend->_priv->output [1]);
-
-    backend->_priv->pid = 0;
-
-    return 0;
-}
-
--- a/backends/server/command.c
+++ b/backends/server/command.c
@@ -1,108 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
-/* $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.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#include <glibtop/xmalloc.h>
-
-#include <glibtop.h>
-#include <glibtop/error.h>
-#include <glibtop/backend.h>
-
-#include <glibtop-backend-private.h>
-
-#include "command.h"
-
-void *
-glibtop_call_i (glibtop *server, glibtop_backend *backend, unsigned command,
-		size_t send_size, const void *send_buf,
-		size_t data_size, const void *data_buf,
-		size_t recv_size, void *recv_ptr,
-		int *retval_ptr)
-{
-    glibtop_command cmnd;
-    glibtop_response resp;
-#if 0
-    int retval;
-#endif
-
-    glibtop_init_r (&server, 0, 0);
-
-    memset (&cmnd, 0, sizeof (glibtop_command));
-    memset (&resp, 0, sizeof (glibtop_response));
-
-    cmnd.command = command;
-
-    /* If send_size is less than _GLIBTOP_PARAM_SIZE (normally 16 Bytes), we
-     * send it together with command, so we only need one system call instead
-     * of two. */
-
-    if (send_size <= _GLIBTOP_PARAM_SIZE) {
-	memcpy (cmnd.parameter, send_buf, send_size);
-	cmnd.param_size = send_size;
-    } else {
-	cmnd.send_size = send_size;
-    }
-
-    cmnd.data_size = data_size;
-	
-    glibtop_write_i (server, backend, sizeof (glibtop_command), &cmnd);
-
-    if (data_size) {
-#ifdef SLAVE_DEBUG
-	fprintf (stderr, "SENDING %d bytes of DATA.\n", data_size);
-#endif
-	glibtop_write_i (server, backend, data_size, data_buf);
-    }
-
-    glibtop_read_i (server, backend, sizeof (glibtop_response), &resp);
-
-#ifdef SLAVE_DEBUG
-    fprintf (stderr, "RESPONSE: %d - %d - %ld - %ld - %p - %ld\n",
-	     resp.retval, resp.glibtop_errno,
-	     (long) resp.recv_size, (long) resp.data_size,
-	     recv_ptr, (long) recv_size);
-#endif
-    
-    if (retval_ptr)
-	*retval_ptr = resp.glibtop_errno;
-
-    if (resp.recv_size != recv_size) {
-	glibtop_warn_r (server, "Expected %ld bytes, but got %ld.",
-			(long) recv_size, (long) resp.recv_size);
-	return NULL;
-    }
-
-    if (recv_ptr)
-	glibtop_read_i (server, backend, recv_size, recv_ptr);
-
-    if (resp.data_size) {
-	void *ptr = glibtop_malloc_r (server, resp.data_size);
-
-	glibtop_read_i (server, backend, resp.data_size, ptr);
-
-	return ptr;
-    }
-
-    return NULL;
-}
--- a/backends/server/command.h.in
+++ b/backends/server/command.h.in
@@ -1,59 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
-/* $Id$ */
-
-@@AUTOGEN_COMMENT@@
-
-/* 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.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __GLIBTOP_COMMAND_H__
-#define __GLIBTOP_COMMAND_H__
-
-#include <glibtop.h>
-#include <glibtop/union.h>
-
-BEGIN_LIBGTOP_DECLS
-
-@@GLIBTOP_COMMAND_CONSTANTS@@
-
-#define _GLIBTOP_PARAM_SIZE		16
-
-typedef struct _glibtop_command		glibtop_command;
-typedef struct _glibtop_response	glibtop_response;
-
-struct _glibtop_command
-{
-    u_int64_t	command;
-    u_int64_t	param_size, send_size, data_size;
-    char	parameter [_GLIBTOP_PARAM_SIZE];
-};
-
-struct _glibtop_response
-{
-    int retval;
-    int glibtop_errno;
-    u_int64_t recv_size, data_size;
-};
-
-END_LIBGTOP_DECLS
-
-#endif
--- a/backends/server/command.pl
+++ b/backends/server/command.pl
@@ -1,76 +0,0 @@
-#!/usr/bin/perl
-
-require 'c_types.pl';
-
-die "Usage: $0 features.def command.h.in" unless $#ARGV == 1;
-
-$[ = 1;			# set array base to 1
-$, = ' ';		# set output field separator
-$\ = "\n";		# set output record separator
-
-sub toupper {
-    local($_) = @_;
-    tr/a-z/A-Z/;
-    return $_;
-}
-
-sub tolower {
-    local($_) = @_;
-    tr/A-Z/a-z/;
-    return $_;
-}
-
-$constants_decl_code = '';
-
-open FEATURESDEF, $ARGV[1] or
-  die "open ($ARGV[1]): $!";
-
-while (<FEATURESDEF>) {
-  chop;				# strip record separator
-  
-  if (/^[^\#]/) {
-    &parse_features_def ($_);
-  }
-}
-
-close FEATURESDEF;
-
-sub parse_features_def {
-  local($line) = @_;
-  @line_fields = split(/\|/, $line, 9999);
-  $retval = $line_fields[1];
-  $element_def = $line_fields[3];
-  $feature = $line_fields[2];
-  $param_def = $line_fields[4];
-
-  $orig = $feature;
-  $feature =~ s/^@//;
-  $space = $feature;
-  $space =~ s/./ /g;
-
-  $constants_decl_code .= sprintf
-    (qq[\#define %-40s %d\n], 'GLIBTOP_CMND_'.&toupper($feature),
-     ++$feature_count);
-
-  $features{$feature_count} = $feature;
-}
-
-chop $constants_decl_code;
-
-$auto_gen_comment = sprintf
-  (qq[/*\n * This file is automatically generated.\n * Please modify `command.pl' and `command.h.in'.\n */]);
-
-open COMMAND, $ARGV[2] or
-  die "open ($ARGV[2]): $!";
-
-while (<COMMAND>) {
-  chop;
-
-  s/^\s*\@\@GLIBTOP_COMMAND_CONSTANTS\@\@\s*$/$constants_decl_code/;
-
-  s/^\s*\@\@AUTOGEN_COMMENT\@\@\s*$/$auto_gen_comment/;
-} continue {
-  print $_;
-}
-
-close COMMAND;
--- a/backends/server/demarshal.pl
+++ b/backends/server/demarshal.pl
@@ -1,386 +0,0 @@
-#!/usr/bin/perl
-
-require 'c_types.pl';
-
-$[ = 1;			# set array base to 1
-$, = ' ';		# set output field separator
-$\ = "\n";		# set output record separator
-
-$always_use_temp_storage = 0;
-
-sub toupper {
-    local($_) = @_;
-    tr/a-z/A-Z/;
-    return $_;
-}
-
-sub tolower {
-    local($_) = @_;
-    tr/A-Z/a-z/;
-    return $_;
-}
-
-print '/* demarshal.c */';
-print "/* This is a generated file.  Please modify `demarshal.pl' */";
-print '';
-
-print '#include <glibtop.h>';
-print '#include <glibtop/open.h>';
-print '#include <glibtop/xmalloc.h>';
-print '';
-print '#include <glibtop/sysdeps.h>';
-print '#include <glibtop/union.h>';
-print '';
-print '#include <glibtop/backend.h>';
-print '';
-print '#include <glibtop-backend-private.h>';
-print '#include "server.h"';
-print '';
-
-$feature_count = 0;
-
-while (<>) {
-  chop;	# strip record separator
-
-  if (/^[^\#]/) {
-    &output($_);
-  }
-}
-
-sub output {
-  local($line) = @_;
-  @line_fields = split(/\|/, $line, 9999);
-  $retval = $line_fields[1];
-  $element_def = $line_fields[3];
-  $feature = $line_fields[2];
-  $param_def = $line_fields[4];
-
-  return if $feature =~ /^@/;
-  $name = 'glibtop_'.$feature;
-  
-  $orig = $feature;
-  $feature =~ s/^@//;
-  $space = $feature;
-  $space =~ s/./ /g;
-  
-  $features{++$feature_count} = $feature;
-
-  $orig_retval = $retval;
-  
-  if ($retval eq 'retval') {
-    $retval_param = '&retval';
-    $call_prefix = '';
-    $call_prefix_space = '';
-    $prefix = 'retval = ';
-    $prefix_space = '         ';
-    $retval = 'int';
-  } elsif ($retval !~ /^void$/) {
-    $retval_param = 'NULL';
-    $prefix = 'retval = ';
-    $prefix_space = '         ';
-    $call_prefix = 'retval = ';
-    $call_prefix_space = '         ';
-  } else {
-    $retval_param = 'NULL';
-    $call_prefix = '';
-    $call_prefix_space = '';
-    $prefix = '';
-    $prefix_space = '';
-  }
-  
-  if ($retval =~ /^(array|pointer)\((.*)\)$/) {
-    $retval = ($2 eq 'string') ? 'char **' : "$2 *";
-  }
-  
-  $need_temp_storage = $always_use_temp_storage;
-  $first_param_name = '';
-  $size_code = "\t/* send size */\n";
-  $size_code .= "\t_LIBGTOP_SEND_len = 0;\n";
-  
-  $local_var_decl_code = '';
-  $local_var_decl_code .= "\tsize_t _LIBGTOP_SEND_len, _LIBGTOP_RECV_len;\n";
-  $local_var_decl_code .= "\toff_t _LIBGTOP_SEND_offset;\n";
-  $local_var_decl_code .= "\tchar *_LIBGTOP_RECV_buf, *_LIBGTOP_RECV_ptr;\n";
-  $local_var_decl_code .= "\tconst char *_LIBGTOP_SEND_ptr;\n";
-  $local_var_decl_code .= sprintf
-    (qq[\tglibtop_%s %s;\n], $feature, $feature);
-  if ($retval !~ /^void$/) {
-    $local_var_decl_code .= sprintf ("\t%s retval = (%s) 0;\n",
-				     $retval, $retval);
-  }
-
-  $init_local_var_code = "\t/* variable initialization */\n";
-  $init_local_var_code .= sprintf
-    (qq[\tmemset (&%s, 0, sizeof (glibtop_%s));\n], $feature, $feature);
-  $init_local_var_code .= "\t_LIBGTOP_SEND_offset = 0;\n";
-  $init_local_var_code .= "\t_LIBGTOP_SEND_ptr = ".
-    "(char *) send_ptr;\n";
-
-  $demarshal_code = '';
-
-  $call_param = '';
-  $param_decl = '';
-  $need_temp_len = 0;
-  $nr_params = (@params = split(/:/, $param_def, 9999));
-  for ($param = 1; $param <= $nr_params; $param++) {
-    $list = $params[$param];
-    $type = $params[$param];
-    $type =~ s/\(.*//;
-    $list =~ s/^.*\(//;
-    $list =~ s/\)$//;
-    $count = (@fields = split(/,/, $list, 9999));
-    for ($field = 1; $field <= $count; $field++) {
-      my $c_type = $typeinfo->{$type}->[1];
-      
-      if ($first_param_name eq '') {
-	$first_param_name = $fields[$field];
-      }
-      
-      if ($typeinfo->{$type}->[2]) {
-	$need_temp_storage = 1;
-      }
-      
-      if ($param_decl eq '') {
-	$param_decl = ",\n            " . $space . '    ';
-      } else {
-	$param_decl = $param_decl . ', ';
-      }
-      $param_decl = $param_decl . $c_type . ' ' . $fields[$field];
-      $call_param = $call_param . ', _LIBGTOP_demarshal_' . $fields[$field];
-
-      $size_code .= "\t_LIBGTOP_SEND_len += ";
-      if ($typeinfo->{$type}->[2]) {
-	$size_code .= sprintf ("sizeof (size_t)");
-      } else {
-	$size_code .= sprintf ("sizeof (%s)", $c_type);
-      }
-      $size_code .= ";\n";
-
-      $local_var_decl_code .= sprintf
-	(qq[\t%s _LIBGTOP_demarshal_%s;\n], $c_type, $fields[$field]);
-      $init_local_var_code .= sprintf
-	(qq[\tmemset (&_LIBGTOP_demarshal_%s, 0, sizeof (%s));\n],
-	 $fields[$field], $c_type);
-
-      $demarshal_code .= "\t_LIBGTOP_SEND_ptr = ".
-	"(char *) send_ptr + _LIBGTOP_SEND_offset;\n";
-
-      if ($typeinfo->{$type}->[2]) {
-	$demarshal_code .= sprintf ("\tmemcpy (&_LIBGTOP_TEMP_len, _LIBGTOP_SEND_ptr, sizeof (size_t));\n");
-	$demarshal_code .= sprintf
-	  (qq[\t_LIBGTOP_DATA_len += _LIBGTOP_TEMP_len;\n]);
-	$demarshal_code .= sprintf
-	  (qq[\tif (_LIBGTOP_DATA_len > data_size)\n\t\treturn -GLIBTOP_ERROR_DEMARSHAL_ERROR;\n]);
-	$demarshal_code .= sprintf
-	  (qq[\t_LIBGTOP_DATA_offset += _LIBGTOP_TEMP_len;\n]);
-      }
-
-      if (defined $demarshal_funcs->{$type}) {
-	$demarshal_code .= $demarshal_funcs->{$type}->($c_type, $fields[$field], "\t");
-      } else {
-	$demarshal_code .= sprintf ("\tmemcpy (&_LIBGTOP_demarshal_%s, _LIBGTOP_SEND_ptr, %s);\n",
-				    $fields[$field], "sizeof ($c_type)");
-      }
-
-      $demarshal_code .= "\t_LIBGTOP_SEND_offset += ";
-      if ($typeinfo->{$type}->[2]) {
-	$demarshal_code .= sprintf ("sizeof (size_t)");
-      } else {
-	$demarshal_code .= sprintf ("sizeof (%s)", $c_type);
-      }
-      $demarshal_code .= ";\n";
-    }
-  }
-
-  if (!($demarshal_code eq '')) {
-    $demarshal_code = sprintf (qq[\t/* demarshal start */\n%s\n],
-			       $demarshal_code);
-  }
-
-  if ($line_fields[3] eq '') {
-    $call_code = sprintf
-      ("\tretval = glibtop_get_%s_p (server%s);\n",
-       $feature, $call_param);
-  } elsif ($line_fields[3] eq 'array') {
-    $call_code = sprintf
-      ("\tretval = glibtop_get_%s_p (server, &array%s);\n",
-       $feature, $call_param);
-    $local_var_decl_code .= sprintf (qq[\tglibtop_array array;\n]);
-  } elsif ($line_fields[3] =~ /^array/) {
-    $call_code = sprintf
-      ("\tretval = glibtop_get_%s_p (server, &array, &%s%s);\n",
-       $feature, $feature, $call_param);
-    $local_var_decl_code .= sprintf (qq[\tglibtop_array array;\n]);
-  } else {
-    $call_code = sprintf
-      ("\tretval = glibtop_get_%s_p (server, &%s%s);\n",
-       $feature, $feature, $call_param);
-  }
-
-  if ($orig_retval eq 'retval') {
-    $call_code .= sprintf
-      (qq[\tif (retval_ptr)\n\t\t*retval_ptr = retval;\n]);
-  } else {
-    $call_code .= sprintf
-      (qq[\tif (retval_ptr)\n\t\t*retval_ptr = server->glibtop_errno;\n]);
-  }
-
-  $size_code .= sprintf
-    (qq[\tif (_LIBGTOP_SEND_len != send_size)\n\t\treturn -GLIBTOP_ERROR_DEMARSHAL_ERROR;\n\n]);
-
-  $size_code .= "\t/* recv size */\n";
-  $size_code .= "\t_LIBGTOP_RECV_len = 0;\n";
-  if ($line_fields[3] eq '') {
-  } elsif ($line_fields[3] eq 'array') {
-    $size_code .= "\t_LIBGTOP_RECV_len += sizeof (glibtop_array);\n";
-  } elsif ($line_fields[3] =~ /^array/) {
-    $size_code .= "\t_LIBGTOP_RECV_len += sizeof (glibtop_array);\n";
-    $size_code .= sprintf
-      (qq[\t_LIBGTOP_RECV_len += sizeof (glibtop_%s);\n], $feature);
-  } else {
-    $size_code .= sprintf
-      (qq[\t_LIBGTOP_RECV_len += sizeof (glibtop_%s);\n], $feature);
-  }
-  $size_code .= "\n";
-
-  $size_code .= "\t/* recv buffer */\n";
-  if ($line_fields[3] eq '') {
-    $size_code .= "\t_LIBGTOP_RECV_buf = NULL;\n";
-  } else {
-    $size_code .= "\t_LIBGTOP_RECV_buf = glibtop_malloc_r (server, _LIBGTOP_RECV_len);\n";
-  }
-  $size_code .= "\t_LIBGTOP_RECV_ptr = _LIBGTOP_RECV_buf;\n\n";
-
-  $recv_buf_code = '';
-  if ($line_fields[3] eq '') {
-  } elsif ($line_fields[3] eq 'array') {
-    $recv_buf_code = "\t/* write recv buffer */\n";
-    $recv_buf_code .= sprintf
-      (qq[\tmemcpy (_LIBGTOP_RECV_ptr, &array, sizeof (glibtop_array));\n]);
-    $recv_buf_code .= sprintf
-      (qq[\t_LIBGTOP_RECV_ptr += sizeof (glibtop_array);\n]);
-  } elsif ($line_fields[3] =~ /^array/) {
-    $recv_buf_code = "\t/* write recv buffer */\n";
-    $recv_buf_code .= sprintf
-      (qq[\tmemcpy (_LIBGTOP_RECV_ptr, &array, sizeof (glibtop_array));\n]);
-    $recv_buf_code .= sprintf
-      (qq[\t_LIBGTOP_RECV_ptr += sizeof (glibtop_array);\n]);
-    $recv_buf_code .= sprintf
-      (qq[\tmemcpy (_LIBGTOP_RECV_ptr, &%s, sizeof (glibtop_%s));\n],
-       $feature, $feature);
-    $recv_buf_code .= sprintf
-      (qq[\t_LIBGTOP_RECV_ptr += sizeof (glibtop_%s);\n], $feature);
-  } else {
-    $recv_buf_code = "\t/* write recv buffer */\n";
-    $recv_buf_code .= sprintf
-      (qq[\tmemcpy (_LIBGTOP_RECV_ptr, &%s, sizeof (glibtop_%s));\n],
-       $feature, $feature);
-    $recv_buf_code .= sprintf
-      (qq[\t_LIBGTOP_RECV_ptr += sizeof (glibtop_%s);\n], $feature);
-  }
-
-  $recv_buf_code .= "\n";
-  $recv_buf_code .= "\t*recv_buf_ptr = _LIBGTOP_RECV_buf;\n";
-  $recv_buf_code .= "\t*recv_size_ptr = _LIBGTOP_RECV_len;\n";
-
-  if ($orig_retval eq 'pointer(string)') {
-    $need_temp_storage = 1;
-    $local_var_decl_code .= "\tchar **_LIBGTOP_TEMP_ptr;\n";
-    $local_var_decl_code .= "\tchar *_LIBGTOP_ARRAY_ptr;\n";
-    $local_var_decl_code .= "\tchar *_LIBGTOP_ARRAY_base;\n";
-    $local_var_decl_code .= "\toff_t _LIBGTOP_ARRAY_offset;\n";
-    $local_var_decl_code .= "\toff_t *_LIBGTOP_ARRAY_off_ptr;\n";
-
-    $recv_buf_code .= "\n";
-    $recv_buf_code .= "\t_LIBGTOP_TEMP_len = 0;\n";
-    $recv_buf_code .= "\t_LIBGTOP_TEMP_ptr = retval;\n";
-    $recv_buf_code .= "\tfor (_LIBGTOP_TEMP_ptr = retval; _LIBGTOP_TEMP_ptr && *_LIBGTOP_TEMP_ptr; _LIBGTOP_TEMP_ptr++)\n";
-    $recv_buf_code .= "\t\t_LIBGTOP_TEMP_len += strlen (*_LIBGTOP_TEMP_ptr)+1;\n";
-    $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 = glibtop_malloc_r (server, _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";
-    $recv_buf_code .= "\t_LIBGTOP_ARRAY_off_ptr = (off_t *) _LIBGTOP_ARRAY_ptr;\n";
-    $recv_buf_code .= "\n";
-    $recv_buf_code .= "\t*_LIBGTOP_ARRAY_off_ptr++ = _LIBGTOP_ARRAY_offset;\n";
-    $recv_buf_code .= "\tfor (_LIBGTOP_TEMP_ptr = retval; _LIBGTOP_TEMP_ptr && *_LIBGTOP_TEMP_ptr; _LIBGTOP_TEMP_ptr++) {\n";
-    $recv_buf_code .= "\t\t*_LIBGTOP_ARRAY_off_ptr++ = _LIBGTOP_ARRAY_offset;\n";
-    $recv_buf_code .= "\t\t_LIBGTOP_ARRAY_offset += strlen (*_LIBGTOP_TEMP_ptr)+1;\n";
-    $recv_buf_code .= "\t}\n\n";
-    $recv_buf_code .= "\t_LIBGTOP_ARRAY_ptr = (char *) _LIBGTOP_ARRAY_off_ptr;\n";
-    $recv_buf_code .= "\tfor (_LIBGTOP_TEMP_ptr = retval; _LIBGTOP_TEMP_ptr && *_LIBGTOP_TEMP_ptr; _LIBGTOP_TEMP_ptr++) {\n";
-    $recv_buf_code .= "\t\tstrcpy (_LIBGTOP_ARRAY_ptr, *_LIBGTOP_TEMP_ptr);\n";
-    $recv_buf_code .= "\t\t_LIBGTOP_ARRAY_ptr += strlen (*_LIBGTOP_TEMP_ptr)+1;\n";
-    $recv_buf_code .= "\t}\n\n";
-    $recv_buf_code .= "\tif (recv_data_ptr) {\n";
-    $recv_buf_code .= "\t\t*recv_data_ptr = _LIBGTOP_ARRAY_base;\n";
-    $recv_buf_code .= "\t\t*recv_data_size_ptr = _LIBGTOP_TEMP_len;\n";
-    $recv_buf_code .= "\t}\n";
-
-  } elsif ($line_fields[3] =~ /^array/) {
-    $recv_buf_code .= "\n";
-    $recv_buf_code .= "\tif (recv_data_ptr) {\n";
-    $recv_buf_code .= "\t\t*recv_data_ptr = retval;\n";
-    $recv_buf_code .= "\t\t*recv_data_size_ptr = array.total;\n";
-    $recv_buf_code .= "\t}\n";
-  }
-
-  if ($need_temp_storage) {
-    $local_var_decl_code .= "\tsize_t _LIBGTOP_TEMP_len;\n";
-    $local_var_decl_code .= "\tsize_t _LIBGTOP_DATA_len;\n";
-    $local_var_decl_code .= "\toff_t _LIBGTOP_DATA_offset;\n";
-    $local_var_decl_code .= "\tchar *_LIBGTOP_DATA_ptr;\n";
-
-    $init_local_var_code .= "\t_LIBGTOP_DATA_len = 0;\n";
-    $init_local_var_code .= "\t_LIBGTOP_DATA_offset = 0;\n";
-    $init_local_var_code .= "\t_LIBGTOP_DATA_ptr = ".
-      "(char *) data_ptr;\n";
-  }
-
-  $func_decl_code = sprintf
-    (qq[static int\n_glibtop_demarshal_%s_i (glibtop *server, glibtop_backend *backend, const void *send_ptr, size_t send_size, void *data_ptr, size_t data_size, void **recv_buf_ptr, size_t *recv_size_ptr, void **recv_data_ptr, size_t *recv_data_size_ptr, int *retval_ptr)\n], $feature);
-
-  if (!($call_code eq '')) {
-    $call_code .= "\n";
-  }
-  
-  $func_body_code = sprintf
-    (qq[%s%s%s%s], $size_code, $demarshal_code, $call_code, $recv_buf_code);
-  
-  $total_code = sprintf
-    (qq[%s{\n%s\n%s\n%s\n\treturn 0;\n}\n],
-     $func_decl_code, $local_var_decl_code, $init_local_var_code,
-     $func_body_code);
-  
-  $total_code = sprintf ("#if GLIBTOP_SUID_%s\n\n%s\n#endif /* GLIBTOP_SUID_%s */\n\n",
-			 &toupper($feature), $total_code,
-			 &toupper($feature));
-
-  print $total_code;
-}
-
-$func_decl_code = sprintf
-  (qq[int\nglibtop_demarshal_func_i (glibtop *server, glibtop_backend *backend, unsigned command, const void *send_ptr, size_t send_size, void *data_ptr, size_t data_size, void **recv_buf_ptr, size_t *recv_size_ptr, void **recv_data_ptr, size_t *recv_data_size_ptr, int *retval_ptr)]);
-
-$switch_body_code = '';
-
-for ($nr = 1; $nr <= $feature_count; $nr++) {
-  $feature = $features{$nr};
-
-  $switch_body_code .= sprintf
-    (qq[#if GLIBTOP_SUID_%s\n\tcase GLIBTOP_CMND_%s:\n\t\treturn _glibtop_demarshal_%s_i\n\t\t\t(server, backend, send_ptr, send_size,\n\t\t\t data_ptr, data_size,\n\t\t\t recv_buf_ptr, recv_size_ptr,\n\t\t\t recv_data_ptr, recv_data_size_ptr, retval_ptr);\n#endif /* GLIBTOP_SUID_%s */\n],
-     &toupper ($feature), &toupper ($feature), $feature, &toupper ($feature));
-}
-
-$switch_code = sprintf
-  (qq[\tswitch (command) {\n%s\tdefault:\n\t\treturn -GLIBTOP_ERROR_INVALID_ARGUMENT;\n\t}\n], $switch_body_code);
-
-$total_code = sprintf
-  (qq[%s\n{\n%s}\n\n], $func_decl_code, $switch_code);
-
-print $total_code;
-
-1;
--- a/backends/server/glibtop-backend-private.h
+++ b/backends/server/glibtop-backend-private.h
@@ -1,55 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
-/* $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.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __GLIBTOP_BACKEND_PRIVATE_H__
-#define __GLIBTOP_BACKEND_PRIVATE_H__
-
-struct _glibtop_backend_private
-{
-    u_int64_t flags;
-    int input [2];		/* Pipe client <- server */
-    int output [2];		/* Pipe client -> server */
-    pid_t pid;			/* PID of the server */
-};
-
-void *
-glibtop_call_i (glibtop *server, glibtop_backend *backend, unsigned command,
-		size_t send_size, const void *send_ptr,
-		size_t data_size, const void *data_ptr,
-		size_t recv_size, void *recv_ptr,
-		int *retval_ptr);
-
-void
-glibtop_read_i (glibtop *server, glibtop_backend *backend,
-		size_t size, void *buf);
-
-void *
-glibtop_read_data_i (glibtop *server, glibtop_backend *backend);
-
-void
-glibtop_write_i (glibtop *server, glibtop_backend *backend,
-		 size_t size, const void *buf);
-
-#endif
--- a/backends/server/io.c
+++ b/backends/server/io.c
@@ -1,114 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
-/* $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.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#include "server.h"
-
-void
-do_output (int s, glibtop_response *resp, const void *recv_ptr,
-	   const void *data_ptr)
-{
-#ifdef DEBUG
-    fprintf (stderr, "Really writing %d bytes.\n",
-	     sizeof (glibtop_response));
-#endif
-
-    if (s == 0) {
-	if (write (1, (const void *) resp, sizeof (glibtop_response)) < 0)
-	    glibtop_warn_io ("write");
-    } else {
-	if (send (s, (const void *) resp, sizeof (glibtop_response), 0) < 0)
-	    glibtop_warn_io ("send");
-    }
-
-    if (resp->recv_size) {
-#ifdef DEBUG
-	fprintf (stderr, "Writing %ld bytes of data.\n",
-		 (long) resp->recv_size);
-#endif
-
-	if (s == 0) {
-	    if (write (1, recv_ptr, resp->recv_size) < 0)
-		glibtop_warn_io ("write");
-	} else {
-	    if (send (s, recv_ptr, resp->recv_size, 0) < 0)
-		glibtop_warn_io ("send");
-	}
-    }
-
-    if (resp->data_size) {
-#ifdef DEBUG
-	fprintf (stderr, "Writing %ld bytes of extra data.\n",
-		 (long) resp->data_size);
-#endif
-
-	if (s == 0) {
-	    if (write (1, data_ptr, resp->data_size) < 0)
-		glibtop_warn_io ("write");
-	} else {
-	    if (send (s, data_ptr, resp->data_size, 0) < 0)
-		glibtop_warn_io ("send");
-	}
-    }
-
-}
-
-int
-do_read (int s, void *ptr, size_t total_size)
-{
-    int nread;
-    char *tmp_ptr;
-    size_t already_read = 0, remaining = total_size;
-
-    while (already_read < total_size) {
-	if (s)
-	    nread = recv (s, ptr, remaining, 0);
-	else
-	    nread = read (0, ptr, remaining);
-
-	if ((already_read == 0) && (nread == 0)) {
-	    glibtop_warn ("pid %d received eof.", getpid ());
-	    return 0;
-	}
-
-	if (nread <= 0) {
-	    glibtop_warn_io ("recv");
-	    return 0;
-	}
-
-	already_read += nread;
-	remaining -= nread;
-	/* (char *) ptr += nread; */
-	tmp_ptr = ptr;
-	tmp_ptr += nread;
-	ptr = tmp_ptr;
-
-#ifdef DEBUG
-	fprintf (stderr, "READ (%d): %d - %d - %d\n",
-		 nread, already_read, remaining, total_size);
-#endif
-    }
-
-    return already_read;
-}
--- a/backends/server/libgtop-server.backend
+++ b/backends/server/libgtop-server.backend
@@ -1,12 +0,0 @@
-<?xml version="1.0"?> <!-- -*-xml-*- -->
-<libgtop:Backends xmlns:libgtop="http://www.home-of-linux.org/libgtop/1.1">
-
-  <libgtop:Backend>
-    <libgtop:Name>glibtop-backend-server</libgtop:Name>
-    <libgtop:Location>
-      <libgtop:LibtoolName>libgtop_backend_server.la</libgtop:LibtoolName>
-      <libgtop:ShlibName>libgtop_backend_server.so</libgtop:ShlibName>
-    </libgtop:Location>
-  </libgtop:Backend>
-
-</libgtop:Backends>
--- a/backends/server/marshal.pl
+++ b/backends/server/marshal.pl
@@ -1,309 +0,0 @@
-#!/usr/bin/perl
-
-require 'c_types.pl';
-
-$[ = 1;			# set array base to 1
-$, = ' ';		# set output field separator
-$\ = "\n";		# set output record separator
-
-$always_use_temp_storage = 1;
-
-sub toupper {
-    local($_) = @_;
-    tr/a-z/A-Z/;
-    return $_;
-}
-
-sub tolower {
-    local($_) = @_;
-    tr/A-Z/a-z/;
-    return $_;
-}
-
-print '/* marshal.c */';
-print "/* This is a generated file.  Please modify `marshal.pl' */";
-print '';
-
-print '#include <glibtop.h>';
-print '#include <glibtop/open.h>';
-print '#include <glibtop/xmalloc.h>';
-print '';
-print '#include <glibtop/sysdeps.h>';
-print '#include <glibtop/union.h>';
-print '';
-print '#include "command.h"';
-print '#include <glibtop/backend.h>';
-print '';
-print '#include <glibtop-backend-private.h>';
-print '';
-
-$feature_count = 0;
-
-while (<>) {
-    chop;	# strip record separator
-
-    if (/^[^#]/) {
-	&output($_);
-    }
-}
-
-sub output {
-    local($line) = @_;
-    @line_fields = split(/\|/, $line, 9999);
-    $retval = $line_fields[1];
-    $feature = $line_fields[2];
-    $param_def = $line_fields[4];
-
-    $orig = $feature;
-    $feature =~ s/^@//;
-    $space = $feature;
-    $space =~ s/./ /g;
-
-    $features{++$feature_count} = $orig;
-    return if $orig =~ /^@/;
-
-    $orig_retval = $retval;
-    if ($retval eq 'retval') {
-      $retval_param = '&retval';
-      $call_prefix = '';
-      $call_prefix_space = '';
-      $prefix = 'retval = ';
-      $prefix_space = '         ';
-      $retval = 'int';
-    }
-    elsif ($retval !~ /^void$/) {
-      $retval_param = 'NULL';
-      $prefix = 'retval = ';
-      $prefix_space = '         ';
-      $call_prefix = 'retval = ';
-      $call_prefix_space = '         ';
-    }
-    else {
-      $retval_param = 'NULL';
-      $call_prefix = '';
-      $call_prefix_space = '';
-      $prefix = '';
-      $prefix_space = '';
-    }
-
-    if ($retval =~ /^(array|pointer)\((.*)\)$/) {
-      $retval = ($2 eq 'string') ? 'char **' : "$2 *";
-    }
-
-    $need_temp_storage = $always_use_temp_storage;
-    $local_var_init_code = "\t/* variable initialization */\n";
-    $local_var_init_code .= "\t_LIBGTOP_SEND_len = 0;\n";
-    $local_var_init_code .= "\t_LIBGTOP_DATA_len = 0;\n";
-    $local_var_init_code .= "\t_LIBGTOP_SEND_offset = 0;\n";
-    $local_var_init_code  .= "\t_LIBGTOP_SEND_ptr = ".
-	  "(char *) _LIBGTOP_SEND_buf;\n";
-    $marshal_code = "\t/* marshal start */\n";
-    $marshal_code .= "\tmemset (_LIBGTOP_SEND_buf, 0, _LIBGTOP_SEND_len);\n";
-    $first_param_name = '';
-    $size_code = '';
-
-    $call_param = '';
-    $param_decl = '';
-    $need_temp_len = 0;
-    $nr_params = (@params = split(/:/, $param_def, 9999));
-    for ($param = 1; $param <= $nr_params; $param++) {
-      $list = $params[$param];
-      $type = $params[$param];
-      $type =~ s/\(.*//;
-      $list =~ s/^.*\(//;
-      $list =~ s/\)$//;
-      $count = (@fields = split(/,/, $list, 9999));
-      for ($field = 1; $field <= $count; $field++) {
-	my $c_type = $typeinfo->{$type}->[1];
-
-	if ($first_param_name eq '') {
-	  $first_param_name = $fields[$field];
-	}
-
-	if ($typeinfo->{$type}->[2]) {
-	  $need_temp_storage = 1;
-	}
-
-	if ($param_decl eq '') {
-	  $param_decl = ",\n            " . $space . '    ';
-	}
-	else {
-	  $param_decl = $param_decl . ', ';
-	}
-	$param_decl = $param_decl . $c_type . ' ' . $fields[$field];
-	$call_param = $call_param . ', ' . $fields[$field];
-
-	$size_code .= "\t_LIBGTOP_SEND_len += ";
-	if ($typeinfo->{$type}->[2]) {
-	  $size_code .= sprintf ("sizeof (size_t)");
-	} else {
-	  $size_code .= sprintf ("sizeof (%s)", $c_type);
-	}
-	$size_code .= ";\n";
-
-	if (defined $sizeof_funcs->{$type}) {
-	  $size_code .= "\t_LIBGTOP_DATA_len += ";
-	  $size_code .= $sizeof_funcs->{$type}->($fields[$field]);
-	  $size_code .= ";\n";
-	}
-
-	$marshal_code .= "\t_LIBGTOP_SEND_ptr = ".
-	  "(char *) _LIBGTOP_SEND_buf + _LIBGTOP_SEND_offset;\n";
-
-	if (defined $marshal_funcs->{$type}) {
-	  $marshal_code .= $marshal_funcs->{$type}->($c_type, $fields[$field], "\t");
-	} else {
-	  $marshal_code .= sprintf ("\tmemcpy (_LIBGTOP_SEND_ptr, %s, %s);\n",
-				    '&'.$fields[$field], "sizeof ($c_type)");
-	}
-
-	$marshal_code .= "\t_LIBGTOP_SEND_offset += ";
-	if ($typeinfo->{$type}->[2]) {
-	  $marshal_code .= sprintf ("sizeof (size_t)");
-	} else {
-	  $marshal_code .= sprintf ("sizeof (%s)", $c_type);
-	}
-	$marshal_code .= ";\n";
-      }
-    }
-
-    $local_var_code = "";
-    $local_var_code .= "\tunsigned _LIBGTOP_SEND_offset, _LIBGTOP_SEND_len;\n";
-    $local_var_code .= "\tunsigned _LIBGTOP_DATA_len;\n";
-    if ($need_temp_len) {
-      $local_var_code .= "\tunsigned _LIBGTOP_SEND_temp_len;\n";
-    }
-    $local_var_code .= "\tvoid *_LIBGTOP_SEND_buf, *_LIBGTOP_DATA_buf;\n";
-    $local_var_code .= "\tchar *_LIBGTOP_SEND_ptr, *_LIBGTOP_DATA_ptr;\n";
-    if ($retval !~ /^void$/) {
-      $local_var_code .= sprintf ("\t%s retval = (%s) 0;\n",
-				  $retval, $retval);
-    }
-
-    $total_code = '';
-
-    $send_buf_code = "\t/* send buffer */\n";
-    $send_buf_code .= "\t_LIBGTOP_SEND_buf = ";
-    if ($need_temp_storage) {
-      $send_buf_code .= "glibtop_malloc_r (server, _LIBGTOP_SEND_len+1)";
-    } else {
-      $send_buf_code .= '(void *) &'.$first_param_name;
-    }
-    $send_buf_code .= ";\n\n";
-
-    $send_buf_code .= "\t/* data buffer */\n";
-    $send_buf_code .= "\t_LIBGTOP_DATA_buf = ";
-    if ($need_temp_storage) {
-      $send_buf_code .= "glibtop_malloc_r (server, _LIBGTOP_DATA_len+1)";
-    } else {
-      $send_buf_code .= 'NULL';
-    }
-    $send_buf_code .= ";\n";
-    $send_buf_code .= "\t_LIBGTOP_DATA_ptr = _LIBGTOP_DATA_buf;\n";
-
-    $call_code = '';
-    $call_code .= sprintf ("\t%sglibtop_call_i (server, backend, GLIBTOP_CMND_%s,\n",
-			   $call_prefix, &toupper($feature));
-    $call_code .= sprintf ("\t\t\t%s%s, %s,\n", $call_prefix_space,
-			   "_LIBGTOP_SEND_len", "_LIBGTOP_SEND_buf");
-    $call_code .= sprintf ("\t\t\t%s%s, %s,\n", $call_prefix_space,
-			   "_LIBGTOP_DATA_len", "_LIBGTOP_DATA_buf");
-    if ($line_fields[3] eq '') {
-      $call_code .= sprintf ("\t\t\t%s0, NULL,\n", $call_prefix_space);
-    } elsif ($line_fields[3] eq  'array') {
-      $call_code .= sprintf ("\t\t\t%ssizeof (glibtop_array), array,\n",
-			     $call_prefix_space);
-    } else {
-      $call_code .= sprintf ("\t\t\t%ssizeof (glibtop_%s), buf,\n",
-			     $call_prefix_space, $feature);
-    }
-    $call_code .= sprintf ("\t\t\t%s%s);\n", $call_prefix_space, $retval_param);
-
-    if ($need_temp_storage) {
-      $send_buf_free_code = "\tglibtop_free_r (server, _LIBGTOP_SEND_buf);\n";
-      $send_buf_free_code .= "\tglibtop_free_r (server, _LIBGTOP_DATA_buf);\n";
-    } else {
-      $send_buf_free_code = "";
-    }
-
-    if (!($size_code eq '')) {
-      $size_code = sprintf (qq[\t/* send size */\n%s\n], $size_code);
-    }
-
-    if ($orig_retval eq 'pointer(string)') {
-      $call_code .= "\n";
-      $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 = glibtop_calloc_r (server, 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";
-      $call_code .= "\tfor (i = 0; i < array->number; i++)\n";
-      $call_code .= "\t\tptrlist [i] = glibtop_strdup_r (server, _LIBGTOP_ARRAY_ptr + *_LIBGTOP_ARRAY_off_ptr++);\n";
-      $call_code .= "\tptrlist [array->number] = NULL;\n\n";
-      $call_code .= "\tglibtop_free_r (server, retval);\n";
-      $call_code .= "\tretval = ptrlist;\n";
-    }
-
-    $total_code .= sprintf ("%s%s\n%s\n%s\n%s\n",
-			    $size_code, $send_buf_code, $marshal_code,
-			    $call_code, $send_buf_free_code);
-
-    $return_code = '';
-    if ($retval !~ /^void$/) {
-      $return_code .= "\treturn retval;\n";
-    } else {
-      $return_code .= "\treturn;\n";
-    }
-
-    $total_code .= $return_code;
-
-    $func_decl = 'static '.$retval."\n";
-    if ($line_fields[3] eq '') {
-      $func_decl .= sprintf ("_glibtop_get_%s_c (glibtop *server, glibtop_backend *backend%s)\n",
-			     $feature, $param_decl);
-    } elsif ($line_fields[3] eq 'array') {
-      $func_decl .= sprintf ("_glibtop_get_%s_c (glibtop *server, glibtop_backend *backend, glibtop_array *array%s)\n",
-			     $feature, $param_decl);
-    } elsif ($line_fields[3] =~ /^array/) {
-      $func_decl .= sprintf ("_glibtop_get_%s_c (glibtop *server, glibtop_backend *backend, glibtop_array *array, %s *buf%s)\n",
-			     $feature, 'glibtop_'.$feature, $param_decl);
-    } else {
-      $func_decl .= sprintf ("_glibtop_get_%s_c (glibtop *server, glibtop_backend *backend, %s *buf%s)\n",
-			     $feature, 'glibtop_'.$feature, $param_decl);
-    }
-
-    $total_code = sprintf ("%s{\n%s\n%s\n%s\n%s}\n", $func_decl,
-			   $local_var_code, $local_var_init_code,
-			   $total_code);
-
-
-    $total_code = sprintf ("#if GLIBTOP_SUID_%s\n\n%s\n#endif /* GLIBTOP_SUID_%s */\n\n",
-			   &toupper($feature), $total_code,
-			   &toupper($feature));
-
-    print $total_code;
-}
-
-$call_vector_code = '';
-for ($nr = 1; $nr <= $feature_count; $nr++) {
-  $feature = $features{$nr};
-
-  $orig = $feature;
-  $feature =~ s/^@//;
-
-  if ($orig =~ /^@/) {
-    $call_vector_code .= sprintf (qq[\tNULL,\n]);
-  } else {
-    $call_vector_code .= sprintf
-      (qq[\#if GLIBTOP_SUID_%s\n\t_glibtop_get_%s_c,\n\#else\n\tNULL,\n\#endif\n],
-       &toupper($feature), $feature);
-  }
-}
-
-print 'glibtop_call_vector glibtop_backend_server_call_vector = {';
-print $call_vector_code;
-print '};';
-print '';
-
--- a/backends/server/read.c
+++ b/backends/server/read.c
@@ -1,53 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
-/* $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.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#include <glibtop.h>
-#include <glibtop/error.h>
-#include <glibtop/backend.h>
-
-#include <glibtop-backend-private.h>
-
-void
-glibtop_read_i (glibtop *server, glibtop_backend *backend,
-		size_t size, void *buf)
-{
-    int ret = 0;
-
-    glibtop_init_r (&server, 0, 0);
-
-#ifdef DEBUG
-    fprintf (stderr, "LIBRARY: really reading %d bytes from %d.\n",
-	     size, backend->_priv->input [0]);
-#endif
-
-    ret = read (backend->_priv->input [0], buf, size);
-
-#ifdef DEBUG
-    fprintf (stderr, "LIBRARY: read %d bytes.\n", ret);
-#endif
-
-    if (ret < 0)
-	glibtop_error_io_r (server, "read %d bytes", size);
-}
--- a/backends/server/read_data.c
+++ b/backends/server/read_data.c
@@ -1,64 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
-/* $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.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#include <glibtop.h>
-#include <glibtop/error.h>
-#include <glibtop/xmalloc.h>
-#include <glibtop/backend.h>
-
-#include <glibtop-backend-private.h>
-
-void *
-glibtop_read_data_i (glibtop *server, glibtop_backend *backend)
-{
-    size_t size;
-    void *ptr;
-    int ret;
-
-#ifdef DEBUG
-    fprintf (stderr, "LIBRARY: reading %d data bytes.\n", sizeof (size_t));
-#endif
-
-    ret = read (backend->_priv->input [0], (void *)&size,
-		sizeof (size_t));
-
-    if (ret < 0)
-	glibtop_error_io_r (server, "read data size");
-
-#ifdef DEBUG
-    fprintf (stderr, "LIBRARY: really reading %d data bytes (ret = %d).\n", size, ret);
-#endif
-
-    if (!size) return NULL;	
-
-    ptr = glibtop_malloc_r (server, size);
-	
-    ret = read (backend->_priv->input [0], ptr, size);
-
-    if (ret < 0)
-	glibtop_error_io_r (server, "read data %d bytes");
-
-    return ptr;
-}
--- a/backends/server/server.c
+++ b/backends/server/server.c
@@ -1,190 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
-/* $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.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#include "server.h"
-
-static glibtop _glibtop_global_server;
-glibtop *glibtop_global_server = &_glibtop_global_server;
-
-#include <glibtop.h>
-#include <glibtop/union.h>
-#include <glibtop/sysdeps.h>
-
-#include <sys/utsname.h>
-
-const unsigned long glibtop_server_features =
-GLIBTOP_SUID_CPU +
-GLIBTOP_SUID_MEM +
-GLIBTOP_SUID_SWAP +
-GLIBTOP_SUID_UPTIME +
-GLIBTOP_SUID_LOADAVG +
-GLIBTOP_SUID_SHM_LIMITS +
-GLIBTOP_SUID_MSG_LIMITS +
-GLIBTOP_SUID_SEM_LIMITS +
-GLIBTOP_SUID_PROCLIST +
-GLIBTOP_SUID_PROC_STATE +
-GLIBTOP_SUID_PROC_UID +
-GLIBTOP_SUID_PROC_MEM +
-GLIBTOP_SUID_PROC_TIME +
-GLIBTOP_SUID_PROC_SIGNAL +
-GLIBTOP_SUID_PROC_KERNEL +
-GLIBTOP_SUID_PROC_SEGMENT +
-GLIBTOP_SUID_PROC_ARGS +
-GLIBTOP_SUID_PROC_MAP +
-GLIBTOP_SUID_NETINFO +
-GLIBTOP_SUID_NETLOAD +
-GLIBTOP_SUID_INTERFACE_NAMES +
-GLIBTOP_SUID_PPP;
-
-#include <fcntl.h>
-#include <locale.h>
-
-int
-main(int argc, char *argv[])
-{
-    struct utsname uts;
-    int uid, euid, gid, egid;
-    glibtop *server;
-
-    /* !!! WE ARE ROOT HERE - CHANGE WITH CAUTION !!! */
-
-    uid = getuid (); euid = geteuid ();
-    gid = getgid (); egid = getegid ();
-
-    if (uname (&uts) < 0) _exit (1);
-
-    if (strcmp (uts.sysname, LIBGTOP_COMPILE_SYSTEM) ||
-	strcmp (uts.release, LIBGTOP_COMPILE_RELEASE) ||
-	strcmp (uts.machine, LIBGTOP_COMPILE_MACHINE)) {
-	fprintf (stderr, "Can only run on %s %s %s\n",
-		 LIBGTOP_COMPILE_SYSTEM,
-		 LIBGTOP_COMPILE_RELEASE,
-		 LIBGTOP_COMPILE_MACHINE);
-	_exit (1);
-    }
-
-    server = glibtop_global_server;
-	
-    if (!server->_priv)
-	server->_priv = glibtop_calloc_r
-	    (server, 1, sizeof (glibtop_server_private));
-
-    glibtop_init_p (server, 0, 0);
-
-    if (setreuid (euid, uid)) _exit (1);
-
-    if (setregid (egid, gid)) _exit (1);
-
-    /* !!! END OF SUID ROOT PART !!! */
-
-    handle_slave_connection (0, 0);
-
-    _exit (0);
-}
-
-void
-handle_slave_connection (int input, int output)
-{
-    glibtop_command _cmnd, *cmnd = &_cmnd;
-    glibtop *server = glibtop_global_server;
-
-    // glibtop_send_version_i (glibtop_global_server, output);
-
-    while (do_read (input, cmnd, sizeof (glibtop_command))) {
-	size_t recv_size = 0, send_size = 0, recv_data_size = 0;
-	void *recv_ptr = NULL, *recv_data_ptr = NULL, *data_ptr = NULL;
-	char parameter [BUFSIZ];
-	int retval, func_retval;
-	glibtop_response resp;
-
-#ifdef DEBUG
-	fprintf (stderr, "Slave %d received command "
-		 "%ld from client.\n", getpid (), (long) cmnd->command);
-#endif
-
-	if (cmnd->send_size >= BUFSIZ)
-	    glibtop_error ("Client sent %d bytes, but buffer is %d",
-			   cmnd->send_size, BUFSIZ);
-	else if (cmnd->param_size >= BUFSIZ)
-	    glibtop_error ("Client sent %d bytes, but buffer is %d",
-			   cmnd->param_size, BUFSIZ);
-
-	memset (parameter, 0, sizeof (parameter));
-
-	if (cmnd->send_size) {
-#ifdef DEBUG
-	    fprintf (stderr, "Client has %d bytes of data.\n",
-		     cmnd->send_size);
-#endif
-
-	    send_size = cmnd->send_size;
-	    do_read (input, parameter, send_size);
-	} else if (cmnd->param_size) {
-#ifdef DEBUG
-	    fprintf (stderr, "Client has %d bytes of parameter data.\n",
-		     cmnd->param_size);
-#endif
-	    send_size = cmnd->param_size;
-	    memcpy (parameter, cmnd->parameter, send_size);
-	}
-
-	if (cmnd->data_size) {
-#ifdef DEBUG
-	    fprintf (stderr, "CLIENT has %d bytes of extra data for us.\n",
-		     cmnd->data_size);
-#endif
-
-	    data_ptr = glibtop_malloc_r (server, cmnd->data_size);
-	    do_read (input, data_ptr, cmnd->data_size);
-	}
-
-	retval = glibtop_demarshal_func_i (server, NULL,
-					   cmnd->command,
-					   parameter, send_size,
-					   data_ptr, cmnd->data_size,
-					   &recv_ptr, &recv_size,
-					   &recv_data_ptr, &recv_data_size,
-					   &func_retval);
-
-#ifdef DEBUG
-	fprintf (stderr, "Retval %d / %d - %p - %d\n",
-		 retval, func_retval, recv_ptr, recv_size);
-
-	if (recv_data_size) {
-	    fprintf (stderr, "Returning %d bytes of data from %p.\n",
-		     recv_data_size, recv_data_ptr);
-	}
-#endif
-
-	memset (&resp, 0, sizeof (glibtop_response));
-
-	resp.retval = retval;
-	resp.glibtop_errno = func_retval;
-	resp.recv_size = recv_size;
-	resp.data_size = recv_data_size;
-
-	do_output (output, &resp, recv_ptr, recv_data_ptr);
-    }		
-}
--- a/backends/server/server.h
+++ b/backends/server/server.h
@@ -1,85 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
-/* $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.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __GLIBTOP_DAEMON_H__
-#define __GLIBTOP_DAEMON_H__
-
-#include <glibtop.h>
-#include <glibtop/error.h>
-
-#include <glibtop/open.h>
-#include <glibtop/union.h>
-#include <glibtop/xmalloc.h>
-#include <glibtop/parameter.h>
-
-#include <fcntl.h>
-#include <sys/wait.h>
-#include <sys/socket.h>
-#include <syslog.h>
-
-#include <glibtop/backend.h>
-#include <glibtop-backend-private.h>
-
-#include "command.h"
-
-BEGIN_LIBGTOP_DECLS
-
-/* Some don't have LOG_PERROR */
-#ifndef LOG_PERROR
-#define LOG_PERROR 0
-#endif
-
-#define LIBGTOP_VERSION_STRING "Libgtop %s server version %s (%u,%u,%u,%u)."
-
-#if defined(HAVE_GETDTABLESIZE)
-#define GET_MAX_FDS() getdtablesize()
-#else
-/* Fallthrough case - please add other #elif cases above
-   for different OS's as necessary */
-#define GET_MAX_FDS() 256
-#endif
-
-void
-do_output (int s, glibtop_response *resp, const void *recv_ptr,
-	   const void *data_ptr);
-
-int
-do_read (int s, void *ptr, size_t total_size);
-
-void
-handle_slave_connection (int input, int output);
-
-int
-glibtop_demarshal_func_i (glibtop *server, glibtop_backend *backend, unsigned command, const void *send_ptr, size_t send_size, void *data_ptr, size_t data_size, void **recv_buf_ptr, size_t *recv_size_ptr, void **recv_data_ptr, size_t *recv_data_size_ptr, int *retval_ptr);
-
-void
-glibtop_send_version_i (glibtop *server, int fd);
-
-extern int enable_debug;
-extern int verbose_output;
-
-END_LIBGTOP_DECLS
-
-#endif
--- a/backends/server/version.c
+++ b/backends/server/version.c
@@ -1,62 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
-/* $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.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#include "server.h"
-
-void
-glibtop_send_version_i (glibtop *server, int fd)
-{
-    char buffer [BUFSIZ];
-    size_t size;
-
-    sprintf (buffer, LIBGTOP_VERSION_STRING,
-	     LIBGTOP_VERSION, LIBGTOP_SERVER_VERSION,
-	     sizeof (glibtop_command),
-	     sizeof (glibtop_response),
-	     sizeof (glibtop_union),
-	     sizeof (glibtop_sysdeps));
-	
-    size = strlen (buffer) + 1;
-
-#ifdef DEBUG
-    fprintf (stderr, "SERVER ID: |%s|\n", buffer);
-#endif
-
-    if (fd == 0) {
-	if (write (1, (const void *) &size, sizeof (size)) < 0)
-	    glibtop_warn_io_r (server, "write");
-    } else {
-	if (send (fd, (const void *) &size, sizeof (size), 0) < 0)
-	    glibtop_warn_io_r (server, "send");
-    }
-
-    if (fd == 0) {
-	if (write (1, (const void *) buffer, size) < 0)
-	    glibtop_warn_io_r (server, "write");
-    } else {
-	if (send (fd, (const void *) buffer, size, 0) < 0)
-	    glibtop_warn_io_r (server, "send");
-    }
-}
--- a/backends/server/write.c
+++ b/backends/server/write.c
@@ -1,48 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
-/* $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.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#include <glibtop.h>
-#include <glibtop/error.h>
-#include <glibtop/backend.h>
-
-#include <glibtop-backend-private.h>
-
-void
-glibtop_write_i (glibtop *server, glibtop_backend *backend,
-		 size_t size, const void *buf)
-{
-    int ret;
-
-    if (size == 0) return;
-
-#ifdef DEBUG
-    fprintf (stderr, "LIBRARY: really writing %d bytes.\n", size);
-#endif
-
-    ret = write (backend->_priv->output [1], buf, size);
-
-    if (ret < 0)
-	glibtop_error_io_r (server, "write %d bytes", size);
-}
--- a/backends/sysdeps/.cvsignore
+++ b/backends/sysdeps/.cvsignore
@@ -1,7 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.lo
-*.la
-marshal.c
--- a/backends/sysdeps/ChangeLog
+++ b/backends/sysdeps/ChangeLog
@@ -1,28 +0,0 @@
-2000-01-12  Martin Baulig  <martin@home-of-linux.org>
-
-	* Makefile.am: Install everything in $(LIBGTOP_BACKEND_DIR).
-
-	* libgtop-sysdeps.backend: New file.
-
-	* backend-sysdeps.c (glibtop_backend_sysdeps): Renamed to
-	`LibGTopBackendInfo'.
-
-2000-01-12  Martin Baulig  <martin@home-of-linux.org>
-
-	* marshal.pl: Create the `_glibtop_init_hook_s' as well.
-
-	* marshal.pl: Don't create code for things which are now
-	in the new `glibtop-backend-common' backend.
-
-2000-01-02  Martin Baulig  <martin@home-of-linux.org>
-
-	* marshal.pl: New file. Automatically creates `marshal.c'.
-	* call-vector.c: Removed.
-
-2000-01-01  Martin Baulig  <martin@home-of-linux.org>
-
-	Initial version of the "glibtop-backend-sysdeps" backend.
-
-	* backend-sysdeps.c: New file.
-	* glibtop-backend-private.h: New file.
-
--- a/backends/sysdeps/Makefile.am
+++ b/backends/sysdeps/Makefile.am
@@ -1,35 +0,0 @@
-LINK		= $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
-
-INCLUDES	= @INCLUDES@
-
-backenddir	= @LIBGTOP_BACKEND_DIR@
-
-backend_DATA = \
-	libgtop-sysdeps.backend
-
-noinst_HEADERS = \
-	glibtop-backend-private.h
-
-backend_LTLIBRARIES = \
-	libgtop_backend_sysdeps.la
-
-libgtop_backend_sysdeps_la_SOURCES = \
-	backend-sysdeps.c		\
-	marshal.c
-
-libgtop_backend_sysdeps_la_LDFLAGS = \
-	$(LT_VERSION_INFO) -export-dynamic
-
-BUILT_SOURCES = \
-	marshal.c
-
-EXTRA_DIST = \
-	marshal.pl	\
-	libgtop-sysdeps.backend
-
-CLEANFILES = $(BUILT_SOURCES)
-
-marshal.c: marshal.pl $(top_builddir)/config.h $(top_srcdir)/features.def $(top_srcdir)/scripts/c_types.pl
-	$(PERL) -I $(top_srcdir)/scripts $(srcdir)/marshal.pl < $(top_srcdir)/features.def > tmp-t
-	mv tmp-t marshal.c
-
--- a/backends/sysdeps/backend-sysdeps.c
+++ b/backends/sysdeps/backend-sysdeps.c
@@ -1,77 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
-/* $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.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#include <glibtop.h>
-#include <glibtop/global.h>
-#include <glibtop/xmalloc.h>
-
-#include <glibtop/open.h>
-#include <glibtop/backend.h>
-#include <glibtop-backend-private.h>
-
-static int
-_open_sysdeps (glibtop *, glibtop_backend *, u_int64_t, const char **);
-
-static int
-_close_sysdeps (glibtop *, glibtop_backend *);
-
-extern glibtop_call_vector glibtop_backend_sysdeps_call_vector;
-
-glibtop_backend_info LibGTopBackendInfo = {
-    "glibtop-backend-sysdeps", _open_sysdeps, _close_sysdeps,
-    &glibtop_backend_sysdeps_call_vector
-};
-
-static int
-_open_sysdeps (glibtop *server, glibtop_backend *backend,
-	       u_int64_t features, const char **backend_args)
-{
-    glibtop_init_func_t *init_fkt;
-
-    backend->_priv = glibtop_calloc_r
-	(server, 1, sizeof (glibtop_backend_private));
-
-    /* Do the initialization, but only if not already initialized. */
-
-    if ((server->flags & _GLIBTOP_INIT_STATE_SYSDEPS) == 0) {
-	glibtop_open_s (server, "glibtop", features, 0);
-
-	for (init_fkt = _glibtop_init_hook_s; *init_fkt; init_fkt++)
-	    (*init_fkt) (server);
-
-	server->sysdeps.pointer_size = sizeof (void*)*8;
-		
-	server->flags |= _GLIBTOP_INIT_STATE_SYSDEPS;
-    }
-
-    return 0;
-}
-
-static int
-_close_sysdeps (glibtop *server, glibtop_backend *backend)
-{
-    return -1;
-}
-
--- a/backends/sysdeps/glibtop-backend-private.h
+++ b/backends/sysdeps/glibtop-backend-private.h
@@ -1,34 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
-/* $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.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __GLIBTOP_BACKEND_PRIVATE_H__
-#define __GLIBTOP_BACKEND_PRIVATE_H__
-
-struct _glibtop_backend_private
-{
-    u_int64_t flags;
-};
-
-#endif
--- a/backends/sysdeps/libgtop-sysdeps.backend
+++ b/backends/sysdeps/libgtop-sysdeps.backend
@@ -1,12 +0,0 @@
-<?xml version="1.0"?> <!-- -*-xml-*- -->
-<libgtop:Backends xmlns:libgtop="http://www.home-of-linux.org/libgtop/1.1">
-
-  <libgtop:Backend>
-    <libgtop:Name>glibtop-backend-sysdeps</libgtop:Name>
-    <libgtop:Location>
-      <libgtop:LibtoolName>libgtop_backend_sysdeps.la</libgtop:LibtoolName>
-      <libgtop:ShlibName>libgtop_backend_sysdeps.so</libgtop:ShlibName>
-    </libgtop:Location>
-  </libgtop:Backend>
-
-</libgtop:Backends>
--- a/backends/sysdeps/marshal.pl
+++ b/backends/sysdeps/marshal.pl
@@ -1,199 +0,0 @@
-#!/usr/bin/perl
-
-require 'c_types.pl';
-
-$[ = 1;			# set array base to 1
-$, = ' ';		# set output field separator
-$\ = "\n";		# set output record separator
-
-$always_use_temp_storage = 1;
-
-sub toupper {
-    local($_) = @_;
-    tr/a-z/A-Z/;
-    return $_;
-}
-
-sub tolower {
-    local($_) = @_;
-    tr/A-Z/a-z/;
-    return $_;
-}
-
-print '/* marshal.c */';
-print "/* This is a generated file.  Please modify `marshal.pl' */";
-print '';
-
-print '#include <glibtop.h>';
-print '#include <glibtop/open.h>';
-print '#include <glibtop/xmalloc.h>';
-print '';
-print '#include <glibtop/sysdeps.h>';
-print '#include <glibtop/union.h>';
-print '';
-print '#include <glibtop/backend.h>';
-print '';
-print '#include <glibtop-backend-private.h>';
-print '';
-
-$feature_count = 0;
-
-while (<>) {
-    chop;	# strip record separator
-
-    if (/^[^#]/) {
-	&output($_);
-    }
-}
-
-sub output {
-    local($line) = @_;
-    @line_fields = split(/\|/, $line, 9999);
-    $retval = $line_fields[1];
-    $feature = $line_fields[2];
-    $param_def = $line_fields[4];
-
-    $orig = $feature;
-    $feature =~ s/^@//;
-    $space = $feature;
-    $space =~ s/./ /g;
-
-    $features{++$feature_count} = $orig;
-
-    return if $orig =~ /^@/;
-
-    if ($retval eq 'retval') {
-      $retval_param = '&retval';
-      $call_prefix = '';
-      $call_prefix_space = '';
-      $prefix = 'retval = ';
-      $prefix_space = '         ';
-      $retval = 'int';
-    }
-    elsif ($retval !~ /^void$/) {
-      $retval_param = 'NULL';
-      $prefix = 'retval = ';
-      $prefix_space = '         ';
-      $call_prefix = 'retval = ';
-      $call_prefix_space = '         ';
-    }
-    else {
-      $retval_param = 'NULL';
-      $call_prefix = '';
-      $call_prefix_space = '';
-      $prefix = '';
-      $prefix_space = '';
-    }
-
-    if ($retval =~ /^(array|pointer)\((.*)\)$/) {
-      $retval = ($2 eq 'string') ? 'char **' : "$2 *";
-    }
-
-    $need_temp_storage = $always_use_temp_storage;
-    $first_param_name = '';
-
-    $call_param = '';
-    $param_decl = '';
-    $need_temp_len = 0;
-    $nr_params = (@params = split(/:/, $param_def, 9999));
-    for ($param = 1; $param <= $nr_params; $param++) {
-      $list = $params[$param];
-      $type = $params[$param];
-      $type =~ s/\(.*//;
-      $list =~ s/^.*\(//;
-      $list =~ s/\)$//;
-      $count = (@fields = split(/,/, $list, 9999));
-      for ($field = 1; $field <= $count; $field++) {
-	my $c_type = $typeinfo->{$type}->[1];
-
-	if ($first_param_name eq '') {
-	  $first_param_name = $fields[$field];
-	}
-
-	if ($typeinfo->{$type}->[2]) {
-	  $need_temp_storage = 1;
-	}
-
-	if ($param_decl eq '') {
-	  $param_decl = ",\n             " . $space . '    ';
-	}
-	else {
-	  $param_decl = $param_decl . ', ';
-	}
-	$param_decl = $param_decl . $c_type . ' ' . $fields[$field];
-	$call_param = $call_param . ', ' . $fields[$field];
-      }
-    }
-
-    if ($line_fields[3] eq '') {
-      $total_code = sprintf
-	("\treturn glibtop_get_%s_s (server%s);\n", $feature, $call_param);
-    } elsif ($line_fields[3] eq 'array') {
-      $total_code = sprintf
-	("\treturn glibtop_get_%s_s (server, array%s);\n", $feature, $call_param);
-    } elsif ($line_fields[3] =~ /^array/) {
-      $total_code = sprintf
-	("\treturn glibtop_get_%s_s (server, array, buf%s);\n", $feature, $call_param);
-    } else {
-      $total_code = sprintf
-	("\treturn glibtop_get_%s_s (server, buf%s);\n", $feature, $call_param);
-    }
-
-    $func_decl = 'static '.$retval."\n";
-    if ($line_fields[3] eq '') {
-      $func_decl .= sprintf ("_glibtop_get_%s_c (glibtop *server, glibtop_backend *backend%s)\n",
-			     $feature, $param_decl);
-    } elsif ($line_fields[3] eq 'array') {
-      $func_decl .= sprintf ("_glibtop_get_%s_c (glibtop *server, glibtop_backend *backend, glibtop_array *array%s)\n",
-			     $feature, $param_decl);
-    } elsif ($line_fields[3] =~ /^array/) {
-      $func_decl .= sprintf ("_glibtop_get_%s_c (glibtop *server, glibtop_backend *backend, glibtop_array *array, %s *buf%s)\n",
-			     $feature, 'glibtop_'.$feature, $param_decl);
-    } else {
-      $func_decl .= sprintf ("_glibtop_get_%s_c (glibtop *server, glibtop_backend *backend, %s *buf%s)\n",
-			     $feature, 'glibtop_'.$feature, $param_decl);
-    }
-
-    $total_code = sprintf ("%s{\n%s\n%s}\n", $func_decl, $total_code);
-
-    $total_code = sprintf ("#if (!GLIBTOP_SUID_%s)\n\n%s\n#endif /* not GLIBTOP_SUID_%s */\n\n",
-			   &toupper($feature), $total_code,
-			   &toupper($feature));
-
-    print $total_code;
-}
-
-$init_hook_code = '';
-$call_vector_code = '';
-for ($nr = 1; $nr <= $feature_count; $nr++) {
-  $feature = $features{$nr};
-
-  if ($feature =~ /^@/) {
-    $call_vector_code .= sprintf (qq[\tNULL,\n]);
-  } else {
-    $call_vector_code .= sprintf
-      (qq[\#if GLIBTOP_SUID_%s\n\tNULL,\n\#else\n\t_glibtop_get_%s_c,\n\#endif\n],
-       &toupper($feature), $feature);
-  }
-
-  if (!($feature =~ /^@/)) {
-    $init_hook_code .= sprintf
-      (qq[\#if !GLIBTOP_SUID_%s\n\tglibtop_init_%s_s,\n\#endif\n],
-       &toupper($feature), $feature);
-  }
-}
-$init_hook_code .= sprintf (qq[\tNULL\n]);
-
-chop $init_hook_code;
-chop $call_vector_code;
-
-print 'glibtop_call_vector glibtop_backend_sysdeps_call_vector = {';
-print $call_vector_code;
-print '};';
-print '';
-
-print 'glibtop_init_func_t _glibtop_init_hook_s [] = {';
-print $init_hook_code;
-print '};';
-print '';
-
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 dnl
-dnl Configure script for LibGTop
+dnl Configure script for the Gnome library
 dnl

 AC_INIT(copyright.txt)
@@ -35,9 +35,6 @@ AC_SUBST(LIBGTOP_VERSION)
 AC_SUBST(LIBGTOP_VERSION_CODE)
 AC_SUBST(LIBGTOP_VERSION_SUFFIX)

-AC_SUBST(LIBGTOP_PACKAGE)
-AC_DEFINE_UNQUOTED(LIBGTOP_PACKAGE, "$LIBGTOP_PACKAGE")
-
 # libtool versioning
 LT_RELEASE=$LIBGTOP_MAJOR_VERSION.$LIBGTOP_MINOR_VERSION
 LT_CURRENT=`expr $LIBGTOP_MICRO_VERSION - $LIBGTOP_INTERFACE_AGE`
@@ -117,23 +114,20 @@ AM_CONDITIONAL(CROSS_COMPILING, test "x$cross_compiling" = xyes)
 GNOME_LIBGTOP_SYSDEPS
 GNOME_LIBGTOP_TYPES

-sysdeps_dir="$libgtop_sysdeps_dir"
-sysdeps_name="$libgtop_sysdeps_name"
-AC_SUBST(sysdeps_dir)
-AC_SUBST(sysdeps_name)
+AC_ARG_WITH(libgtop-guile,
+[  --with-libgtop-guile    Build the libgtop guile interface (default=no)],
+[build_guile="$withval"], [build_guile=yes])

-AC_MSG_CHECKING(for sysdeps_init_file)
-sysdeps_init_file='sysdeps-init-'"$libgtop_sysdeps_name"'.c'
-AC_SUBST(sysdeps_init_file)
-AC_MSG_RESULT($sysdeps_init_file)
-
-LIBGTOP_XML_CHECK
+if test x$build_guile != xno ; then
+  GNOME_CHECK_GUILE
+fi

 AC_ARG_WITH(libgtop-inodedb,
 [  --with-libgtop-inodedb  Build the inodedb stuff (default=no)],
 [build_inodedb="$withval"], [build_inodedb=no])

 LIBGTOP_EXTRA_LIBS=
+
 if test x$build_inodedb = xyes ; then
  AC_CHECK_LIB(gdbm, gdbm_open, LIBGTOP_EXTRA_LIBS='-lgdbm', build_inodedb=no)
 fi
@@ -146,13 +140,45 @@ fi

 AC_DEFINE(GLIBTOP_NAMES)

+if test x$ac_cv_guile_found = xyes ; then
+  AC_DEFINE(GLIBTOP_GUILE)
+  AC_DEFINE(GLIBTOP_GUILE_NAMES)
+  libgtop_guile_found=yes
+  guile_examples='third'
+  guile_static_examples='third_static'
+  guile_subdirs='guile'
+else
+  libgtop_guile_found=no
+  guile_examples=
+  guile_static_examples=
+  guile_subdirs=
+fi
+
+if test x$libgtop_smp = xyes ; then
+  smp_examples='smp'
+  smp_static_examples='smp_static'
+else
+  smp_examples=
+  smp_static_examples=
+fi
+
+if test "x$enable_static" != xno; then
+  static_targets="first_static second_static mountlist_static procmap_static netload_static sysdeps_static timings_static $guile_static_examples $smp_static_examples"
+else
+  static_targets=""
+fi
+
 AM_CONDITIONAL(ENABLE_STATIC, test x$enable_static = xyes)
 AM_CONDITIONAL(ENABLE_SHARED, test x$enable_static = xyes)

+AC_SUBST(static_targets)
+AC_SUBST(smp_examples)
+AC_SUBST(guile_examples)
+AC_SUBST(guile_subdirs)
+
 AM_PROG_LIBTOOL

-AM_PATH_GLIB(1.2.0,,AC_MSG_ERROR(GLIB >= 1.2.0 is required for LibGTop),
-             [gmodule])
+AM_PATH_GLIB(1.2.0,,AC_MSG_ERROR(GLIB >= 1.2.0 is required for LibGTop))

 dnl You need to uncomment the following line if you want to use
 dnl libGTop without Gnome.
@@ -251,7 +277,7 @@ AC_FUNC_STRFTIME
 AC_CHECK_FUNCS(getcwd gettimeofday getwd putenv strdup strtoul uname)

 dnl ## all 'es_??' are only needed for format numbers different of 'es'
-ALL_LINGUAS="da de es es_DO es_GT es_HN es_MX es_PA es_PE es_SV fi fr gl ja ko nl no pl pt_BR sv uk"
+ALL_LINGUAS="az ca da de es es_DO es_GT es_HN es_MX es_PA es_PE es_SV fi fr ga gl hu ja ko nl no pl pt_BR ru sk sv tr uk zh_CN.GB2312"
 AM_GNOME_GETTEXT

 AC_PATH_XTRA
@@ -271,29 +297,26 @@ for W in $2; do if test -z "$T"; then T="$W"; else T="$T $W"; fi; done
 $1="$T"
 ])dnl

+dnl Autodetect Xauth
+dnl -lXau is only used by gnuclient, so use a special variable for Xauth X libs
+saved_CPPFLAGS="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS $X_CFLAGS"
+test -z "$with_xauth" && { AC_CHECK_HEADER(X11/Xauth.h,          ,with_xauth=no) }
+test -z "$with_xauth" && { AC_CHECK_LIB(Xau, XauGetAuthByAddr,[:],with_xauth=no, $X_LIBS) }
+test -z "$with_xauth" && with_xauth=yes
+if test "$with_xauth" = "yes"; then
+  AC_DEFINE(HAVE_XAUTH)
+  XE_SPACE(libs_xauth, $X_LIBS -lXau)
+fi
+CPPFLAGS="$saved_CPPFLAGS"
+AC_SUBST(libs_xauth)
+
 dnl For diskusage stuff
 GNOME_FILEUTILS_CHECKS

 dnl Debugging
-AC_ARG_ENABLE(debug, [  --enable-debug          turn on debugging [default=no]], libgtop_enable_debug=yes, libgtop_enable_debug=no)
+AC_ARG_ENABLE(debug, [  --enable-debug          turn on debugging [default=no]],AC_DEFINE(LIBGTOP_ENABLE_DEBUG),)
 AC_ARG_ENABLE(fatal-warnings, [  --enable-fatal-warnings make all warnings fatal [debug=no]],AC_DEFINE(LIBGTOP_FATAL_WARNINGS),)
-AC_ARG_ENABLE(glib-malloc, [  --enable-glib-malloc    use glib's malloc [default=auto]], libgtop_enable_glib_malloc=yes,)
-
-if test "x$libgtop_enable_glib_malloc" != xyes ; then
-  if test "x$libgtop_enable_debug" = xyes ; then
-    libgtop_enable_glib_malloc=yes
-  else
-    libgtop_enable_glib_malloc=no
-  fi
-fi
-
-if test "x$libgtop_enable_glib_malloc" = xyes ; then
-  AC_DEFINE(LIBGTOP_USE_GLIB_MALLOC)
-fi
-
-if test "x$libgtop_enable_debug" = xyes ; then
-  AC_DEFINE(LIBGTOP_ENABLE_DEBUG)
-fi

 if test "x$gnome_found" = xyes ; then
  LIBSUPPORT="$GNOME_LIBDIR -lgnomesupport"
@@ -335,37 +358,73 @@ fi

 LIBGTOP_INCS="$LIBGTOP_INCS $SUPPORTINCS $GLIB_CFLAGS"

+LIBGTOP_GUILE_LIBS="$LIBGTOP_LIBS"
+LIBGTOP_GUILE_INCS="$LIBGTOP_INCS"
 LIBGTOP_BINDIR='$(bindir)'
 LIBGTOP_SERVER='$(bindir)/libgtop_server'

-LIBGTOP_EXTRA_LIBS="$LIBGTOP_EXTRA_LIBS $GLIB_LIBS $LIBGTOP_XML_LIB"
+sysdeps_dir="$libgtop_sysdeps_dir"
+AC_SUBST(sysdeps_dir)

-LIBGTOP_LIBS="$LIBGTOP_LIBS -lgtop_sysdeps -lgtop_common -lgtop"
+if test x$ac_cv_guile_found = xyes ; then
+  LIBGTOP_GUILE_LIBS="$LIBGTOP_GUILE_LIBS -lgtop_guile"
+  libgtop_guile_found=yes
+else
+  libgtop_guile_found=no
+fi
+
+AC_SUBST(libgtop_guile_found)
+
+if test -z "$LIBGTOP_EXTRA_LIBS" ; then
+  LIBGTOP_EXTRA_LIBS="$libs_xauth"
+else
+  LIBGTOP_EXTRA_LIBS="$LIBGTOP_EXTRA_LIBS $libs_xauth"
+fi
+
+LIBGTOP_EXTRA_LIBS="$LIBGTOP_EXTRA_LIBS $GLIB_LIBS"
+
+LIBGTOP_LIBS="$LIBGTOP_LIBS -lgtop -lgtop_sysdeps -lgtop_common"
+LIBGTOP_GUILE_LIBS="$LIBGTOP_GUILE_LIBS -lgtop -lgtop_sysdeps -lgtop_common"

 LIBGTOP_NAMES_LIBS="$LIBGTOP_LIBS -lgtop_names"
+LIBGTOP_GUILE_NAMES_LIBS="$LIBGTOP_GUILE_LIBS -lgtop_guile_names -lgtop_names"

 LIBGTOP_LIBS="$LIBGTOP_LIBS" 
 LIBGTOP_NAMES_LIBS="$LIBGTOP_NAMES_LIBS"
+LIBGTOP_GUILE_LIBS="$LIBGTOP_GUILE_LIBS"
+LIBGTOP_GUILE_NAMES_LIBS="$LIBGTOP_GUILE_NAMES_LIBS"
+
+LIBGTOP_GUILE_LIBS="$LIBGTOP_GUILE_LIBS $GUILE_LIBS"
+LIBGTOP_GUILE_INCS="$LIBGTOP_GUILE_INCS $GUILE_INCS -DGLIBTOP_GUILE"

 LIBGTOP_NAMES_INCS="$LIBGTOP_INCS -DGLIBTOP_NAMES"
+LIBGTOP_GUILE_NAMES_INCS="$LIBGTOP_GUILE_INCS -DGLIBTOP_GUILE_NAMES"
+LIBGTOP_GUILE_NAMES_INCS="$LIBGTOP_GUILE_INCS -DGLIBTOP_NAMES"

 machine_incs="-I\$(top_srcdir)/sysdeps/$sysdeps_dir"

 AC_SUBST(machine_incs)

-LIBGTOP_BACKEND_DIR="\$(datadir)/libgtop/backends"
+if test x$libgtop_guile_found = xyes ; then
+  guile_def="-DGLIBTOP_GUILE -DGLIBTOP_GUILE_NAMES $GUILE_INCS "
+else
+  guile_def=""
+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 -I\$(top_builddir)/include -I\$(top_srcdir)/intl $SUPPORTINCS $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"'\" -DLIBGTOP_BACKEND_DIR=\"'"$LIBGTOP_BACKEND_DIR"'\"'
+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 -I\$(top_srcdir)/intl $SUPPORTINCS $GLIB_CFLAGS $CFLAGS $X_CFLAGS $guile_def "'-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)

 AC_SUBST(LIBGTOP_EXTRA_LIBS)
-AC_SUBST(LIBGTOP_BACKEND_DIR)

 AC_SUBST(LIBGTOP_LIBS)
 AC_SUBST(LIBGTOP_INCS)
 AC_SUBST(LIBGTOP_NAMES_LIBS)
 AC_SUBST(LIBGTOP_NAMES_INCS)
+AC_SUBST(LIBGTOP_GUILE_LIBS)
+AC_SUBST(LIBGTOP_GUILE_INCS)
+AC_SUBST(LIBGTOP_GUILE_NAMES_LIBS)
+AC_SUBST(LIBGTOP_GUILE_NAMES_INCS)
 AC_SUBST(LIBGTOP_BINDIR)
 AC_SUBST(LIBGTOP_SERVER)

@@ -523,6 +582,8 @@ include/glibtop/Makefile
 sysdeps/Makefile
 sysdeps/common/Makefile
 sysdeps/names/Makefile
+sysdeps/guile/Makefile
+sysdeps/guile/names/Makefile
 sysdeps/stub/Makefile
 sysdeps/stub_suid/Makefile
 sysdeps/sun4/Makefile
@@ -532,13 +593,10 @@ sysdeps/kernel/Makefile
 sysdeps/freebsd/Makefile
 sysdeps/solaris/Makefile
 src/Makefile
+src/daemon/Makefile
 src/inodedb/Makefile
-scripts/Makefile
-backends/Makefile
-backends/server/Makefile
-backends/sysdeps/Makefile
-backends/common/Makefile
 lib/Makefile
+examples/Makefile
 doc/Makefile
 support/Makefile
 macros/Makefile])
--- a/copyright.txt
+++ b/copyright.txt
@@ -1,23 +0,0 @@
-/* $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.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
--- a/debian/.cvsignore
+++ b/debian/.cvsignore
@@ -1,9 +0,0 @@
-control
-rules
-build
-tmp
-*.postinst
-*.debhelper
-*.files
-files
-substvars
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -1,10 +0,0 @@
-LibGTop CVS snapshots for Debian
--------------------------------
-
-This is a snapshot of LibGTop from the main CVS archive, built into a
-Debian package. This package is not guaranteed to work, as it was
-built automatically. You're on your own, mister or missus!
-
-
-Martin Baulig <martin@home-of-linux.org>, Fri, 14 Jan 2000 20:20:13 +0100
-
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,120 +0,0 @@
-libgtop (1.1.4-1) unstable; urgency=low
-  * New upstream source
-  * Non-maintainer upload; this is an unstable developer's snapshot from
-    the GNOME CVS tree.
-
- -- Martin Baulig <martin@home-of-linux.org>  Fri, 14 Jan 2000 15:32:48 +0100
-
-libgtop (1.0.6-1) unstable; urgency=low
-  * New upstream source
-
- -- Ian Lynagh (wibble) <igloo@debian.org>  Wed, 20 Oct 1999 16:16:27 +0100
-
-libgtop (1.0.4.5pre1-1) frozen unstable; urgency=low
-  * New upstream source (1.0.5 pre release)
-  * Maintainer e-mail address changed to igloo@debian.org
-
- -- Ian Lynagh (wibble) <igloo@debian.org>  Thu, 30 Sep 1999 22:37:33 +0100
-
-libgtop (1.0.4-1) frozen unstable; urgency=low
-  * New upstream source
-  * Removed nasty sed stuff from the rules in favour of make install prefix=...
-  * Added .la files to libgtop-dev
-  * Added info to the copyright file
-  * Wrote simple man page for libgtop-config.
-  * Recompiled with later debhelper so docs go to /usr/share/doc as per FHS
-  * changed infodir to /usr/share/info
-
- -- Ian Lynagh (wibble) <igloo@debian.org>  Mon, 20 Sep 1999 00:06:16 +0100
-
-libgtop (1.0.1-2) frozen unstable; urgency=low
-
-  * Didn't actually use wildcards in libgtop-dev.files because tar complained
-  * Set section names properly
-
- -- Ian Lynagh <ian@lynagh.demon.co.uk>  Sun,  7 Mar 1999 00:53:50 +0000
-
-libgtop (1.0.1-1) frozen unstable; urgency=low
-
-  * SONAME changed back to 1. Fun fun fun.
-  * Added RELNOTES-1.0 to debian/libgtop1.docs and debian/rules
-  * Changed libgtop1.README.Debian to at least make sense
-  * Used wildcards in libgtop-dev.files
-
- -- Ian Lynagh <ian@lynagh.demon.co.uk>  Sun,  7 Mar 1999 00:53:50 +0000
-
-libgtop (1.0.1-0.1) unstable; urgency=low
-
-  * Non-maintainer upload for GNOME 1.0
-
- -- Jules Bean <jules@debian.org>  Thu,  4 Mar 1999 22:34:12 +0000
-
-libgtop (0.99.2-0.2) unstable; urgency=low
-
-  * Oops, forgot some files.
-
- -- Jim Pick <jim@jimpick.com>  Sun, 24 Jan 1999 02:12:24 -0800
-
-libgtop (0.99.2-0.1) unstable; urgency=low
-
-  * Non-maintainer upload.
-  * New upstream source.
-  * SONAME is now 0 again.  Hmmm.
-
- -- Jim Pick <jim@jimpick.com>  Sat, 23 Jan 1999 20:21:38 -0800
-
-libgtop (0.26.2-4) frozen unstable; urgency=low
-
-  * Upstream changelog installed as changelog
-  * debian/shlibs.local removed in favour of the LD_LIBRARY_PATH line
-
- -- Ian Lynagh <ian@lynagh.demon.co.uk>  Thu, 26 Nov 1998 17:20:24 +0000
-
-libgtop (0.26.2-3.1) frozen unstable; urgency=low
-
-  * Non-maintainer upload.
-  * Upload to frozen, corrects Bug #29110, Bug #29111, which were
-    already fixed.
-  * Noticed that guile option is no longer being used, so I removed
-    the dependency.
-  * Added changelog (to fix lintian error).
-  * Changed control file to use macro substitutions.  This is a much
-    less error-prone way of building dependencies than doing them by
-    hand.
-  * Added -V option to dh_makeshlibs to put version number on shlibs
-    file.
-  * Added shlibs.local file with null entry for "libgtop 1" (and
-    others) so libgtop1 doesn't declare a relationship on itself.
-
- -- Jim Pick <jim@jimpick.com>  Wed, 25 Nov 1998 12:03:12 -0800
-
-libgtop (0.26.2-3) frozen unstable; urgency=low
-
-  * libgtop0 changed to libgtop1
-  * Added an #ifndef strstr around the prototype of strstr in
-    sysdeps/common/mountlist.c as this is a macro under glibc 2.1.
-
- -- Ian Lynagh <ian@lynagh.demon.co.uk>  Sun,  8 Nov 1998 12:06:09 +0000
-
-libgtop (0.26.2-2) frozen unstable; urgency=low
-
-  * Fixes minor bugs in debian/rules
-
- -- Ian Lynagh <ian@lynagh.demon.co.uk>  Fri, 16 Oct 1998 05:30:16 +0200
-
-libgtop (0.26.2-1) unstable; urgency=low
-
-  * New upstream version
-  * Non-maintainer release
-
- -- Martin Schulze <joey@finlandia.infodrom.north.de>  Fri, 16 Oct 1998 05:30:16 +0200
-
-libgtop (0.26.0-1) unstable; urgency=low
-
-  * Initial Release.
-
- -- Jim Pick <jim@jimpick.com>  Thu, 24 Sep 1998 18:42:48 -0700
-
-Local variables:
-mode: debian-changelog
-End:
--- a/debian/control.in
+++ b/debian/control.in
@@ -1,33 +0,0 @@
-Source: libgtop@SUFFIX@
-Maintainer: Martin Baulig <martin@home-of-linux.org>
-Section: libs
-Priority: optional
-Standards-Version: 3.0.0
-
-Package: libgtop2@SUFFIX@
-Architecture: any
-Section: libs
-Depends: ${shlibs:Depends}
-Description: Portable system access library (part of Gnome)
- Gnome is the "GNU Network Object Model Environment"
- .
- It is a project to build a complete, user-friendly desktop based
- entirely on free software.
- .
- This package contains the gtop libraries which read information about
- processes and the running systems.
-
-Package: libgtop-dev@SUFFIX@
-Architecture: any
-Section: devel
-Depends: libgtop2@SUFFIX@ (= ${Source-Version})
-Description: Dev libraries for the portable system access library (part of Gnome)
- Gnome is the "GNU Network Object Model Environment"
- .
- It is a project to build a complete, user-friendly desktop based
- entirely on free software.
- .
- This package contains the include files and static library for the
- gtop libraries which read information about processes and the running
- systems.
-
--- a/debian/debconfigure
+++ b/debian/debconfigure
@@ -1,109 +0,0 @@
-#! /bin/sh
-#
-# debconfigure
-#
-# A script to generate a debian/rules file, with options.
-#
-# By Jim Pick <jim@jimpick.com>, GPL'd of course.
-# Adjusted for LibGTop by Martin Baulig <martin@home-of-linux.org>
-#
-
-if [ ! -r rules.in ]; then
-	echo "Please run the debconfigure script in the debian directory" 1>&2
-	exit 1
-fi
-
-debtype='official'
-prefix='/usr'
-gnomeprefix='/usr'
-localstatedir='/var/lib'
-pkgsuffix=''
-
-for dc_option
-do
-    case "$dc_option" in
-	-*=*) dc_optarg=`echo "$dc_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-	*) dc_optarg= ;;
-    esac
-
-    case "$dc_option" in
-
-	--clean)
-	    rm -f control rules *~ core *files *menu *substvars *.postinst *.debhelper
-	    exit ;;
-
-	--prefix=*)
-	    prefix="$dc_optarg" ;;
-
-        --localstatedir=*)
-	    prefix="$dc_optarg" ;;
-
-	--pkgsuffix=*)
-	    pkgsuffix="$dc_optarg" ;;
-
-	--gnome-prefix=*)
-	    gnomeprefix="$dc_optarg" ;;
-
-	--debtype=*)
-	    debtype="$dc_optarg" ;;
-
-	*)
-	    cat <<EOF 1>&2
-Usage: debconfigure [options]
-Options: [defaults in brackets after descriptions]
-  --help                  print this message
-  --clean		  remove generated files
-  --prefix=PREFIX         install files under under PREFIX dir [/usr]
-  --gnome-prefix=PREFIX   look for GNOME under PREFIX dir [/usr]
-  --localstatedir=DIR     directory for things like game scores [/var/lib]
-  --pkgsuffix=SUFFIX      append SUFFIX onto package names []
-  --debtype=DEBTYPE       enable macros with the name of DEBTYPE [official]
-EOF
-	    exit ;;
-
-    esac
-done
-
-# Strip leading slash
-prefix=`expr $prefix : '/\(.*\)'`
-gnomeprefix=`expr $gnomeprefix : '/\(.*\)'`
-localstatedir=`expr $localstatedir : '/\(.*\)'`
-
-for infile in `ls control.in rules.in`
-do
-    tofile=`expr $infile : '\(.*\)\.in'`
-    cat $infile | \
-       sed "s,@SUFFIX@,$pkgsuffix,g" | \
-       sed "s,@PREFIX@,$prefix,g" | \
-       sed "s,@GNOMEPREFIX@,$gnomeprefix,g" | \
-       sed "s,@LOCALSTATEDIR@,$localstatedir,g" | \
-       sed "s,%$debtype>,," | sed '/^%/d' > $tofile
-done
-chmod +x rules
-
-for filesfile in `ls *.files.in`
-do
-    tofile=`expr $filesfile : '\(.*\)\.files\.in'`
-    tofile=`echo $tofile$pkgsuffix.files`
-    cat $filesfile | \
-       sed "s,@SUFFIX@,$pkgsuffix,g" | \
-       sed "s,@PREFIX@,$prefix,g" | \
-       sed "s,@GNOMEPREFIX@,$gnomeprefix,g" | \
-       sed "s,@LOCALSTATEDIR@,$localstatedir,g" | \
-       sed "s,%$debtype>,," | sed '/^%/d' > $tofile
-done
-
-for postinst in libgtop2$pkgsuffix
-do
-
-cat > $postinst.postinst <<EOF
-#! /bin/sh
-
-set -e
-ldconfig
-
-#DEBHELPER#
-EOF
-
-done
-
--- a/debian/libgtop-config.1
+++ b/debian/libgtop-config.1
@@ -1,34 +0,0 @@
-.TH GTOP l "15 September 1999"
-.SH NAME
-\fBlibgtop-config\fP \- libgtop libraries and component information retrieval.
-.SH SYNTAX
-.B libgtop-config
-.RI [ --version ]
-.RI [ --config ]
-.RI [ --features-def-file ]
-.SH DESCRIPTION
-.B libgtop-config
-is used to retrieve information from installed libraries in the system.
-
-This manual page was written for the Debian GNU/Linux distribution because the original program does not have a manual page.
-.LP
-.SH OPTIONS
-.TP
-.B \-\-version
-.PD
-Prints the version of libgtop that you're using.
-.TP
-.B \-\-config
-.PD
-Prints the location of libgtopConf.sh.
-.TP
-.B \-\-version
-.PD
-Prints the location of libgtop-features.def.
-.SH BUGS
-None known
-
-.SH AUTHORS
-Martin Baulig (martin@home-of-linux.org)
-.TP
-Josh Sled (jsled@scam.XCF.Berkeley.EDU)
--- a/debian/libgtop-dev.files.in
+++ b/debian/libgtop-dev.files.in
@@ -1,25 +0,0 @@
-@PREFIX@/lib/libgtop.a
-@PREFIX@/lib/libgtop_common.a
-@PREFIX@/lib/libgtop_names.a
-@PREFIX@/lib/libgtop_suid_common.a
-@PREFIX@/lib/libgtop_sysdeps.a
-@PREFIX@/lib/libgtop.la
-@PREFIX@/lib/libgtop_common.la
-@PREFIX@/lib/libgtop_names.la
-@PREFIX@/lib/libgtop_suid_common.la
-@PREFIX@/lib/libgtop_sysdeps.la
-@PREFIX@/lib/libgtopConf.sh
-@PREFIX@/lib/libgtop.so
-@PREFIX@/lib/libgtop_common.so
-@PREFIX@/lib/libgtop_names.so
-@PREFIX@/lib/libgtop_suid_common.so
-@PREFIX@/lib/libgtop_sysdeps.so
-@PREFIX@/lib/libgtop-features.def
-@PREFIX@/lib/libgtop-structures.def
-@PREFIX@/lib/libgtop/include/*.h
-@PREFIX@/include/glibtop/*.h
-@PREFIX@/include/glibtop.h
-@PREFIX@/include/glibtop_server.h
-@PREFIX@/include/glibtop_machine.h
-@PREFIX@/info/libgtop.info
-@PREFIX@/bin/libgtop-config
--- a/debian/libgtop2.README.Debian
+++ b/debian/libgtop2.README.Debian
@@ -1,5 +0,0 @@
-
-The Debian package of libgtop, a GNOME library.
-
-- 
-Ian Lynagh <ian@lynagh.demon.co.uk>
--- a/debian/libgtop2.copyright
+++ b/debian/libgtop2.copyright
@@ -1,12 +0,0 @@
-
-libgtop is released under the GPL.
-On Debian GNU/Linux systems, the complete text of the GNU General
-Public License can be found in /usr/share/common-licenses/GPL
-
-Original authors: Martin Baulig <martin@home-of-linux.org>
-                  Drazen Kacar <dave@srce.hr>
-
-Originally Debianised by Jim Pick <jim@jimpick.com>
-Then re-Debianised in October 1998 by Martin Schulze
-<joey@finlandia.infodrom.north.de> before being taken over by Ian Lynagh
-<ian@lynagh.demon.co.uk> in November 1998.
--- a/debian/libgtop2.docs
+++ b/debian/libgtop2.docs
@@ -1,7 +0,0 @@
-RELNOTES-0.25
-RELNOTES-1.0
-RELNOTES-1.1.x
-NEWS
-AUTHORS
-TODO
-debian/changelog
--- a/debian/libgtop2.files.in
+++ b/debian/libgtop2.files.in
@@ -1,2 +0,0 @@
-@PREFIX@/lib/libgtop*-1.1.so.*.*
-@PREFIX@/lib/libgtop*-1.1.so.*
--- a/debian/rules.in
+++ b/debian/rules.in
@@ -1,115 +0,0 @@
-#!/usr/bin/make -f
-# Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess.
-# This version is for a hypothetical package that builds an
-# architecture-dependant package, as well as an architecture-independent
-# package.
-
-# Uncomment this to turn on verbose mode. 
-#export DH_VERBOSE=1
-
-i=$(shell pwd)/debian/tmp
-b=$(shell pwd)/debian/build
-
-configure: configure.in
-	@echo "--- Making configure script and configuring"
-	chmod +x autogen.sh
-	./autogen.sh --prefix=/@PREFIX@ --with-gnome=/@GNOMEPREFIX@ \
-	  --localstatedir=/@LOCALSTATEDIR@
-
-Makefile: configure
-	@echo "--- Configuring"
-	./configure --prefix=/@PREFIX@ --with-gnome=/@GNOMEPREFIX@ \
-	  --localstatedir=/@LOCALSTATEDIR@
-
-build: configure Makefile build-debstamp
-build-debstamp:
-	@echo "--- Compiling"
-	dh_testdir
-	$(MAKE) all
-	touch build-debstamp
-
-clean: Makefile
-	@echo "--- Cleaning"
-	dh_testdir
-	dh_clean
-	-rm -rf static shared
-	-rm -f build-debstamp install-debstamp
-	-make -k distclean
-	-rm -f `find . -name "*~"`
-	-rm -f `find . -name "*\.la"`
-	-rm -rf `find . -name "\.deps"`
-	-rm -rf `find . -name "\.libs"`
-	-rm -rf `find . -name "*\.rej"`
-	-rm -rf debian/tmp `find debian/* -type d ! -name CVS` debian/files* core
-	-rm -f debian/*substvars
-
-install: build install-debstamp
-install-debstamp:
-	@echo "--- Installing"
-	dh_testdir
-	dh_testroot
-	rm -rf $(b)
-	$(MAKE) install prefix=$(i)/@PREFIX@ exec_prefix=$(i)/@PREFIX@ \
-	  localstatedir=$(i)/@LOCALSTATEDIR@
-	touch install-debstamp
-
-install-save: install
-	rm -rf $(i).saved
-	cp -a $(i) $(i).saved
-
-install-saved:
-	rm -rf $(i)
-	cp -a $(i).saved $(i)
-	rm -rf $(b)
-	touch install-debstamp
-
-binary-indep: build install
-
-binary-arch: build install \
-		libgtop2@SUFFIX@ \
-		libgtop-dev@SUFFIX@
-
-#
-# libgtop2@SUFFIX@
-#
-
-libgtop2@SUFFIX@: install
-	@echo "--- Building: $@"
-	dh_installdocs       -p$@ -P$(b)/$@ README NEWS AUTHORS
-	dh_installchangelogs -p$@ -P$(b)/$@ ChangeLog
-	dh_movefiles         -p$@ -P$(b)/$@
-	dh_strip             -p$@ -P$(b)/$@ 
-	dh_compress          -p$@ -P$(b)/$@ 
-	dh_fixperms          -p$@ -P$(b)/$@ 
-	dh_installdeb        -p$@ -P$(b)/$@
-	dh_shlibdeps         -p$@ -P$(b)/$@
-	dh_gencontrol        -p$@ -P$(b)/$@
-	dh_makeshlibs        -p$@ -P$(b)/$@ -V
-	dh_md5sums           -p$@ -P$(b)/$@
-	dh_builddeb          -p$@ -P$(b)/$@
-
-#
-# libgtop-dev
-#
-
-libgtop-dev@SUFFIX@: install
-	@echo "--- Building: $@"
-	mkdir -p $(b)/$@/usr/doc
-	cd $(b)/$@/usr/doc; ln -s libgtop2@SUFFIX@ $@	
-	dh_movefiles         -p$@ -P$(b)/$@
-	dh_strip             -p$@ -P$(b)/$@ 
-	dh_compress          -p$@ -P$(b)/$@ 
-	dh_fixperms          -p$@ -P$(b)/$@ 
-	dh_installdeb        -p$@ -P$(b)/$@
-	dh_shlibdeps         -p$@ -P$(b)/$@
-	dh_gencontrol        -p$@ -P$(b)/$@
-	dh_makeshlibs        -p$@ -P$(b)/$@ -V
-	dh_undocumented      -p$@ -P$(b)/$@ \
-				libgtop-config.1
-	dh_md5sums           -p$@ -P$(b)/$@
-	dh_builddeb          -p$@ -P$(b)/$@
-
-binary: binary-indep binary-arch
-.PHONY: binary clean binary-indep binary-arch build install install-save install-saved
-
-
--- a/doc/.cvsignore
+++ b/doc/.cvsignore
@@ -1,10 +0,0 @@
-texinfo.tex
-*.info
-Makefile.in
-Makefile
-*.log *.toc *.dvi *.aux *.cp *.fn *.vr *.tp *.ky *.pg
-*.ps
-auto-macros.texi
-version.texi
-stamp-vti
-*.html *.pdf
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,53 +0,0 @@
-1999-10-18  Martin Baulig  <martin@home-of-linux.org>
-
-	* about.texi: Added a note about LibGTop and GNOME.
-
-	* reference.texi (glibtop_proc_state): Fix description of the `state'
- 	field for LibGTop 1.0.x.
-
-1999-09-29  Martin Baulig  <martin@home-of-linux.org>
-
-	* Makefile.am: Reverted Timur's commit.
-	(MAKEINFO): Add `-I @libgtop_top_builddir@/doc' here. This still
-	creates libgtop.info in srcdir, but that's an automake problem.
-
-Tue Jun 15 15:59:50 1999 Timur Bakeyev <mc@bat.ru>
-
-	* Makefile.am: Force `auto-macros.texi' to be created in $(srcdir),
-	as, otherwise, makeinfo is unable to find it, if srcdir != builddir.
-	That's a buggy solution, as spoils srcdir, but, as libgtop.info also
-	created in srcdir - this is acceptable. Both SHOULD be fixed!
-
-1999-05-28  Martin Baulig  <baulig@Stud.Informatik.Uni-Trier.DE>
-
-	* internals.texi: New file documenting LibGTop internals.
-	* reference.texi: Started to document all library functions and
-	finished the sysdeps and common references.
-
-1999-05-16  Martin Baulig  <martin@home-of-linux.org>
-
-	* main.texi: This is now the main file which will @include all
-	chapter files so we can use `texinfo-multiple-files-update'.
-
-	* reference.texi: Added all missing sections with a "not yet written"
-	notice.
-
-1999-05-16  Martin Baulig  <martin@home-of-linux.org>
-
-	* white-paper.texi: Initial version of the LibGTop White Paper.
-
-	* Makefile.am: Create `auto-macros.texi' from `auto-macros.texi.in'
- 	which will contain some `@set' commands for the LibGTop version etc.
-
-	* auto-macros.texi.in: New file. This is a template for
-	`auto-macros.texi' which will be automatically generated.
-
-1999-05-09  Martin Baulig  <martin@home-of-linux.org>
-
-	* about.texi: Split the `libgtop.texi' into one file pro chapter,
-	this is the "About LibGTop".
-
-	* reference.texi: The "LibGTop Reference Manual".
-
-	* libgtop.texi: Initial version of the new LibGTop Manual.
-
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,45 +0,0 @@
-info_TEXINFOS		= libgtop.texi
-
-libgtop_TEXINFOS	= libgtop.texi about.texi reference.texi \
-			  auto-macros.texi version.texi main.texi \
-			  white-paper.texi internals.texi
-
-MAKEINFO		+= -I @libgtop_top_builddir@/doc
-
-EXTRA_DIST		= auto-macros.texi.in
-
-auto-macros.texi: auto-macros.texi.in Makefile
-## Use sed and then mv to avoid problems if the user interrupts.
-	sed -e 's#\%LIBGTOP_LIBDIR\%#$(libdir)#g' \
-	  -e 's#\%LIBGTOP_INCLUDEDIR\%#$(includedir)#g' \
-	  -e 's#\%LIBGTOP_DATADIR\%#$(datadir)#g' \
-	  -e 's#\%LIBGTOP_EXTRA_LIBS\%#$(LIBGTOP_EXTRA_LIBS)#g' \
-	  -e 's#\%LIBGTOP_LIBS\%#$(LIBGTOP_LIBS)#g' \
-	  -e 's#\%LIBGTOP_INCS\%#$(LIBGTOP_INCS)#g' \
-	  -e 's#\%LIBGTOP_NAMES_LIBS\%#$(LIBGTOP_NAMES_LIBS)#g' \
-	  -e 's#\%LIBGTOP_NAMES_INCS\%#$(LIBGTOP_NAMES_INCS)#g' \
-	  -e 's#\%LIBGTOP_GUILE_LIBS\%#$(LIBGTOP_GUILE_LIBS)#g' \
-	  -e 's#\%LIBGTOP_GUILE_INCS\%#$(LIBGTOP_GUILE_INCS)#g' \
-	  -e 's#\%LIBGTOP_GUILE_NAMES_LIBS\%#$(LIBGTOP_GUILE_NAMES_LIBS)#g' \
-	  -e 's#\%LIBGTOP_GUILE_NAMES_INCS\%#$(LIBGTOP_GUILE_NAMES_INCS)#g' \
-	  -e 's#\%LIBGTOP_BINDIR\%#$(LIBGTOP_BINDIR)#g' \
-	  -e 's#\%LIBGTOP_SERVER\%#$(LIBGTOP_SERVER)#g' \
-	  -e 's#\%LIBGTOP_MAJOR_VERSION\%#$(LIBGTOP_MAJOR_VERSION)#g' \
-	  -e 's#\%LIBGTOP_MINOR_VERSION\%#$(LIBGTOP_MINOR_VERSION)#g' \
-	  -e 's#\%LIBGTOP_MICRO_VERSION\%#$(LIBGTOP_MICRO_VERSION)#g' \
-	  -e 's#\%LIBGTOP_VERSION\%#$(LIBGTOP_VERSION)#g' \
-	  -e 's#\%LIBGTOP_VERSION_CODE\%#$(LIBGTOP_VERSION_CODE)#g' \
-	  -e 's#\%LIBGTOP_SERVER_VERSION\%#$(LIBGTOP_SERVER_VERSION)#g' \
-	  -e 's#\%libgtop_sysdeps_dir\%#$(libgtop_sysdeps_dir)#g' \
-	  -e 's#\%libgtop_need_server\%#$(libgtop_need_server)#g' \
-	  -e 's#\%libgtop_use_machine_h\%#$(libgtop_use_machine_h)#g' \
-	  -e 's#\%libgtop_guile_found\%#$(libgtop_guile_found)#g' \
-	  -e 's#\%libgtop_want_examples\%#$(libgtop_want_examples)#g' \
-	      < $(srcdir)/auto-macros.texi.in > auto-macros.tmp
-	echo '@c Set this if this is LibGTop 1.1.x' >> auto-macros.tmp
-	if [ $(LIBGTOP_VERSION_CODE) -ge 1001000 ] ; then \
-	  echo '@set LIBGTOP-1-1' >> auto-macros.tmp ; \
-	else \
-	  echo '@clear LIBGTOP-1-1' >> auto-macros.tmp ; \
-	fi
-	mv auto-macros.tmp auto-macros.texi
--- a/doc/about.texi
+++ b/doc/about.texi
@@ -1,121 +0,0 @@
-@node About, White Paper, Top, Top
-@chapter About LibGTop
-
-LibGTop is a library to get system specific data such as CPU and Memory Usage
-and information about running Processes.
-
-On Systems like Solaris or Digital Unix where you need special privileges to
-get those data, it uses a setuid/setgid server to do so.
-
-Even if LibGTop is a part of the GNOME desktop environment (@uref{http://www.gnome.org}),
-the main interface of LibGTop is totally independent from any particular desktop environment,
-so you can also use it as a standalone library in any piece of GPLed software.
-
-@menu
-* Availability::                Where to get LibGTop
-* Supported Platforms::         Supported Platforms
-* Mailing List::                Helping with LibGTop development
-* Thanks::                      People who contributed to LibGTop
-@end menu
-
-@node Availability, Supported Platforms, About, About
-@section Availability
-
-The master source of LibGTop is the GNOME CVS tree
-(see @uref{http://www.gnome.org} for details), but you can also get the
-latest release tarballs from
-
-@display
-@uref{ftp://ftp.gnome.org/pub/GNOME/sources/libgtop/}
-@end display
-
-@noindent
-or any of its mirror sites.
-
-The latest stable version of LibGTop is 1.0.1 which is also the one that comes
-together with GNOME 1.0. In CVS, there is a @code{LIBGTOP_STABLE_1_0} branch
-which is rooted at the @code{LIBGTOP_1_0_1} tag while actual development occurs
-in the @code{HEAD} which currently has version 1.1.0.
-
-@node Supported Platforms, Mailing List, Availability, About
-@section Supported Platforms
-
-The stable branch currently supports the following platforms:
-
-@itemize @bullet
-@item All versions of Linux
-
-LibGTop was tested under Linux 2.0.x and 2.2.x on the ix86 and the alpha, but
-it should also work without problems on SparcLinux.
-
-Note: I'm speaking of the Linux kernel here, not the GNU/Linux operating system.
-
-@item FreeBSD, NetBSD and OpenBSD
-
-LibGTop was tested under FreeBSD 2.2.6 and 3.0, NetBSD 1.3.2 and OpenBSD 2.4.
-Support for NetBSD 1.4 was added in LibGTop 1.0.2.
-
-@end itemize
-
-The platforms listed above are known to be stable and working. However, if
-you're using the latest development version, you can use it on the following
-platforms as well:
-
-@itemize @bullet
-@item BSD/OS
-
-There is a port for BSD/OS (aka BSDI) 2.x and 3.x from Timur Bakeyev which
-should also work with 4.x. This isn't tested very well, but it should be
-working.
-
-@item Digital Unix
-
-There is some basic support for Digital Unix (formerly DEC OSF/1) V3.2C, but
-this may still be a bit unstable. I'm currently working on this port as time
-permits so it should be fully supported soon.
-
-@item Solaris
-
-The Solaris port currently works on Solaris 7 and maybe also on other releases.
-Thanks a lot to Drazen Kacar and everyone who helped working on this port. They
-have really done excellent work here and I'm pretty sure that this port will be
-fully functional on most Solaris versions in near future.
-
-@end itemize
-
-@node Mailing List, Thanks, Supported Platforms, About
-@section Mailing List
-
-There is a @email{libgtop-devel-list@@egroups.com} mailing list for people who
-want to help with the development of LibGTop.
-
-It is meant as a low-traffic, but high content-list where we can discuss
-technical details such as adding new sysdeps ports etc. 
-
-Especially, I'd like to see people with a deeper knowledge of operating systems
-internals joining my list so we can discuss technical details of the sysdeps
-code. 
-
-It is *not* for users that want to know how to compile LibGTop etc.
-
-You can subscribe to this mailing list and view the mailing list archives
-on the LibGTop Page at @uref{http://www.home-of-linux.org/gnome/libgtop}.
-
-@node Thanks,  , Mailing List, About
-@section Thanks
-
-At the place I'd like to thank the following people who contributed to
-LibGTop (listed in chronological order):
-
-@itemize @bullet
-@item Sebastian Wilhelmi who had the initial idea of LibGTop and helped
-me a lot in the early beginning.
-@item Josh Sled for the initial FreeBSD port.
-@item Jeremy Lea for his BSD patches.
-@item Timur Bakeyev for the BSDI port.
-@item Drazen Kacar and the other people on the LibGTop development mailing
-list for the Solaris port.
-@item All people sending me patches, having good ideas, ...
-@item Everyone I have forgotten in this list ...
-@end itemize
-
--- a/doc/auto-macros.texi.in
+++ b/doc/auto-macros.texi.in
@@ -1,12 +0,0 @@
-@c LibGTop major, minor and micro version.
-@set LIBGTOP_MAJOR_VERSION %LIBGTOP_MAJOR_VERSION%
-@set LIBGTOP_MINOR_VERSION %LIBGTOP_MINOR_VERSION%
-@set LIBGTOP_MICRO_VERSION %LIBGTOP_MICRO_VERSION%
-
-@c LibGTop version and numerical version code ("1.234.567" -> 1234567).
-@set LIBGTOP_VERSION "%LIBGTOP_VERSION%"
-@set LIBGTOP_VERSION_CODE %LIBGTOP_VERSION_CODE%
-
-@c LibGTop server version, increased each time the protocol changes.
-@set LIBGTOP_SERVER_VERSION %LIBGTOP_SERVER_VERSION%
-
--- a/doc/internals.texi
+++ b/doc/internals.texi
@@ -1,107 +0,0 @@
-@node LibGTop Internals, , Reference Manual, Top
-@chapter LibGTop Internals
-
-@menu
-* General Internals::           General Internals
-* Sysdeps Internals::           Sysdeps Internals
-@end menu
-
-@node General Internals, Sysdeps Internals, LibGTop Internals, LibGTop Internals
-@section General Internals
-
-@menu
-* glibtop::                     The server structure
-@end menu
-
-@node glibtop,  , General Internals, General Internals
-@subsection The server structure - @code{glibtop}
-
-@example
-@cartouche
-typedef struct _glibtop         glibtop;
-
-struct _glibtop
-@{
-        unsigned flags;
-        unsigned method;
-        unsigned error_method;
-#ifdef HAVE_GLIBTOP_MACHINE_H
-        glibtop_machine machine;
-#endif
-        int input [2];
-        int output [2];
-        int socket;
-        int ncpu;
-        unsigned long os_version_code;
-        const char *name;
-        const char *server_command;
-        const char *server_host;
-        const char *server_user;
-        const char *server_rsh;
-        unsigned long features;
-        unsigned long server_port;
-        glibtop_sysdeps sysdeps;
-        glibtop_sysdeps required;
-        glibtop_sysdeps wanted;
-        pid_t pid;
-@};
-@end cartouche
-@end example
-
-@node Sysdeps Internals,  , General Internals, LibGTop Internals
-@section Sysdeps Internals
-
-@menu
-* glibtop_open_s::              Non-privileged initializations
-* glibtop_close_s::             Non-privileged cleanups
-@end menu
-
-@node glibtop_open_s, glibtop_close_s, Sysdeps Internals, Sysdeps Internals
-@subsection glibtop_open_s
-
-This function is used in the non-suid sysdeps library @samp{-lgtop_sysdeps} to
-initialize a server. It should do all initializations that do not need any
-privileges.
-
-@example
-@cartouche
-void
-glibtop_open_s (glibtop *server, const char *program_name,
-		const unsigned long features,
-		const unsigned flags);
-@end cartouche
-@end example
-
-@table @code
-@item server
-Pointer to the @code{glibtop} server structure.
-@item program_name
-Name of the calling program; the implementation will usually
-set @samp{server->name} to this so it'll be used as the program
-name in error messages.
-@end table
-
-Typically, this function will set @code{server->name}, @code{server->ncpu} and
-@code{server->os_version_code} and initialize any of the @code{server->machine}
-fields which do not need any privileges.
-
-It is normally implemented in @file{open.c} in the sysdeps directory.
-
-@node glibtop_close_s,  , glibtop_open_s, Sysdeps Internals
-@subsection glibtop_close_s
-
-This function is used in the non-suid sysdeps library @samp{-lgtop_sysdeps} to
-clean-up a server when it's no longer used.
-
-It must free all resources that were allocated in @code{glibtop_open_s}.
-
-@example
-@cartouche
-void
-glibtop_close_s (glibtop *server);
-@end cartouche
-@end example
-
-It is normally implemented in @file{close.c} in the sysdeps directory, but may
-be empty.
-
--- a/doc/libgtop.texi
+++ b/doc/libgtop.texi
@@ -1,89 +0,0 @@
-\input texinfo   @c -*-texinfo-*-
-@c %**start of header
-@setfilename libgtop.info
-@settitle LibGTop Reference Manual
-@setchapternewpage odd
-@c %**end of header
-
-@include auto-macros.texi
-@include version.texi
-
-@ifinfo
-This is the LibGTop Reference Manual version @value{VERSION}
-(last modified @value{UPDATED}).
-
-Copyright 1999 Free Software Foundation, Inc.
-     
-Permission is granted to make and distribute verbatim
-copies of this manual provided the copyright notice and
-this permission notice are preserved on all copies.
-     
-@ignore
-Permission is granted to process this file through TeX
-and print the results, provided the printed document
-carries a copying permission notice identical to this
-one except for the removal of this paragraph (this
-paragraph not being relevant to the printed manual).
-     
-@end ignore
-Permission is granted to copy and distribute modified
-versions of this manual under the conditions for
-verbatim copying, provided also that the sections
-entitled ``Copying'' and ``GNU General Public License''
-are included exactly as in the original, and provided
-that the entire resulting derived work is distributed
-under the terms of a permission notice identical to this
-one.
-     
-Permission is granted to copy and distribute
-translations of this manual into another language,
-under the above conditions for modified versions,
-except that this permission notice may be stated in a
-translation approved by the Free Software Foundation.
-
-@format
-@dircategory Libraries:
-@direntry
-* libgtop: (libgtop).			Library to get system specific data
-					such as cpu and memory usage, active
-					processes
-@end direntry
-@end format
-
-@end ifinfo
-
-@titlepage
-@title LibGTop Reference Manual
-@subtitle Version @value{VERSION} - @value{UPDATED}
-@author Martin Baulig
-
-@page
-@vskip 0pt plus 1filll
-Copyright @copyright{} 1999 Free Software Foundation, Inc.
-
-Permission is granted to make and distribute verbatim
-copies of this manual provided the copyright notice and
-this permission notice are preserved on all copies.
-     
-Permission is granted to copy and distribute modified
-versions of this manual under the conditions for
-verbatim copying, provided also that the sections
-entitled ``Copying'' and ``GNU General Public License''
-are included exactly as in the original, and provided
-that the entire resulting derived work is distributed
-under the terms of a permission notice identical to this
-one.
-     
-Permission is granted to copy and distribute
-translations of this manual into another language,
-under the above conditions for modified versions,
-except that this permission notice may be stated in a
-translation approved by the Free Software Foundation.
-@end titlepage
-
-@contents
-
-@include main.texi
-
-@bye
-
--- a/doc/main.texi
+++ b/doc/main.texi
@@ -1,85 +0,0 @@
-@node Top, About, (dir), (dir)
-
-@menu
-* About::                       About LibGTop
-* White Paper::                 LibGTop White Paper
-* Reference Manual::            LibGTop Reference Manual
-* LibGTop Internals::           LibGTop Internals
-
- --- The Detailed Node Listing ---
-
-About LibGTop
-
-* Availability::                Where to get LibGTop
-* Supported Platforms::         Supported Platforms
-* Mailing List::                Helping with LibGTop development
-* Thanks::                      People who contributed to LibGTop
-
-LibGTop White Paper
-
-* Introduction::                Introduction
-* Overview::                    Overview
-* Servers and Daemons::         Servers and Daemons
-
-Overview
-
-* Interface Design::            Things that need to be considered
-* Server Implementation::       The LibGTop "server"
-
-LibGTop Reference Manual
-
-* System Dependent::            System Dependent Functions.
-* Common Functions::            Common Functions.
-* Library Functions::           Library Functions.
-
-System Dependent Functions
-
-* glibtop_cpu::                 CPU Usage.
-* glibtop_mem::                 Memory Usage.
-* glibtop_swap::                Swap Usage.
-* glibtop_uptime::              System Uptime.
-* glibtop_loadavg::             Load Average.
-* glibtop_proclist::            Process List.
-* glibtop_proc_state::          Process State.
-* glibtop_proc_uid::            Process UID and TTY Information.
-* glibtop_proc_mem::            Process Memory Information.
-* glibtop_proc_time::           Process Time Information.
-* glibtop_proc_signal::         Process Signal Information.
-* glibtop_proc_kernel::         Process Kernel Data Information.
-* glibtop_proc_segment::        Process Segment Information.
-* glibtop_proc_args::           Process Arguments.
-* glibtop_proc_map::            Process Memory Maps.
-* glibtop_netload::             Network Load.
-* glibtop_ppp::                 PPP Usage.
-
-Common Functions
-
-* glibtop_mountlist::           Mount List.
-* glibtop_fsusage::             File System Usage.
-
-Library Functions
-
-* glibtop_init::                Server Initialization.
-* glibtop_sysdeps::             Server Sysdeps.
-* Library Parameters::          Library Parameters.
-
-LibGTop Internals
-
-* General Internals::           General Internals
-* Sysdeps Internals::           Sysdeps Internals
-
-General Internals
-
-* glibtop::                     The server structure
-
-Sysdeps Internals
-
-* glibtop_open_s::              Non-privileged initializations
-* glibtop_close_s::             Non-privileged cleanups
-@end menu
-
-@include about.texi
-@include white-paper.texi
-@include reference.texi
-@include internals.texi
-
--- a/doc/reference.texi
+++ b/doc/reference.texi
--- a/doc/white-paper.texi
+++ b/doc/white-paper.texi
@@ -1,136 +0,0 @@
-@node White Paper, Reference Manual, About, Top
-@chapter LibGTop White Paper
-
-@menu
-* Introduction::                Introduction
-* Overview::                    Overview
-* Servers and Daemons::         Servers and Daemons
-@end menu
-
-@node Introduction, Overview, White Paper, White Paper
-@section Introduction
-
-Many modern UNIX systems like Solaris, BSD or Digitial Unix only allow
-priviledged processes to read information like CPU and Memory Usage or
-information about running processes.
-
-@itemize @bullet
-@item
-BSD, for instance, doesn't have any other way to get those data than reading
-directly from @file{/dev/kmem} and you need to be in the @code{kmem} group to
-be able to read this.
-
-@item
-Other systems, like Digital Unix, allow all users to get things like CPU and
-Memory statistics, but only root may read information about any process other
-than the current one (you may not even get information about your own processes
-if you're not root).
-
-@item
-Linux has a very nice @file{/proc} filesystem, but reading and parsing
-@file{/proc} is very slow and inefficient.
-
-@item
-Solaris is a bit better, but you still need to be in the @code{sys} group or
-even root to get some data.
-@end itemize
-
-Because of this system utilities like @code{ps}, @code{uptime} or @code{top}
-often are setgid kmem or setuid root. Usually, they're also very specific to
-the system they're written for and not easily portable to other systems without
-a lot of work.
-
-This, of cause, becomes a problem for graphical tools like @code{gtop} - making
-a GTK+ program setgid or even setuid would be a security hole as big as you can
-drive the entire X11 source code through. For the GNOME project, we also needed
-some kind of library which provides all the required information in a portable
-since there's more than just one single program that wants to use them - for
-instance @code{gtop} and the @code{multiload}, @code{cpumemusage} and
-@code{netload} panel applets.
-
-@node Overview, Servers and Daemons, Introduction, White Paper
-@section Overview
-
-This section should give you a short overview on how LibGTop was developed, which
-things needed to be considered and how it works.
-
-@menu
-* Interface Design::            Things that need to be considered
-* Server Implementation::       The LibGTop "server"
-@end menu
-
-@node Interface Design, Server Implementation, Overview, Overview
-@subsection Interface Design
-
-At the very beginning, it was necessary to collect all the data the library part
-should provide and put them into some C structures. This was not that easiy as it
-might sound since LibGTop should be portable to any modern UNIX system with a common
-library part on all those systems, but the data that should be returned vary from
-system to system. For instance some systems support shared memory, but some others
-may not.
-
-The header files where we define these C structures (which are system-independent) are
-shared between client and server. This way we can call the system dependent code
-directly where we do not need any special privileges to do so.
-
-All of those structures contain a @code{flags} member which is interpreted as a bit
-mask and tells the caller of the library functions which of the fields in the returned
-structure are valid and which are not.
-
-@node Server Implementation,  , Interface Design, Overview
-@subsection Server Implementation
-
-The LibGTop @dfn{server} is a setgid/setuid binary which contains all the system
-dependent code which needs special privileges. It is only build if it's required
-on the current system (for instance, the Linux kernel provides all the required
-data via its @file{/proc} filesystem so we do not need the server at all) and it
-only contains the @dfn{features} which need privileges.
-
-Whenever we do not need any privileges to get all the data for some of the requested
-structures (here called @dfn{features}) the library calls the sysdeps code directly
-rather than using the server.
-
-@node Servers and Daemons,  , Overview, White Paper
-@section Servers and Daemons
-
-LibGTop gives you the possibility to use different LibGTop "servers" and
-"daemons" in your application.
-
-Normally you do not need to worry about this things since LibGTop auto-
-matically opens a pipe to its server it it's required, but this can also
-be customized to fit your needs.
-
-For instance if you have a small applet which is only interested in disk
-usage there's no need to fork a separate server process since you don't
-need any privileges to get them on any of the supported systems. This can
-be archieved with a special call to @code{glibtop_init_r} on startup.
-
-There's also an option to tell @code{glibtop_init_r} that you're only
-interested in several features - for instance cpu and memory usage. In
-this case LibGTop will only fork a server process if it's required to get
-cpu and memory.
-
-You can also tell @code{glibtop_init_r} to start the server only on demand,
-this might become useful in command-line based programs. For graphical
-applications it's normally best to start the server directly during their
-initialization. The same applies for any time critical applications (since
-@code{fork} is an expensive operation on some systems this may lead to
-incorrect statistics).
-
-LibGTop also allows you to talk to a remote machine using the
-@dfn{LibGTop daemon}. This daemon is based on @code{gnuserv} from
-GNU Emacs and should be run as an unprivileged user. It has support
-for either @code{xauth} or host based authorization.
-
-This daemon itself behaves like a LibGTop client application, i.e. it
-forks a server process if this is required.
-
-The main use for this daemon is when you want to monitor a machine which
-is either very slow or has very low disk space. In this case you don't need
-to install the whole client application (for instance GTop) on the remote
-machine but only a very small (maybe also statically linked) executable and
-run the graphical application on a more powerful machine.
-
-It can also be used to monitor a remote machine over a very slow link such
-as a dialup connection since the conversation between LibGTop client and
-daemon uses much less bandwith than an ordinary X11 connection.
--- a/features.def
+++ b/features.def
@@ -1,24 +0,0 @@
-retval|cpu|ulong(total,user,nice,sys,idle,frequency,xcpu_total[GLIBTOP_NCPU],xcpu_user[GLIBTOP_NCPU],xcpu_nice[GLIBTOP_NCPU],xcpu_sys[GLIBTOP_NCPU],xcpu_idle[GLIBTOP_NCPU],xcpu_flags)
-retval|mem|ulong(total,used,free,shared,buffer,cached,user,locked)
-retval|swap|ulong(total,used,free,pagein,pageout)
-retval|uptime|double(uptime,idletime):ulong(boot_time)
-retval|loadavg|double(loadavg[3]):ulong(nr_running,nr_tasks,last_pid)
-retval|shm_limits|ulong(shmmax,shmmin,shmmni,shmseg,shmall)
-retval|msg_limits|ulong(msgpool,msgmap,msgmax,msgmnb,msgmni,msgssz,msgtql)
-retval|sem_limits|ulong(semmap,semmni,semmns,semmnu,semmsl,semopm,semume,semusz,semvmx,semaem)
-pointer(unsigned)|proclist|array|long(which,arg)
-retval|proc_state|string(cmd):unsigned(state):ulong(uid,gid,ruid,rgid,has_cpu,processor,last_processor)|pid_t(pid)
-retval|proc_uid|long(uid,euid,gid,egid,suid,sgid,fsuid,fsgid,pid,ppid,pgrp,session,tty,tpgid,priority,nice,ngroups,groups[GLIBTOP_MAX_GROUPS])|pid_t(pid)
-retval|proc_mem|long(size,vsize,resident,share,rss,rss_rlim)|pid_t(pid)
-retval|proc_time|long(start_time,rtime,utime,stime,cutime,cstime,timeout,it_real_value,frequency,xcpu_utime[GLIBTOP_NCPU],xcpu_stime[GLIBTOP_NCPU],xcpu_flags)|pid_t(pid)
-retval|proc_signal|ulong(signal[2],blocked[2],sigignore[2],sigcatch[2])|pid_t(pid)
-retval|proc_kernel|ulong(k_flags,min_flt,maj_flt,cmin_flt,cmaj_flt,kstk_esp,kstk_eip,nwchan):string(wchan)|pid_t(pid)
-retval|proc_segment|ulong(text_rss,shlib_rss,data_rss,stack_rss,dirty_size,start_code,end_code,start_data,end_data,start_brk,end_brk,start_stack,start_mmap,arg_start,arg_end,env_start,env_end)|pid_t(pid)
-pointer(string)|proc_args|array|pid_t(pid)
-array(glibtop_map_entry)|proc_map|array|pid_t(pid)
-array(glibtop_mountentry)|@mountlist|array|int(all_fs)
-retval|@fsusage|ulong(blocks,bfree,bavail,files,ffree)|string(mount_dir)
-array(glibtop_interface)|interface_names|array|ulong(interface,number,instance,strategy)
-retval|netinfo|ulong(if_flags,transport,mtu,subnet,address)|string(interface):unsigned(transport)
-retval|netload|ulong(packets_in,packets_out,packets_total,bytes_in,bytes_out,bytes_total,errors_in,errors_out,errors_total,collisions)|string(interface):unsigned(transport,protocol)
-retval|ppp|ulong(state,bytes_in,bytes_out)|ushort(device)
--- a/glibtop-server-private.h
+++ b/glibtop-server-private.h
@@ -1,43 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
-/* $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.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __GLIBTOP_SERVER_PRIVATE_H__
-#define __GLIBTOP_SERVER_PRIVATE_H__
-
-#ifdef HAVE_GLIBTOP_MACHINE_H
-#include <glibtop_machine.h>
-#endif
-
-#include <glib.h>
-
-struct _glibtop_server_private
-{
-#ifdef HAVE_GLIBTOP_MACHINE_H
-    glibtop_machine machine;	/* Machine dependent data */
-#endif
-    GSList *backend_list;
-};
-
-#endif
--- a/glibtop.h
+++ b/glibtop.h
@@ -1,99 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
-/* $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.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __GLIBTOP_H__
-#define __GLIBTOP_H__
-
-#ifndef _IN_LIBGTOP
-#include <glibtop-config.h>
-#endif
-
-#include <glibtop/global.h>
-#include <glibtop/limits.h>
-
-#include <glibtop_server.h>
-#include <glibtop/types.h>
-
-BEGIN_LIBGTOP_DECLS
-
-typedef struct _glibtop			glibtop;
-typedef struct _glibtop_server_private	glibtop_server_private;
-
-#include <glibtop/sysdeps.h>
-#include <glibtop/errors.h>
-
-#ifdef _IN_LIBGTOP
-#include <glibtop-server-private.h>
-#endif
-
-struct _glibtop
-{
-    int refcount;		/* Reference count */
-    unsigned flags;
-    unsigned method;		/* Server Method */
-    unsigned error_method;	/* Error Method */
-    int ncpu;			/* Number of CPUs, zero if single-processor */
-    unsigned long os_version_code;	/* Version code of the operating system */
-    const char *name;		/* Program name for error messages */
-    const char *server_command;	/* Command used to invoke server */
-    const char *server_host;	/* Host the server should run on */
-    const char *server_user;	/* Name of the user on the target host */
-    const char *server_rsh;	/* Command used to connect to the target host */
-    unsigned long features;	/* Server is required for this features */
-    unsigned long server_port;	/* Port on which daemon is listening */
-    glibtop_sysdeps sysdeps;	/* Detailed feature list */
-    glibtop_sysdeps required;	/* Required feature list */
-    glibtop_sysdeps wanted;	/* We only want this features */
-    glibtop_server_private *_priv;	/* Private data */
-    unsigned glibtop_errno;
-};
-
-extern glibtop *glibtop_global_server;
-
-extern const unsigned long glibtop_server_features;
-
-#define glibtop_init()	glibtop_init_r(&glibtop_global_server, 0, 0);
-
-#define glibtop_close()	glibtop_close_r(glibtop_global_server);
-
-glibtop *
-glibtop_init_r (glibtop **server_ptr,
-		unsigned long features,
-		unsigned flags);
-
-glibtop *
-glibtop_init_s (glibtop **server_ptr,
-		unsigned long features,
-		unsigned flags);
-
-void
-glibtop_server_ref (glibtop *server);
-
-void
-glibtop_server_unref (glibtop *server);
-
-END_LIBGTOP_DECLS
-
-#endif
--- a/include/.cvsignore
+++ b/include/.cvsignore
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,2 +0,0 @@
-SUBDIRS		= glibtop
-
--- a/include/glibtop/.cvsignore
+++ b/include/glibtop/.cvsignore
@@ -1,3 +0,0 @@
-Makefile
-Makefile.in
-call-vector.h
--- a/include/glibtop/Makefile.am
+++ b/include/glibtop/Makefile.am
@@ -1,23 +0,0 @@
-glibtopdir		= $(includedir)/glibtop
-
-glibtop_HEADERS		= close.h loadavg.h prockernel.h procstate.h \
-			  sem_limits.h uptime.h mem.h proclist.h \
-			  proctime.h shm_limits.h cpu.h msg_limits.h \
-			  procmem.h procuid.h swap.h error.h open.h \
-			  procsegment.h sysdeps.h xmalloc.h global.h \
-			  procsignal.h union.h types.h \
-			  parameter.h mountlist.h fsusage.h procmap.h signal.h \
-			  inodedb.h sysinfo.h ppp.h procargs.h netload.h \
-			  netinfo.h interfaces.h limits.h array.h compat_10.h \
-			  errors.h glib-arrays.h backend.h call-vector.h
-
-BUILT_SOURCES		= call-vector.h
-
-call-vector.h: call-vector.pl call-vector.h.in $(top_builddir)/config.h $(top_srcdir)/features.def $(top_srcdir)/scripts/c_types.pl
-	$(PERL) -I $(top_srcdir)/scripts $(srcdir)/call-vector.pl $(top_srcdir)/features.def $(srcdir)/call-vector.h.in > tmp-t
-	mv tmp-t call-vector.h
-
-EXTRA_DIST		= call-vector.pl call-vector.h.in
-
-CLEANFILES		= $(BUILT_SOURCES)
-
--- a/include/glibtop/array.h
+++ b/include/glibtop/array.h
@@ -1,50 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
-/* $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.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __GLIBTOP_ARRAY_H__
-#define __GLIBTOP_ARRAY_H__
-
-#include <glibtop.h>
-#include <glibtop/global.h>
-
-BEGIN_LIBGTOP_DECLS
-
-#define GLIBTOP_ARRAY_NUMBER		0
-#define GLIBTOP_ARRAY_SIZE		1
-#define GLIBTOP_ARRAY_TOTAL		2
-
-#define GLIBTOP_MAX_ARRAY		3
-
-typedef struct _glibtop_array	glibtop_array;
-
-struct _glibtop_array
-{
-    u_int64_t flags,
-	number,		/* GLIBTOP_ARRAY_NUMBER	*/
-	size,		/* GLIBTOP_ARRAY_SIZE	*/
-	total;		/* GLIBTOP_ARRAY_TOTAL	*/
-};
-
-#endif
--- a/include/glibtop/backend.h
+++ b/include/glibtop/backend.h
@@ -1,114 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
-/* $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.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __GLIBTOP_BACKEND_H__
-#define __GLIBTOP_BACKEND_H__
-
-#include <glibtop.h>
-#include <glibtop/global.h>
-
-#include <glib.h>
-
-BEGIN_LIBGTOP_DECLS
-
-typedef struct _glibtop_backend_info	glibtop_backend_info;
-typedef struct _glibtop_backend_entry	glibtop_backend_entry;
-typedef struct _glibtop_backend_module	glibtop_backend_module;
-typedef struct _glibtop_backend_private	glibtop_backend_private;
-
-typedef struct _glibtop_backend		glibtop_backend;
-
-#include <glibtop/call-vector.h>
-
-typedef int (*glibtop_backend_open_func_t) (glibtop *, glibtop_backend *,
-					    u_int64_t, const char **);
-typedef int (*glibtop_backend_close_func_t) (glibtop *, glibtop_backend *);
-
-struct _glibtop_backend_info
-{
-    const char *name;
-    glibtop_backend_open_func_t open;
-    glibtop_backend_close_func_t close;
-    glibtop_call_vector *call_vector;
-};
-
-#ifdef _IN_LIBGTOP
-
-#include <gmodule.h>
-
-/* private structure */
-struct _glibtop_backend_module
-{
-    int refcount;
-    GModule *module;
-};
-
-#endif /* _IN_LIBGTOP */
-
-struct _glibtop_backend_entry
-{
-    char *name;
-    char *libtool_name;
-    char *shlib_name;
-
-    /* This is const since you must not attempt to
-     * write into gmodule loaded memory. */
-    const glibtop_backend_info *info;
-
-    /* private pointer */
-    glibtop_backend_module *_priv;
-};
-
-struct _glibtop_backend
-{
-    const glibtop_backend_info *info;
-
-    /* private pointers */
-    glibtop_backend_private *_priv;
-    glibtop_backend_module *_priv_module;
-};
-
-long
-glibtop_register_backend (glibtop_backend_entry *entry);
-
-void
-glibtop_unregister_backend (long id);
-
-glibtop_backend_entry *
-glibtop_backend_by_id (long id);
-
-glibtop_backend_entry *
-glibtop_backend_by_name (const char *backend_name);
-
-void
-glibtop_init_backends (void);
-
-int
-glibtop_open_backend_l (glibtop *server, const char *backend_name,
-			u_int64_t features, const char **backend_args);
-
-END_LIBGTOP_DECLS
-
-#endif
--- a/include/glibtop/call-vector.h.in
+++ b/include/glibtop/call-vector.h.in
@@ -1,45 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
-/* $Id$ */
-
-@@AUTOGEN_COMMENT@@
-
-/* 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.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __GLIBTOP_CALL_VECTOR_H__
-#define __GLIBTOP_CALL_VECTOR_H__
-
-#include <glibtop.h>
-#include <glibtop/union.h>
-
-BEGIN_LIBGTOP_DECLS
-
-typedef struct _glibtop_call_vector	glibtop_call_vector;
-
-struct _glibtop_call_vector
-{
-    @@GLIBTOP_CALL_VECTOR@@
-};
-
-END_LIBGTOP_DECLS
-
-#endif
--- a/include/glibtop/call-vector.pl
+++ b/include/glibtop/call-vector.pl
@@ -1,116 +0,0 @@
-#!/usr/bin/perl
-
-require 'c_types.pl';
-
-die "Usage: $0 features.def call-vector.h.in" unless $#ARGV == 1;
-
-$[ = 1;			# set array base to 1
-$, = ' ';		# set output field separator
-$\ = "\n";		# set output record separator
-
-sub toupper {
-    local($_) = @_;
-    tr/a-z/A-Z/;
-    return $_;
-}
-
-sub tolower {
-    local($_) = @_;
-    tr/A-Z/a-z/;
-    return $_;
-}
-
-$func_decl_code = '';
-
-open FEATURESDEF, $ARGV[1] or
-  die "open ($ARGV[1]): $!";
-
-while (<FEATURESDEF>) {
-  chop;				# strip record separator
-  
-  if (/^[^\#]/) {
-    &parse_features_def ($_);
-  }
-}
-
-close FEATURESDEF;
-
-sub parse_features_def {
-  local($line) = @_;
-  @line_fields = split(/\|/, $line, 9999);
-  $retval = $line_fields[1];
-  $element_def = $line_fields[3];
-  $feature = $line_fields[2];
-  $param_def = $line_fields[4];
-
-  $orig = $feature;
-  $feature =~ s/^@//;
-  $space = $feature;
-  $space =~ s/./ /g;
-
-  if ($retval eq 'retval') {
-    $retval_param = '&retval';
-    $retval = 'int';
-  }
-  elsif ($retval !~ /^void$/) {
-    $retval_param = 'NULL';
-  }
-  else {
-    $retval_param = 'NULL';
-  }
- 
-  if ($retval =~ /^(array|pointer)\((.*)\)$/) {
-    $retval = ($2 eq 'string') ? 'char **' : "$2 *";
-  }
-
-  $param_decl = '';
-  $nr_params = (@params = split(/:/, $param_def, 9999));
-  for ($param = 1; $param <= $nr_params; $param++) {
-    $list = $params[$param];
-    $type = $params[$param];
-    $type =~ s/\(.*//;
-    $list =~ s/^.*\(//;
-    $list =~ s/\)$//;
-    $count = (@fields = split(/,/, $list, 9999));
-    for ($field = 1; $field <= $count; $field++) {
-      my $c_type = $typeinfo->{$type}->[1];
-
-      $param_decl = $param_decl . ', ';
-      $param_decl = $param_decl . $c_type;
-    }
-  }
-
-  if ($line_fields[3] eq '') {
-    $func_decl_code .= sprintf
-      (qq[\t%s (*%s) (glibtop *, glibtop_backend *%s);\n], $retval, $feature, $param_decl);
-  } elsif ($line_fields[3] eq 'array') {
-    $func_decl_code .= sprintf
-      (qq[\t%s (*%s) (glibtop *, glibtop_backend *, glibtop_array *%s);\n], $retval, $feature, $param_decl);
-  } elsif ($line_fields[3] =~ /^array/) {
-    $func_decl_code .= sprintf
-      (qq[\t%s (*%s) (glibtop *, glibtop_backend *, glibtop_array *, %s *%s);\n], $retval, $feature, 'glibtop_'.$feature, $param_decl);
-  } else {
-    $func_decl_code .= sprintf
-      (qq[\t%s (*%s) (glibtop *, glibtop_backend *, %s *%s);\n], $retval, $feature, 'glibtop_'.$feature, $param_decl);
-  }
-}
-
-chop $func_decl_code;
-
-$auto_gen_comment = sprintf
-  (qq[/*\n * This file is automatically generated.\n * Please modify `call-vector.pl' and `call-vector.h.in'.\n */]);
-
-open CALLVECTOR, $ARGV[2] or
-  die "open ($ARGV[2]): $!";
-
-while (<CALLVECTOR>) {
-  chop;
-
-  s/^\s*\@\@GLIBTOP_CALL_VECTOR\@\@\s*$/$func_decl_code/;
-
-  s/^\s*\@\@AUTOGEN_COMMENT\@\@\s*$/$auto_gen_comment/;
-} continue {
-  print $_;
-}
-
-close CALLVECTOR;
--- a/include/glibtop/close.h
+++ b/include/glibtop/close.h
@@ -1,40 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
-/* $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.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __GLIBTOP_CLOSE_H__
-#define __GLIBTOP_CLOSE_H__
-
-#include <glibtop.h>
-
-BEGIN_LIBGTOP_DECLS
-
-void glibtop_close_r (glibtop *server);
-
-void glibtop_close_s (glibtop *server);
-void glibtop_close_p (glibtop *server);
-
-END_LIBGTOP_DECLS
-
-#endif
--- a/include/glibtop/compat_10.h
+++ b/include/glibtop/compat_10.h
@@ -1,91 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
-/* $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.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __GLIBTOP_COMPAT10_H__
-#define __GLIBTOP_COMPAT10_H__
-
-#include <glibtop.h>
-#include <glibtop/global.h>
-
-BEGIN_LIBGTOP_DECLS
-
-/* glibtop_cpu */
-
-#define GLIBTOP_XCPU_TOTAL		GLIBTOP_CPU_XCPU_TOTAL
-#define GLIBTOP_XCPU_USER		GLIBTOP_CPU_XCPU_USER
-#define GLIBTOP_XCPU_NICE		GLIBTOP_CPU_XCPU_NICE
-#define GLIBTOP_XCPU_SYS		GLIBTOP_CPU_XCPU_SYS
-#define GLIBTOP_XCPU_IDLE		GLIBTOP_CPU_XCPU_IDLE
-#define GLIBTOP_XCPU_FLAGS		GLIBTOP_CPU_XCPU_FLAGS
-
-/* glibtop_proclist */
-
-#define GLIBTOP_PROCLIST_NUMBER		GLIBTOP_ARRAY_NUMBER
-#define GLIBTOP_PROCLIST_SIZE		GLIBTOP_ARRAY_SIZE
-#define GLIBTOP_PROCLIST_TOTAL		GLIBTOP_ARRAY_TOTAL
-
-#define GLIBTOP_MAX_PROCLIST		GLIBTOP_MAX_ARRAY
-
-typedef struct _glibtop_array		glibtop_proclist;
-
-/* glibtop_mountlist */
-
-#define GLIBTOP_MOUNTLIST_NUMBER	GLIBTOP_ARRAY_NUMBER
-#define GLIBTOP_MOUNTLIST_SIZE		GLIBTOP_ARRAY_SIZE
-#define GLIBTOP_MOUNTLIST_TOTAL		GLIBTOP_ARRAY_TOTAL
-
-#define GLIBTOP_MAX_MOUNTLIST		GLIBTOP_MAX_ARRAY
-
-typedef struct _glibtop_array		glibtop_mountlist;
-
-/* glibtop_proc_args */
-
-#define GLIBTOP_PROC_ARGS_SIZE		0
-
-#define GLIBTOP_MAX_PROC_ARGS		1
-
-typedef struct _glibtop_array		glibtop_proc_args;
-
-/* glibtop_proc_map */
-
-#define GLIBTOP_PROC_MAP_NUMBER		GLIBTOP_ARRAY_NUMBER
-#define GLIBTOP_PROC_MAP_SIZE		GLIBTOP_ARRAY_SIZE
-#define GLIBTOP_PROC_MAP_TOTAL		GLIBTOP_ARRAY_TOTAL
-
-#define GLIBTOP_MAX_PROC_MAP		GLIBTOP_MAX_ARRAY
-
-typedef struct _glibtop_array		glibtop_proc_map;
-
-/* glibtop_interface_names */
-
-#define GLIBTOP_INTERFACE_NAMES_NUMBER	GLIBTOP_ARRAY_NUMBER
-#define GLIBTOP_INTERFACE_NAMES_SIZE	GLIBTOP_ARRAY_SIZE
-#define GLIBTOP_INTERFACE_NAMES_TOTAL	GLIBTOP_ARRAY_TOTAL
-
-#define GLIBTOP_MAX_INTERFACE_NAMES	GLIBTOP_MAX_ARRAY
-
-typedef struct _glibtop_array		glibtop_interface_names;
-
-#endif
--- a/include/glibtop/cpu.h
+++ b/include/glibtop/cpu.h
@@ -1,100 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
-/* $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.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __GLIBTOP_CPU_H__
-#define __GLIBTOP_CPU_H__
-
-#include <glibtop.h>
-#include <glibtop/global.h>
-
-BEGIN_LIBGTOP_DECLS
-
-#define GLIBTOP_CPU_TOTAL	0
-#define GLIBTOP_CPU_USER	1
-#define GLIBTOP_CPU_NICE	2
-#define GLIBTOP_CPU_SYS		3
-#define GLIBTOP_CPU_IDLE	4
-#define GLIBTOP_CPU_FREQUENCY	5
-
-#define GLIBTOP_CPU_XCPU_TOTAL	6
-#define GLIBTOP_CPU_XCPU_USER	7
-#define GLIBTOP_CPU_XCPU_NICE	8
-#define GLIBTOP_CPU_XCPU_SYS	9
-#define GLIBTOP_CPU_XCPU_IDLE	10
-#define GLIBTOP_CPU_XCPU_FLAGS	11
-
-#define GLIBTOP_MAX_CPU		12
-
-typedef struct _glibtop_cpu	glibtop_cpu;
-
-struct _glibtop_cpu
-{
-    u_int64_t	flags,
-	total,				/* GLIBTOP_CPU_TOTAL		*/
-	user,				/* GLIBTOP_CPU_USER		*/
-	nice,				/* GLIBTOP_CPU_NICE		*/
-	sys,				/* GLIBTOP_CPU_SYS		*/
-	idle,				/* GLIBTOP_CPU_IDLE		*/
-	frequency,			/* GLIBTOP_CPU_FREQUENCY	*/
-	xcpu_total [GLIBTOP_NCPU],	/* GLIBTOP_CPU_XCPU_TOTAL	*/
-	xcpu_user [GLIBTOP_NCPU],	/* GLIBTOP_CPU_XCPU_USER	*/
-	xcpu_nice [GLIBTOP_NCPU],	/* GLIBTOP_CPU_XCPU_NICE	*/
-	xcpu_sys  [GLIBTOP_NCPU],	/* GLIBTOP_CPU_XCPU_SYS		*/
-	xcpu_idle [GLIBTOP_NCPU],	/* GLIBTOP_CPU_XCPU_IDLE	*/
-	xcpu_flags;			/* GLIBTOP_CPU_XCPU_FLAGS	*/
-};
-
-#define glibtop_get_cpu(cpu)	glibtop_get_cpu_l(glibtop_global_server, cpu)
-
-#if GLIBTOP_SUID_CPU
-#define glibtop_get_cpu_r	glibtop_get_cpu_p
-#else
-#define glibtop_get_cpu_r	glibtop_get_cpu_s
-#endif
-
-int glibtop_get_cpu_l (glibtop *server, glibtop_cpu *buf);
-
-#if GLIBTOP_SUID_CPU
-int glibtop_init_cpu_p (glibtop *server);
-int glibtop_get_cpu_p (glibtop *server, glibtop_cpu *buf);
-#else
-int glibtop_init_cpu_s (glibtop *server);
-int glibtop_get_cpu_s (glibtop *server, glibtop_cpu *buf);
-#endif
-
-#ifdef GLIBTOP_NAMES
-
-/* You need to link with -lgtop_names to get this stuff here. */
-
-extern const char *glibtop_names_cpu [];
-extern const unsigned glibtop_types_cpu [];
-extern const char *glibtop_labels_cpu [];
-extern const char *glibtop_descriptions_cpu [];
-
-#endif
-
-END_LIBGTOP_DECLS
-
-#endif
--- a/include/glibtop/error.h
+++ b/include/glibtop/error.h
@@ -1,138 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
-/* $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.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __GLIBTOP_ERROR_H__
-#define __GLIBTOP_ERROR_H__
-
-#include <glibtop.h>
-
-BEGIN_LIBGTOP_DECLS
-
-#ifndef G_GNUC_UNUSED
-#if	__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4)
-#define G_GNUC_UNUSED				\
-  __attribute__((unused))
-#else	/* !__GNUC__ */
-#define	G_GNUC_UNUSED
-#endif	/* !__GNUC__ */
-#endif /* defined G_GNUC_UNUSED */
-
-void glibtop_error_vr (glibtop *server, char *format, va_list args);
-void glibtop_warn_vr (glibtop *server, char *format, va_list args);
-
-void glibtop_error_io_vr (glibtop *server, char *format, int, va_list args);
-void glibtop_warn_io_vr (glibtop *server, char *format, int, va_list args);
-
-static void G_GNUC_UNUSED
-glibtop_error_r (glibtop *server, char *format, ...)
-{
-    va_list args;
-
-    va_start (args, format);
-    glibtop_error_vr (server, format, args);
-    va_end (args);
-}
-
-static void G_GNUC_UNUSED
-glibtop_warn_r (glibtop *server, char *format, ...)
-{
-    va_list args;
-
-    va_start (args, format);
-    glibtop_warn_vr (server, format, args);
-    va_end (args);
-}
-
-static void G_GNUC_UNUSED
-glibtop_error_io_r (glibtop *server, char *format, ...)
-{
-    va_list args;
-
-    va_start (args, format);
-    glibtop_error_io_vr (server, format, errno, args);
-    va_end (args);
-}
-
-static void G_GNUC_UNUSED
-glibtop_warn_io_r (glibtop *server, char *format, ...)
-{
-    va_list args;
-
-    va_start (args, format);
-    glibtop_warn_io_vr (server, format, errno, args);
-    va_end (args);
-}
-
-#ifdef  __GNUC__
-
-#define glibtop_error(p1, args...)	glibtop_error_r(glibtop_global_server , p1 , ## args)
-#define glibtop_warn(p1, args...)	glibtop_warn_r(glibtop_global_server , p1 , ## args)
-
-#define glibtop_error_io(p1, args...)	glibtop_error_io_r(glibtop_global_server , p1 , ## args)
-#define glibtop_warn_io(p1, args...)	glibtop_warn_io_r(glibtop_global_server , p1 , ## args)
-
-#else /* no __GNUC__ */
-
-static void
-glibtop_error (char *format, ...)
-{
-    va_list args;
-    va_start (args, format);
-    glibtop_error_vr (glibtop_global_server, format, args);
-    va_end (args);
-}
-
-static void
-glibtop_warn (char *format, ...)
-{
-    va_list args;
-    va_start (args, format);
-    glibtop_warn_vr (glibtop_global_server, format, args);
-    va_end (args);
-}
-
-static void
-glibtop_error_io (char *format, ...)
-{
-    va_list args;
-    va_start (args, format);
-    glibtop_error_io_vr (glibtop_global_server, format, errno, args);
-    va_end (args);
-}
-
-static void
-glibtop_warn_io (char *format, ...)
-{
-    va_list args;
-    va_start (args, format);
-    glibtop_warn_io_vr (glibtop_global_server, format, errno, args);
-    va_end (args);
-}
-
-#endif /* no __GNUC__ */
-
-END_LIBGTOP_DECLS
-
-#endif
--- a/include/glibtop/errors.h
+++ b/include/glibtop/errors.h
@@ -1,66 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
-/* $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.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __GLIBTOP_ERRORS_H__
-#define __GLIBTOP_ERRORS_H__
-
-#include <glibtop.h>
-
-BEGIN_LIBGTOP_DECLS
-
-#define GLIBTOP_ERROR_NO_ERROR			0
-#define GLIBTOP_ERROR_UNKNOWN			1
-#define GLIBTOP_ERROR_INVALID_ARGUMENT		2
-#define GLIBTOP_ERROR_NO_SUCH_PARAMETER		3
-#define GLIBTOP_ERROR_READONLY_VALUE		4
-#define GLIBTOP_ERROR_SIZE_MISMATCH		5
-
-#define GLIBTOP_ERROR_SERVER_COMM_FAILURE	6
-
-#define GLIBTOP_ERROR_NO_SUCH_PROCESS		7
-
-#define GLIBTOP_ERROR_NO_KERNEL_SUPPORT		8
-#define GLIBTOP_ERROR_INCOMPATIBLE_KERNEL	9
-
-#define GLIBTOP_ERROR_NO_SUCH_BACKEND		10
-#define GLIBTOP_ERROR_NOT_IMPLEMENTED		11
-#define GLIBTOP_ERROR_NO_BACKEND_OPENED		12
-
-#define GLIBTOP_ERROR_DEMARSHAL_ERROR		13
-
-#define GLIBTOP_MAX_ERROR			14
-
-char *
-glibtop_get_error_string_l (glibtop *server, unsigned error_number);
-
-unsigned
-glibtop_get_errno_l (glibtop *server);
-
-unsigned
-glibtop_clear_errno_l (glibtop *server);
-
-END_LIBGTOP_DECLS
-
-#endif
--- a/include/glibtop/fsusage.h
+++ b/include/glibtop/fsusage.h
@@ -1,74 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
-/* $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.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __GLIBTOP_FSUSAGE_H__
-#define __GLIBTOP_FSUSAGE_H__
-
-#include <glibtop.h>
-#include <glibtop/global.h>
-
-BEGIN_LIBGTOP_DECLS
-
-#define GLIBTOP_FSUSAGE_BLOCKS		0
-#define GLIBTOP_FSUSAGE_BFREE		1
-#define GLIBTOP_FSUSAGE_BAVAIL		2
-#define GLIBTOP_FSUSAGE_FILES		3
-#define GLIBTOP_FSUSAGE_FFREE		4
-
-#define GLIBTOP_MAX_FSUSAGE		5
-
-typedef struct _glibtop_fsusage		glibtop_fsusage;
-
-struct _glibtop_fsusage
-{
-    u_int64_t	flags,
-	blocks,		/* Total blocks. */
-	bfree,		/* Free blocks available to superuser. */
-	bavail,		/* Free blocks available to non-superuser. */
-	files,		/* Total file nodes. */
-	ffree;		/* Free file nodes. */
-};
-
-#define glibtop_get_fsusage(fsusage,disk)	glibtop_get_fsusage_l(glibtop_global_server, fsusage, disk)
-
-#define glibtop_get_fsusage_r		glibtop_get_fsusage_s
-
-int glibtop_get_fsusage_l (glibtop *server, glibtop_fsusage *buf, const char *mount_dir);
-int glibtop_get_fsusage_s (glibtop *server, glibtop_fsusage *buf, const char *mount_dir);
-
-#ifdef GLIBTOP_NAMES
-
-/* You need to link with -lgtop_names to get this stuff here. */
-
-extern const char *glibtop_names_fsusage [];
-extern const unsigned glibtop_types_fsusage [];
-extern const char *glibtop_labels_fsusage [];
-extern const char *glibtop_descriptions_fsusage [];
-
-#endif
-
-END_LIBGTOP_DECLS
-
-#endif
--- a/include/glibtop/glib-arrays.h
+++ b/include/glibtop/glib-arrays.h
@@ -1,59 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
-/* $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.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __GLIBTOP_GLIB_ARRAYS_H__
-#define __GLIBTOP_GLIB_ARRAYS_H__
-
-#include <glibtop.h>
-#include <glibtop/array.h>
-#include <glibtop/global.h>
-#include <glibtop/xmalloc.h>
-
-#include <glib.h>
-
-BEGIN_LIBGTOP_DECLS
-
-#define glibtop_get_proc_args_as_array(pid) glibtop_get_proc_args_as_array_l(glibtop_global_server, pid)
-
-GPtrArray *
-glibtop_get_proc_args_as_array_l (glibtop *server, pid_t pid);
-
-#define glibtop_get_proclist_as_array(which,arg) glibtop_get_proclist_as_array_l(glibtop_global_server, which, arg)
-
-GArray *
-glibtop_get_proclist_as_array_l (glibtop *server, int64_t which, int64_t arg);
-
-#define glibtop_get_proc_map_as_array(pid) glibtop_get_proc_map_as_array_l(glibtop_global_server, pid)
-
-GPtrArray *
-glibtop_get_proc_map_as_array_l (glibtop *server, pid_t pid);
-
-#define glibtop_get_mountlist_as_array(all_fs) glibtop_get_mountlist_as_array_l(glibtop_global_server, all_fs)
-
-GPtrArray *
-glibtop_get_mountlist_as_array_l (glibtop *server, int all_fs);
-
-END_LIBGTOP_DECLS
-#endif
--- a/include/glibtop/global.h
+++ b/include/glibtop/global.h
@@ -1,144 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
-/* $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.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __GLIBTOP_GLOBAL_H__
-#define __GLIBTOP_GLOBAL_H__
-
-#ifdef _IN_LIBGTOP
-#include <config.h>
-#endif
-
-/*
- * All declarations are enclosed in BEGIN_LIBGTOP_DECLS and
- * END_LIBGTOP_DECLS so that C++ compilers don't mangle their names.
- *
- */
-   
-#undef BEGIN_LIBGTOP_DECLS
-#undef END_LIBGTOP_DECLS
-#ifdef __cplusplus
-# define BEGIN_LIBGTOP_DECLS extern "C" {
-# define END_LIBGTOP_DECLS }
-#else
-# define BEGIN_LIBGTOP_DECLS /* empty */
-# define END_LIBGTOP_DECLS /* empty */
-#endif
-
-#ifdef _IN_LIBGTOP
-
-/* Provide macros to feature the GCC function attribute.
- */
-#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4)
-#define G_GNUC_NORETURN				\
-  __attribute__((noreturn))
-#define G_GNUC_CONST				\
-  __attribute__((const))
-#define G_GNUC_UNUSED				\
-  __attribute__((unused))
-#else	/* !__GNUC__ */
-#define G_GNUC_NORETURN
-#define G_GNUC_CONST
-#define	G_GNUC_UNUSED
-#endif	/* !__GNUC__ */
-
-#endif /* _IN_LIBGTOP */
-
-#if TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# if HAVE_SYS_TIME_H
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
-#endif
-
-#ifdef NEED_GNOMESUPPORT_H
-#include <gnomesupport.h>
-#endif
-
-#ifdef WITHOUT_GUILE
-#undef GLIBTOP_GUILE
-#undef GLIBTOP_GUILE_NAMES
-#endif
-
-#ifdef GLIBTOP_GUILE
-#include <guile/gh.h>
-#endif
-
-#ifdef _IN_LIBGTOP
-#if (defined HAVE_LIBINTL_H) || (defined HAVE_GETTEXT)
-#include <libintl.h>
-#else
-#include <libgettext.h>
-#endif
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <stdarg.h>
-
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-#ifdef HAVE_MEMORY_H
-#include <memory.h>
-#endif
-
-#include <string.h>
-#include <sys/types.h>
-
-#ifdef _IN_LIBGTOP
-
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-
-#endif /* _IN_LIBGTOP */
-
-#include <signal.h>
-#include <errno.h>
-
-#ifdef _IN_LIBGTOP
-
-BEGIN_LIBGTOP_DECLS
-
-#ifndef _
-#define _(String) dgettext (LIBGTOP_PACKAGE, String)
-#define N_(String) (String)
-#endif
-
-#ifndef HAVE_STRERROR
-char *strerror (int errno);
-#endif
-
-END_LIBGTOP_DECLS
-
-#endif /* _IN_LIBGTOP */
-
-#endif
--- a/include/glibtop/inodedb.h
+++ b/include/glibtop/inodedb.h
@@ -1,69 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
-/* 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.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __GLIBTOP_INODEDB_H__
-#define __GLIBTOP_INODEDB_H__
-
-#include <glibtop.h>
-#include <gdbm.h>
-
-#define GLIBTOP_INODEDB_SYSTEM		1
-#define GLIBTOP_INODEDB_USER		2
-#define GLIBTOP_INODEDB_CACHE		4
-
-#define GLIBTOP_INODEDB_ALL		7
-
-BEGIN_LIBGTOP_DECLS
-
-typedef struct _glibtop_inodedb		glibtop_inodedb;
-
-typedef struct _glibtop_inodedb_key	glibtop_inodedb_key;
-
-struct _glibtop_inodedb_key
-{
-    u_int64_t device, inode;
-};
-
-struct _glibtop_inodedb
-{
-    GDBM_FILE system_dbf, user_dbf;
-};
-
-#define glibtop_inodedb_open(p1,p2)	glibtop_inodedb_open_s(glibtop_global_server, p1, p2)
-#define glibtop_inodedb_lookup(p1,p2,p3) glibtop_inodedb_lookup_s(glibtop_global_server, p1, p2, p3)
-#define glibtop_inodedb_close(p1)	glibtop_inodedb_close_s(glibtop_global_server)
-
-glibtop_inodedb *
-glibtop_inodedb_open_s (glibtop *server, unsigned databases, unsigned long cache_size);
-
-const char *
-glibtop_inodedb_lookup_s (glibtop *server,
-			  glibtop_inodedb *inodedb,
-			  u_int64_t device, u_int64_t inode);
-
-void
-glibtop_inodedb_close_s (glibtop *server, glibtop_inodedb *inodedb);
-
-END_LIBGTOP_DECLS
-
-#endif
--- a/include/glibtop/interfaces.h
+++ b/include/glibtop/interfaces.h
@@ -1,173 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
-/* $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.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __GLIBTOP_INTERFACES_H__
-#define __GLIBTOP_INTERFACES_H__
-
-#include <glibtop.h>
-#include <glibtop/global.h>
-
-#include <glibtop/compat_10.h>
-#include <glibtop/array.h>
-
-BEGIN_LIBGTOP_DECLS
-
-#define GLIBTOP_INTERFACE_IF_FLAGS	0
-#define GLIBTOP_INTERFACE_TRANSPORT	1
-#define GLIBTOP_INTERFACE_TYPE		2
-#define GLIBTOP_INTERFACE_NUMBER	3
-#define GLIBTOP_INTERFACE_INSTANCE	4
-#define GLIBTOP_INTERFACE_NUM_LOGICAL	5
-#define GLIBTOP_INTERFACE_NAME		6
-
-#define GLIBTOP_MAX_INTERFACE		7
-
-typedef struct _glibtop_interface	glibtop_interface;
-
-typedef enum _glibtop_interface_type	glibtop_interface_type;
-typedef enum _glibtop_transport		glibtop_transport;
-typedef enum _glibtop_protocol		glibtop_protocol;
-
-typedef enum _glibtop_strategy		glibtop_strategy;
-typedef enum _glibtop_interface_flags	glibtop_interface_flags;
-
-enum _glibtop_protocol {
-    GLIBTOP_PROTOCOL_OTHERS	= 0,
-    GLIBTOP_PROTOCOL_ICMP	= 1 << 0,
-    GLIBTOP_PROTOCOL_TCP	= 1 << 1,
-    GLIBTOP_PROTOCOL_UDP	= 1 << 2,
-    GLIBTOP_PROTOCOL_IGMP	= 1 << 3,
-    GLIBTOP_PROTOCOL_RAW	= 1 << 4,
-    GLIBTOP_PROTOCOL_ICMP6	= 1 << 5,
-    GLIBTOP_PROTOCOL_TCP6	= 1 << 6,
-    GLIBTOP_PROTOCOL_UDP6	= 1 << 7,
-    GLIBTOP_PROTOCOL_IGMP6	= 1 << 8,
-    GLIBTOP_PROTOCOL_RAW6	= 1 << 9
-};
-
-enum _glibtop_transport {
-    GLIBTOP_TRANSPORT_DEFAULT	= 0,
-    GLIBTOP_TRANSPORT_IPV4	= 1 << 0,
-    GLIBTOP_TRANSPORT_IPV6	= 1 << 1,
-    GLIBTOP_TRANSPORT_IPX	= 1 << 2,
-    GLIBTOP_TRANSPORT_X25	= 1 << 3,
-    GLIBTOP_TRANSPORT_DECNET	= 1 << 4,
-    GLIBTOP_TRANSPORT_APPLETALK	= 1 << 5,
-    GLIBTOP_TRANSPORT_NETBEUI	= 1 << 6,
-};
-
-#define GLIBTOP_TRANSPORT_ALL	GLIBTOP_UNLIMITED
-#define GLIBTOP_PROTOCOL_ALL	GLIBTOP_UNLIMITED
-
-enum _glibtop_interface_type {
-    GLIBTOP_INTERFACE_ALL		= 0,
-    GLIBTOP_INTERFACE_OTHER,
-    /* Network interfaces */
-    GLIBTOP_INTERFACE_ETHERNET		= 101,
-    GLIBTOP_INTERFACE_FDDI,
-    GLIBTOP_INTERFACE_FRAME_RELAY,
-    GLIBTOP_INTERFACE_TOKEN_RING,
-    GLIBTOP_INTERFACE_ARCNET,
-    GLIBTOP_INTERFACE_ATM,
-    /* Dummy interfaces */
-    GLIBTOP_INTERFACE_LOOPBACK		= 501,
-    GLIBTOP_INTERFACE_DUMMY,
-    /* Dialup interfaces */
-    GLIBTOP_INTERFACE_PARA		= 801,
-    GLIBTOP_INTERFACE_SLIP,
-    GLIBTOP_INTERFACE_PPP,
-    GLIBTOP_INTERFACE_ISDN
-};
-
-enum _glibtop_strategy {
-    GLIBTOP_INTERFACES_ALL		= 0,
-    GLIBTOP_INTERFACES_BEST_MATCHING,
-    GLIBTOP_INTERFACES_ONLY_THIS_ONE,
-    GLIBTOP_INTERFACES_INCLUDE_LOGICAL	= 1 << 7,
-};
-
-enum _glibtop_interface_flags {
-    GLIBTOP_IF_FLAGS_UP = 1,
-    GLIBTOP_IF_FLAGS_BROADCAST,
-    GLIBTOP_IF_FLAGS_DEBUG,
-    GLIBTOP_IF_FLAGS_LOOPBACK,
-    GLIBTOP_IF_FLAGS_POINTOPOINT,
-    GLIBTOP_IF_FLAGS_RUNNING,
-    GLIBTOP_IF_FLAGS_NOARP,
-    GLIBTOP_IF_FLAGS_PROMISC,
-    GLIBTOP_IF_FLAGS_ALLMULTI,
-    GLIBTOP_IF_FLAGS_OACTIVE,
-    GLIBTOP_IF_FLAGS_SIMPLEX,
-    GLIBTOP_IF_FLAGS_LINK0,
-    GLIBTOP_IF_FLAGS_LINK1,
-    GLIBTOP_IF_FLAGS_LINK2,
-    GLIBTOP_IF_FLAGS_ALTPHYS,
-    GLIBTOP_IF_FLAGS_MULTICAST
-};
-
-struct _glibtop_interface
-{
-    u_int64_t	flags,
-	if_flags,		/* GLIBTOP_INTERFACE_IF_FLAGS		*/
-	transport,		/* GLIBTOP_INTERFACE_TRANSPORT		*/
-	type,			/* GLIBTOP_INTERFACE_TYPE		*/
-	number,			/* GLIBTOP_INTERFACE_NUMBER		*/
-	instance,		/* GLIBTOP_INTERFACE_INSTANCE		*/
-	num_logical;		/* GLIBTOP_INTERFACE_NUM_LOGICAL	*/
-    char name [GLIBTOP_INTERFACE_LEN];
-};
-
-#define glibtop_get_interface_names(array,interface,number,instance,strategy) glibtop_get_interface_names_l (glibtop_global_server, array, interface, number, instance, strategy)
-
-#if GLIBTOP_SUID_INTERFACE_NAMES
-#define glibtop_get_interface_names_r	glibtop_get_interface_names_p
-#else
-#define glibtop_get_interface_names_r	glibtop_get_interface_names_s
-#endif
-
-glibtop_interface *glibtop_get_interface_names_l (glibtop *server, glibtop_array *array, u_int64_t interface, u_int64_t number, u_int64_t instance, u_int64_t strategy);
-
-#if GLIBTOP_SUID_INTERFACE_NAMES
-int glibtop_init_interface_names_p (glibtop *server);
-glibtop_interface *glibtop_get_interface_names_p (glibtop *server, glibtop_array *array, u_int64_t interface, u_int64_t number, u_int64_t instance, u_int64_t strategy);
-#else
-int glibtop_init_interface_names_s (glibtop *server);
-glibtop_interface *glibtop_get_interface_names_s (glibtop *server, glibtop_array *array, u_int64_t interface, u_int64_t number, u_int64_t instance, u_int64_t strategy);
-#endif
-
-#ifdef GLIBTOP_NAMES
-
-/* You need to link with -lgtop_names to get this stuff here. */
-
-extern const char *glibtop_names_interface_names [];
-extern const unsigned glibtop_types_interface_names [];
-extern const char *glibtop_labels_interface_names [];
-extern const char *glibtop_descriptions_interface_names [];
-
-#endif
-
-END_LIBGTOP_DECLS
-
-#endif
--- a/include/glibtop/limits.h
+++ b/include/glibtop/limits.h
@@ -1,53 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
-/* $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.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __GLIBTOP_LIMITS_H__
-#define __GLIBTOP_LIMITS_H__
-
-#include <glibtop/global.h>
-
-BEGIN_LIBGTOP_DECLS
-
-/* Nobody should really be using more than 64 processors. */
-#define GLIBTOP_NCPU		64
-
-/* Maximum number of process groups in glibtop_proc_uid. */
-#define GLIBTOP_MAX_GROUPS	32
-
-/* Maximum length of a mountpoint/device name in glibtop_mountlist. */
-#define GLIBTOP_MOUNTENTRY_LEN	79
-
-/* Maximum length of a network interface name. */
-#define GLIBTOP_INTERFACE_LEN	32
-
-/* This is ((u_int64_t)-1) */
-#define GLIBTOP_UNLIMITED	(~(u_int64_t)0)
-
-/* Maximum length of a backend name. */
-#define GLIBTOP_BACKEND_NAME_LEN	40
-
-END_LIBGTOP_DECLS
-
-#endif
--- a/include/glibtop/loadavg.h
+++ b/include/glibtop/loadavg.h
@@ -1,83 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
-/* $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.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __GLIBTOP_LOADAVG_H__
-#define __GLIBTOP_LOADAVG_H__
-
-#include <glibtop.h>
-#include <glibtop/global.h>
-
-BEGIN_LIBGTOP_DECLS
-
-#define GLIBTOP_LOADAVG_LOADAVG		0
-#define GLIBTOP_LOADAVG_NR_RUNNING	1
-#define GLIBTOP_LOADAVG_NR_TASKS	2
-#define GLIBTOP_LOADAVG_LAST_PID	3
-
-#define GLIBTOP_MAX_LOADAVG		4
-
-typedef struct _glibtop_loadavg	glibtop_loadavg;
-
-struct _glibtop_loadavg
-{
-    u_int64_t flags;
-    double loadavg [3];		/* GLIBTOP_LOADAVG_LOADAVG	*/
-    u_int64_t nr_running,	/* GLIBTOP_LOADAVG_NR_RUNNING	*/
-	nr_tasks,		/* GLIBTOP_LOADAVG_NR_TASKS	*/
-	last_pid;		/* GLIBTOP_LOADAVG_LAST_PID	*/
-};
-
-#define glibtop_get_loadavg(loadavg)	glibtop_get_loadavg_l(glibtop_global_server, loadavg)
-
-#if GLIBTOP_SUID_LOADAVG
-#define glibtop_get_loadavg_r		glibtop_get_loadavg_p
-#else
-#define glibtop_get_loadavg_r		glibtop_get_loadavg_s
-#endif
-
-int glibtop_get_loadavg_l (glibtop *server, glibtop_loadavg *buf);
-
-#if GLIBTOP_SUID_LOADAVG
-int glibtop_init_loadavg_p (glibtop *server);
-int glibtop_get_loadavg_p (glibtop *server, glibtop_loadavg *buf);
-#else
-int glibtop_init_loadavg_s (glibtop *server);
-int glibtop_get_loadavg_s (glibtop *server, glibtop_loadavg *buf);
-#endif
-
-#ifdef GLIBTOP_NAMES
-
-/* You need to link with -lgtop_names to get this stuff here. */
-
-extern const char *glibtop_names_loadavg [];
-extern const unsigned glibtop_types_loadavg [];
-extern const char *glibtop_labels_loadavg [];
-extern const char *glibtop_descriptions_loadavg [];
-
-#endif
-
-END_LIBGTOP_DECLS
-
-#endif
--- a/include/glibtop/mem.h
+++ b/include/glibtop/mem.h
@@ -1,91 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
-/* $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.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __GLIBTOP_MEM_H__
-#define __GLIBTOP_MEM_H__
-
-#include <glibtop.h>
-#include <glibtop/global.h>
-
-BEGIN_LIBGTOP_DECLS
-
-#define GLIBTOP_MEM_TOTAL	0
-#define GLIBTOP_MEM_USED	1
-#define GLIBTOP_MEM_FREE	2
-#define GLIBTOP_MEM_SHARED	3
-#define GLIBTOP_MEM_BUFFER	4
-#define GLIBTOP_MEM_CACHED	5
-#define GLIBTOP_MEM_USER	6
-#define GLIBTOP_MEM_LOCKED	7
-
-#define GLIBTOP_MAX_MEM		8
-
-typedef struct _glibtop_mem	glibtop_mem;
-
-struct _glibtop_mem
-{
-    u_int64_t	flags,
-	total,		/* GLIBTOP_MEM_TOTAL	*/
-	used,		/* GLIBTOP_MEM_USED	*/
-	free,		/* GLIBTOP_MEM_FREE	*/
-	shared,		/* GLIBTOP_MEM_SHARED	*/
-	buffer,		/* GLIBTOP_MEM_BUFFER	*/
-	cached,		/* GLIBTOP_MEM_CACHED	*/
-	user,		/* GLIBTOP_MEM_USER	*/
-	locked;		/* GLIBTOP_MEM_LOCKED	*/
-};
-
-#define glibtop_get_mem(mem)	glibtop_get_mem_l(glibtop_global_server, mem)
-
-#if GLIBTOP_SUID_MEM
-#define glibtop_get_mem_r		glibtop_get_mem_p
-#else
-#define glibtop_get_mem_r		glibtop_get_mem_s
-#endif
-
-int glibtop_get_mem_l (glibtop *server, glibtop_mem *buf);
-
-#if GLIBTOP_SUID_MEM
-int glibtop_init_mem_p (glibtop *server);
-int glibtop_get_mem_p (glibtop *server, glibtop_mem *buf);
-#else
-int glibtop_init_mem_s (glibtop *server);
-int glibtop_get_mem_s (glibtop *server, glibtop_mem *buf);
-#endif
-
-#ifdef GLIBTOP_NAMES
-
-/* You need to link with -lgtop_names to get this stuff here. */
-
-extern const char *glibtop_names_mem [];
-extern const unsigned glibtop_types_mem [];
-extern const char *glibtop_labels_mem [];
-extern const char *glibtop_descriptions_mem [];
-
-#endif
-
-END_LIBGTOP_DECLS
-
-#endif
--- a/include/glibtop/mountlist.h
+++ b/include/glibtop/mountlist.h
@@ -1,70 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
-/* $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.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __GLIBTOP_MOUNTLIST_H__
-#define __GLIBTOP_MOUNTLIST_H__
-
-#include <glibtop.h>
-#include <glibtop/global.h>
-
-#include <glibtop/compat_10.h>
-#include <glibtop/array.h>
-
-BEGIN_LIBGTOP_DECLS
-
-typedef struct _glibtop_mountentry	glibtop_mountentry;
-
-struct _glibtop_mountentry
-{
-    u_int64_t dev;
-    char devname [GLIBTOP_MOUNTENTRY_LEN+1];
-    char mountdir [GLIBTOP_MOUNTENTRY_LEN+1];
-    char type [GLIBTOP_MOUNTENTRY_LEN+1];
-};
-
-#define glibtop_get_mountlist(array,all_fs)	glibtop_get_mountlist_l(glibtop_global_server, array, all_fs)
-
-#define glibtop_get_mountlist_r		glibtop_get_mountlist_s
-
-glibtop_mountentry *
-glibtop_get_mountlist_l (glibtop *server, glibtop_array *array, int all_fs);
-
-glibtop_mountentry *
-glibtop_get_mountlist_s (glibtop *server, glibtop_array *array, int all_fs);
-
-#ifdef GLIBTOP_NAMES
-
-/* You need to link with -lgtop_names to get this stuff here. */
-
-extern const char *glibtop_names_mountlist [];
-extern const unsigned glibtop_types_mountlist [];
-extern const char *glibtop_labels_mountlist [];
-extern const char *glibtop_descriptions_mountlist [];
-
-#endif
-
-END_LIBGTOP_DECLS
-
-#endif
--- a/include/glibtop/msg_limits.h
+++ b/include/glibtop/msg_limits.h
@@ -1,90 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
-/* $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.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __GLIBTOP_MSG_LIMITS_H__
-#define __GLIBTOP_MSG_LIMITS_H__
-
-#include <glibtop.h>
-#include <glibtop/global.h>
-
-BEGIN_LIBGTOP_DECLS
-
-#define GLIBTOP_MSG_LIMITS_MSGPOOL	0
-#define GLIBTOP_MSG_LIMITS_MSGMAP	1
-#define GLIBTOP_MSG_LIMITS_MSGMAX	2
-#define GLIBTOP_MSG_LIMITS_MSGMNB	3
-#define GLIBTOP_MSG_LIMITS_MSGMNI	4
-#define GLIBTOP_MSG_LIMITS_MSGSSZ	5
-#define GLIBTOP_MSG_LIMITS_MSGTQL	6
-
-#define GLIBTOP_MAX_MSG_LIMITS		7
-
-typedef struct _glibtop_msg_limits	glibtop_msg_limits;
-
-struct _glibtop_msg_limits
-{
-    u_int64_t	flags,
-	msgpool,	/* GLIBTOP_MSG_LIMITS_MSGPOOL	*/
-	msgmap,		/* GLIBTOP_MSG_LIMITS_MSGMAP	*/
-	msgmax,		/* GLIBTOP_MSG_LIMITS_MSGMAX	*/
-	msgmnb,		/* GLIBTOP_MSG_LIMITS_MSGMNB	*/
-	msgmni,		/* GLIBTOP_MSG_LIMITS_MSGMNI	*/
-	msgssz,		/* GLIBTOP_MSG_LIMITS_MSGSSZ	*/
-	msgtql;		/* GLIBTOP_MSG_LIMITS_MSGTQL	*/
-};
-
-#define glibtop_get_msg_limits(msg)	glibtop_get_msg_limits_l(glibtop_global_server, msg)
-
-#if GLIBTOP_SUID_MSG_LIMITS
-#define glibtop_get_msg_limits_r	glibtop_get_msg_limits_p
-#else
-#define glibtop_get_msg_limits_r	glibtop_get_msg_limits_s
-#endif
-
-int glibtop_get_msg_limits_l (glibtop *server, glibtop_msg_limits *buf);
-
-#if GLIBTOP_SUID_MSG_LIMITS
-int glibtop_init_msg_limits_p (glibtop *server);
-int glibtop_get_msg_limits_p (glibtop *server, glibtop_msg_limits *buf);
-#else
-int glibtop_init_msg_limits_s (glibtop *server);
-int glibtop_get_msg_limits_s (glibtop *server, glibtop_msg_limits *buf);
-#endif
-
-#ifdef GLIBTOP_NAMES
-
-/* You need to link with -lgtop_names to get this stuff here. */
-
-extern const char *glibtop_names_msg_limits [];
-extern const unsigned glibtop_types_msg_limits [];
-extern const char *glibtop_labels_msg_limits [];
-extern const char *glibtop_descriptions_msg_limits [];
-
-#endif
-
-END_LIBGTOP_DECLS
-
-#endif
-
--- a/include/glibtop/netinfo.h
+++ b/include/glibtop/netinfo.h
@@ -1,87 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
-/* $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.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __GLIBTOP_NETINFO_H__
-#define __GLIBTOP_NETINFO_H__
-
-#include <glibtop.h>
-#include <glibtop/global.h>
-
-BEGIN_LIBGTOP_DECLS
-
-#define GLIBTOP_NETINFO_IF_FLAGS	0
-#define GLIBTOP_NETINFO_TRANSPORT	1
-#define GLIBTOP_NETINFO_MTU		2
-#define GLIBTOP_NETINFO_SUBNET		3
-#define GLIBTOP_NETINFO_ADDRESS		4
-
-#define GLIBTOP_MAX_NETINFO		5
-
-typedef struct _glibtop_netinfo	glibtop_netinfo;
-
-#include <glibtop/interfaces.h>
-
-struct _glibtop_netinfo
-{
-    u_int64_t	flags,
-	if_flags,		/* GLIBTOP_NETINFO_IF_FLAGS	*/
-	transport,		/* GLIBTOP_NETINFO_TRANSPORT	*/		
-	mtu,			/* GLIBTOP_NETINFO_MTU		*/
-	subnet,			/* GLIBTOP_NETINFO_SUBNET	*/
-	address;		/* GLIBTOP_NETINFO_ADDRESS	*/
-};
-
-#define glibtop_get_netinfo(netinfo,interface,transport)	glibtop_get_netinfo_l(glibtop_global_server, netinfo, interface, transport)
-
-#if GLIBTOP_SUID_NETINFO
-#define glibtop_get_netinfo_r		glibtop_get_netinfo_p
-#else
-#define glibtop_get_netinfo_r		glibtop_get_netinfo_s
-#endif
-
-int glibtop_get_netinfo_l (glibtop *server, glibtop_netinfo *buf, const char *interface, unsigned transport);
-
-#if GLIBTOP_SUID_NETINFO
-int glibtop_init_netinfo_p (glibtop *server);
-int glibtop_get_netinfo_p (glibtop *server, glibtop_netinfo *buf, const char *interface, unsigned transport);
-#else
-int glibtop_init_netinfo_s (glibtop *server);
-int glibtop_get_netinfo_s (glibtop *server, glibtop_netinfo *buf, const char *interface, unsigned transport);
-#endif
-
-#ifdef GLIBTOP_NAMES
-
-/* You need to link with -lgtop_names to get this stuff here. */
-
-extern const char *glibtop_names_netinfo [];
-extern const unsigned glibtop_types_netinfo [];
-extern const char *glibtop_labels_netinfo [];
-extern const char *glibtop_descriptions_netinfo [];
-
-#endif
-
-END_LIBGTOP_DECLS
-
-#endif
--- a/include/glibtop/netload.h
+++ b/include/glibtop/netload.h
@@ -1,97 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
-/* $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.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __GLIBTOP_NETLOAD_H__
-#define __GLIBTOP_NETLOAD_H__
-
-#include <glibtop.h>
-#include <glibtop/global.h>
-
-BEGIN_LIBGTOP_DECLS
-
-#define GLIBTOP_NETLOAD_PACKETS_IN	0
-#define GLIBTOP_NETLOAD_PACKETS_OUT	1
-#define GLIBTOP_NETLOAD_PACKETS_TOTAL	2
-#define GLIBTOP_NETLOAD_BYTES_IN	3
-#define GLIBTOP_NETLOAD_BYTES_OUT	4
-#define GLIBTOP_NETLOAD_BYTES_TOTAL	5
-#define GLIBTOP_NETLOAD_ERRORS_IN	6
-#define GLIBTOP_NETLOAD_ERRORS_OUT	7
-#define GLIBTOP_NETLOAD_ERRORS_TOTAL	8
-#define GLIBTOP_NETLOAD_COLLISIONS	9
-
-#define GLIBTOP_MAX_NETLOAD		10
-
-typedef struct _glibtop_netload	glibtop_netload;
-
-#include <glibtop/interfaces.h>
-
-struct _glibtop_netload
-{
-    u_int64_t	flags,
-	packets_in,		/* GLIBTOP_NETLOAD_PACKETS_IN	*/
-	packets_out,		/* GLIBTOP_NETLOAD_PACKETS_OUT	*/
-	packets_total,		/* GLIBTOP_NETLOAD_PACKETS_TOTAL*/
-	bytes_in,		/* GLIBTOP_NETLOAD_BYTES_IN	*/
-	bytes_out,		/* GLIBTOP_NETLOAD_BYTES_OUT	*/
-	bytes_total,		/* GLIBTOP_NETLOAD_BYTES_TOTAL	*/
-	errors_in,		/* GLIBTOP_NETLOAD_ERRORS_IN	*/
-	errors_out,		/* GLIBTOP_NETLOAD_ERRORS_OUT	*/
-	errors_total,		/* GLIBTOP_NETLOAD_ERRORS_TOTAL	*/
-	collisions;		/* GLIBTOP_NETLOAD_COLLISIONS	*/
-};
-
-#define glibtop_get_netload(netload,interface,transport,protocol)	glibtop_get_netload_l(glibtop_global_server, netload, interface, transport, protocol)
-
-#if GLIBTOP_SUID_NETLOAD
-#define glibtop_get_netload_r		glibtop_get_netload_p
-#else
-#define glibtop_get_netload_r		glibtop_get_netload_s
-#endif
-
-int glibtop_get_netload_l (glibtop *server, glibtop_netload *buf, const char *interface, unsigned transport, unsigned protocol);
-
-#if GLIBTOP_SUID_NETLOAD
-int glibtop_init_netload_p (glibtop *server);
-int glibtop_get_netload_p (glibtop *server, glibtop_netload *buf, const char *interface, unsigned transport, unsigned protocol);
-#else
-int glibtop_init_netload_s (glibtop *server);
-int glibtop_get_netload_s (glibtop *server, glibtop_netload *buf, const char *interface, unsigned transport, unsigned protocol);
-#endif
-
-#ifdef GLIBTOP_NAMES
-
-/* You need to link with -lgtop_names to get this stuff here. */
-
-extern const char *glibtop_names_netload [];
-extern const unsigned glibtop_types_netload [];
-extern const char *glibtop_labels_netload [];
-extern const char *glibtop_descriptions_netload [];
-
-#endif
-
-END_LIBGTOP_DECLS
-
-#endif
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Pablo Saratxaga	22a2289d00	updated Catalan file	2001-02-27 19:27:03 +00:00
Pablo Saratxaga	6fae8502b9	Added several po files from CVS HEAD corrected some po files headers or syntax errors	2001-02-26 14:57:36 +00:00
Christian Rose	f835defa4f	Updated Swedish translation.	2001-02-16 02:21:26 +00:00
Stano Visnovsky	bf217abf64	Added sk to ALL_LINGUAS	2001-02-13 11:12:50 +00:00
Stano Visnovsky	b210a6b707	Added Slovak translation from Marcel Telka <marcel@telka.sk>	2001-02-13 11:10:28 +00:00
Yukihiro Nakai	020842ccad	ja.po: Update Japanese translation.	2000-10-11 04:14:23 +00:00
Martin Baulig	d25bf7628d	Released LibGTop 1.1.2.1 "Hardangervidda goes Paris".	2000-02-16 15:32:52 +00:00
Martin Baulig	18442bf377	Released LibGTop 1.1.2.1 "Hardangervidda goes Paris". 2000-02-16 Martin Baulig <martin@home-of-linux.org> Released LibGTop 1.1.2.1 "Hardangervidda goes Paris". * LIBGTOP-VERSION: Set version number to 1.1.2.1 and let the tarball be called `libgtop-1.1.2.1-solaris.tar.gz'.	2000-02-16 14:00:23 +00:00
Martin Baulig	f948d8f193	1.1.2.1 :)	2000-02-15 14:19:43 +00:00
Martin Baulig	84965bc3e8	Set version number to 1.1.2.1. 2000-02-15 Martin Baulig <baulig@Stud.Informatik.Uni-Trier.DE> * LIBGTOP-VERSION: Set version number to 1.1.2.1.	2000-02-15 13:05:39 +00:00
Martin Baulig	7880078382	** Merged from HEAD ** 2000-01-16 Martin Baulig <martin@home-of-linux.org> * LIBGTOP-VERSION (LIBGTOP_VERSION_SUFFIX): Added this so you can have your tarballs called `libgtop-1.x.y-snap.tar.gz' or whatever. This only affects the `VERSION' variable and thus how the resulting tarball will be called, but not `LIBGTOP_VERSION_CODE' etc. * Makefile.am: Make `aclocal.m4' also depend on `LIBGTOP-VERSION' when in maintainer-mode.	2000-02-15 12:40:37 +00:00
Martin Baulig	1b8d205eb0	** Merged from LIBGTOP_STABLE_1_0 ** 2000-01-22 Martin Baulig <martin@home-of-linux.org> * procargs.c (glibtop_get_proc_args_s): Set correct `buf->size' and `buf->flags' fields when `max_length' was given. Fixes #5183.	2000-01-21 23:28:35 +00:00
Martin Baulig	bc86c09ede	** Merged from HEAD ** 2000-01-20 Martin Baulig <martin@home-of-linux.org> * fsusage.c (adjust_blocks): Use `u_int64_t' arguments and return value to avoid long int overflows on machines with large disks. * fsusage.h (struct fs_usage): Use `u_int64_t' here as well.	2000-01-20 22:05:39 +00:00
Martin Baulig	ad536313f1	Don't dump core when the table of permitted host names contains a NULL 1999-11-28 Martin Baulig <martin@home-of-linux.org> * gnuserv.c (setup_table): Don't dump core when the table of permitted host names contains a NULL pointer.	1999-11-28 16:41:26 +00:00
Martin Baulig	caf17330b3	Stat "/proc/<pid>" instead of "/proc/<pid>/state" to get `uid' and` gid'. 1999-11-28 Martin Baulig <martin@home-of-linux.org> * procstate.c (glibtop_get_procstate_s): Stat "/proc/<pid>" instead of "/proc/<pid>/state" to get `uid' and `gid'. Thanks to Jason Becker for pointing out that GTop reported wrong uid's.	1999-11-28 11:54:11 +00:00