Released the one and only final LibGTop 1.0.1.

Released LibGTop 1.0.1.
1999-03-01 Martin Baulig <martin@home-of-linux.org> Released LibGTop 1.0.1. * LIBGTOP-VERSION: Set version number to 1.0.1 binary age 0, interface age 0.
1999-03-01 22:12:11 +00:00 · 1999-03-01 20:58:12 +00:00 · 1999-03-01 20:57:36 +00:00 · 1999-03-01 20:41:26 +00:00 · 1999-03-01 18:33:58 +00:00 · 1999-03-01 15:33:30 +00:00
356 changed files with 11218 additions and 8863 deletions
--- a/.cvsignore
+++ b/.cvsignore
@@ -29,3 +29,6 @@ alpha-dec-osf3.0
 i686-pc-linux-gnu-linux
 libgtop-config
 ABOUT-NLS
 libgtop.spec
 libgtop-0.99.*.tar.gz
 libgtop-0.99.*
--- a/95
+++ b/95
@@ -1,95 +0,0 @@
 Hi all,
 I just uploaded the first working draft alpha version 0.01 to my website:
  http://www.home-of-linux.org/gnome/libgtop/
 Libgtop is a library that fetches information about the running system such as cpu and
 memory usage, active processes etc. On Linux systems, these information are taken directly
 from the /proc filesystem. For other systems such as Solaris, where such programs need to be
 suid root (or only setgid kmem/mem on some systems), it provides a suid/setgid server that
 fetches those information and a client-side library that talks to this server. Main idea
 was to have the same interface for all operating systems, thus all system dependent details
 are hidden in the implementation of that server.
 Currently, it only works for Linux, documentation on how to port it to other systems is on
 the way. I'm planning to keep this site an up-to-date mirror of my local machine (which is
 connected to the internet over some expensive dialup connection, so I'll upload it about
 once every day I made significant changes) so that you can always find the latest version
 of the software here.
 I've written a simple guile interface for the library to show which information it can
 already fetch. See examples/third for details.
 ===========================================================================================
 #include <glibtop.h>
 #include <glibtop/open.h>
 #include <glibtop/close.h>
 #include <glibtop/cpu.h>
 int
 main (int argc, char *argv [])
 {
        glibtop server;
        glibtop_cpu cpu;
        unsigned i, *ptr;
        setlocale (LC_ALL, "");
        bindtextdomain (PACKAGE, GTOPLOCALEDIR);
        textdomain (PACKAGE);
        glibtop_open (&server, argv [0]);
        glibtop_get_cpu (&server, &cpu);
        fprintf (stderr, "CPU: %lu, %lu, %lu, %lu, %lu\n",
                 cpu.total, cpu.user, cpu.nice, cpu.sys, cpu.idle);
        glibtop_close (&server);
        exit (0);
 }
 ===========================================================================================
 The following scheme code is used in examples/third to show all information that is
 currently available:
        (display (get-cpu)) (newline)
        (display (get-mem)) (newline)
        (display (get-swap)) (newline)
        (display (get-uptime)) (newline)
        (display (get-loadavg)) (newline)
        (display (get-shm_limits)) (newline)
        (display (get-msg_limits)) (newline)
        (display (get-sem_limits)) (newline)
        (display (get-sysdeps)) (newline)
        (display (get-proclist)) (newline)
 On my system, this yields:
 (3796245 348706 66 89999 3357474)
 (31715328 31354880 360448 13385728 401408 7237632 17567744)
 (133885952 42160128 91725824)
 (37962.49 33574.74)
 (0.01 0.02 0.0)
 (33554432 1 128 128 4194304)
 (2048 16384 4056 16384 128 16 16384)
 (4096 128 4096 4096 32 32 32 20 32767 16383)
 (31 127 7 3 1 31 127 1023 3)
 (71 4 284 1 2 3 246 247 210 8 48 81 83 153 157 167 170 171 172 173 174 175 178 181 195 191 200 203 207 248 215 216 217 220 222 227 245 249 250 251 253 254 315 267 331 373 338 334 335 345 337 372 374 342 343 344 375 14445 13119 6438 14555 13118 13801 6439 17362 18411 18455 6521 6522 6523 23979 23980 7905 7906)
 ===========================================================================================
 Better documentation is on the way! There's still a little bit under the URL above.
 Enjoy it!
 Martin <martin@home-of-linux.org>
--- a/ANNOUNCE-0.25
+++ b/ANNOUNCE-0.25
@@ -1,241 +0,0 @@
 [Posted to the Gnome Mailing List on Fri Aug 21 1998]
 About this release:
 ------------------
 LibGTop 0.25 is a stable release.
 Of cause it has its bug like any software has, I'm planning
 to fix as many bugs as possible in _this_ release and then
 re-release it as libgtop-0.26 or even libgtop-0.30.
 Especially portings to new operating systems should be made
 in this release.
 This also means that we can safely use this version of LibGTop
 all over the GNOME project.
 Currently LibGTop-Apps is still a little bit under development -
 especially the LibGTop-Apps GTop does not yet have the full
 functionallity of the real GTop.
 We should test this extensively and then decide whether to continue
 with the `libgtop-apps' module or whether to merge all its code
 back into the modules it came from. I'd like to hear some comments
 about this from you !
 Please look at the release notes below for more details about this
 release.
 Where to get the sources
 ------------------------
 The sources can be found at:
 	ftp://ftp.home-of-linux.org/pub/
 Tarballs:
 	libgtop-0.25.0.tar.gz
 	libgtop-apps-0.25.0.tar.gz
 Source RPM:
 	libgtop-0.25.0-REL.src.rpm
 	libgtop-apps-0.25.0-REL.src.rpm
 Binary RPMS:
 	libgtop-0.25.0-REL.i386.rpm
 	libgtop-devel-0.25.0-REL.i386.rpm
 	libgtop-examples-0.25.0-REL.i386.rpm
 	libgtop-apps-0.25.0-REL.i386.rpm
 There is some little problem with the binary RPMS of `libgtop-apps':
 Most of its files will conflict with ones from `gnome-core' and `gnome-utils',
 so you'll need to use the `--force' parameter to install it.
 Getting the sources from CVS:
 ----------------------------
 You can also fetch the sources from the GNOME CVS tree
 (see http://www.gnome.org/ for details).
 To get the latest sources:
 $ cvs checkout libgtop
 $ cvs checkout libgtop-apps
 To get the sources of *this* release:
 $ cvs checkout -r LIBGTOP_0_25 libgtop
 $ cvs checkout -r LIBGTOP_0_25 libgtop-apps
 To get the sources of this release with all bug-fixes applied:
 $ cvs checkout -r LIBGTOP_0_25_PATCHES libgtop
 $ cvs checkout -r LIBGTOP_0_25_PATCHES libgtop-apps
 To get a patch to apply to the tarballs to get all bug-fixes:
 $ cvs rdiff -r LIBGTOP_0_25 -r LIBGTOP_0_25_PATCHES libgtop
 $ cvs rdiff -r LIBGTOP_0_25 -r LIBGTOP_0_25_PATCHES libgtop-apps
 [Note for people having write access to the GNOME CVS tree:
 Please apply bug fixes to the `LIBGTOP_0_25_PATCHES' branch and
 merge them into the main trunk.
 After merging, please re-tag the branch `libgtop_0_25_after_merge'.
 This will help us to re-release this package when all bugs are
 fixed.
 ]
 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/186
+++ b/186
@@ -1,3 +1,189 @@
 1999-03-01  Martin Baulig  <martin@home-of-linux.org>
 	Released LibGTop 1.0.1.
 	* LIBGTOP-VERSION: Set version number to 1.0.1 binary age 0,
 	interface age 0.
 1999-03-01  Martin Baulig  <martin@home-of-linux.org>
 	* configure.in (LIBGTOP_LIBS): Move `-lgtop_common' last to
 	make it work with static-only libs. Thanks to Roderik Muit
 	for pointing this out.
 	(PERL): First check for `perl5', then for `perl'. Thanks again
 	to Roderik Muit.
 1999-02-24  Martin Baulig  <martin@home-of-linux.org>
 	Released LibGTop 1.0.0.
 	* LIBGTOP-VERSION: Set version number to 1.0.0 binary age 0,
 	interface age 0.
 	* configure.in: Require GLIB >= 1.2.0.
 1999-02-23  Martin Baulig  <martin@home-of-linux.org>
 	Released LibGTop 0.100.0.
 	Make the copyright of LibGTop be the GNU General Public License.
 	* LIBGTOP-VERSION: Set version number to 0.100.0 binary age 0,
 	interface age 0.
 	* copyright.txt: Set the year to 1998-99 and pretty-format it a
 	little bit. Same in all C source and header files.
 1999-02-21  Martin Baulig  <martin@home-of-linux.org>
 	* configure.in (LIBGTOP_*_INCS): Define `HAVE_GLIBTOP_MACHINE_H'
 	if appropriate.
 1999-02-19  Martin Baulig  <martin@home-of-linux.org>
 	Released LibGTop 0.99.9.
 	* LIBGTOP-VERSION: Set version number to 0.99.9 binary age 0,
 	interface age 0.
 	* include/glibtop/error.h: Don't include <glib.h>.
 	* sysdeps/common/error.c: Use `int' not `gint'.
 	* misc/porting-libgtop.txt: Added a few instructions on how
 	to port LibGTop to Solaris.
 	* Replace all __BEGIN_DELCS with LIBGTOP_BEGIN_DECLS and all
 	__END_DECLS with LIBGTOP_END_DECLS; remove all __P macros and
 	use real function prototypes.
 1999-02-18  Martin Baulig  <martin@home-of-linux.org>
 	* include/glibtop/*.h: Use glib-like function prototypes
 	instead of "extern <function> __P((args))".
 	* sysdeps/common/error.h: Replaced inline with static.
 1999-02-18  Martin Baulig  <martin@home-of-linux.org>
 	* */*.awk: Replaced all awk scripts with perl scripts since it is
 	more likely that people have a working perl interpreter than GNU
 	awk on their system.
 1999-02-18  Martin Baulig  <martin@home-of-linux.org>
 	* sysdeps/common/error.c (glibtop_error_r, glibtop_warn_r): Define
 	them as G_INLINE_FUNC in <glibtop/errno.h> if possible.
 	(glibtop_error_io_r, glibtop_warn_io_r): Likewise.
 	(glibtop_error_vr, glibtop_warn_vr): New functions taking a va_list.
 	(glibtop_error_io_vr, glibtop_warn_io_vr): New functions taking an
 	errno an a va_list.
 1999-02-17  Martin Baulig  <martin@home-of-linux.org>
 	Released LibGTop 0.99.8.
 1999-02-16  Martin Baulig  <martin@home-of-linux.org>
 	* examples/Makefile.am, lib/Makefile.am, src/daemon/Makefile.am,
 	  sysdeps/common/Makefile.am, sysdeps/guile/Makefile.am,
 	  sysdeps/guile/names/Makefile.am, sysdeps/kernel/Makefile.am,
 	  sysdeps/linux/Makefile.am, sysdeps/names/Makefile.am,
 	  sysdeps/osf1/Makefile.am, sysdeps/stub/Makefile.am,
 	  sysdeps/stub_suid/Makefile.am, sysdeps/sun4/Makefile.am:
 	Initialize INCLUDES to `@INCLUDES@' to make it clear that it is
 	set in configure.in. It is ok to add things there, but you must
 	not remove the `@INCLUDES@'.
 1999-02-15  Jeff Garzik  <jgarzik@pobox.com>
 	* examples/Makefile.am, lib/Makefile.am, src/daemon/Makefile.am,
 	  sysdeps/common/Makefile.am, sysdeps/guile/Makefile.am,
 	  sysdeps/guile/names/Makefile.am, sysdeps/kernel/Makefile.am,
 	  sysdeps/linux/Makefile.am, sysdeps/names/Makefile.am,
 	  sysdeps/osf1/Makefile.am, sysdeps/stub/Makefile.am,
 	  sysdeps/stub_suid/Makefile.am, sysdeps/sun4/Makefile.am:
 	Removed hardcoded gcc arguments from CFLAGS.
 	* include/glibtop/error.h:
 	Added FIXME comment about varargs macros breaking Sun cc
 	compilation.
 1999-02-12  Martin Baulig  <martin@home-of-linux.org>
 	Thanks to Frederic Devernay for pointing out that we need to define
 	__BEGIN_DECLS and __END_DECLS when not using GNOME.
 	* configure.in: Define `WITHOUT_GNOME' if appropriate.
 	* include/glibtop/global.h: Define __BEGIN_DECLS and __END_DECLS
 	when WITHOUT_GNOME not when _IN_LIBGTOP.
 1999-02-12  Martin Baulig  <martin@home-of-linux.org>
 	* include/glibtop/global.h: Applied patch from Frederic Devernay;
 	__BEGIN_DECLS and __END_DECLS are only defined inside _IN_LIBGTOP.
 1999-02-10  Martin Baulig  <martin@home-of-linux.org>
 	* configure.in (program_invocation_name): Check whether we need
 	to declare this; some libc5 systems define that symbol but do
 	not declare it in any header file.
 1999-02-10  Martin Baulig  <martin@home-of-linux.org>
 	* libgtop.spec.in, libgtop.spec: Replaced libgtop.spec with
 	with libgtop.spec.in, so libgtop.spec is now a generated file.
 1999-02-05  Martin Baulig  <martin@home-of-linux.org>
 	* include/glibtop/global.h: Enclose some of the stuff in this
 	file in `#ifdef _IN_LIBGTOP'.
 1999-02-04  Martin Baulig  <martin@home-of-linux.org>
 	* include/glibtop/global.h (_): Use dgettext (), not gettext ().
 1999-01-23  Martin Baulig  <martin@home-of-linux.org>
 	* libgtopConf.sh.in (LIBGTOP_DATADIR): New variable.
 1999-01-06  Martin Baulig  <martin@home-of-linux.org>
 	* libgtop-sysdeps.m4: Always enable SMP support for Linux.
 1999-01-03  Martin Baulig  <martin@home-of-linux.org>
 	Released LibGTop 0.99.2.
 1999-01-05  Martin Baulig  <martin@home-of-linux.org>
 	* libgtop.spec: Always build SMP support; binary packages should
 	contain all possible features.
 	* configure.in: LibGTop will now require GLIB >= 1.1.12.
 1999-01-05  Martin Baulig  <martin@home-of-linux.org>
 	* configure.in: Make it abort if the `dc' utility is not installed.
 1999-01-03  Martin Baulig  <martin@home-of-linux.org>
 	Released LibGTop 0.99.1.
 1998-12-25  Martin Baulig  <martin@home-of-linux.org>
 	* configure.in (LIBGTOP_INCS): Define `HAVE_LIBGTOP_SMP' if SMP
 	support was enabled.
 1998-12-22  Yukihiro Nakai  <Nakai@TokyoNet.AD.JP>
 	* configure.in (ALL_LINGUAS): Added `ja'.
 1998-12-18  Martin Baulig  <martin@home-of-linux.org>
 	* Makefile.am: Applied patch from Edward Jason Riedy to use '#'
 	as separator in sed commands.
 1998-12-15  Martin Baulig  <martin@home-of-linux.org>
 	Released LibGTop 0.99.0 which is a feature-freezed version
--- a/8
+++ b/8
@@ -6,15 +6,15 @@
 # if backwards compatibility has been broken,
 # set LIBGTOP_BINARY_AGE and LIBGTOP_INTERFACE_AGE to 0.
 #
-LIBGTOP_MAJOR_VERSION=0
+LIBGTOP_MAJOR_VERSION=1
-LIBGTOP_MINOR_VERSION=99
+LIBGTOP_MINOR_VERSION=0
-LIBGTOP_MICRO_VERSION=0
+LIBGTOP_MICRO_VERSION=1
 LIBGTOP_INTERFACE_AGE=0
 LIBGTOP_BINARY_AGE=0
 # Increase each time you change the client/server protocol.
-LIBGTOP_SERVER_VERSION=3
+LIBGTOP_SERVER_VERSION=5
 # Don't change this
 LIBGTOP_VERSION=$LIBGTOP_MAJOR_VERSION.$LIBGTOP_MINOR_VERSION.$LIBGTOP_MICRO_VERSION
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,9 +15,12 @@ SUBDIRS = po intl $(support) macros misc include sysdeps lib src \
 include_HEADERS = glibtop.h
-EXTRA_DIST = autogen.sh libgtop.spec copyright.txt libgtopConf.sh.in \
+EXTRA_DIST = autogen.sh libgtop.spec.in copyright.txt libgtopConf.sh.in \
 	LIBGTOP-VERSION features.def libgtop-config.in RELNOTES-0.25 \
-	libgtop-sysdeps.m4
+	RELNOTES-1.0 libgtop-sysdeps.m4 README NEWS.old libgtop-mirror.sh
 dist-hook:
 	cp libgtop.spec $(distdir)
 release:
 	$(MAKE) dist distdir=$(PACKAGE)-$(VERSION)
@@ -44,35 +47,36 @@ bin_SCRIPTS = $(top_builddir)/libgtop-config
 ## is an autoconf feature, not a bug).
 libgtopConf.sh: libgtopConf.sh.in Makefile
 ## Use sed and then mv to avoid problems if the user interrupts.
-	sed -e 's,\@LIBGTOP_LIBDIR\@,$(libdir),g' \
+	sed -e 's#\@LIBGTOP_LIBDIR\@#$(libdir)#g' \
-	    -e 's,\@LIBGTOP_INCLUDEDIR\@,$(includedir),g' \
+	  -e 's#\@LIBGTOP_INCLUDEDIR\@#$(includedir)#g' \
-	    -e 's,\@LIBGTOP_EXTRA_LIBS\@,$(LIBGTOP_EXTRA_LIBS),g' \
+	  -e 's#\@LIBGTOP_DATADIR\@#$(datadir)#g' \
-	    -e 's,\@LIBGTOP_LIBS\@,$(LIBGTOP_LIBS),g' \
+	  -e 's#\@LIBGTOP_EXTRA_LIBS\@#$(LIBGTOP_EXTRA_LIBS)#g' \
-	    -e 's,\@LIBGTOP_INCS\@,$(LIBGTOP_INCS),g' \
+	  -e 's#\@LIBGTOP_LIBS\@#$(LIBGTOP_LIBS)#g' \
-	    -e 's,\@LIBGTOP_NAMES_LIBS\@,$(LIBGTOP_NAMES_LIBS),g' \
+	  -e 's#\@LIBGTOP_INCS\@#$(LIBGTOP_INCS)#g' \
-	    -e 's,\@LIBGTOP_NAMES_INCS\@,$(LIBGTOP_NAMES_INCS),g' \
+	  -e 's#\@LIBGTOP_NAMES_LIBS\@#$(LIBGTOP_NAMES_LIBS)#g' \
-	    -e 's,\@LIBGTOP_GUILE_LIBS\@,$(LIBGTOP_GUILE_LIBS),g' \
+	  -e 's#\@LIBGTOP_NAMES_INCS\@#$(LIBGTOP_NAMES_INCS)#g' \
-	    -e 's,\@LIBGTOP_GUILE_INCS\@,$(LIBGTOP_GUILE_INCS),g' \
+	  -e 's#\@LIBGTOP_GUILE_LIBS\@#$(LIBGTOP_GUILE_LIBS)#g' \
-	    -e 's,\@LIBGTOP_GUILE_NAMES_LIBS\@,$(LIBGTOP_GUILE_NAMES_LIBS),g' \
+	  -e 's#\@LIBGTOP_GUILE_INCS\@#$(LIBGTOP_GUILE_INCS)#g' \
-	    -e 's,\@LIBGTOP_GUILE_NAMES_INCS\@,$(LIBGTOP_GUILE_NAMES_INCS),g' \
+	  -e 's#\@LIBGTOP_GUILE_NAMES_LIBS\@#$(LIBGTOP_GUILE_NAMES_LIBS)#g' \
-	    -e 's,\@LIBGTOP_BINDIR\@,$(LIBGTOP_BINDIR),g' \
+	  -e 's#\@LIBGTOP_GUILE_NAMES_INCS\@#$(LIBGTOP_GUILE_NAMES_INCS)#g' \
-	    -e 's,\@LIBGTOP_SERVER\@,$(LIBGTOP_SERVER),g' \
+	  -e 's#\@LIBGTOP_BINDIR\@#$(LIBGTOP_BINDIR)#g' \
-	    -e 's,\@LIBGTOP_MAJOR_VERSION\@,$(LIBGTOP_MAJOR_VERSION),g' \
+	  -e 's#\@LIBGTOP_SERVER\@#$(LIBGTOP_SERVER)#g' \
-	    -e 's,\@LIBGTOP_MINOR_VERSION\@,$(LIBGTOP_MINOR_VERSION),g' \
+	  -e 's#\@LIBGTOP_MAJOR_VERSION\@#$(LIBGTOP_MAJOR_VERSION)#g' \
-	    -e 's,\@LIBGTOP_MICRO_VERSION\@,$(LIBGTOP_MICRO_VERSION),g' \
+	  -e 's#\@LIBGTOP_MINOR_VERSION\@#$(LIBGTOP_MINOR_VERSION)#g' \
-	    -e 's,\@LIBGTOP_VERSION\@,$(LIBGTOP_VERSION),g' \
+	  -e 's#\@LIBGTOP_MICRO_VERSION\@#$(LIBGTOP_MICRO_VERSION)#g' \
-	    -e 's,\@LIBGTOP_VERSION_CODE\@,$(LIBGTOP_VERSION_CODE),g' \
+	  -e 's#\@LIBGTOP_VERSION\@#$(LIBGTOP_VERSION)#g' \
-	    -e 's,\@LIBGTOP_SERVER_VERSION\@,$(LIBGTOP_SERVER_VERSION),g' \
+	  -e 's#\@LIBGTOP_VERSION_CODE\@#$(LIBGTOP_VERSION_CODE)#g' \
-	    -e 's,\@libgtop_sysdeps_dir\@,$(libgtop_sysdeps_dir),g' \
+	  -e 's#\@LIBGTOP_SERVER_VERSION\@#$(LIBGTOP_SERVER_VERSION)#g' \
-	    -e 's,\@libgtop_need_server\@,$(libgtop_need_server),g' \
+	  -e 's#\@libgtop_sysdeps_dir\@#$(libgtop_sysdeps_dir)#g' \
-	    -e 's,\@libgtop_use_machine_h\@,$(libgtop_use_machine_h),g' \
+	  -e 's#\@libgtop_need_server\@#$(libgtop_need_server)#g' \
-	    -e 's,\@libgtop_guile_found\@,$(libgtop_guile_found),g' \
+	  -e 's#\@libgtop_use_machine_h\@#$(libgtop_use_machine_h)#g' \
-	    -e 's,\@libgtop_want_examples\@,$(libgtop_want_examples),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
 libgtop-config: libgtop-config.in Makefile
-	sed -e 's,\@LIBGTOP_LIBDIR\@,$(libdir),g' \
+	sed -e 's#\@LIBGTOP_LIBDIR\@#$(libdir)#g' \
 	      < $(srcdir)/libgtop-config.in > libgtop-config.tmp \
 	  && mv libgtop-config.tmp libgtop-config && \
 		chmod 755 libgtop-config
--- a/244
+++ b/244
@@ -1,244 +0,0 @@
 $Id$
 Jun/01/1998
 ===========
 	* We have some new ``suffix rules'':
 	  '__l' is a function defined in the client part;
 	  '__s' is a function defined in the sysdeps part and
 	  '__p' is a function that needs special priviledges.
 	  '__r' is mapped either on '__p' or on '__s'.
 	  the function without suffix is mapped on '__l'.
 	* We now decide at runtime whether or not using the server
 	is required for a particular function. All user programs
 	now call the '__l' function defined in '-lgtop' (in the lib
 	subdir). These functions either use 'glibtop_call__l' to
 	call the server or call the '__r' function.
 	* A function in the sysdeps directory now has the '__s' suffix
 	if it do not need any priviledges (and thus can be called directly
 	from client code) and the '__p' suffix otherwise (when it has to
 	be called from the server).
 	* If you call one of these functions:
 	  -> use the '__p' suffix to be sure to get the SUID-safe one
 	     (used in the server).
 	  -> use the '__s' suffix to be sure to get a function that
 	     doesn't need any priviledges.
 	  -> use the '__r' suffix otherwise (it is mapped either on the
 	     '__p' or on the '__s' one).
 	Only use the '__p' and '__s' functions in a 'GLIBTOP_SUID_<feature>'
 	conditional, otherwise you'll get undefined symbols !
 	* The server is now started from 'glibtop_init__r', but only when
 	it's really needed; for instance on DEC OSF/1 you only need it
 	for the proc* features - if you program only fetches the CPU usage,
 	now server will be started.
 	* Sorry, at the moment everything is a little bit unstable, I'm doing
 	heavy changes. I've just some great ideas which still need some work:
 	  -> I want to have a SUID server that only implements those features
 	     that need to be SUID; everything else uses the sysdeps code directly.
 	  -> If a program only uses stuff that do not need the server, the
 	     server will not be started at all.
 	  -> I'm working on some kind of proxy server that can be used on a remote
 	     host; in feature one can then use the MDI stuff from ghex in gtop to
 	     have notebook pages displaying processes from different hosts.
 	* Well it is as much unstable that it only works under Linux at the moment.
 1998-06-01  Martin Baulig  <martin@home-of-linux.org>
 	* sysdeps/common/sysdeps.c: now using '__r' functions,
 	they are #defined either as the '__p' or the '__s' ones.
 	* sysdeps/linux/*.c: changed call of 'glibtop_init__r',
 	it now takes two additional arguments.
 	* examples/{first.c, second.c}: now using 'glibtop_init'
 	instead of 'glibtop_init__r'.
 	* include/glibtop/sysdeps.h: added 'dummy' member so
 	'GLIBTOP_SYSDEPS_<feature>' now start with 1.
 	* include/glibtop/*.h: we now #define 'glibtop_get_<feature>'
 	as 'glibtop_get_<feature>__l' and 'glibtop_get_<feature>__r'
 	either as the '__p' or the '__s' function.
 	* lib/*.c: removed #if's - we now decide at runtime
 	whether to use the server or to call the appropriate
 	function for the sysdeps directory.
 1998-05-28  Martin Baulig  <baulig@merkur.uni-trier.de>
 	* src/server/main.c: we now use the '__p' functions,
 	but only if the appropriate 'GLIBTOP_SUID_<feature>'
 	has a non-zero value.
 	* configure.in (@machine_incs@): always use 
 	`-I$(top_srcdir)/sysdeps/@sysdeps_dir@'; it's no
 	longer conditional.
 	* examples/Makefile.am: removed the '_linux' examples.
 	* sysdeps/linux/*.c: renamed all functions implementing
 	features to '__s'.
 	* lib/*.c: renamed all functions implementing features
 	to '__l'; we only emit code for those functions if the
 	corresponding 'GLIBTOP_SUID_<feature>' has a positive value.
 	* include/glibtop/*.h: added some new function suffixes:
 	'__l' is a function defined in the client part;
 	'__s' is a function defined in the sysdeps part and
 	'__p' is a function that needs special priviledges.
 	'__r' is mapped either on '__l' or on '__s'.
 	* sysdeps/linux/glibtop_server.h: New file -
 	defines system dependent constants 'GLIBTOP_SUID_<feature>'
 	being either 'GLIBTOP_SYSDEPS_<feature>'+1 depending upon
 	whether or not this feature requires using the server.
 	* lib/sysdeps.c: removed that file; it is no longer
 	needed.
 May/21/1998
 ===========
 * doc/gnome-hackers.sgml: This is a short intro on how to use libgtop
  in the GNOME project. It covers especially the use of its 'configure'
  script and the automatically generated 'gtopConf.sh'.
 May/20/1998
 ===========
 * 'gtopConf.sh' now defines 'GTOP_LIBS' and 'GTOP_INCS' in a manner
  that they contain everything that is needed to link some program with
  libgtop. It will use '-lgtop' only if the server is really needed and
  '-lgtop_sysdeps' otherwise;
 * 'gtopConf.sh' additionally defines 'GTOP_GUILE_LIBS' and 'GTOP_GUILE_INCS'
  containing everything that is needed to link some program both with
  libgtop and its guile interface. They are identically to 'GTOP_LIBS'
  and 'GTOP_INCS' if building the guile interface is disabled or guile
  cannot be found on the system.
 * 'configure' takes additional arguments '--enable-libgtop-server' and
  '--disable-libgtop-server' to use the server even when it's not needed
  or to disable it's use where it's needed.
 * 'configure' takes an argument '--without-libgtop-guile' to disable
  guile support.
 * 'configure takes an argument '--without-libgtop-names' to remove
  '-lgtop_names' (and '-lgtop_guile_names' when we have guile) from
  'GTOP_LIBS'; in this case these libraries are not even built.
 May/19/1998
 ===========
 * Libgtop is now in the GNOME CVS Repository.
 May/17/1998
 ===========
 * we have now 'const char *glibtop_types_* []' consisting
  of the C types of the corresponding files of '_glibtop_*'.
 * added guile function '(glibtop-types-*)' and '(glibtop-descriptions-*)'.
 May/10/1998
 ===========
 * Port to DEC OSF1 3.0 has been made:
  cpu		(total, user, nice, sys, idle)
  mem		(total, used, free)
  loadavg	(loadavg)
  uptime	(uptime)
  msg_limits	(map, max, mnb, mni, tql)
  sem_limits	(mni, msl, opm, vmx, aem)
  shm_limits	(max, min, mni, seg)
  The following need the server to be SUID root:
  proclist	(total, number, size)
  procdata	(cmd, state, uid, pid, ppid, pgrp, tty, k_flags,
 		 session, tpgid, sigignore, sigcatch, signal, nice, 
 		 priority, resident, rss, vsize, utime, stime,
 		 cutime, cstime, trs, drs)
 May/07/1998
 ===========
 * 'flags' member of sysdeps/linux/procdata.c is now
  'unsigned long flags [2]'.
 * When we give glibtop_get_procdata () a pid of zero, only
  the flags are returned.
 * We now use static constants instead of #defines for sysdeps flags.
 May/03/1998
 ===========
 * VPATH-Build now working; sometimes it's necessary to copy
  $(top_srcdir)/po/cat-id-tbl.c to $(top_builddir)/po.
 * The library has been tested on the following systems:
  - i686-pc-linux-gnu
  - sparc-sun-sunos4.1.1
  - alpha-dec-osf1 (that's DEC OSF1 3.0 and 3.2)
 * Compilation has been tested on the following systems (I have no root
  access there and cannot test the library because of this):
  - sparc-sun-solaris2
  - i386-bsdi
 * Does no longer require Gnome.
 * Guile-Parts are compiled only if guile can be found.
 * Some of the executables are statically linked to copy them more easily
  between machines.
 May/02/1998
 ===========
 * Global changes to the interfaces, all functions except glibtop_open()
   and glibtop_close() that took a server argument have now a '__r' suffix;
   the original name is now a macro that uses glibtop_global_server.
 Apr/10/1998
 ===========
 Added new directory sysdeps/guile/names. It is the guile interface
 to the gtop_names library found in sysdeps/names. Changed
 GLIBTOP_DESCRIPTIONS to GLIBTOP_NAMES and added GLIBTOP_GUILE_NAMES
 to the header files.
 Apr/09/1998
 ===========
 Added new directories guile and names to sysdeps. In names are
 some string constants about the data stored in the structures.
 guile is a guile interface for the library. It is used in
 examples/third (which has been completely rewritten).
 The header files define things from names when GLIBTOP_DESCRIPTIONS
 if defined and/or from guile when HAVE_GUILE is defined.
 Apr/08/1998
 ===========
 Added guile wrapper for the library (see examples/third).
--- a/NEWS.old
+++ b/NEWS.old
@@ -0,0 +1,244 @@
 $Id$
 Jun/01/1998
 ===========
 	* We have some new ``suffix rules'':
 	  '__l' is a function defined in the client part;
 	  '__s' is a function defined in the sysdeps part and
 	  '__p' is a function that needs special priviledges.
 	  '__r' is mapped either on '__p' or on '__s'.
 	  the function without suffix is mapped on '__l'.
 	* We now decide at runtime whether or not using the server
 	is required for a particular function. All user programs
 	now call the '__l' function defined in '-lgtop' (in the lib
 	subdir). These functions either use 'glibtop_call__l' to
 	call the server or call the '__r' function.
 	* A function in the sysdeps directory now has the '__s' suffix
 	if it do not need any priviledges (and thus can be called directly
 	from client code) and the '__p' suffix otherwise (when it has to
 	be called from the server).
 	* If you call one of these functions:
 	  -> use the '__p' suffix to be sure to get the SUID-safe one
 	     (used in the server).
 	  -> use the '__s' suffix to be sure to get a function that
 	     doesn't need any priviledges.
 	  -> use the '__r' suffix otherwise (it is mapped either on the
 	     '__p' or on the '__s' one).
 	Only use the '__p' and '__s' functions in a 'GLIBTOP_SUID_<feature>'
 	conditional, otherwise you'll get undefined symbols !
 	* The server is now started from 'glibtop_init__r', but only when
 	it's really needed; for instance on DEC OSF/1 you only need it
 	for the proc* features - if you program only fetches the CPU usage,
 	now server will be started.
 	* Sorry, at the moment everything is a little bit unstable, I'm doing
 	heavy changes. I've just some great ideas which still need some work:
 	  -> I want to have a SUID server that only implements those features
 	     that need to be SUID; everything else uses the sysdeps code directly.
 	  -> If a program only uses stuff that do not need the server, the
 	     server will not be started at all.
 	  -> I'm working on some kind of proxy server that can be used on a remote
 	     host; in feature one can then use the MDI stuff from ghex in gtop to
 	     have notebook pages displaying processes from different hosts.
 	* Well it is as much unstable that it only works under Linux at the moment.
 1998-06-01  Martin Baulig  <martin@home-of-linux.org>
 	* sysdeps/common/sysdeps.c: now using '__r' functions,
 	they are #defined either as the '__p' or the '__s' ones.
 	* sysdeps/linux/*.c: changed call of 'glibtop_init__r',
 	it now takes two additional arguments.
 	* examples/{first.c, second.c}: now using 'glibtop_init'
 	instead of 'glibtop_init__r'.
 	* include/glibtop/sysdeps.h: added 'dummy' member so
 	'GLIBTOP_SYSDEPS_<feature>' now start with 1.
 	* include/glibtop/*.h: we now #define 'glibtop_get_<feature>'
 	as 'glibtop_get_<feature>__l' and 'glibtop_get_<feature>__r'
 	either as the '__p' or the '__s' function.
 	* lib/*.c: removed #if's - we now decide at runtime
 	whether to use the server or to call the appropriate
 	function for the sysdeps directory.
 1998-05-28  Martin Baulig  <baulig@merkur.uni-trier.de>
 	* src/server/main.c: we now use the '__p' functions,
 	but only if the appropriate 'GLIBTOP_SUID_<feature>'
 	has a non-zero value.
 	* configure.in (@machine_incs@): always use 
 	`-I$(top_srcdir)/sysdeps/@sysdeps_dir@'; it's no
 	longer conditional.
 	* examples/Makefile.am: removed the '_linux' examples.
 	* sysdeps/linux/*.c: renamed all functions implementing
 	features to '__s'.
 	* lib/*.c: renamed all functions implementing features
 	to '__l'; we only emit code for those functions if the
 	corresponding 'GLIBTOP_SUID_<feature>' has a positive value.
 	* include/glibtop/*.h: added some new function suffixes:
 	'__l' is a function defined in the client part;
 	'__s' is a function defined in the sysdeps part and
 	'__p' is a function that needs special priviledges.
 	'__r' is mapped either on '__l' or on '__s'.
 	* sysdeps/linux/glibtop_server.h: New file -
 	defines system dependent constants 'GLIBTOP_SUID_<feature>'
 	being either 'GLIBTOP_SYSDEPS_<feature>'+1 depending upon
 	whether or not this feature requires using the server.
 	* lib/sysdeps.c: removed that file; it is no longer
 	needed.
 May/21/1998
 ===========
 * doc/gnome-hackers.sgml: This is a short intro on how to use libgtop
  in the GNOME project. It covers especially the use of its 'configure'
  script and the automatically generated 'gtopConf.sh'.
 May/20/1998
 ===========
 * 'gtopConf.sh' now defines 'GTOP_LIBS' and 'GTOP_INCS' in a manner
  that they contain everything that is needed to link some program with
  libgtop. It will use '-lgtop' only if the server is really needed and
  '-lgtop_sysdeps' otherwise;
 * 'gtopConf.sh' additionally defines 'GTOP_GUILE_LIBS' and 'GTOP_GUILE_INCS'
  containing everything that is needed to link some program both with
  libgtop and its guile interface. They are identically to 'GTOP_LIBS'
  and 'GTOP_INCS' if building the guile interface is disabled or guile
  cannot be found on the system.
 * 'configure' takes additional arguments '--enable-libgtop-server' and
  '--disable-libgtop-server' to use the server even when it's not needed
  or to disable it's use where it's needed.
 * 'configure' takes an argument '--without-libgtop-guile' to disable
  guile support.
 * 'configure takes an argument '--without-libgtop-names' to remove
  '-lgtop_names' (and '-lgtop_guile_names' when we have guile) from
  'GTOP_LIBS'; in this case these libraries are not even built.
 May/19/1998
 ===========
 * Libgtop is now in the GNOME CVS Repository.
 May/17/1998
 ===========
 * we have now 'const char *glibtop_types_* []' consisting
  of the C types of the corresponding files of '_glibtop_*'.
 * added guile function '(glibtop-types-*)' and '(glibtop-descriptions-*)'.
 May/10/1998
 ===========
 * Port to DEC OSF1 3.0 has been made:
  cpu		(total, user, nice, sys, idle)
  mem		(total, used, free)
  loadavg	(loadavg)
  uptime	(uptime)
  msg_limits	(map, max, mnb, mni, tql)
  sem_limits	(mni, msl, opm, vmx, aem)
  shm_limits	(max, min, mni, seg)
  The following need the server to be SUID root:
  proclist	(total, number, size)
  procdata	(cmd, state, uid, pid, ppid, pgrp, tty, k_flags,
 		 session, tpgid, sigignore, sigcatch, signal, nice, 
 		 priority, resident, rss, vsize, utime, stime,
 		 cutime, cstime, trs, drs)
 May/07/1998
 ===========
 * 'flags' member of sysdeps/linux/procdata.c is now
  'unsigned long flags [2]'.
 * When we give glibtop_get_procdata () a pid of zero, only
  the flags are returned.
 * We now use static constants instead of #defines for sysdeps flags.
 May/03/1998
 ===========
 * VPATH-Build now working; sometimes it's necessary to copy
  $(top_srcdir)/po/cat-id-tbl.c to $(top_builddir)/po.
 * The library has been tested on the following systems:
  - i686-pc-linux-gnu
  - sparc-sun-sunos4.1.1
  - alpha-dec-osf1 (that's DEC OSF1 3.0 and 3.2)
 * Compilation has been tested on the following systems (I have no root
  access there and cannot test the library because of this):
  - sparc-sun-solaris2
  - i386-bsdi
 * Does no longer require Gnome.
 * Guile-Parts are compiled only if guile can be found.
 * Some of the executables are statically linked to copy them more easily
  between machines.
 May/02/1998
 ===========
 * Global changes to the interfaces, all functions except glibtop_open()
   and glibtop_close() that took a server argument have now a '__r' suffix;
   the original name is now a macro that uses glibtop_global_server.
 Apr/10/1998
 ===========
 Added new directory sysdeps/guile/names. It is the guile interface
 to the gtop_names library found in sysdeps/names. Changed
 GLIBTOP_DESCRIPTIONS to GLIBTOP_NAMES and added GLIBTOP_GUILE_NAMES
 to the header files.
 Apr/09/1998
 ===========
 Added new directories guile and names to sysdeps. In names are
 some string constants about the data stored in the structures.
 guile is a guile interface for the library. It is used in
 examples/third (which has been completely rewritten).
 The header files define things from names when GLIBTOP_DESCRIPTIONS
 if defined and/or from guile when HAVE_GUILE is defined.
 Apr/08/1998
 ===========
 Added guile wrapper for the library (see examples/third).
--- a/59
+++ b/59
@@ -1,57 +1,8 @@
-Hi all,
+$Id$
-[PLEASE READ THE FILE ``README.LATEST'' FOR LATEST NEWS]
+LATEST NEWS:
 this is the latest alpha version of libgtop, a library that fetches
 information about the running system such as cpu and memory usage,
 active processes etc. On Linux systems, these information are taken
 directly from the /proc filesystem. For other systems such as Solaris,
 where such programs need to be suid root (or only setgid kmem/mem on
 some systems), it provides a suid/setgid server that fetches those
 information and a client-side library that talks to this server.
 Main idea was to have the same interface for all operating systems,
 thus all system dependent details are hidden in the implementation
 of that server.
 Currently, it only works for Linux, documentation on how to port it
 to other systems is on the way. I'm planning to keep this site an
 up-to-date mirror of my local machine (which is connected to the
 internet over some expensive dialup connection, so I'll upload it about
 once every day I made significant changes) so that you can always find
 the latest version of the software here.
 I've written a simple guile interface for the library to show which
 information it can already fetch. See examples/third for details.
 Source Code:
 ===========
-   libgtop-current-cvs.cpio.gz     is a cpio archive from the CVS repository
+Please look also in the file 'NEWS' for latest news.
-   libgtop-current.cpio.gz         contains the lates checked out sources
+ 
-   libgtop-stable.cpio.gz          if present, it contains the last stable release
+Martin
 Documentation:
 =============
   libgtop.sgml                    is the SGML source of the (DocBook) documentation
 The next three files are only provided until they get too big to upload.
   libgtop.tex                     TEX file of the documentation
   libgtop.dvi                     DVI file of the documentation
   libgtop.ps                      Postscript file of the documentation
 HTML-Documentation:
 ==================
   libgtop.shtml                   Start here to browse the HTML documentation
 Other stuff:
 ===========
   README, NEWS, ChangeLog         copied from the sources
 Enjoy it!
 Martin (martin@home-of-linux.org - baulig@merkur.uni-trier.de)
--- a/README.LATEST
+++ b/README.LATEST
@@ -1,8 +0,0 @@
 $Id$
 LATEST NEWS:
 ===========
 Please look also in the file 'NEWS' for latest news.
 Martin
--- a/RELNOTES-1.0
+++ b/RELNOTES-1.0
@@ -0,0 +1,163 @@
 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/8
+++ b/8
@@ -1,4 +1,4 @@
-This is LibGTop 0.30.0,
+This is LibGTop 0.99.2,
 a feature-freezed version of LibGTop for GNOME 1.0.
@@ -15,9 +15,7 @@ NOTE:  LibGTop is already feature-freezed for GNOME 1.0, so only bug fixes
 Sysdeps directory 'linux':
 ==========================
-* Add implementation `netload' and `ppp' with modems.
+* Add implementation for `ppp' with modems.
 * Add implementation for `proc_args'.
 Sysdeps directory 'freebsd':
 ============================
@@ -43,6 +41,6 @@ Everything except sysdeps directories:
 * Ready for Gnome 1.0. [ALREADY FEATURE FREEZED]
-December 15, 1998
+January 5, 1999
 Martin
--- a/acconfig.h
+++ b/acconfig.h
@@ -11,6 +11,9 @@
 /* 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
@@ -152,3 +155,7 @@
 * the running kernel (if we don't have configured kernel sources).
 */
 #undef GLIBTOP_LINUX_VERSION_CODE
 /* Define if you want to use LibGTop without GNOME. */
 #undef WITHOUT_GNOME
--- a/configure.in
+++ b/configure.in
@@ -6,6 +6,16 @@ AC_INIT(copyright.txt)
 AM_CONFIG_HEADER(config.h)
 AC_CANONICAL_SYSTEM
 dnl This is required at several places
 AC_CHECK_PROG(ac_dc_found, dc, yes, no)
 if test x$ac_dc_found != xyes ; then
 AC_MSG_ERROR([
 *** The "dc" utility was not found on your system.
 ***
 *** When using RedHat Linux, you need to install the "bc" package.
 ***])
 fi
 . $srcdir/LIBGTOP-VERSION
 AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
@@ -42,6 +52,10 @@ dnl does not work for libgtop.
 AC_CHECK_PROGS(AWK, gawk awk, )
 test -z "$AWK" && AC_MSG_ERROR([Sorry, you need a working awk interpreter.])
 dnl Most people should have a working perl interpreter on their system
 AC_CHECK_PROGS(PERL, perl5 perl)
 test -z "$PERL" && AC_MSG_ERROR([You need to have a working perl interpreter.])
 AC_CHECK_TOOL(CC,gcc)
 AC_CHECK_TOOL(RANLIB,ranlib)
 AC_CHECK_TOOL(AS,as)
@@ -72,6 +86,8 @@ if test "x$gnome_found" != xyes; then
 *** If you want to use LibGTop without GNOME, you need
 *** to give configure the --without-gnome parameter.
 ])
  else
    AC_DEFINE(WITHOUT_GNOME)
  fi
  GNOME_SUPPORT_CHECKS
 else
@@ -143,7 +159,7 @@ AC_SUBST(guile_subdirs)
 AM_PROG_LIBTOOL
-AM_PATH_GLIB(1.1.3,,AC_MSG_ERROR(GLIB >= 1.1.3 is required for LibGTop))
+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.
@@ -170,6 +186,17 @@ AC_CHECK_LIB(kvm, kvm_open)
 dnl For DEC OSF1
 AC_CHECK_LIB(mach, vm_statistics)
 dnl For some broken libc5 systems (Debian 1.3)                                                           
 saved_CFLAGS=$CFLAGS                                                                                     
 CFLAGS="$CFLAGS -D_GNU_SOURCE"                                                                           
 GCC_NEED_DECLARATION(program_invocation_name, [                           
 #include <errno.h>                                                                                       
 #include <stdio.h>                                                                                       
 #include <stdlib.h>                                                                                      
 #include <string.h>                                                                                      
 ])                                                                                                       
 CFLAGS=$saved_CFLAGS                                                                                     
 dnl Check for Internet sockets.
 AC_CHECK_FUNC(socket,
 [AC_CHECK_HEADER(netinet/in.h,
@@ -193,7 +220,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="de es es_DO es_GT es_HN es_MX es_PA es_PE es_SV fr ko no"
+ALL_LINGUAS="de es es_DO es_GT es_HN es_MX es_PA es_PE es_SV fr ko no ja"
 AM_GNOME_GETTEXT
 AC_PATH_XTRA
@@ -256,10 +283,18 @@ dnl These definitions are expanded in make.
 LIBGTOP_LIBS='-L$(libdir)'
 LIBGTOP_INCS='-I$(includedir)'
 if test x$libgtop_use_machine_h = xyes ; then
  LIBGTOP_INCS="$LIBGTOP_INCS -DHAVE_GLIBTOP_MACHINE_H"
 fi
 if test x$build_inodedb = xyes ; then
  LIBGTOP_INCS="$LIBGTOP_INCS -DGLIBTOP_INODEDB"
 fi
 if test x$libgtop_smp = xyes ; then
  LIBGTOP_INCS="$LIBGTOP_INCS -DHAVE_LIBGTOP_SMP"
 fi
 if test x$libgtop_have_sysinfo = xyes ; then
  LIBGTOP_INCS="$LIBGTOP_INCS -DHAVE_LIBGTOP_SYSINFO"
 fi
@@ -291,8 +326,8 @@ fi
 LIBGTOP_EXTRA_LIBS="$LIBGTOP_EXTRA_LIBS $GLIB_LIBS"
-LIBGTOP_LIBS="$LIBGTOP_LIBS -lgtop_common -lgtop -lgtop_sysdeps"
+LIBGTOP_LIBS="$LIBGTOP_LIBS -lgtop -lgtop_sysdeps -lgtop_common"
-LIBGTOP_GUILE_LIBS="$LIBGTOP_GUILE_LIBS -lgtop_common -lgtop -lgtop_sysdeps"
+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"
@@ -348,6 +383,7 @@ AC_SUBST(server_programs)
 AC_OUTPUT([
 Makefile
 libgtop.spec
 po/Makefile.in
 intl/Makefile
 misc/Makefile
--- a/copyright.txt
+++ b/copyright.txt
@@ -1,21 +1,23 @@
 /* $Id$ */
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
 */
--- a/examples/.cvsignore
+++ b/examples/.cvsignore
@@ -11,3 +11,4 @@ third_linux
 third_static
 second_static
 second_linux
 smp sysdeps netload procmap mountlist
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -2,7 +2,7 @@
 LINK			= $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
-CFLAGS			= -Wall -W @CFLAGS@ -O0
+INCLUDES		= @INCLUDES@
 DEFS			= @DEFS@
@@ -24,7 +24,7 @@ first_SOURCES		= first.c
 first_LDADD		= $(top_builddir)/lib/libgtop.la \
 			  $(top_builddir)/sysdeps/common/libgtop_common.la \
 			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps.la \
-			  @INTLLIBS@ @LIBSUPPORT@
+			  @LIBSUPPORT@ @INTLLIBS@
 first_static_SOURCES	= $(first_SOURCES)
 first_static_LDADD	= $(first_LDADD)
@@ -34,7 +34,7 @@ second_SOURCES		= second.c
 second_LDADD		= $(top_builddir)/lib/libgtop.la \
 			  $(top_builddir)/sysdeps/common/libgtop_common.la \
 			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps.la \
-			  @INTLLIBS@ @LIBSUPPORT@
+			  @LIBSUPPORT@ @INTLLIBS@
 second_static_SOURCES	= $(second_SOURCES)
 second_static_LDADD	= $(second_LDADD)
@@ -44,7 +44,7 @@ procmap_SOURCES		= procmap.c
 procmap_LDADD		= $(top_builddir)/lib/libgtop.la \
 			  $(top_builddir)/sysdeps/common/libgtop_common.la \
 			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps.la \
-			  @INTLLIBS@ @LIBSUPPORT@
+			  @LIBSUPPORT@ @INTLLIBS@
@@ -56,7 +56,7 @@ netload_SOURCES		= netload.c
 netload_LDADD		= $(top_builddir)/lib/libgtop.la \
 			  $(top_builddir)/sysdeps/common/libgtop_common.la \
 			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps.la \
-			  @INTLLIBS@ @LIBSUPPORT@
+			  @LIBSUPPORT@ @INTLLIBS@
 netload_static_SOURCES	= $(netload_SOURCES)
 netload_static_LDADD	= $(netload_LDADD)
@@ -66,7 +66,7 @@ sysdeps_SOURCES		= sysdeps.c
 sysdeps_LDADD		= $(top_builddir)/lib/libgtop.la \
 			  $(top_builddir)/sysdeps/common/libgtop_common.la \
 			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps.la \
-			  @INTLLIBS@ @LIBSUPPORT@
+			  @LIBSUPPORT@ @INTLLIBS@
 sysdeps_static_SOURCES	= $(sysdeps_SOURCES)
 sysdeps_static_LDADD	= $(sysdeps_LDADD)
@@ -81,7 +81,7 @@ third_LDADD		= $(top_builddir)/sysdeps/guile/libgtop_guile.la \
 			  $(top_builddir)/lib/libgtop.la \
 			  $(top_builddir)/sysdeps/common/libgtop_common.la \
 			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps.la \
-			  @GUILE_LIBS@ @INTLLIBS@ @LIBSUPPORT@
+			  @GUILE_LIBS@ @LIBSUPPORT@ @INTLLIBS@
 third_static_SOURCES	= $(third_SOURCES)
 third_static_LDADD	= $(third_LDADD)
@@ -91,7 +91,7 @@ mountlist_SOURCES	= mountlist.c
 mountlist_LDADD		= $(top_builddir)/lib/libgtop.la \
 			  $(top_builddir)/sysdeps/common/libgtop_common.la \
 			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps.la \
-			  @INTLLIBS@ @LIBSUPPORT@
+			  @LIBSUPPORT@ @INTLLIBS@
 mountlist_static_SOURCES= $(mountlist_SOURCES)
 mountlist_static_LDADD	= $(mountlist_LDADD)
@@ -102,7 +102,7 @@ smp_SOURCES		= smp.c
 smp_LDADD		= $(top_builddir)/lib/libgtop.la \
 			  $(top_builddir)/sysdeps/common/libgtop_common.la \
 			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps.la \
-			  @INTLLIBS@ @LIBSUPPORT@
+			  @LIBSUPPORT@ @INTLLIBS@
 smp_static_SOURCES	= $(smp_SOURCES)
 smp_static_LDADD	= $(smp_LDADD)
--- a/examples/first.c
+++ b/examples/first.c
@@ -1,23 +1,25 @@
 /* $Id$ */
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
 */
 #include <locale.h>
--- a/examples/mountlist.c
+++ b/examples/mountlist.c
@@ -1,23 +1,25 @@
 /* $Id$ */
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
 */
 #include <locale.h>
--- a/examples/netload.c
+++ b/examples/netload.c
@@ -1,23 +1,25 @@
 /* $Id$ */
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
 */
 #include <locale.h>
--- a/examples/procmap.c
+++ b/examples/procmap.c
@@ -1,23 +1,25 @@
 /* $Id$ */
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
 */
 #include <locale.h>
--- a/examples/second.c
+++ b/examples/second.c
@@ -1,23 +1,25 @@
 /* $Id$ */
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
 */
 #include <locale.h>
--- a/examples/smp.c
+++ b/examples/smp.c
@@ -1,23 +1,25 @@
 /* $Id$ */
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
   Contributed by Martin Baulig <martin@home-of-linux.org>, September 1998.
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
 */
 #include <locale.h>
--- a/examples/sysdeps.c
+++ b/examples/sysdeps.c
@@ -1,23 +1,25 @@
 /* $Id$ */
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
 */
 #include <locale.h>
--- a/examples/third.c
+++ b/examples/third.c
@@ -1,23 +1,25 @@
 /* $Id$ */
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
 */
 #include <locale.h>
--- a/glibtop.h
+++ b/glibtop.h
@@ -1,23 +1,25 @@
 /* $Id$ */
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
 */
 #ifndef __GLIBTOP_H__
 #define __GLIBTOP_H__
@@ -72,14 +74,21 @@ extern const unsigned long glibtop_server_features;
 #define glibtop_close()	glibtop_close_r(glibtop_global_server);
-extern glibtop *glibtop_init_r __P((glibtop **, unsigned long, unsigned));
+glibtop *
-extern glibtop *glibtop_init_s __P((glibtop **, unsigned long, unsigned));
+glibtop_init_r (glibtop **server_ptr,
 		unsigned long features,
 		unsigned flags);
 glibtop *
 glibtop_init_s (glibtop **server_ptr,
 		unsigned long features,
 		unsigned flags);
 #ifdef GLIBTOP_GUILE
 /* You need to link with -lgtop_guile to get this stuff here. */
-extern void glibtop_boot_guile __P((void));
+void glibtop_boot_guile (void);
 #endif
@@ -87,7 +96,7 @@ extern void glibtop_boot_guile __P((void));
 /* You need to link with -lgtop_guile_names to get this stuff here. */
-extern void glibtop_boot_guile_names __P((void));
+void glibtop_boot_guile_names (void);
 #ifndef GLIBTOP_NAMES
 #define GLIBTOP_NAMES
--- a/include/glibtop/close.h
+++ b/include/glibtop/close.h
@@ -1,36 +1,38 @@
 /* $Id$ */
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
 */
 #ifndef __GLIBTOP_CLOSE_H__
 #define __GLIBTOP_CLOSE_H__
 #include <glibtop.h>
-__BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
-extern void glibtop_close_r __P((glibtop *));
+void glibtop_close_r (glibtop *server);
-extern void glibtop_close_s __P((glibtop *));
+void glibtop_close_s (glibtop *server);
-extern void glibtop_close_p __P((glibtop *));
+void glibtop_close_p (glibtop *server);
-__END_DECLS
+END_LIBGTOP_DECLS
 #endif
--- a/include/glibtop/command.h
+++ b/include/glibtop/command.h
@@ -1,23 +1,25 @@
 /* $Id$ */
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
 */
 #ifndef __GLIBTOP_COMMAND_H__
 #define __GLIBTOP_COMMAND_H__
@@ -26,7 +28,7 @@
 #include <glibtop/sysdeps.h>
 #include <glibtop/union.h>
-__BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 #define GLIBTOP_CMND_QUIT		0
 #define GLIBTOP_CMND_SYSDEPS		1
@@ -87,9 +89,14 @@ struct _glibtop_response
 #define glibtop_call(p1, p2, p3, p4)	glibtop_call_r(glibtop_global_server, p1, p2, p3, p4)
-extern void *glibtop_call_l __P((glibtop *, unsigned, size_t, const void *, size_t, void *));
+void *
-extern void *glibtop_call_s __P((glibtop *, unsigned, size_t, const void *, size_t, void *));
+glibtop_call_l (glibtop *server, unsigned command, size_t send_size,
 		const void *send_buf, size_t recv_size, void *recv_buf);
-__END_DECLS
+void *
 glibtop_call_s (glibtop *server, unsigned command, size_t send_size,
 		const void *send_buf, size_t recv_size, void *recv_buf);
 END_LIBGTOP_DECLS
 #endif
--- a/include/glibtop/cpu.h
+++ b/include/glibtop/cpu.h
@@ -1,23 +1,25 @@
 /* $Id$ */
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
 */
 #ifndef __GLIBTOP_CPU_H__
 #define __GLIBTOP_CPU_H__
@@ -25,7 +27,7 @@
 #include <glibtop.h>
 #include <glibtop/global.h>
-__BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 #define GLIBTOP_CPU_TOTAL	0
 #define GLIBTOP_CPU_USER	1
@@ -71,14 +73,14 @@ struct _glibtop_cpu
 #define glibtop_get_cpu_r	glibtop_get_cpu_s
 #endif
-extern void glibtop_get_cpu_l __P((glibtop *, glibtop_cpu *));
+void glibtop_get_cpu_l (glibtop *server, glibtop_cpu *buf);
 #if GLIBTOP_SUID_CPU
-extern void glibtop_init_cpu_p __P((glibtop *));
+void glibtop_init_cpu_p (glibtop *server);
-extern void glibtop_get_cpu_p __P((glibtop *, glibtop_cpu *));
+void glibtop_get_cpu_p (glibtop *server, glibtop_cpu *buf);
 #else
-extern void glibtop_init_cpu_s __P((glibtop *));
+void glibtop_init_cpu_s (glibtop *server);
-extern void glibtop_get_cpu_s __P((glibtop *, glibtop_cpu *));
+void glibtop_get_cpu_s (glibtop *server, glibtop_cpu *buf);
 #endif
 #ifdef GLIBTOP_NAMES
@@ -92,6 +94,6 @@ extern const char *glibtop_descriptions_cpu [];
 #endif
-__END_DECLS
+END_LIBGTOP_DECLS
 #endif
--- a/include/glibtop/error.h
+++ b/include/glibtop/error.h
@@ -1,30 +1,80 @@
 /* $Id$ */
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
 */
 #ifndef __GLIBTOP_ERROR_H__
 #define __GLIBTOP_ERROR_H__
 #include <glibtop.h>
-__BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 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
 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
 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
 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
 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)
@@ -32,12 +82,46 @@ __BEGIN_DECLS
 #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)
-extern void glibtop_error_r __P((glibtop *, char *, ...));
+#else /* no __GNUC__ */
 extern void glibtop_warn_r __P((glibtop *, char *, ...));
-extern void glibtop_error_io_r __P((glibtop *, char *, ...));
+static void
-extern void glibtop_warn_io_r __P((glibtop *, char *, ...));
+glibtop_error (char *format, ...)
 {
 	va_list args;
 	va_start (args, format);
 	glibtop_error_vr (glibtop_global_server, format, args);
 	va_end (args);
 }
-__END_DECLS
+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/fsusage.h
+++ b/include/glibtop/fsusage.h
@@ -1,23 +1,25 @@
 /* $Id$ */
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
 */
 #ifndef __GLIBTOP_FSUSAGE_H__
 #define __GLIBTOP_FSUSAGE_H__
@@ -25,7 +27,7 @@
 #include <glibtop.h>
 #include <glibtop/global.h>
-__BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 #define GLIBTOP_FSUSAGE_BLOCKS		0
 #define GLIBTOP_FSUSAGE_BFREE		1
@@ -51,9 +53,8 @@ struct _glibtop_fsusage
 #define glibtop_get_fsusage_r		glibtop_get_fsusage_s
-extern void glibtop_get_fsusage_l __P((glibtop *, glibtop_fsusage *, const char *));
+void glibtop_get_fsusage_l (glibtop *server, glibtop_fsusage *buf, const char *mount_dir);
-
+void glibtop_get_fsusage_s (glibtop *server, glibtop_fsusage *buf, const char *mount_dir);
 extern void glibtop_get_fsusage_s __P((glibtop *, glibtop_fsusage *, const char *));
 #ifdef GLIBTOP_NAMES
@@ -66,6 +67,6 @@ extern const char *glibtop_descriptions_fsusage [];
 #endif
-__END_DECLS
+END_LIBGTOP_DECLS
 #endif
--- a/include/glibtop/global.h
+++ b/include/glibtop/global.h
@@ -1,54 +1,47 @@
 /* $Id$ */
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
 */
 #ifndef __GLIBTOP_GLOBAL_H__
 #define __GLIBTOP_GLOBAL_H__
 #ifdef _IN_LIBGTOP
 #include <config.h>
 /* __BEGIN_DECLS should be used at the beginning of your declarations,
   so that C++ compilers don't mangle their names.  Use __END_DECLS at
   the end of C declarations. */
 #undef __BEGIN_DECLS
 #undef __END_DECLS
 #ifdef __cplusplus
 # define __BEGIN_DECLS extern "C" {
 # define __END_DECLS }
 #else
 # define __BEGIN_DECLS /* empty */
 # define __END_DECLS /* empty */
 #endif
-/* __P is a macro used to wrap function prototypes, so that compilers
+/*
-   that don't understand ANSI C prototypes still work, and ANSI C
+ * All declarations are enclosed in BEGIN_LIBGTOP_DECLS and
-   compilers can issue warnings about type mismatches. */
+ * END_LIBGTOP_DECLS so that C++ compilers don't mangle their names.
-
+ *
-#undef __P
+ */
-#if defined (__STDC__) || defined (_AIX) \
+   
-|| (defined (__mips) && defined (_SYSTYPE_SVR4)) \
+#undef BEGIN_LIBGTOP_DECLS
-     || defined(WIN32) || defined(__cplusplus)
+#undef END_LIBGTOP_DECLS
-# define __P(protos) protos
+#ifdef __cplusplus
 # define BEGIN_LIBGTOP_DECLS extern "C" {
 # define END_LIBGTOP_DECLS }
 #else
-# define __P(protos) ()
+# define BEGIN_LIBGTOP_DECLS /* empty */
 # define END_LIBGTOP_DECLS /* empty */
 #endif
 #ifdef _IN_LIBGTOP
@@ -129,17 +122,21 @@
 #include <signal.h>
 #include <errno.h>
-__BEGIN_DECLS
+#ifdef _IN_LIBGTOP
 BEGIN_LIBGTOP_DECLS
 #ifndef _
-#define _(String) gettext (String)
+#define _(String) dgettext (PACKAGE, String)
 #define N_(String) (String)
 #endif
 #ifndef HAVE_STRERROR
-extern char *strerror __P((int));
+char *strerror (int errno);
 #endif
-__END_DECLS
+END_LIBGTOP_DECLS
 #endif /* _IN_LIBGTOP */
 #endif
--- a/include/glibtop/gnuserv.h
+++ b/include/glibtop/gnuserv.h
@@ -153,8 +153,9 @@ static char header_rcsid [] = "!Header: gnuserv.h,v 2.4 95/02/16 11:58:11 arup a
 #define CONN_IPC      2
 /* function declarations */
-extern int glibtop_make_connection __P((const char *, int, int *));
+int glibtop_make_connection (const char *hostarg, int portarg, int *s);
 #ifdef INTERNET_DOMAIN_SOCKETS
-extern long glibtop_internet_addr __P((const char *));
+long glibtop_internet_addr (const char *host);
 #endif
--- a/include/glibtop/inodedb.h
+++ b/include/glibtop/inodedb.h
@@ -1,21 +1,23 @@
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
 */
 #ifndef __GLIBTOP_INODEDB_H__
 #define __GLIBTOP_INODEDB_H__
@@ -29,7 +31,7 @@
 #define GLIBTOP_INODEDB_ALL		7
-__BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 typedef struct _glibtop_inodedb		glibtop_inodedb;
@@ -49,10 +51,17 @@ struct _glibtop_inodedb
 #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)
-extern glibtop_inodedb *glibtop_inodedb_open_s __P((glibtop *, unsigned, unsigned long));
+glibtop_inodedb *
-extern const char *glibtop_inodedb_lookup_s __P((glibtop *, glibtop_inodedb *, u_int64_t, u_int64_t));
+glibtop_inodedb_open_s (glibtop *server, unsigned databases, unsigned long cache_size);
 extern void glibtop_inodedb_close_s __P((glibtop *, glibtop_inodedb *));
-__END_DECLS
+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/loadavg.h
+++ b/include/glibtop/loadavg.h
@@ -1,23 +1,25 @@
 /* $Id$ */
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
 */
 #ifndef __GLIBTOP_LOADAVG_H__
 #define __GLIBTOP_LOADAVG_H__
@@ -25,7 +27,7 @@
 #include <glibtop.h>
 #include <glibtop/global.h>
-__BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 #define GLIBTOP_LOADAVG_LOADAVG		0
 #define GLIBTOP_LOADAVG_NR_RUNNING	1
@@ -53,14 +55,14 @@ struct _glibtop_loadavg
 #define glibtop_get_loadavg_r		glibtop_get_loadavg_s
 #endif
-extern void glibtop_get_loadavg_l __P((glibtop *, glibtop_loadavg *));
+void glibtop_get_loadavg_l (glibtop *server, glibtop_loadavg *buf);
 #if GLIBTOP_SUID_LOADAVG
-extern void glibtop_init_loadavg_p __P((glibtop *));
+void glibtop_init_loadavg_p (glibtop *server);
-extern void glibtop_get_loadavg_p __P((glibtop *, glibtop_loadavg *));
+void glibtop_get_loadavg_p (glibtop *server, glibtop_loadavg *buf);
 #else
-extern void glibtop_init_loadavg_s __P((glibtop *));
+void glibtop_init_loadavg_s (glibtop *server);
-extern void glibtop_get_loadavg_s __P((glibtop *, glibtop_loadavg *));
+void glibtop_get_loadavg_s (glibtop *server, glibtop_loadavg *buf);
 #endif
 #ifdef GLIBTOP_NAMES
@@ -74,6 +76,6 @@ extern const char *glibtop_descriptions_loadavg [];
 #endif
-__END_DECLS
+END_LIBGTOP_DECLS
 #endif
--- a/include/glibtop/mem.h
+++ b/include/glibtop/mem.h
@@ -1,23 +1,25 @@
 /* $Id$ */
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
 */
 #ifndef __GLIBTOP_MEM_H__
 #define __GLIBTOP_MEM_H__
@@ -25,7 +27,7 @@
 #include <glibtop.h>
 #include <glibtop/global.h>
-__BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 #define GLIBTOP_MEM_TOTAL	0
 #define GLIBTOP_MEM_USED	1
@@ -61,14 +63,14 @@ struct _glibtop_mem
 #define glibtop_get_mem_r		glibtop_get_mem_s
 #endif
-extern void glibtop_get_mem_l __P((glibtop *, glibtop_mem *));
+void glibtop_get_mem_l (glibtop *server, glibtop_mem *buf);
 #if GLIBTOP_SUID_MEM
-extern void glibtop_init_mem_p __P((glibtop *));
+void glibtop_init_mem_p (glibtop *server);
-extern void glibtop_get_mem_p __P((glibtop *, glibtop_mem *));
+void glibtop_get_mem_p (glibtop *server, glibtop_mem *buf);
 #else
-extern void glibtop_init_mem_s __P((glibtop *));
+void glibtop_init_mem_s (glibtop *server);
-extern void glibtop_get_mem_s __P((glibtop *, glibtop_mem *));
+void glibtop_get_mem_s (glibtop *server, glibtop_mem *buf);
 #endif
 #ifdef GLIBTOP_NAMES
@@ -82,6 +84,6 @@ extern const char *glibtop_descriptions_mem [];
 #endif
-__END_DECLS
+END_LIBGTOP_DECLS
 #endif
--- a/include/glibtop/mountlist.h
+++ b/include/glibtop/mountlist.h
@@ -1,23 +1,25 @@
 /* $Id$ */
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
 */
 #ifndef __GLIBTOP_MOUNTLIST_H__
 #define __GLIBTOP_MOUNTLIST_H__
@@ -25,7 +27,7 @@
 #include <glibtop.h>
 #include <glibtop/global.h>
-__BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 #define GLIBTOP_MOUNTLIST_NUMBER	0
 #define GLIBTOP_MOUNTLIST_TOTAL		1
@@ -57,9 +59,11 @@ struct _glibtop_mountlist
 #define glibtop_get_mountlist_r		glibtop_get_mountlist_s
-extern glibtop_mountentry *glibtop_get_mountlist_l __P((glibtop *, glibtop_mountlist *, int));
+glibtop_mountentry *
 glibtop_get_mountlist_l (glibtop *server, glibtop_mountlist *buf, int all_fs);
-extern glibtop_mountentry *glibtop_get_mountlist_s __P((glibtop *, glibtop_mountlist *, int));
+glibtop_mountentry *
 glibtop_get_mountlist_s (glibtop *server, glibtop_mountlist *buf, int all_fs);
 #ifdef GLIBTOP_NAMES
@@ -72,6 +76,6 @@ extern const char *glibtop_descriptions_mountlist [];
 #endif
-__END_DECLS
+END_LIBGTOP_DECLS
 #endif
--- a/include/glibtop/msg_limits.h
+++ b/include/glibtop/msg_limits.h
@@ -1,23 +1,25 @@
 /* $Id$ */
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
 */
 #ifndef __GLIBTOP_MSG_LIMITS_H__
 #define __GLIBTOP_MSG_LIMITS_H__
@@ -25,7 +27,7 @@
 #include <glibtop.h>
 #include <glibtop/global.h>
-__BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 #define GLIBTOP_IPC_MSGPOOL	0
 #define GLIBTOP_IPC_MSGMAP	1
@@ -59,14 +61,14 @@ struct _glibtop_msg_limits
 #define glibtop_get_msg_limits_r	glibtop_get_msg_limits_s
 #endif
-extern void glibtop_get_msg_limits_l __P((glibtop *, glibtop_msg_limits *));
+void glibtop_get_msg_limits_l (glibtop *server, glibtop_msg_limits *buf);
 #if GLIBTOP_SUID_MSG_LIMITS
-extern void glibtop_init_msg_limits_p __P((glibtop *));
+void glibtop_init_msg_limits_p (glibtop *server);
-extern void glibtop_get_msg_limits_p __P((glibtop *, glibtop_msg_limits *));
+void glibtop_get_msg_limits_p (glibtop *server, glibtop_msg_limits *buf);
 #else
-extern void glibtop_init_msg_limits_s __P((glibtop *));
+void glibtop_init_msg_limits_s (glibtop *server);
-extern void glibtop_get_msg_limits_s __P((glibtop *, glibtop_msg_limits *));
+void glibtop_get_msg_limits_s (glibtop *server, glibtop_msg_limits *buf);
 #endif
 #ifdef GLIBTOP_NAMES
@@ -80,6 +82,7 @@ extern const char *glibtop_descriptions_msg_limits [];
 #endif
-__END_DECLS
+END_LIBGTOP_DECLS
 #endif
--- a/include/glibtop/netload.h
+++ b/include/glibtop/netload.h
@@ -1,23 +1,25 @@
 /* $Id$ */
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
 */
 #ifndef __GLIBTOP_NETLOAD_H__
 #define __GLIBTOP_NETLOAD_H__
@@ -25,7 +27,7 @@
 #include <glibtop.h>
 #include <glibtop/global.h>
-__BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 #define GLIBTOP_NETLOAD_IF_FLAGS	0
 #define GLIBTOP_NETLOAD_MTU		1
@@ -92,14 +94,14 @@ struct _glibtop_netload
 #define glibtop_get_netload_r	glibtop_get_netload_s
 #endif
-extern void glibtop_get_netload_l __P((glibtop *, glibtop_netload *, const char *));
+void glibtop_get_netload_l (glibtop *server, glibtop_netload *buf, const char *interface);
 #if GLIBTOP_SUID_NETLOAD
-extern void glibtop_init_netload_p __P((glibtop *));
+void glibtop_init_netload_p (glibtop *server);
-extern void glibtop_get_netload_p __P((glibtop *, glibtop_netload *, const char *));
+void glibtop_get_netload_p (glibtop *server, glibtop_netload *buf, const char *interface);
 #else
-extern void glibtop_init_netload_s __P((glibtop *));
+void glibtop_init_netload_s (glibtop *server);
-extern void glibtop_get_netload_s __P((glibtop *, glibtop_netload *, const char *));
+void glibtop_get_netload_s (glibtop *server, glibtop_netload *buf, const char *interface);
 #endif
 #ifdef GLIBTOP_NAMES
@@ -113,6 +115,6 @@ extern const char *glibtop_descriptions_netload [];
 #endif
-__END_DECLS
+END_LIBGTOP_DECLS
 #endif
--- a/include/glibtop/open.h
+++ b/include/glibtop/open.h
@@ -1,21 +1,23 @@
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
 */
 #ifndef __GLIBTOP_OPEN_H__
 #define __GLIBTOP_OPEN_H__
@@ -24,7 +26,7 @@
 #include <glibtop/read.h>
 #include <glibtop/error.h>
-__BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 #define _GLIBTOP_INIT_STATE_INIT	0x10000
 #define _GLIBTOP_INIT_STATE_OPEN	0x20000
@@ -49,12 +51,23 @@ __BEGIN_DECLS
 #define GLIBTOP_ERROR_METHOD_DEFAULT	GLIBTOP_ERROR_METHOD_WARN_ONCE
-extern void glibtop_open_l __P((glibtop *, const char *, const unsigned long, const unsigned));
+void
 glibtop_open_l (glibtop *server, const char *program_name,
 		const unsigned long features, const unsigned flags);
-extern void glibtop_init_p __P((glibtop *, const unsigned long, const unsigned));
+void
-extern void glibtop_open_p __P((glibtop *, const char *, const unsigned long, const unsigned));
+glibtop_init_p (glibtop *server, const unsigned long features,
-extern void glibtop_open_s __P((glibtop *, const char *, const unsigned long, const unsigned));
+		const unsigned flags);
-__END_DECLS
+void
 glibtop_open_p (glibtop *server, const char *program_name,
 		const unsigned long features, const unsigned flags);
 void
 glibtop_open_s (glibtop *server, const char *program_name,
 		const unsigned long features, const unsigned flags);
 END_LIBGTOP_DECLS
 #endif
--- a/include/glibtop/parameter.h
+++ b/include/glibtop/parameter.h
@@ -1,21 +1,23 @@
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
 */
 #ifndef __GLIBTOP_PARAMETER_H__
 #define __GLIBTOP_PARAMETER_H__
@@ -23,7 +25,7 @@
 #include <glibtop.h>
 #include <glibtop/open.h>
-__BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 #define GLIBTOP_PARAM_METHOD		1
 #define GLIBTOP_PARAM_FEATURES		2
@@ -36,9 +38,14 @@ __BEGIN_DECLS
 #define glibtop_get_parameter(p1,p2,p3)	glibtop_get_parameter_l(glibtop_global_server,p1,p2,p3)
 #define glibtop_set_parameter(p1,p2,p3) glibtop_set_parameter_l(glibtop_global_server,p1,p2,p3)
-extern size_t	glibtop_get_parameter_l __P((glibtop *, const unsigned, void *, size_t));
+size_t
-extern void	glibtop_set_parameter_l __P((glibtop *, const unsigned, const void *, size_t));
+glibtop_get_parameter_l (glibtop *server, const unsigned parameter,
 			 void *data_ptr, size_t data_size);
-__END_DECLS
+void
 glibtop_set_parameter_l (glibtop *server, const unsigned parameter,
 			 const void *data_ptr, size_t data_size);
 END_LIBGTOP_DECLS
 #endif
--- a/include/glibtop/ppp.h
+++ b/include/glibtop/ppp.h
@@ -1,23 +1,25 @@
 /* $Id$ */
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
 */
 #ifndef __GLIBTOP_PPP_H__
 #define __GLIBTOP_PPP_H__
@@ -25,7 +27,7 @@
 #include <glibtop.h>
 #include <glibtop/global.h>
-__BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 #define GLIBTOP_PPP_STATE	0
 #define GLIBTOP_PPP_BYTES_IN	1	
@@ -57,14 +59,14 @@ struct _glibtop_ppp
 #define glibtop_get_ppp_r	glibtop_get_ppp_s
 #endif
-extern void glibtop_get_ppp_l __P((glibtop *, glibtop_ppp *, unsigned short));
+void glibtop_get_ppp_l (glibtop *server, glibtop_ppp *buf, unsigned short device);
 #if GLIBTOP_SUID_PPP
-extern void glibtop_init_ppp_p __P((glibtop *));
+void glibtop_init_ppp_p (glibtop *server);
-extern void glibtop_get_ppp_p __P((glibtop *, glibtop_ppp *, unsigned short));
+void glibtop_get_ppp_p (glibtop *server, glibtop_ppp *buf, unsigned short device);
 #else
-extern void glibtop_init_ppp_s __P((glibtop *));
+void glibtop_init_ppp_s (glibtop *server);
-extern void glibtop_get_ppp_s __P((glibtop *, glibtop_ppp *, unsigned short));
+void glibtop_get_ppp_s (glibtop *server, glibtop_ppp *buf, unsigned short device);
 #endif
 #ifdef GLIBTOP_NAMES
@@ -78,6 +80,6 @@ extern const char *glibtop_descriptions_ppp [];
 #endif
-__END_DECLS
+END_LIBGTOP_DECLS
 #endif
--- a/include/glibtop/procargs.h
+++ b/include/glibtop/procargs.h
@@ -1,23 +1,25 @@
 /* $Id$ */
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
 */
 #ifndef __GLIBTOP_PROC_ARGS_H__
 #define __GLIBTOP_PROC_ARGS_H__
@@ -25,7 +27,7 @@
 #include <glibtop.h>
 #include <glibtop/global.h>
-__BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 #define GLIBTOP_PROC_ARGS_SIZE		0
@@ -47,14 +49,22 @@ struct _glibtop_proc_args
 #define glibtop_get_proc_args_r		glibtop_get_proc_args_s
 #endif
-extern char  *glibtop_get_proc_args_l __P((glibtop *, glibtop_proc_args *, pid_t, unsigned));
+char *
 glibtop_get_proc_args_l (glibtop *server, glibtop_proc_args *buf,
 			 pid_t pid, unsigned max_len);
 #if GLIBTOP_SUID_PROC_ARGS
-extern void glibtop_init_proc_args_p __P((glibtop *));
+void glibtop_init_proc_args_p (glibtop *server);
-extern char *glibtop_get_proc_args_p __P((glibtop *, glibtop_proc_args *, pid_t, unsigned));
+
 char *
 glibtop_get_proc_args_p (glibtop *server, glibtop_proc_args *buf,
 			 pid_t pid, unsigned max_len);
 #else
-extern void glibtop_init_proc_args_s __P((glibtop *));
+void glibtop_init_proc_args_s (glibtop *server);
-extern char *glibtop_get_proc_args_s __P((glibtop *, glibtop_proc_args *, pid_t, unsigned));
+
 char *
 glibtop_get_proc_args_s (glibtop *server, glibtop_proc_args *buf,
 			 pid_t pid, unsigned max_len);
 #endif
 #ifdef GLIBTOP_NAMES
@@ -68,6 +78,6 @@ extern const char *glibtop_descriptions_proc_args [];
 #endif
-__END_DECLS
+END_LIBGTOP_DECLS
 #endif
--- a/include/glibtop/prockernel.h
+++ b/include/glibtop/prockernel.h
@@ -1,23 +1,25 @@
 /* $Id$ */
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
 */
 #ifndef __GLIBTOP_PROCKERNEL_H__
 #define __GLIBTOP_PROCKERNEL_H__
@@ -25,7 +27,7 @@
 #include <glibtop.h>
 #include <glibtop/global.h>
-__BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 #define GLIBTOP_PROC_KERNEL_K_FLAGS	0
 #define GLIBTOP_PROC_KERNEL_MIN_FLT	1
@@ -70,14 +72,14 @@ struct _glibtop_proc_kernel
 #define glibtop_get_proc_kernel_r	glibtop_get_proc_kernel_s
 #endif
-extern void glibtop_get_proc_kernel_l __P((glibtop *, glibtop_proc_kernel *, pid_t));
+void glibtop_get_proc_kernel_l (glibtop *server, glibtop_proc_kernel *buf, pid_t pid);
 #if GLIBTOP_SUID_PROC_KERNEL
-extern void glibtop_init_proc_kernel_p __P((glibtop *));
+void glibtop_init_proc_kernel_p (glibtop *server);
-extern void glibtop_get_proc_kernel_p __P((glibtop *, glibtop_proc_kernel *, pid_t));
+void glibtop_get_proc_kernel_p (glibtop *server, glibtop_proc_kernel *buf, pid_t pid);
 #else
-extern void glibtop_init_proc_kernel_s __P((glibtop *));
+void glibtop_init_proc_kernel_s (glibtop *server);
-extern void glibtop_get_proc_kernel_s __P((glibtop *, glibtop_proc_kernel *, pid_t));
+void glibtop_get_proc_kernel_s (glibtop *server, glibtop_proc_kernel *buf, pid_t pid);
 #endif
 #ifdef GLIBTOP_NAMES
@@ -91,6 +93,6 @@ extern const char *glibtop_descriptions_proc_kernel [];
 #endif
-__END_DECLS
+END_LIBGTOP_DECLS
 #endif
--- a/include/glibtop/proclist.h
+++ b/include/glibtop/proclist.h
@@ -1,23 +1,25 @@
 /* $Id$ */
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
 */
 #ifndef __GLIBTOP_PROCLIST_H__
 #define __GLIBTOP_PROCLIST_H__
@@ -25,7 +27,7 @@
 #include <glibtop.h>
 #include <glibtop/global.h>
-__BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 #define GLIBTOP_PROCLIST_NUMBER	0
 #define GLIBTOP_PROCLIST_TOTAL	1
@@ -68,14 +70,22 @@ struct _glibtop_proclist
 #define glibtop_get_proclist_r		glibtop_get_proclist_s
 #endif
-extern unsigned *glibtop_get_proclist_l __P((glibtop *, glibtop_proclist *, int64_t, int64_t));
+unsigned *
 glibtop_get_proclist_l (glibtop *server, glibtop_proclist *buf,
 			int64_t which, int64_t arg);
 #if GLIBTOP_SUID_PROCLIST
-extern void glibtop_init_proclist_p __P((glibtop *));
+void glibtop_init_proclist_p (glibtop *server);
-extern unsigned *glibtop_get_proclist_p __P((glibtop *, glibtop_proclist *, int64_t, int64_t));
+
 unsigned *
 glibtop_get_proclist_p (glibtop *server, glibtop_proclist *buf,
 			int64_t which, int64_t arg);
 #else
-extern void glibtop_init_proclist_s __P((glibtop *));
+void glibtop_init_proclist_s (glibtop *server);
-extern unsigned *glibtop_get_proclist_s __P((glibtop *, glibtop_proclist *, int64_t, int64_t));
+
 unsigned *
 glibtop_get_proclist_s (glibtop *server, glibtop_proclist *buf,
 			int64_t which, int64_t arg);
 #endif
 #ifdef GLIBTOP_NAMES
@@ -89,6 +99,6 @@ extern const char *glibtop_descriptions_proclist [];
 #endif
-__END_DECLS
+END_LIBGTOP_DECLS
 #endif
--- a/include/glibtop/procmap.h
+++ b/include/glibtop/procmap.h
@@ -1,23 +1,25 @@
 /* $Id$ */
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
 */
 #ifndef __GLIBTOP_PROC_MAP_H__
 #define __GLIBTOP_PROC_MAP_H__
@@ -25,7 +27,7 @@
 #include <glibtop.h>
 #include <glibtop/global.h>
-__BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 #define GLIBTOP_PROC_MAP_NUMBER		0
 #define GLIBTOP_PROC_MAP_TOTAL		1
@@ -77,14 +79,19 @@ struct _glibtop_proc_map
 #define glibtop_get_proc_map_r		glibtop_get_proc_map_s
 #endif
-extern glibtop_map_entry *glibtop_get_proc_map_l __P((glibtop *, glibtop_proc_map *, pid_t));
+glibtop_map_entry *
 glibtop_get_proc_map_l (glibtop *server, glibtop_proc_map *buf, pid_t pid);
 #if GLIBTOP_SUID_PROC_MAP
-extern void glibtop_init_proc_map_p __P((glibtop *));
+void glibtop_init_proc_map_p (glibtop *server);
-extern glibtop_map_entry *glibtop_get_proc_map_p __P((glibtop *, glibtop_proc_map *, pid_t));
+
 glibtop_map_entry *
 glibtop_get_proc_map_p (glibtop *server, glibtop_proc_map *buf, pid_t pid);
 #else
-extern void glibtop_init_proc_map_s __P((glibtop *));
+void glibtop_init_proc_map_s (glibtop *server);
-extern glibtop_map_entry *glibtop_get_proc_map_s __P((glibtop *, glibtop_proc_map *, pid_t));
+
 glibtop_map_entry *
 glibtop_get_proc_map_s (glibtop *server, glibtop_proc_map *buf, pid_t pid);
 #endif
 #ifdef GLIBTOP_NAMES
@@ -98,6 +105,6 @@ extern const char *glibtop_descriptions_proc_map [];
 #endif
-__END_DECLS
+END_LIBGTOP_DECLS
 #endif
--- a/include/glibtop/procmem.h
+++ b/include/glibtop/procmem.h
@@ -1,23 +1,25 @@
 /* $Id$ */
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
 */
 #ifndef __GLIBTOP_PROCMEM_H__
 #define __GLIBTOP_PROCMEM_H__
@@ -25,7 +27,7 @@
 #include <glibtop.h>
 #include <glibtop/global.h>
-__BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 #define GLIBTOP_PROC_MEM_SIZE		0
 #define GLIBTOP_PROC_MEM_VSIZE		1
@@ -61,14 +63,14 @@ struct _glibtop_proc_mem
 #define glibtop_get_proc_mem_r		glibtop_get_proc_mem_s
 #endif
-extern void glibtop_get_proc_mem_l __P((glibtop *, glibtop_proc_mem *, pid_t));
+void glibtop_get_proc_mem_l (glibtop *server, glibtop_proc_mem *buf, pid_t pid);
 #if GLIBTOP_SUID_PROC_MEM
-extern void glibtop_init_proc_mem_p __P((glibtop *));
+void glibtop_init_proc_mem_p (glibtop *server);
-extern void glibtop_get_proc_mem_p __P((glibtop *, glibtop_proc_mem *, pid_t));
+void glibtop_get_proc_mem_p (glibtop *server, glibtop_proc_mem *buf, pid_t pid);
 #else
-extern void glibtop_init_proc_mem_s __P((glibtop *));
+void glibtop_init_proc_mem_s (glibtop *server);
-extern void glibtop_get_proc_mem_s __P((glibtop *, glibtop_proc_mem *, pid_t));
+void glibtop_get_proc_mem_s (glibtop *server, glibtop_proc_mem *buf, pid_t pid);
 #endif
 #ifdef GLIBTOP_NAMES
@@ -82,6 +84,6 @@ extern const char *glibtop_descriptions_proc_mem [];
 #endif
-__END_DECLS
+END_LIBGTOP_DECLS
 #endif
--- a/include/glibtop/procsegment.h
+++ b/include/glibtop/procsegment.h
@@ -1,23 +1,25 @@
 /* $Id$ */
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
 */
 #ifndef __GLIBTOP_PROCSEGMENT_H__
 #define __GLIBTOP_PROCSEGMENT_H__
@@ -25,7 +27,7 @@
 #include <glibtop.h>
 #include <glibtop/global.h>
-__BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 #define GLIBTOP_PROC_SEGMENT_TEXT_RSS		0
 #define GLIBTOP_PROC_SEGMENT_SHLIB_RSS		1
@@ -64,14 +66,14 @@ struct _glibtop_proc_segment
 #define glibtop_get_proc_segment_r	glibtop_get_proc_segment_s
 #endif
-extern void glibtop_get_proc_segment_l __P((glibtop *, glibtop_proc_segment *, pid_t));
+void glibtop_get_proc_segment_l (glibtop *server, glibtop_proc_segment *buf, pid_t pid);
 #if GLIBTOP_SUID_PROC_SEGMENT
-extern void glibtop_init_proc_segment_p __P((glibtop *));
+void glibtop_init_proc_segment_p (glibtop *server);
-extern void glibtop_get_proc_segment_p __P((glibtop *, glibtop_proc_segment *, pid_t));
+void glibtop_get_proc_segment_p (glibtop *server, glibtop_proc_segment *buf, pid_t pid);
 #else
-extern void glibtop_init_proc_segment_s __P((glibtop *));
+void glibtop_init_proc_segment_s (glibtop *server);
-extern void glibtop_get_proc_segment_s __P((glibtop *, glibtop_proc_segment *, pid_t));
+void glibtop_get_proc_segment_s (glibtop *server, glibtop_proc_segment *buf, pid_t pid);
 #endif
 #ifdef GLIBTOP_NAMES
@@ -85,6 +87,6 @@ extern const char *glibtop_descriptions_proc_segment [];
 #endif
-__END_DECLS
+END_LIBGTOP_DECLS
 #endif
--- a/include/glibtop/procsignal.h
+++ b/include/glibtop/procsignal.h
@@ -1,23 +1,25 @@
 /* $Id$ */
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
 */
 #ifndef __GLIBTOP_PROCSIGNAL_H__
 #define __GLIBTOP_PROCSIGNAL_H__
@@ -25,7 +27,7 @@
 #include <glibtop.h>
 #include <glibtop/global.h>
-__BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 #define GLIBTOP_PROC_SIGNAL_SIGNAL	0
 #define GLIBTOP_PROC_SIGNAL_BLOCKED	1
@@ -55,14 +57,14 @@ struct _glibtop_proc_signal
 #define glibtop_get_proc_signal_r	glibtop_get_proc_signal_s
 #endif
-extern void glibtop_get_proc_signal_l __P((glibtop *, glibtop_proc_signal *, pid_t));
+void glibtop_get_proc_signal_l (glibtop *server, glibtop_proc_signal *buf, pid_t pid);
 #if GLIBTOP_SUID_PROC_SIGNAL
-extern void glibtop_init_proc_signal_p __P((glibtop *));
+void glibtop_init_proc_signal_p (glibtop *server);
-extern void glibtop_get_proc_signal_p __P((glibtop *, glibtop_proc_signal *, pid_t));
+void glibtop_get_proc_signal_p (glibtop *server, glibtop_proc_signal *buf, pid_t pid);
 #else
-extern void glibtop_init_proc_signal_s __P((glibtop *));
+void glibtop_init_proc_signal_s (glibtop *server);
-extern void glibtop_get_proc_signal_s __P((glibtop *, glibtop_proc_signal *, pid_t));
+void glibtop_get_proc_signal_s (glibtop *server, glibtop_proc_signal *buf, pid_t pid);
 #endif
 #ifdef GLIBTOP_NAMES
@@ -76,6 +78,6 @@ extern const char *glibtop_descriptions_proc_signal [];
 #endif
-__END_DECLS
+END_LIBGTOP_DECLS
 #endif
--- a/include/glibtop/procstate.h
+++ b/include/glibtop/procstate.h
@@ -1,23 +1,25 @@
 /* $Id$ */
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
 */
 #ifndef __GLIBTOP_PROCSTATE_H__
 #define __GLIBTOP_PROCSTATE_H__
@@ -25,7 +27,7 @@
 #include <glibtop.h>
 #include <glibtop/global.h>
-__BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 #define GLIBTOP_PROC_STATE_CMD		0
 #define GLIBTOP_PROC_STATE_STATE	1
@@ -62,14 +64,14 @@ struct _glibtop_proc_state
 #define glibtop_get_proc_state_r	glibtop_get_proc_state_s
 #endif
-extern void glibtop_get_proc_state_l __P((glibtop *, glibtop_proc_state *, pid_t));
+void glibtop_get_proc_state_l (glibtop *server, glibtop_proc_state *buf, pid_t pid);
 #if GLIBTOP_SUID_PROC_STATE
-extern void glibtop_init_proc_state_p __P((glibtop *));
+void glibtop_init_proc_state_p (glibtop *server);
-extern void glibtop_get_proc_state_p __P((glibtop *, glibtop_proc_state *, pid_t));
+void glibtop_get_proc_state_p (glibtop *server, glibtop_proc_state *buf, pid_t pid);
 #else
-extern void glibtop_init_proc_state_s __P((glibtop *));
+void glibtop_init_proc_state_s (glibtop *server);
-extern void glibtop_get_proc_state_s __P((glibtop *, glibtop_proc_state *, pid_t));
+void glibtop_get_proc_state_s (glibtop *server, glibtop_proc_state *buf, pid_t pid);
 #endif
 #ifdef GLIBTOP_NAMES
@@ -83,6 +85,6 @@ extern const char *glibtop_descriptions_proc_state [];
 #endif
-__END_DECLS
+END_LIBGTOP_DECLS
 #endif
--- a/include/glibtop/proctime.h
+++ b/include/glibtop/proctime.h
@@ -1,23 +1,25 @@
 /* $Id$ */
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
 */
 #ifndef __GLIBTOP_PROCTIME_H__
 #define __GLIBTOP_PROCTIME_H__
@@ -26,7 +28,7 @@
 #include <glibtop/cpu.h>
 #include <glibtop/global.h>
-__BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 #define GLIBTOP_PROC_TIME_START_TIME	0
 #define GLIBTOP_PROC_TIME_RTIME		1
@@ -76,14 +78,14 @@ struct _glibtop_proc_time
 #define glibtop_get_proc_time_r	glibtop_get_proc_time_s
 #endif
-extern void glibtop_get_proc_time_l __P((glibtop *, glibtop_proc_time *, pid_t));
+void glibtop_get_proc_time_l (glibtop *server, glibtop_proc_time *buf, pid_t pid);
 #if GLIBTOP_SUID_PROC_TIME
-extern void glibtop_init_proc_time_p __P((glibtop *));
+void glibtop_init_proc_time_p (glibtop *server);
-extern void glibtop_get_proc_time_p __P((glibtop *, glibtop_proc_time *, pid_t));
+void glibtop_get_proc_time_p (glibtop *server, glibtop_proc_time *buf, pid_t pid);
 #else
-extern void glibtop_init_proc_time_s __P((glibtop *));
+void glibtop_init_proc_time_s (glibtop *server);
-extern void glibtop_get_proc_time_s __P((glibtop *, glibtop_proc_time *, pid_t));
+void glibtop_get_proc_time_s (glibtop *server, glibtop_proc_time *buf, pid_t pid);
 #endif
 #ifdef GLIBTOP_NAMES
@@ -97,6 +99,6 @@ extern const char *glibtop_descriptions_proc_time [];
 #endif
-__END_DECLS
+END_LIBGTOP_DECLS
 #endif
--- a/include/glibtop/procuid.h
+++ b/include/glibtop/procuid.h
@@ -1,23 +1,25 @@
 /* $Id$ */
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
 */
 #ifndef __GLIBTOP_PROCUID_H__
 #define __GLIBTOP_PROCUID_H__
@@ -25,7 +27,7 @@
 #include <glibtop.h>
 #include <glibtop/global.h>
-__BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 #define GLIBTOP_PROC_UID_UID		0
 #define GLIBTOP_PROC_UID_EUID		1
@@ -71,14 +73,14 @@ struct _glibtop_proc_uid
 #define glibtop_get_proc_uid_r		glibtop_get_proc_uid_s
 #endif
-extern void glibtop_get_proc_uid_l __P((glibtop *, glibtop_proc_uid *, pid_t));
+void glibtop_get_proc_uid_l (glibtop *server, glibtop_proc_uid *buf, pid_t pid);
 #if GLIBTOP_SUID_PROC_UID
-extern void glibtop_init_proc_uid_p __P((glibtop *));
+void glibtop_init_proc_uid_p (glibtop *server);
-extern void glibtop_get_proc_uid_p __P((glibtop *, glibtop_proc_uid *, pid_t));
+void glibtop_get_proc_uid_p (glibtop *server, glibtop_proc_uid *buf, pid_t pid);
 #else
-extern void glibtop_init_proc_uid_s __P((glibtop *));
+void glibtop_init_proc_uid_s (glibtop *server);
-extern void glibtop_get_proc_uid_s __P((glibtop *, glibtop_proc_uid *, pid_t));
+void glibtop_get_proc_uid_s (glibtop *server, glibtop_proc_uid *buf, pid_t pid);
 #endif
 #ifdef GLIBTOP_NAMES
@@ -92,6 +94,6 @@ extern const char *glibtop_descriptions_proc_uid [];
 #endif
-__END_DECLS
+END_LIBGTOP_DECLS
 #endif
--- a/include/glibtop/read.h
+++ b/include/glibtop/read.h
@@ -1,23 +1,25 @@
 /* $Id$ */
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
 */
 #ifndef __GLIBTOP_READ_H__
 #define __GLIBTOP_READ_H__
@@ -25,13 +27,13 @@
 #include <glibtop.h>
 #include <glibtop/error.h>
-__BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 #define glibtop_read(p1, p2)	glibtop_read(glibtop_global_server, p1, p2)
-extern void glibtop_read_l __P((glibtop *, size_t, void *));
+void glibtop_read_l (glibtop *server, size_t size, void *buf);
-extern void glibtop_read_s __P((glibtop *, size_t, void *));
+void glibtop_read_s (glibtop *server, size_t size, void *buf);
-__END_DECLS
+END_LIBGTOP_DECLS
 #endif
--- a/include/glibtop/read_data.h
+++ b/include/glibtop/read_data.h
@@ -1,23 +1,25 @@
 /* $Id$ */
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
 */
 #ifndef __GLIBTOP_READ_DATA_H__
 #define __GLIBTOP_READ_DATA_H__
@@ -25,13 +27,13 @@
 #include <glibtop.h>
 #include <glibtop/error.h>
-__BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 #define glibtop_read_data()	glibtop_read_data_r(glibtop_global_server)
-extern void *glibtop_read_data_l __P((glibtop *));
+void *glibtop_read_data_l (glibtop *server);
-extern void *glibtop_read_data_s __P((glibtop *));
+void *glibtop_read_data_s (glibtop *server);
-__END_DECLS
+END_LIBGTOP_DECLS
 #endif
--- a/include/glibtop/sem_limits.h
+++ b/include/glibtop/sem_limits.h
@@ -1,23 +1,25 @@
 /* $Id$ */
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
 */
 #ifndef __GLIBTOP_SEM_LIMITS_H__
 #define __GLIBTOP_SEM_LIMITS_H__
@@ -25,7 +27,7 @@
 #include <glibtop.h>
 #include <glibtop/global.h>
-__BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 #define GLIBTOP_IPC_SEMMAP	0
 #define GLIBTOP_IPC_SEMMNI	1
@@ -65,14 +67,14 @@ struct _glibtop_sem_limits
 #define glibtop_get_sem_limits_r	glibtop_get_sem_limits_s
 #endif
-extern void glibtop_get_sem_limits_l __P((glibtop *, glibtop_sem_limits *));
+void glibtop_get_sem_limits_l (glibtop *server, glibtop_sem_limits *buf);
 #if GLIBTOP_SUID_SEM_LIMITS
-extern void glibtop_init_sem_limits_p __P((glibtop *));
+void glibtop_init_sem_limits_p (glibtop *server);
-extern void glibtop_get_sem_limits_p __P((glibtop *, glibtop_sem_limits *));
+void glibtop_get_sem_limits_p (glibtop *server, glibtop_sem_limits *buf);
 #else
-extern void glibtop_init_sem_limits_s __P((glibtop *));
+void glibtop_init_sem_limits_s (glibtop *server);
-extern void glibtop_get_sem_limits_s __P((glibtop *, glibtop_sem_limits *));
+void glibtop_get_sem_limits_s (glibtop *server, glibtop_sem_limits *buf);
 #endif
 #ifdef GLIBTOP_NAMES
@@ -86,6 +88,6 @@ extern const char *glibtop_descriptions_sem_limits [];
 #endif
-__END_DECLS
+END_LIBGTOP_DECLS
 #endif
--- a/include/glibtop/shm_limits.h
+++ b/include/glibtop/shm_limits.h
@@ -1,23 +1,25 @@
 /* $Id$ */
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
 */
 #ifndef __GLIBTOP_SHM_LIMITS_H__
 #define __GLIBTOP_SHM_LIMITS_H__
@@ -25,7 +27,7 @@
 #include <glibtop.h>
 #include <glibtop/global.h>
-__BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 #define GLIBTOP_IPC_SHMMAX	0
 #define GLIBTOP_IPC_SHMMIN	1
@@ -55,14 +57,14 @@ struct _glibtop_shm_limits
 #define glibtop_get_shm_limits_r	glibtop_get_shm_limits_s
 #endif
-extern void glibtop_get_shm_limits_l __P((glibtop *, glibtop_shm_limits *));
+void glibtop_get_shm_limits_l (glibtop *server, glibtop_shm_limits *buf);
 #if GLIBTOP_SUID_SHM_LIMITS
-extern void glibtop_init_shm_limits_p __P((glibtop *));
+void glibtop_init_shm_limits_p (glibtop *server);
-extern void glibtop_get_shm_limits_p __P((glibtop *, glibtop_shm_limits *));
+void glibtop_get_shm_limits_p (glibtop *, glibtop_shm_limits *buf);
 #else
-extern void glibtop_init_shm_limits_s __P((glibtop *));
+void glibtop_init_shm_limits_s (glibtop *server);
-extern void glibtop_get_shm_limits_s __P((glibtop *, glibtop_shm_limits *));
+void glibtop_get_shm_limits_s (glibtop *server, glibtop_shm_limits *buf);
 #endif
 #ifdef GLIBTOP_NAMES
@@ -76,6 +78,6 @@ extern const char *glibtop_descriptions_shm_limits [];
 #endif
-__END_DECLS
+END_LIBGTOP_DECLS
 #endif
--- a/include/glibtop/signal.h
+++ b/include/glibtop/signal.h
@@ -1,23 +1,25 @@
 /* $Id$ */
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
 */
 #ifndef __GLIBTOP_SIGNAL_H__
 #define __GLIBTOP_SIGNAL_H__
@@ -28,7 +30,7 @@
 #include <sys/signal.h>
 #endif
-__BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 typedef struct _glibtop_signame	glibtop_signame;
@@ -40,6 +42,6 @@ struct _glibtop_signame
 extern const glibtop_signame glibtop_sys_siglist [];
-__END_DECLS
+END_LIBGTOP_DECLS
 #endif
--- a/include/glibtop/swap.h
+++ b/include/glibtop/swap.h
@@ -1,23 +1,25 @@
 /* $Id$ */
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
 */
 #ifndef __GLIBTOP_SWAP_H__
 #define __GLIBTOP_SWAP_H__
@@ -25,7 +27,7 @@
 #include <glibtop.h>
 #include <glibtop/global.h>
-__BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 #define GLIBTOP_SWAP_TOTAL	0
 #define GLIBTOP_SWAP_USED	1
@@ -55,14 +57,14 @@ struct _glibtop_swap
 #define glibtop_get_swap_r		glibtop_get_swap_s
 #endif
-extern void glibtop_get_swap_l __P((glibtop *, glibtop_swap *));
+void glibtop_get_swap_l (glibtop *server, glibtop_swap *buf);
 #if GLIBTOP_SUID_SWAP
-extern void glibtop_init_swap_p __P((glibtop *));
+void glibtop_init_swap_p (glibtop *server);
-extern void glibtop_get_swap_p __P((glibtop *, glibtop_swap *));
+void glibtop_get_swap_p (glibtop *server, glibtop_swap *buf);
 #else
-extern void glibtop_init_swap_s __P((glibtop *));
+void glibtop_init_swap_s (glibtop *server);
-extern void glibtop_get_swap_s __P((glibtop *, glibtop_swap *));
+void glibtop_get_swap_s (glibtop *server, glibtop_swap *buf);
 #endif
 #ifdef GLIBTOP_NAMES
@@ -76,6 +78,6 @@ extern const char *glibtop_descriptions_swap [];
 #endif
-__END_DECLS
+END_LIBGTOP_DECLS
 #endif
--- a/include/glibtop/sysdeps.h
+++ b/include/glibtop/sysdeps.h
@@ -1,30 +1,32 @@
 /* $Id$ */
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
 */
 #ifndef __GLIBTOP_SYSDEPS_H__
 #define __GLIBTOP_SYSDEPS_H__
 #include <glibtop.h>
-__BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 #define GLIBTOP_SYSDEPS_FEATURES	0
 #define GLIBTOP_SYSDEPS_CPU		1
@@ -90,7 +92,7 @@ struct _glibtop_sysdeps
 #define glibtop_get_sysdeps(sysdeps)	glibtop_get_sysdeps_r(glibtop_global_server,sysdeps)
-extern void glibtop_get_sysdeps_r __P((glibtop *, glibtop_sysdeps *));
+void glibtop_get_sysdeps_r (glibtop *server, glibtop_sysdeps *buf);
 #ifdef GLIBTOP_NAMES
@@ -103,6 +105,6 @@ extern const char *glibtop_descriptions_sysdeps [];
 #endif
-__END_DECLS
+END_LIBGTOP_DECLS
 #endif
--- a/include/glibtop/sysinfo.h
+++ b/include/glibtop/sysinfo.h
@@ -1,23 +1,25 @@
 /* $Id$ */
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
 */
 #ifndef __GLIBTOP_SYSINFO_H__
 #define __GLIBTOP_SYSINFO_H__
@@ -28,7 +30,7 @@
 #include <glib.h>
-__BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 #define GLIBTOP_SYSINFO_CPUINFO		0
@@ -55,8 +57,8 @@ struct _glibtop_sysinfo
 #define glibtop_get_sysinfo_r	glibtop_get_sysinfo_s
-extern glibtop_sysinfo * glibtop_get_sysinfo_s __P((glibtop *));
+glibtop_sysinfo *glibtop_get_sysinfo_s (glibtop *server);
-__END_DECLS
+END_LIBGTOP_DECLS
 #endif
--- a/include/glibtop/types.h
+++ b/include/glibtop/types.h
@@ -1,28 +1,30 @@
 /* $Id$ */
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
 */
 #ifndef __GLIBTOP_TYPES_H__
 #define __GLIBTOP_TYPES_H__
-__BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 #define GLIBTOP_TYPE_LONG	1
 #define GLIBTOP_TYPE_ULONG	2
@@ -31,6 +33,6 @@ __BEGIN_DECLS
 #define GLIBTOP_TYPE_CHAR	5
 #define GLIBTOP_TYPE_STRING	6
-__END_DECLS
+END_LIBGTOP_DECLS
 #endif
--- a/include/glibtop/union.h
+++ b/include/glibtop/union.h
@@ -1,23 +1,25 @@
 /* $Id$ */
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
 */
 #ifndef __GLIBTOP_UNION_H__
 #define __GLIBTOP_UNION_H__
@@ -48,7 +50,7 @@
 #include <glibtop/netload.h>
 #include <glibtop/ppp.h>
-__BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 typedef union _glibtop_union	glibtop_union;
@@ -78,6 +80,6 @@ union _glibtop_union
 	glibtop_ppp		ppp;
 };
-__END_DECLS
+END_LIBGTOP_DECLS
 #endif
--- a/include/glibtop/uptime.h
+++ b/include/glibtop/uptime.h
@@ -1,23 +1,25 @@
 /* $Id$ */
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
 */
 #ifndef __GLIBTOP_UPTIME_H__
 #define __GLIBTOP_UPTIME_H__
@@ -25,7 +27,7 @@
 #include <glibtop.h>
 #include <glibtop/global.h>
-__BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 #define GLIBTOP_UPTIME_UPTIME		0
 #define GLIBTOP_UPTIME_IDLETIME		1
@@ -49,14 +51,14 @@ struct _glibtop_uptime
 #define glibtop_get_uptime_r		glibtop_get_uptime_s
 #endif
-extern void glibtop_get_uptime_l __P((glibtop *, glibtop_uptime *));
+void glibtop_get_uptime_l (glibtop *server, glibtop_uptime *buf);
 #if GLIBTOP_SUID_UPTIME
-extern void glibtop_init_uptime_p __P((glibtop *));
+void glibtop_init_uptime_p (glibtop *server);
-extern void glibtop_get_uptime_p __P((glibtop *, glibtop_uptime *));
+void glibtop_get_uptime_p (glibtop *server, glibtop_uptime *buf);
 #else
-extern void glibtop_init_uptime_s __P((glibtop *));
+void glibtop_init_uptime_s (glibtop *server);
-extern void glibtop_get_uptime_s __P((glibtop *, glibtop_uptime *));
+void glibtop_get_uptime_s (glibtop *server, glibtop_uptime *buf);
 #endif
 #ifdef GLIBTOP_NAMES
@@ -70,6 +72,6 @@ extern const char *glibtop_descriptions_uptime [];
 #endif
-__END_DECLS
+END_LIBGTOP_DECLS
 #endif
--- a/include/glibtop/version.h
+++ b/include/glibtop/version.h
@@ -1,21 +1,23 @@
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
 */
 #ifndef __GLIBTOP_VERSION_H__
 #define __GLIBTOP_VERSION_H__
@@ -27,14 +29,14 @@
 #define LIBGTOP_VERSION_STRING "Libgtop %s server version %s (%u,%u,%u,%u)."
-__BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 #if _IN_LIBGTOP
-extern void glibtop_send_version __P((glibtop *, int));
+void glibtop_send_version (glibtop *server, int fd);
 #endif
-__END_DECLS
+END_LIBGTOP_DECLS
 #endif
--- a/include/glibtop/write.h
+++ b/include/glibtop/write.h
@@ -1,23 +1,25 @@
 /* $Id$ */
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
 */
 #ifndef __GLIBTOP_WRITE_H__
 #define __GLIBTOP_WRITE_H__
@@ -25,13 +27,13 @@
 #include <glibtop.h>
 #include <glibtop/error.h>
-__BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 #define glibtop_write(p1, p2)	glibtop_write(glibtop_global_server, p1, p2)
-extern void glibtop_write_l __P((glibtop *, size_t, void *));
+void glibtop_write_l (glibtop *server, size_t size, void *buf);
-extern void glibtop_write_s __P((glibtop *, size_t, void *));
+void glibtop_write_s (glibtop *server, size_t size, void *buf);
-__END_DECLS
+END_LIBGTOP_DECLS
 #endif
--- a/include/glibtop/xmalloc.h
+++ b/include/glibtop/xmalloc.h
@@ -1,23 +1,25 @@
 /* $Id$ */
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
 */
 #ifndef __GLIBTOP_XMALLOC_H__
 #define __GLIBTOP_XMALLOC_H__
@@ -25,7 +27,7 @@
 #include <glibtop.h>
 #include <glibtop/error.h>
-__BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 #define glibtop_malloc(p1)	glibtop_malloc_r(glibtop_global_server, p1)
 #define glibtop_calloc(p1, p2)	glibtop_calloc_r(glibtop_global_server, p1, p2)
@@ -33,12 +35,12 @@ __BEGIN_DECLS
 #define glibtop_strdup(p1)	glibtop_strdup_r(glibtop_global_server, p1)
 #define glibtop_free(p1)	glibtop_free_r(glibtop_global_server, p1)
-extern void *glibtop_malloc_r	__P((glibtop *, size_t));
+void *glibtop_malloc_r	(glibtop *server, size_t size);
-extern void *glibtop_calloc_r	__P((glibtop *, size_t, size_t));
+void *glibtop_calloc_r	(glibtop *server, size_t nmemb, size_t size);
-extern void *glibtop_realloc_r	__P((glibtop *, void *, size_t));
+void *glibtop_realloc_r	(glibtop *server, void *ptr, size_t size);
-extern char *glibtop_strdup_r	__P((glibtop *, const char *));
+char *glibtop_strdup_r	(glibtop *server, const char *string);
-extern void glibtop_free_r	__P((glibtop *, const void *));
+void glibtop_free_r	(glibtop *server, const void *ptr);
-__END_DECLS
+END_LIBGTOP_DECLS
 #endif
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,6 +1,6 @@
 LINK				= $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
-CFLAGS				= -Wall -W @CFLAGS@
+INCLUDES			= @INCLUDES@
 lib_LTLIBRARIES			= libgtop.la
@@ -12,11 +12,11 @@ libgtop_la_LDFLAGS		= $(LT_VERSION_INFO)
 BUILT_SOURCES			= lib.c
-lib.c: lib.awk $(top_builddir)/config.h $(top_srcdir)/features.def
+lib.c: lib.pl $(top_builddir)/config.h $(top_srcdir)/features.def
-	$(AWK) -f $(srcdir)/lib.awk < $(top_srcdir)/features.def > lib-t
+	$(PERL) $(srcdir)/lib.pl < $(top_srcdir)/features.def > lib-t
 	mv lib-t lib.c
-EXTRA_DIST			= lib.awk
+EXTRA_DIST			= lib.pl
 CLEANFILES			= lib.c
--- a/lib/close.c
+++ b/lib/close.c
@@ -1,23 +1,25 @@
 /* $Id$ */
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
 */
 #include <glibtop.h>
 #include <glibtop/open.h>
--- a/lib/command.c
+++ b/lib/command.c
@@ -1,23 +1,25 @@
 /* $Id$ */
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
 */
 #include <glibtop/read.h>
 #include <glibtop/write.h>
--- a/lib/init.c
+++ b/lib/init.c
@@ -1,23 +1,25 @@
 /* $Id$ */
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
 */
 #include <glibtop.h>
 #include <glibtop/xmalloc.h>
--- a/lib/inodedb.c
+++ b/lib/inodedb.c
@@ -1,23 +1,25 @@
 /* $Id$ */
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
 */
 #include <glibtop.h>
 #include <glibtop/error.h>
--- a/lib/lib.awk
+++ b/lib/lib.awk
@@ -1,167 +0,0 @@
 BEGIN {
  print "/* lib.c */";
  print "/* This is a generated file.  Please modify `lib.awk' */";
  print "";
  print "#include <glibtop.h>";
  print "#include <glibtop/open.h>";
  print "";
  print "#include <glibtop/sysdeps.h>";
  print "#include <glibtop/union.h>";
  print "";
  print "#include <glibtop/command.h>";
  print "";
  print "/* Some required fields are missing. */";
  print "";
  print "static void";
  print "_glibtop_missing_feature (glibtop *server, const char *feature,";
  print "\t\t\t  const u_int64_t present, u_int64_t *required)";
  print "{";
  print "\tswitch (server->error_method) {";
  print "\tcase GLIBTOP_ERROR_METHOD_WARN_ONCE:";
  print "\t\t*required &= present;";
  print "\tcase GLIBTOP_ERROR_METHOD_WARN:";
  print "\t\tglibtop_warn_r (server,";
  print "\t\t\t\t_(\"glibtop_get_%s (): Client requested \"";
  print "\t\t\t\t  \"field mask %05Lx, but only have %05Lx.\"),";
  print "\t\t\t\t feature, required, present);";
  print "\t\tbreak;";
  print "\tcase GLIBTOP_ERROR_METHOD_ABORT:";
  print "\t\tglibtop_error_r (server,";
  print "\t\t\t\t _(\"glibtop_get_%s (): Client requested \"";
  print "\t\t\t\t   \"field mask %05x, but only have %05x.\"),";
  print "\t\t\t\t feature, required, present);";
  print "\t\tbreak;";
  print "\t}";
  print "}";
  print "";
  print "/* Library functions. */";
  print "";
  convert["long"]     = "int64_t";
  convert["ulong"]    = "u_int64_t";
  convert["pid_t"]    = "pid_t";
  convert["int"]      = "int";
  convert["ushort"]   = "unsigned short";
  convert["unsigned"] = "unsigned";
 }
 function output(line) {
  split (line, line_fields, /\|/);
  retval = line_fields[1];
  feature = line_fields[2];
  param_def = line_fields[4];
  orig = feature; sub(/^@/,"",feature);
  space = feature; gsub(/./," ",space);
  print retval;
  if (retval !~ /^void$/) {
    prefix = "retval = ";
    prefix_space = "         ";
  } else {
    prefix = "";
    prefix_space = "";
  }
  if (param_def == "string") {
    call_param = ", "line_fields[5];
    param_decl = ",\n            "space"    const char *"line_fields[5];
    send_ptr = "\n\tconst void *send_ptr = "line_fields[5]";";
    send_size = "\n\tconst size_t send_size =\n\t\tstrlen ("line_fields[5]") + 1;";
  } else {
    call_param = "";
    param_decl = "";
    send_size = "";
    send_ptr = "";
    nr_params = split (param_def, params, /:/);
    for (param = 1; param <= nr_params; param++) {
      list = params[param];
      type = params[param];
      sub(/\(.*/, "", type);
      sub(/^.*\(/, "", list); sub(/\)$/, "", list);
      count = split (list, fields, /,/);
      for (field = 1; field <= count; field++) {
 	if (param_decl == "")
 	  param_decl = ",\n            "space"    ";
 	else
 	  param_decl = param_decl", ";
 	param_decl = param_decl""convert[type]" "fields[field];
 	call_param = call_param", "fields[field];
 	if (send_ptr == "")
 	  send_ptr = "\n\tconst void *send_ptr = &"fields[field]";";
 	if (send_size == "")
 	  send_size = "\n\tconst size_t send_size =\n\t\t";
 	else
 	  send_size = send_size" + ";
 	send_size = send_size"sizeof ("fields[field]")";
      }
    }
    if (send_size != "")
      send_size = send_size";";
    else
      send_size = "\n\tconst size_t send_size = 0;";
    if (send_ptr == "")
      send_ptr = "\n\tconst void *send_ptr = NULL;";
  }
  print "glibtop_get_"feature"_l (glibtop *server, glibtop_"feature" *buf"param_decl")";
  print "{"send_ptr""send_size;
  if (retval !~ /^void$/)
    print "\t"retval" retval = ("retval") 0;";
  print "";
  print "\tglibtop_init_r (&server, (1 << GLIBTOP_SYSDEPS_"toupper(feature)"), 0);";
  print "";
  print "\t/* If neccessary, we ask the server for the requested";
  print "\t * feature. If not, we call the sysdeps function. */";
  print "";
  print "\tif ((server->flags & _GLIBTOP_INIT_STATE_SERVER) &&";
  print "\t    (server->features & (1 << GLIBTOP_SYSDEPS_"toupper(feature)")))";
  print "\t{";
  print "\t\t"prefix"glibtop_call_l (server, GLIBTOP_CMND_"toupper(feature)",";
  print "\t\t\t\t"prefix_space"send_size, send_ptr,";
  print "\t\t\t\t"prefix_space"sizeof (glibtop_"feature"), buf);";
  print "\t} else {";
  if (orig !~ /^@/)
    print "#if (!GLIBTOP_SUID_"toupper(feature)")";
  print "\t\t"prefix"glibtop_get_"feature"_s (server, buf"call_param");";
  if (orig !~ /^@/) {
    print "#else";
    print "\t\terrno = ENOSYS;";
    print "\t\tglibtop_error_io_r (server, \"glibtop_get_"feature"\");";
    print "#endif";
  }
  print "\t}";
  print "";
  print "\t/* Make sure that all required fields are present. */";
  print "";
  print "\tif (buf->flags & server->required."feature")";
  print "\t\t_glibtop_missing_feature (server, \""feature"\", buf->flags,";
  print "\t\t\t\t\t  &server->required."feature");";
  if (retval !~ /^void$/) {
    print "\n\t/* Now we can return. */";
    print "\n\treturn retval;";
  }
  print "}";
  print "";
 }
 /^[^#]/		{ output($0) }
--- a/lib/lib.pl
+++ b/lib/lib.pl
@@ -0,0 +1,227 @@
 #!/usr/bin/perl
 $[ = 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 $_;
 }
 print '/* lib.c */';
 print "/* This is a generated file.  Please modify `lib.pl' */";
 print '';
 print '#include <glibtop.h>';
 print '#include <glibtop/open.h>';
 print '';
 print '#include <glibtop/sysdeps.h>';
 print '#include <glibtop/union.h>';
 print '';
 print '#include <glibtop/command.h>';
 print '';
 print '/* Some required fields are missing. */';
 print '';
 print 'static void';
 print '_glibtop_missing_feature (glibtop *server, const char *feature,';
 print "\t\t\t  const u_int64_t present, u_int64_t *required)";
 print '{';
 print "\tswitch (server->error_method) {";
 print "\tcase GLIBTOP_ERROR_METHOD_WARN_ONCE:";
 print "\t\t*required &= present;";
 print "\tcase GLIBTOP_ERROR_METHOD_WARN:";
 print "\t\tglibtop_warn_r (server,";
 print "\t\t\t\t_(\"glibtop_get_%s (): Client requested \"";
 print "\t\t\t\t  \"field mask %05Lx, but only have %05Lx.\"),";
 print "\t\t\t\t feature, required, present);";
 print "\t\tbreak;";
 print "\tcase GLIBTOP_ERROR_METHOD_ABORT:";
 print "\t\tglibtop_error_r (server,";
 print "\t\t\t\t _(\"glibtop_get_%s (): Client requested \"";
 print "\t\t\t\t   \"field mask %05x, but only have %05x.\"),";
 print "\t\t\t\t feature, required, present);";
 print "\t\tbreak;";
 print "\t}";
 print '}';
 print '';
 print '/* Library functions. */';
 print '';
 $convert{'long'} = 'int64_t';
 $convert{'ulong'} = 'u_int64_t';
 $convert{'pid_t'} = 'pid_t';
 $convert{'int'} = 'int';
 $convert{'ushort'} = 'unsigned short';
 $convert{'unsigned'} = 'unsigned';
 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;
    print $retval;
    if ($retval !~ /^void$/) {
 	$prefix = 'retval = ';
 	$prefix_space = '         ';
    }
    else {
 	$prefix = '';
 	$prefix_space = '';
    }
    if ($param_def eq 'string') {
 	$call_param = ', ' . $line_fields[5];
 	$param_decl = ",\n            " . $space . '    const char *' .
 	  $line_fields[5];
 	$send_ptr = "\n\tconst void *send_ptr = " . $line_fields[5] . ';';
 	$send_size = "\n\tconst size_t send_size =\n\t\tstrlen (" .
 	  $line_fields[5] . ') + 1;';
    }
    else {
 	$call_param = '';
 	$param_decl = '';
 	$send_size = '';
 	$send_ptr = '';
 	$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++) {
 		if ($param_decl eq '') {
 		    $param_decl = ",\n            " . $space . '    ';
 		}
 		else {
 		    $param_decl = $param_decl . ', ';
 		}
 		$param_decl = $param_decl . '' . $convert{$type} . ' ' .
 		  $fields[$field];
 		$call_param = $call_param . ', ' . $fields[$field];
 		if ($send_ptr eq '') {
 		    $send_ptr = "\n\tconst void *send_ptr = &" .
 		      $fields[$field] . ';';
 		}
 		if ($send_size eq '') {
 		    $send_size = "\n\tconst size_t send_size =\n\t\t";
 		}
 		else {
 		    $send_size = $send_size . ' + ';
 		}
 		$send_size = $send_size . 'sizeof (' . $fields[$field] . ')';
 	    }
 	}
 	if ($send_size ne '') {
 	    $send_size = $send_size . ';';
 	}
 	else {
 	    $send_size = "\n\tconst size_t send_size = 0;";
 	}
 	if ($send_ptr eq '') {
 	    $send_ptr = "\n\tconst void *send_ptr = NULL;";
 	}
    }
    print 'glibtop_get_' . $feature . '_l (glibtop *server, glibtop_' .
      $feature . ' *buf' . $param_decl . ')';
    print '{' . $send_ptr . '' . $send_size;
    if ($retval !~ /^void$/) {
 	print "\t" . $retval . ' retval = (' . $retval . ') 0;';
    }
    print '';
    print "\tglibtop_init_r (&server, (1 << GLIBTOP_SYSDEPS_" .
      &toupper($feature) . '), 0);';
    print '';
    print "\t/* If neccessary, we ask the server for the requested";
    print "\t * feature. If not, we call the sysdeps function. */";
    print '';
    print "\tif ((server->flags & _GLIBTOP_INIT_STATE_SERVER) &&";
    print "\t    (server->features & (1 << GLIBTOP_SYSDEPS_" .
      &toupper($feature) . ')))';
    print "\t{";
    print "\t\t" . $prefix . 'glibtop_call_l (server, GLIBTOP_CMND_' .
      &toupper($feature) . ',';
    print "\t\t\t\t" . $prefix_space . 'send_size, send_ptr,';
    print "\t\t\t\t" . $prefix_space . 'sizeof (glibtop_' . $feature .
      '), buf);';
    print "\t} else {";
    if ($orig !~ /^@/) {
 	print '#if (!GLIBTOP_SUID_' . &toupper($feature) . ')';
    }
    print "\t\t" . $prefix . 'glibtop_get_' . $feature . '_s (server, buf' .
      $call_param . ');';
    if ($orig !~ /^@/) {
 	print '#else';
 	print "\t\terrno = ENOSYS;";
 	print "\t\tglibtop_error_io_r (server, \"glibtop_get_" . $feature .
 	  "\");";
 	print '#endif';
    }
    print "\t}";
    print '';
    print "\t/* Make sure that all required fields are present. */";
    print '';
    print "\tif (buf->flags & server->required." . $feature . ')';
    print "\t\t_glibtop_missing_feature (server, \"" . $feature .
      "\", buf->flags,";
    print "\t\t\t\t\t  &server->required." . $feature . ');';
    if ($retval !~ /^void$/) {
 	print "\n\t/* Now we can return. */";
 	print "\n\treturn retval;";
    }
    print '}';
    print '';
 }
--- a/lib/open.c
+++ b/lib/open.c
@@ -1,23 +1,25 @@
 /* $Id$ */
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
 */
 #include <glibtop.h>
 #include <glibtop/open.h>
@@ -128,7 +130,7 @@ glibtop_open_l (glibtop *server, const char *program_name,
 	if (server->flags & _GLIBTOP_INIT_STATE_SERVER) {
 		char version [BUFSIZ], buffer [BUFSIZ];
 		glibtop_sysdeps sysdeps;
-		unsigned size, nbytes;
+		size_t size, nbytes;
 		/* First check whether the server version is correct. */
--- a/lib/parameter.c
+++ b/lib/parameter.c
@@ -1,23 +1,25 @@
 /* $Id$ */
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
 */
 #include <glibtop.h>
 #include <glibtop/parameter.h>
--- a/lib/read.c
+++ b/lib/read.c
@@ -1,23 +1,25 @@
 /* $Id$ */
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
 */
 #include <glibtop/read.h>
--- a/lib/read_data.c
+++ b/lib/read_data.c
@@ -1,23 +1,25 @@
 /* $Id$ */
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
 */
 #include <glibtop/xmalloc.h>
 #include <glibtop/read_data.h>
--- a/lib/sysdeps.c
+++ b/lib/sysdeps.c
@@ -1,21 +1,23 @@
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
 */
 #include <glibtop.h>
 #include <glibtop/union.h>
--- a/lib/write.c
+++ b/lib/write.c
@@ -1,23 +1,25 @@
 /* $Id$ */
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
 */
 #include <glibtop/write.h>
--- a/libgtop-sysdeps.m4
+++ b/libgtop-sysdeps.m4
@@ -87,20 +87,14 @@ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[
 	if test $libgtop_smp = auto ; then
 	  AC_MSG_CHECKING(whether to enable SMP support)
-	  AC_TRY_RUN([
+	  case "$host_os" in
-#include <sys/utsname.h>
+	  linux*)
-#include <string.h>
+	    libgtop_smp=yes
-
+	    ;;
-int
+	  *)
-main (void)
+	    libgtop_smp=no
-{
+	    ;;
-	struct utsname name;
+	  esac
 	if (uname (&name)) exit (1);
 	exit (strstr (name.version, "SMP") ? 0 : 1);
 }
 ], libgtop_smp=yes, libgtop_smp=no, libgtop_smp=no)
 	  AC_MSG_RESULT($libgtop_smp)
 	fi
@@ -231,11 +225,11 @@ main (void)
 	  fi
 	  ;;
 	linux*)
-	  os_major_version=`uname -r | \
+	  os_major_version=`uname -r | sed 's/-pre[[0-9]]*//' | \
 	    sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-	  os_minor_version=`uname -r | \
+	  os_minor_version=`uname -r | sed 's/-pre[[0-9]]*//' | \
 	    sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-	  os_micro_version=`uname -r | \
+	  os_micro_version=`uname -r | sed 's/-pre[[0-9]]*//' | \
 	    sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
 	  os_version_expr="$os_major_version 65536 * $os_minor_version 256 * + $os_micro_version + p q"
--- a/libgtop.spec.in
+++ b/libgtop.spec.in
@@ -1,5 +1,5 @@
 # Note that this is NOT a relocatable package
-%define ver      0.99.0
+%define ver      @VERSION@
 %define rel      SNAP
 %define prefix   /usr
@@ -9,7 +9,7 @@ Version: %ver
 Release: %rel
 Copyright: LGPL
 Group: X11/Libraries
-Source: ftp://ftp.home-of-linux.org/pub/libgtop-%{ver}.tar.gz
+Source: ftp://ftp.gnome.org/pub/GNOME/sources/libgtop/libgtop-%{ver}.tar.gz
 BuildRoot: /tmp/libgtop-root
 Packager: Martin Baulig <martin@home-of-linux.org>
 URL: http://www.home-of-linux.org/gnome/libgtop/
@@ -58,9 +58,13 @@ Examples for LibGTop.
 %build
 # Needed for snapshot releases.
 if [ ! -f configure ]; then
-  CFLAGS="$RPM_OPT_FLAGS" ./autogen.sh --prefix=%prefix --without-linux-table --with-libgtop-inodedb --with-libgtop-examples --with-libgtop-guile
+  CFLAGS="$RPM_OPT_FLAGS" ./autogen.sh --prefix=%prefix --without-linux-table --with-libgtop-inodedb --with-libgtop-examples --with-libgtop-guile --with-libgtop-smp
 else
-  CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%prefix --without-linux-table --with-libgtop-inodedb --with-libgtop-examples --with-libgtop-guile
+%ifarch alpha
  CFLAGS="$RPM_OPT_FLAGS" ./configure --host=alpha-redhat-linux --prefix=%prefix --without-linux-table --with-libgtop-inodedb --with-libgtop-examples --with-libgtop-guile --with-libgtop-smp
 %else
  CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%prefix --without-linux-table --with-libgtop-inodedb --with-libgtop-examples --with-libgtop-guile --with-libgtop-smp
 %endif
 fi
 if [ "$SMP" != "" ]; then
@@ -98,8 +102,10 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-, root, root)
-%doc RELNOTES-0.25 AUTHORS ChangeLog NEWS README copyright.txt
+%doc RELNOTES-0.25 RELNOTES-1.0 AUTHORS ChangeLog NEWS README
 %doc TODO NEWS.old copyright.txt
 %doc src/inodedb/README.inodedb
 %{prefix}/lib/lib*.so.*
 %{prefix}/share/*
 %{prefix}/bin/*
--- a/libgtopConf.sh.in
+++ b/libgtopConf.sh.in
@@ -5,6 +5,8 @@
 LIBGTOP_LIBDIR="@LIBGTOP_LIBDIR@"
 LIBGTOP_INCLUDEDIR="@LIBGTOP_INCLUDEDIR@"
 LIBGTOP_DATADIR="@LIBGTOP_DATADIR@"
 LIBGTOP_EXTRA_LIBS="@LIBGTOP_EXTRA_LIBS@"
 LIBGTOP_LIBS="@LIBGTOP_LIBS@"
--- a/misc/porting-libgtop.txt
+++ b/misc/porting-libgtop.txt
@@ -0,0 +1,81 @@
 There are a few instructions as I write them here (I'll at this file
 to CVS as well).
 First, there is a new 0.99.9 tarball. You should use this one when
 porting libgtop to Solaris, it has a lot of fixes in the header files
 and I just tested it with DEC OSF/1 3.2 native `cc' and BSDI 3.1; both
 compiled without problems.
 The tarball is not yet on ftp.gnome.org since I want to fix the broken
 DEC OSF/1 port and check whether it works with Digital Unix 3.2C this
 weekend.
 Here the instructions:
 ========================================================================
 * Edit libgtop-sysdeps.m4:
  Somewhere in the GNOME_LIBGTOP_SYSDEPS macro you'll find
 	freebsd*|netbsd*|openbsd*)
 	  libgtop_sysdeps_dir=freebsd
 	  libgtop_use_machine_h=yes
 	  libgtop_need_server=yes
 	  libgtop_postinstall='chgrp kmem $(bindir)/libgtop_server && chmod 2755 $(bindir)/libgtop_server'
 	  ;;
  add something like
 	solaris*)
 	  libgtop_sysdeps_dir=solaris
 	  libgtop_use_machine_h=yes
 	  libgtop_need_server=yes
 	  libgtop_postinstall='chgrp kmem $(bindir)/libgtop_server && chmod 2755 $(bindir)/libgtop_server'
 	  ;;
  there.
  Until you port is stable, please add it to the
 	  if test x$hacker_mode = xyes ; then
 	    case "$host_os" in
 	      ...
 	    esac
  section so this will look like
 	  if test x$hacker_mode = xyes ; then
 	    case "$host_os" in
 	      solaris*)
 	        libgtop_sysdeps_dir=solaris
 	        libgtop_use_machine_h=yes
 	        libgtop_need_server=yes
 	        libgtop_postinstall='chgrp kmem $(bindir)/libgtop_server && chmod 2755 $(bindir)/libgtop_server'
 	        ;;
  If you add the check there configure will only detect Solaris as a
  valid system if you give it the `--enable-hacker-mode' parameter so
  it doesn't matter if it does not compile or not work, it won't get
  compiled for "normal" users.
 * Copy sysdeps/stub_suid to sysdeps/solaris
 * Run configure with --enable-hacker-mode and try a make, it should
  compile without problems.
  If not, please let me know - in this case the `stub_suid' directory
  is broken.
 * Now you can start porting LibGTop ...
 I don't know how similar Solaris and Sun4 are, but perhaps you can
 use some code from my very old and broken sun4 port in sysdeps/sun4.
 =========================================================================
 If you have any more questions, feel free to ask them ...
 Happy porting,
 Martin
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,11 @@
 1999-01-27  Kjartan Maraas  <kmaraas@fib.hl.no>
 	* no.po: Updated translation
 1998-12-22  Yukihiro Nakai  <Nakai@TokyoNet.AD.JP>
 	* ja.po: New file - added Japanese translation
 1998-10-11  Martin Baulig  <martin@home-of-linux.org>
 	* POTFILES.in: Removed `sysdeps/linux/procdata.c'.
--- a/po/LEEME.es
+++ b/po/LEEME.es
@@ -0,0 +1,26 @@
 [ This file explains why there are various incomplete es_??.po in adition
  to the es.po; that is on purpose ]
 Los diferentes archivos para las locales es_DO, es_GT, es_HN, es_MX, es_PA,
 es_PE y es_SV; solo existen porque en esos paises se usa una representaci<EFBFBD>n
 de los n<EFBFBD>meros diferente de la que se usa en los dem<EFBFBD>s paises de habla
 castellan (usan el sistema anglosaj<EFBFBD>n, esdecir 1,000 en vez de 1.000 para 
 'mil').
 Por ello solo es necesario traducir aquellas ocurrencias donde aparezcan
 n<EFBFBD>meros; no hace falta perder el tiempo traduciendo en doble lo dem<EFBFBD>s;
 el sistema de internacionalizaci<EFBFBD>n de GNU gettext es lo suficientemente
 inteligente como para buscar las traducciones en la locale 'es' cuando no
 las encuentra en una 'es_XX' m<EFBFBD>s espec<EFBFBD>fica.
 Tambi<EFBFBD>n podriase crear un es_ES para traducir aquellos terminos que difieren
 en Espa<EFBFBD>a y Am<EFBFBD>rica (ej: computadora/ordenador, archivo/fichero, <EFBFBD>cono/icono),
 si alg<EFBFBD>n espa<EFBFBD>ol tiene ganas de encargarse de ello, bienvenido.
 Notese que solo es necesario traducir aquellas cadenas de texto para las
 cuales se usan terminos diferentes en Espa<EFBFBD>a; no es necesario traducir las
 dem<EFBFBD>s, con que est<EFBFBD>n en la traducci<EFBFBD>n general 'es' ya basta. 
 Pablo Saratxaga
 <srtxg@chanae.alphanet.ch>
--- a/po/de.po
+++ b/po/de.po
--- a/po/es.po
+++ b/po/es.po
--- a/po/es_DO.po
+++ b/po/es_DO.po
--- a/po/es_GT.po
+++ b/po/es_GT.po
--- a/po/es_HN.po
+++ b/po/es_HN.po
--- a/po/es_MX.po
+++ b/po/es_MX.po
--- a/po/es_PA.po
+++ b/po/es_PA.po
--- a/po/es_PE.po
+++ b/po/es_PE.po
--- a/po/es_SV.po
+++ b/po/es_SV.po
--- a/po/fr.po
+++ b/po/fr.po
--- a/po/ja.po
+++ b/po/ja.po
--- a/po/ko.po
+++ b/po/ko.po
--- a/po/no.po
+++ b/po/no.po
--- a/src/daemon/ChangeLog
+++ b/src/daemon/ChangeLog
@@ -1,3 +1,20 @@
 1999-02-19  Martin Baulig  <martin@home-of-linux.org>
 	* Makefile.am (LIBGTOP_COMPILE_SYSTEM): Hardcoded system name.
 	(LIBGTOP_COMPILE_RELEASE): Hardcoded system release.
 	(LIBGTOP_COMPILE_MACHINE): Hardcoded machine type.
 	* src/daemon/Makefile.am (libgtop_server_SOURCES): Don't use
 	`@INTLLIBS@' for the server.
 	* server.c (main): Abort if not running on the system the server
 	was compiled on.
 1999-02-10  Martin Baulig  <martin@home-of-linux.org>
 	* gnuserv.c (program_invocation_*_name): Declare this as `extern'
 	if necessary.
 1998-12-17  Martin Baulig  <baulig@merkur.uni-trier.de>
 	* gnuserv.c: Don't include <gnome-argp.h>.
--- a/src/daemon/Makefile.am
+++ b/src/daemon/Makefile.am
@@ -14,7 +14,10 @@
 LINK				= $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
-CFLAGS				= -Wall -W @CFLAGS@ -D_BSD
+INCLUDES			= @INCLUDES@ -D_BSD \
 				  -DLIBGTOP_COMPILE_SYSTEM=\"`uname -s`\" \
 				  -DLIBGTOP_COMPILE_RELEASE=\"`uname -r`\" \
 				  -DLIBGTOP_COMPILE_MACHINE=\"`uname -m`\"
 if NEED_LIBGTOP
 suid_sysdeps			= $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps_suid.la
@@ -36,7 +39,7 @@ libgtop_daemon_LDADD		= $(top_builddir)/lib/libgtop.la \
 				  @sysdeps_suid_lib@ \
 				  $(suid_sysdeps) $(suid_common)\
 				  $(GLIB_LIBS)\
-				  @INTLLIBS@ @LIBSUPPORT@ @libs_xauth@
+				  @LIBSUPPORT@ @INTLLIBS@ @libs_xauth@
 libgtop_server_SOURCES		= server.c slave.c io.c version.c daemon.h
 libgtop_server_LDADD		= $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps_suid.la \
--- a/Show More
+++ b/Show More