Fixing mistakes from previous checkin.

1998-06-12  Martin Baulig  <baulig@taurus.uni-trier.de>

	* sysdeps/guile/proclist.c: Replaced call to
	`gh_append2 ()' with `gh_append ()'.

.cvsignore

@@ -1,18 +1,19 @@
 Makefile
 Makefile.in
 aclocal.m4
+alpha-dec-osf1
+autoh31167
 config.cache
 config.h
 config.h.in
 config.log
-config.sub
-config.guess
 config.status
 configure
 gtopConf.sh
 i386-bsdi
 i686-pc-linux-gnu
 intl
+libgtop-0.01.tar.gz
 libgtop-mirror.sh.swp
 libgtopConf.sh
 libtool
@@ -20,22 +21,6 @@ ltconfig
 ltmain.sh
 macros
 stamp-h
-stamp-h.in
 sun4
 sun4sol2
 support
-i386-freebsd
-alpha-dec-osf3.0
-i686-pc-linux-gnu-linux
-libgtop-config
-ABOUT-NLS
-libgtop.spec
-libgtop*.tar.gz
-*-debstamp
-libgtop*.pc
-autom4te.cache
-COPYING
-INSTALL
-install-sh
-missing
-mkinstalldirs

ABOUT-NLS

@@ -0,0 +1,225 @@
+Notes on the Free Translation Project
+*************************************
+
+   Free software is going international!  The Free Translation Project
+is a way to get maintainers of free software, translators, and users all
+together, so that will gradually become able to speak many languages.
+A few packages already provide translations for their messages.
+
+   If you found this `ABOUT-NLS' file inside a distribution, you may
+assume that the distributed package does use GNU `gettext' internally,
+itself available at your nearest GNU archive site.  But you do *not*
+need to install GNU `gettext' prior to configuring, installing or using
+this package with messages translated.
+
+   Installers will find here some useful hints.  These notes also
+explain how users should proceed for getting the programs to use the
+available translations.  They tell how people wanting to contribute and
+work at translations should contact the appropriate team.
+
+   When reporting bugs in the `intl/' directory or bugs which may be
+related to internationalization, you should tell about the version of
+`gettext' which is used.  The information can be found in the
+`intl/VERSION' file, in internationalized packages.
+
+One advise in advance
+=====================
+
+   If you want to exploit the full power of internationalization, you
+should configure it using
+
+     ./configure --with-included-gettext
+
+to force usage of internationalizing routines provided within this
+package, despite the existence of internationalizing capabilities in the
+operating system where this package is being installed.  So far, only
+the `gettext' implementation in the GNU C library version 2 provides as
+many features (such as locale alias or message inheritance) as the
+implementation here.  It is also not possible to offer this additional
+functionality on top of a `catgets' implementation.  Future versions of
+GNU `gettext' will very likely convey even more functionality.  So it
+might be a good idea to change to GNU `gettext' as soon as possible.
+
+   So you need not provide this option if you are using GNU libc 2 or
+you have installed a recent copy of the GNU gettext package with the
+included `libintl'.
+
+INSTALL Matters
+===============
+
+   Some packages are "localizable" when properly installed; the
+programs they contain can be made to speak your own native language.
+Most such packages use GNU `gettext'.  Other packages have their own
+ways to internationalization, predating GNU `gettext'.
+
+   By default, this package will be installed to allow translation of
+messages.  It will automatically detect whether the system provides
+usable `catgets' (if using this is selected by the installer) or
+`gettext' functions.  If neither is available, the GNU `gettext' own
+library will be used.  This library is wholly contained within this
+package, usually in the `intl/' subdirectory, so prior installation of
+the GNU `gettext' package is *not* required.  Installers may use
+special options at configuration time for changing the default
+behaviour.  The commands:
+
+     ./configure --with-included-gettext
+     ./configure --with-catgets
+     ./configure --disable-nls
+
+will respectively bypass any pre-existing `catgets' or `gettext' to use
+the internationalizing routines provided within this package, enable
+the use of the `catgets' functions (if found on the locale system), or
+else, *totally* disable translation of messages.
+
+   When you already have GNU `gettext' installed on your system and run
+configure without an option for your new package, `configure' will
+probably detect the previously built and installed `libintl.a' file and
+will decide to use this.  This might be not what is desirable.  You
+should use the more recent version of the GNU `gettext' library.  I.e.
+if the file `intl/VERSION' shows that the library which comes with this
+package is more recent, you should use
+
+     ./configure --with-included-gettext
+
+to prevent auto-detection.
+
+   By default the configuration process will not test for the `catgets'
+function and therefore they will not be used.  The reasons are already
+given above: the emulation on top of `catgets' cannot provide all the
+extensions provided by the GNU `gettext' library.  If you nevertheless
+want to use the `catgets' functions use
+
+     ./configure --with-catgets
+
+to enable the test for `catgets' (this causes no harm if `catgets' is
+not available on your system).  If you really select this option we
+would like to hear about the reasons because we cannot think of any
+good one ourself.
+
+   Internationalized packages have usually many `po/LL.po' files, where
+LL gives an ISO 639 two-letter code identifying the language.  Unless
+translations have been forbidden at `configure' time by using the
+`--disable-nls' switch, all available translations are installed
+together with the package.  However, the environment variable `LINGUAS'
+may be set, prior to configuration, to limit the installed set.
+`LINGUAS' should then contain a space separated list of two-letter
+codes, stating which languages are allowed.
+
+Using This Package
+==================
+
+   As a user, if your language has been installed for this package, you
+only have to set the `LANG' environment variable to the appropriate
+ISO 639 `LL' two-letter code prior to using the programs in the
+package.  For example, let's suppose that you speak German.  At the
+shell prompt, merely execute `setenv LANG de' (in `csh'),
+`export LANG; LANG=de' (in `sh') or `export LANG=de' (in `bash').  This
+can be done from your `.login' or `.profile' file, once and for all.
+
+   An operating system might already offer message localization for
+many of its programs, while other programs have been installed locally
+with the full capabilities of GNU `gettext'.  Just using `gettext'
+extended syntax for `LANG' would break proper localization of already
+available operating system programs.  In this case, users should set
+both `LANGUAGE' and `LANG' variables in their environment, as programs
+using GNU `gettext' give preference to `LANGUAGE'.  For example, some
+Swedish users would rather read translations in German than English for
+when Swedish is not available.  This is easily accomplished by setting
+`LANGUAGE' to `sv:de' while leaving `LANG' to `sv'.
+
+Translating Teams
+=================
+
+   For the Free Translation Project to be a success, we need interested
+people who like their own language and write it well, and who are also
+able to synergize with other translators speaking the same language.
+Each translation team has its own mailing list, courtesy of Linux
+International.  You may reach your translation team at the address
+`LL@li.org', replacing LL by the two-letter ISO 639 code for your
+language.  Language codes are *not* the same as the country codes given
+in ISO 3166.  The following translation teams exist, as of August 1997:
+
+     Chinese `zh', Czech `cs', Danish `da', Dutch `nl', English `en',
+     Esperanto `eo', Finnish `fi', French `fr', German `de', Hungarian
+     `hu', Irish `ga', Italian `it', Indonesian `id', Japanese `ja',
+     Korean `ko', Latin `la', Norwegian `no', Persian `fa', Polish
+     `pl', Portuguese `pt', Russian `ru', Slovenian `sl', Spanish `es',
+     Swedish `sv', and Turkish `tr'.
+
+For example, you may reach the Chinese translation team by writing to
+`zh@li.org'.
+
+   If you'd like to volunteer to *work* at translating messages, you
+should become a member of the translating team for your own language.
+The subscribing address is *not* the same as the list itself, it has
+`-request' appended.  For example, speakers of Swedish can send a
+message to `sv-request@li.org', having this message body:
+
+     subscribe
+
+   Keep in mind that team members are expected to participate
+*actively* in translations, or at solving translational difficulties,
+rather than merely lurking around.  If your team does not exist yet and
+you want to start one, or if you are unsure about what to do or how to
+get started, please write to `translation@iro.umontreal.ca' to reach the
+coordinator for all translator teams.
+
+   The English team is special.  It works at improving and uniformizing
+the terminology in use.  Proven linguistic skill are praised more than
+programming skill, here.
+
+Available Packages
+==================
+
+   Languages are not equally supported in all packages.  The following
+matrix shows the current state of internationalization, as of August
+1997.  The matrix shows, in regard of each package, for which languages
+PO files have been submitted to translation coordination.
+
+     Ready PO files    cs da de en es fi fr it ja ko nl no pl pt sl sv
+                     .-------------------------------------------------.
+     bash            |       []          []          []                |  3
+     bison           |       []          []          []                |  3
+     clisp           |       [] [] []    []                            |  4
+     cpio            |       []    []    []          []    []          |  5
+     diffutils       |       []    []    []                []       [] |  5
+     enscript        |       []    [] [] []          []          []    |  6
+     fileutils       | []    []    []    []       [] []    [] [] [] [] | 10
+     findutils       |       []    []    [] []    [] []    []       [] |  8
+     flex            |             []    []       []                [] |  4
+     gcal            |       []          []          []    []       [] |  5
+     gettext         |       []    []    []       [] [] [] [] [] [] [] | 11
+     grep            |       []    []    []       [] [] [] []    [] [] |  9
+     hello           |       []    []    []       [] [] [] [] [] [] [] | 10
+     id-utils        |       []          []                []          |  3
+     indent          |    [] []                   []       []          |  4
+     libc            |       []    []    []       [] []    []       [] |  7
+     m4              |       []          []    []    []             [] |  5
+     make            |       []    []    []       [] []    []          |  6
+     music           |                   []                []          |  2
+     ptx             |       []    []    []          [] [] [] []    [] |  8
+     recode          |    [] []    []    []          []    [] [] [] [] |  9
+     sh-utils        |       []          []          [] [] [] []    [] |  7
+     sharutils       |       []    []    []          []             [] |  5
+     tar             |       []          [] []    [] [] [] [] [] [] [] | 10
+     texinfo         |                   []                            |  1
+     textutils       | []    []    []    []       [] [] [] []       [] |  9
+     wdiff           | []    []    []    []          [] [] []       [] |  8
+                     `-------------------------------------------------'
+       16 languages    cs da de en es fi fr it ja ko nl no pl pt sl sv
+       27 packages      3  2 24  1 17  1 26  2  1 11 20  9 19  7  7 17  167
+
+   Some counters in the preceding matrix are higher than the number of
+visible blocks let us expect.  This is because a few extra PO files are
+used for implementing regional variants of languages, or language
+dialects.
+
+   For a PO file in the matrix above to be effective, the package to
+which it applies should also have been internationalized and
+distributed as such by its maintainer.  There might be an observable
+lag between the mere existence a PO file and its wide availability in a
+distribution.
+
+   If August 1997 seems to be old, you may fetch a more recent copy of
+this `ABOUT-NLS' file on most GNU archive sites.
+

ANNOUNCE

@@ -0,0 +1,95 @@
+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>
+
+
+
+
+

AUTHORS

@@ -1,3 +1 @@
 Martin Baulig (martin@home-of-linux.org)
-Drazen Kacar (dave@srce.hr)
-Beno<EFBFBD>t Dejean (tazforever@dlfp.org)

LIBGTOP-VERSION

@@ -1,28 +0,0 @@
-# Making releases:
-#   LIBGTOP_MICRO_VERSION += 1;
-#   LIBGTOP_INTERFACE_AGE += 1;
-#   LIBGTOP_BINARY_AGE += 1;
-# if any functions have been added, set LIBGTOP_INTERFACE_AGE to 0.
-# if backwards compatibility has been broken,
-# set LIBGTOP_BINARY_AGE and LIBGTOP_INTERFACE_AGE to 0.
-#
-LIBGTOP_MAJOR_VERSION=1
-LIBGTOP_MINOR_VERSION=90
-LIBGTOP_MICRO_VERSION=0
-
-LIBGTOP_INTERFACE_AGE=0
-LIBGTOP_BINARY_AGE=0
-# you can set this to `-snap' for instance to create
-# a `libgtop-1.x.y-snap.tar.gz' tarball.
-LIBGTOP_VERSION_SUFFIX=
-
-# Increase each time you change the client/server protocol.
-LIBGTOP_SERVER_VERSION=5
-
-# Don't change this
-LIBGTOP_VERSION=$LIBGTOP_MAJOR_VERSION.$LIBGTOP_MINOR_VERSION.$LIBGTOP_MICRO_VERSION
-LIBGTOP_VERSION_CODE=`echo "$LIBGTOP_MAJOR_VERSION 1000000 * $LIBGTOP_MINOR_VERSION 1000 * + $LIBGTOP_MICRO_VERSION + p q" | dc`
-
-# For automake.
-VERSION=$LIBGTOP_VERSION$LIBGTOP_VERSION_SUFFIX
-PACKAGE=libgtop

MAINTAINERS

@@ -1,3 +0,0 @@
-Email: martin@home-of-linux.org
-Email: dave@srce.hr
-Beno<EFBFBD>t Dejean (tazforever@dlfp.org)

Makefile.am

@@ -1,20 +1,53 @@
+## Process this file with automake to produce Makefile.in.
 
-SUBDIRS = po misc include sysdeps lib src examples doc
+if GLIBTOP_EXAMPLES
+examples_SUBDIRS	= examples
+endif
 
-libgtopinclude_HEADERS = glibtop.h
+built_SUBDIRS = include sysdeps src lib
-libgtopincludedir = $(includedir)/libgtop-2.0
 
-EXTRA_DIST = autogen.sh libgtop.spec.in copyright.txt \
+SUBDIRS = po intl macros $(built_SUBDIRS) $(examples_SUBDIRS)
-	LIBGTOP-VERSION features.def \
-	libgtop-sysdeps.m4 README \
-	libgtop-mirror.sh libgtop-2.0.pc.in acinclude.m4
 
-dist-hook:
+DIST_SUBDIRS = po intl macros include sysdeps src lib examples
-	cp libgtop.spec $(distdir)
 
-pkgconfigdir = $(libdir)/pkgconfig
+include_HEADERS = glibtop.h
-pkgconfig_DATA = libgtop-2.0.pc
 
-libgtop-features.def: features.def
+EXTRA_DIST = autogen.sh libgtop.spec copyright.txt libgtopConf.sh.in
-	@LN_S@ $< $@
 
+release:
+	$(MAKE) dist distdir=$(PACKAGE)$(VERSION)
+
+## Put `exec' in the name because this should be installed by
+## `install-exec', not `install-data'.
+confexecdir=$(libdir)
+confexec_DATA = $(top_builddir)/libgtopConf.sh
+
+## to automatically rebuild aclocal.m4 if any of the macros in
+## `macros/' change
+@MAINT@include macros/macros.dep
+@MAINT@macros/macros.dep: macros/Makefile.am
+@MAINT@	cd macros && $(MAKE) macros.dep
+
+## We create libgtopConf.sh here and not from configure because we want
+## to get the paths expanded correctly.  Macros like srcdir are given
+## the value NONE in configure if the user doesn't specify them (this
+## 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' \
+	    -e 's,\@LIBGTOP_INCLUDEDIR\@,$(includedir),g' \
+	    -e 's,\@LIBGTOP_LIBS\@,$(LIBGTOP_LIBS),g' \
+	    -e 's,\@LIBGTOP_INCS\@,$(LIBGTOP_INCS),g' \
+	    -e 's,\@LIBGTOP_GUILE_LIBS\@,$(LIBGTOP_GUILE_LIBS),g' \
+	    -e 's,\@LIBGTOP_GUILE_INCS\@,$(LIBGTOP_GUILE_INCS),g' \
+	    -e 's,\@LIBGTOP_BINDIR\@,$(LIBGTOP_BINDIR),g' \
+	    -e 's,\@LIBGTOP_SERVER\@,$(LIBGTOP_SERVER),g' \
+	    -e 's,\@libgtop_sysdeps_dir\@,$(libgtop_sysdeps_dir),g' \
+	    -e 's,\@libgtop_need_server\@,$(libgtop_need_server),g' \
+	    -e 's,\@libgtop_use_machine_h\@,$(libgtop_use_machine_h),g' \
+	    -e 's,\@libgtop_guile_found\@,$(libgtop_guile_found),g' \
+	    -e 's,\@libgtop_want_names\@,$(libgtop_want_names),g' \
+	    -e 's,\@libgtop_want_guile_names\@,$(libgtop_want_guile_names),g' \
+	    -e 's,\@libgtop_want_examples\@,$(libgtop_want_examples),g' \
+	      < $(srcdir)/libgtopConf.sh.in > libgtopConf.tmp \
+	  && mv libgtopConf.tmp libgtopConf.sh

NEWS

@@ -1,134 +1,133 @@
-December 4, 2004: Overview of Changes from 2.8.1 to 2.8.2
+$Id$
-=========================================================
-  o linux:
-     - fixed segfault when polling PPP devices with glibtop_get_proclist.
-     - fixed process state in glibtop_get_proclist.
 
-  o updated translations:
+May/21/1998
-     - da (Martin Willemoes Hansen)
+===========
 
+* 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'.
 
-October 11, 2004: Overview of Changes from 2.8.0 to 2.8.1
+May/20/1998
-=========================================================
+===========
-* Improved Solaris and AIX support.
 
+* '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;
 
-August 13, 2004: Overview of Changes from 2.7.92 to 2.8.0
+* 'gtopConf.sh' additionally defines 'GTOP_GUILE_LIBS' and 'GTOP_GUILE_INCS'
-=========================================================
+  containing everything that is needed to link some program both with
-* No changes
+  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.
 
-August 30, 2004:
+* 'configure' takes an argument '--without-libgtop-guile' to disable
-===============
+  guile support.
-* Applied some *BSD patches.
-* Removed old files.
 
+* '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.
 
-August 15, 2004:
+May/19/1998
-===============
+===========
-* Fixed compilation with C89-only compilers and old libc.
 
+* Libgtop is now in the GNOME CVS Repository.
 
-August 3, 2004:
+May/17/1998
-==============
+===========
-* Some cleanups.
-* Fixed the behaviour of some linux proc_*() functions.
-* Updated the documentation.
 
+* we have now 'const char *glibtop_types_* []' consisting
+  of the C types of the corresponding files of '_glibtop_*'.
 
-July 19, 2004: Overview of Changes from 2.6.1 to 2.7.4
+* added guile function '(glibtop-types-*)' and '(glibtop-descriptions-*)'.
-======================================================
-* Plenty of code cleanups. Uninlined a lot of functions. ~5-10KB object size
-  reduction.
-* Glibify a bit more.
-* API changes:
- - glibtop_fsusage provides total read and writes since boot_time.
- - glibtop_netload provides hardware address. IPv6 enable.
- - Added glibtop_get_proc_argv.
 
-Work in progress :
+May/10/1998
-* Finish glibtop_fsusage implementation for Linux.
+===========
-* Some fuctions don't conform to the documentation, e.g. proctime.
 
-March 11, 2004:
+* Port to DEC OSF1 3.0 has been made:
-===============
 
-* Released LibGTop 2.5.99 "Gross Work", dedicated to people who do push-ups
+  cpu		(total, user, nice, sys, idle)
-  in the loos.
+  mem		(total, used, free)
 
-  - plenty of code cleanups
+  loadavg	(loadavg)
+  uptime	(uptime)
 
-  - removed the dependency on libgnome, only glib required now
+  msg_limits	(map, max, mnb, mni, tql)
+  sem_limits	(mni, msl, opm, vmx, aem)
+  shm_limits	(max, min, mni, seg)
 
-  - Linux 2.6 support, NetBSD support and better FreeBSD support
+  The following need the server to be SUID root:
 
-  - Make the block size available for filesystem statistics
+  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)
 
-February 27, 2001:
+May/07/1998
-=================
+===========
 
-* Released LibGTop 1.0.12 "Gerolzhofen".
+* 'flags' member of sysdeps/linux/procdata.c is now
+  'unsigned long flags [2]'.
 
-  - fix for Solaris 8 from Laszlo PETER (msg_limits, sem_limits).
+* When we give glibtop_get_procdata () a pid of zero, only
+  the flags are returned.
 
-  - fix for FreeBSD 4.2 from Rolf Grossmann (FreeBSD now uses
+* We now use static constants instead of #defines for sysdeps flags.
-    `_KERNEL' instead of `KERNEL'). Bug #51334.
 
-  - for BSDI, comment out `subnet' field in netload; this should make
+May/03/1998
-    it compile, but there may be other problems. Bug #13345.
+===========
 
-  This release is for GNOME 1.4 Beta2.
+* VPATH-Build now working; sometimes it's necessary to copy
+  $(top_srcdir)/po/cat-id-tbl.c to $(top_builddir)/po.
 
-February 14, 2001:
+* The library has been tested on the following systems:
-=================
 
-* Released LibGTop 1.0.11 "Jasmin":
+  - i686-pc-linux-gnu
+  - sparc-sun-sunos4.1.1
+  - alpha-dec-osf1 (that's DEC OSF1 3.0 and 3.2)
 
-  [The release which was supposed to be called "Gerolzhofen".]
+* Compilation has been tested on the following systems (I have no root
+  access there and cannot test the library because of this):
 
-  - merged in the Solaris code from LIBGTOP_1_1_2_PATCHES.
+  - sparc-sun-solaris2
+  - i386-bsdi
 
-  - minor OpenBSD fixes.
+* Does no longer require Gnome.
 
-  - again a bunch of updated translations.
+* Guile-Parts are compiled only if guile can be found.
 
-  Please test the Solaris stuff and report and bugs and
+* Some of the executables are statically linked to copy them more easily
-  problems as soon as possible; I'll make a new release
+  between machines.
-  for the 2nd beta of GNOME 1.4 if necessary.
 
-November 20, 2000:
+May/02/1998
-=================
+===========
 
-* Released LibGTop 1.0.10 "November Rain":
+ * 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.
 
-  - this release contains a bunch of updated translations.
+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.
 
-May 25, 2000:
+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.
 
-* Released LibGTop 1.0.9 "Stuttgart".
+Apr/08/1998
-
+===========
-  (LibGTop 1.0.8 "Frankfurt" was not publically released.)
-
-February 15, 2000:
-=================
-
-* Released LibGTop 1.0.7 "Copenhagen":
-
-  - this is a bug fix release for the GUADEC CD-ROM;
-    it contains fixes in both the Linux and *BSD sysdeps
-    directory.
-
-October 18, 1999:
-================
-
-* Released LibGTop 1.0.6 "October LibGTop":
-
-  - compilation fixes for FreeBSD.
-  - updated reference manual.
-
-September 29, 1999:
-==================
-
-* Released LibGTop 1.0.5.
 
+Added guile wrapper for the library (see examples/third).

README

@@ -1,8 +1,57 @@
-$Id$
+Hi all,
 
-LATEST NEWS:
+[PLEASE READ THE FILE ``README.LATEST'' FOR 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:
 ===========
 
-Please look also in the file 'NEWS' for latest news.
+   libgtop-current-cvs.cpio.gz     is a cpio archive from the CVS repository
- 
+   libgtop-current.cpio.gz         contains the lates checked out sources
-Martin
+   libgtop-stable.cpio.gz          if present, it contains the last stable release
+
+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)

README.LATEST

@@ -0,0 +1,8 @@
+$Id$
+
+LATEST NEWS:
+===========
+
+Please look also in the file 'NEWS' for latest news.
+ 
+Martin

acconfig.h

@@ -1,24 +1,5 @@
-
-/* Define if gethostname () must be declared. */
-#undef NEED_DECLARATION_GETHOSTNAME
-
-/* Define if setreuid () must be declared. */
-#undef NEED_DECLARATION_SETREUID
-
-/* Define if setregid () must be declared. */
-#undef NEED_DECLARATION_SETREGID
-
-/* Define if getpagesize () must be declared. */
-#undef NEED_DECLARATION_GETPAGESIZE
-
-/* Define if program_invocation_name must be declared. */
-#undef NEED_DECLARATION_PROGRAM_INVOCATION_NAME
-
-@TOP@
-
 #undef ENABLE_NLS
 #undef HAVE_CATGETS
-#undef GETTEXT_PACKAGE
 #undef HAVE_GETTEXT
 #undef HAVE_LC_MESSAGES
 #undef HAVE_STPCPY
@@ -31,140 +12,24 @@
 
 /* Do not remove this comments and the empty lines; they are needed */
 #undef HAVE_PROGRAM_INVOCATION_SHORT_NAME
-/* Define if you have the Andrew File System.  */
-#undef AFS
-
-/* Define one of the following to indicate how a program can
-   get a list of mounted filesystems.  */
-
-/* Define if there is no specific function for reading the list of
-   mounted filesystems.  fread will be used to read /etc/mnttab.  [SVR2]  */
-#undef MOUNTED_FREAD
-
-/* Define if (like SVR2) there is no specific function for reading the
-   list of mounted filesystems, and your system has these header files:
-   <sys/fstyp.h> and <sys/statfs.h>.  [SVR3]  */
-#undef MOUNTED_FREAD_FSTYP
-
-/* Define if there is a function named getfsstat for reading the list
-   of mounted filesystems.  [DEC Alpha running OSF/1]  */
-#undef MOUNTED_GETFSSTAT
-
-/* Define if there is a function named getmnt for reading the list of
-   mounted filesystems.  [Ultrix]  */
-#undef MOUNTED_GETMNT
-
-/* Define if there is a function named getmntent for reading the list
-   of mounted filesystems, and that function takes a single argument.
-   [4.3BSD, SunOS, HP-UX, Dynix, Irix]  */
-#undef MOUNTED_GETMNTENT1
-
-/* Define if there is a function named getmntent for reading the list of
-   mounted filesystems, and that function takes two arguments.  [SVR4]  */
-#undef MOUNTED_GETMNTENT2
-
-/* Define if there is a function named getmntinfo for reading the list
-   of mounted filesystems.  [4.4BSD]  */
-#undef MOUNTED_GETMNTINFO
-
-/* Define if there is a function named listmntent that can be used to
-   list all mounted filesystems. [UNICOS] */
-#undef MOUNTED_LISTMNTENT
-
-/* Define if there is a function named mntctl that can be used to read
-   the list of mounted filesystems, and there is a system header file
-   that declares `struct vmount.'  [AIX]  */
-#undef MOUNTED_VMOUNT
-
-/* Define one of the following to indicate how a program can obtain
-   filesystems usage information.  */
-
-/*  Define if  statfs takes 3 args.  [DEC Alpha running OSF/1]  */
-#undef STAT_STATFS3_OSF1
-
-/* Define if there is no specific function for reading filesystems usage
-   information and you have the <sys/filsys.h> header file.  [SVR2]  */
-#undef STAT_READ_FILSYS
-
-/* Define if statfs takes 2 args and struct statfs has a field named f_bsize.
-   [4.3BSD, SunOS 4, HP-UX, AIX PS/2]  */
-#undef STAT_STATFS2_BSIZE
-
-/* Define if statfs takes 2 args and struct statfs has a field named f_fsize.
-   [4.4BSD, NetBSD]  */
-#undef STAT_STATFS2_FSIZE
-
-/* Define if statfs takes 2 args and the second argument has
-   type struct fs_data.  [Ultrix]  */
-#undef STAT_STATFS2_FS_DATA
-
-/* Define if statfs takes 4 args.  [SVR3, Dynix, Irix, Dolphin]  */
-#undef STAT_STATFS4
-
-/* Define if there is a function named statvfs.  [SVR4]  */
-#undef STAT_STATVFS
-
-/* Define if the block counts reported by statfs may be truncated to 2GB
-   and the correct values may be stored in the f_spare array.
-   [SunOS 4.1.2, 4.1.3, and 4.1.3_U1 are reported to have this problem.
-   SunOS 4.1.1 seems not to be affected.]  */
-#undef STATFS_TRUNCATES_BLOCK_COUNTS
-
 
 /* to fix a bug in autoheader on DEC OSF1. */
 #undef HAVE_PROGRAM_INVOCATION_NAME
 
-#undef HAVE_SOCKETS
-#undef HAVE_SOCKADDR_SUN_LEN
-
 #undef HAVE_LIBJPEG
 #undef HAVE_LIBGIF
 #undef HAVE_LIBTIFF
 #undef HAVE_LIBZ
 #undef HAVE_LIBPNG
+#undef GNOME_ENABLE_DEBUG
 #undef HAVE_GMP2_INCLUDE_DIR
 #undef HAVE_GUILE
-
 #undef ssize_t
-#undef guint64
-#undef int64_t
 
 #undef HAVE_GLIBTOP_MACHINE_H
 
 #undef GLIBTOP_NAMES
-#undef GLIBTOP_GUILE
 #undef GLIBTOP_GUILE_NAMES
 #undef GLIBTOP_EXAMPLES
-#undef GLIBTOP_INODEDB
 
 #undef NEED_LIBGTOP
-
-#undef HAVE_LINUX_TABLE
-#undef HAVE_LIBGTOP_SMP
-
-#undef HAVE_XAUTH
-
-/* Define if your have the I4B package. */
-#undef HAVE_I4B
-#undef HAVE_I4B_ACCT
-
-/* Define to enable debugging. */
-#undef LIBGTOP_ENABLE_DEBUG
-#undef LIBGTOP_FATAL_WARNINGS
-
-/* Same as LINUX_VERSION_CODE either from <linux/version.h> or from
- * the running kernel (if we don't have configured kernel sources).
- */
-#undef GLIBTOP_LINUX_VERSION_CODE
-
-/* Solaris release code (eg. 251 for Solaris 2.5.1). */
-#undef GLIBTOP_SOLARIS_RELEASE
-
-/* Define if you want to use LibGTop without GNOME. */
-#undef WITHOUT_GNOME
-
-/* Define if you have the <procfs.h> header file */
-#undef HAVE_PROCFS_H
-
-/* Define if you have the <sys/procfs.h> header file */
-#undef HAVE_SYS_PROCFS_H

autogen.sh

@@ -14,8 +14,4 @@ PKG_NAME="Gnome Top Library"
     exit 1
 }
 
-which gnome-autogen.sh || {
+. $srcdir/macros/autogen.sh
-    echo "You need to install gnome-common from the GNOME CVS"
-    exit 1
-}
-USE_GNOME2_MACROS=1 . gnome-autogen.sh

backends/.cvsignore

@@ -1,5 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.lo

backends/Makefile.am

@@ -1,15 +0,0 @@
-if NEED_LIBGTOP
-server_dir	= server
-else
-server_dir	=
-endif
-
-if HAVE_SYSDEPS
-sysdeps_dir	= sysdeps
-else
-sysdeps_dir	=
-endif
-
-SUBDIRS		= $(server_dir) $(sysdeps_dir) common
-
-DIST_SUBDIRS	= server sysdeps common

backends/common/.cvsignore

@@ -1,7 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.lo
-*.la
-marshal.c

backends/common/ChangeLog

@@ -1,50 +0,0 @@
-2003-10-20  Bastien Nocera  <hadess@hadess.net>
-
-	* backend-common.c: (_open_common): s/u_int64_t/guint64/
-
-2003-10-20  Bastien Nocera  <hadess@hadess.net>
-
-	* backend-common.h: fixed compilation
-
-2000-11-26  Martin Baulig  <martin@home-of-linux.org>
-
-	* glibtop-backend-private.h: Removed.
-
-	* backend-common.h: New files.
-
-	* backend-common.c (_open_common): Don't overwrite
-	`backend->_priv'.
-
-2000-11-22  Martin Baulig  <martin@home-of-linux.org>
-
-	* Makefile.am: Link libgtop_backend_common.la against
-	$(top_builddir)/sysdeps/common/libgtop_common.la and
-	$(top_builddir)/lib/libgtop_server.la.
-
-2000-02-22  Martin Baulig  <martin@home-of-linux.org>
-
-	* backend-sysdeps.c (LibGTopBackendInfo): Call this
-	`LibGTopBackendInfo_Common' when we don't use gmodule.
-
-2000-02-22  Martin Baulig  <martin@home-of-linux.org>
-
-	* Makefile.am: Only install the libs in $(LIBGTOP_BACKEND_DIR)
-	when we LIBGTOP_USE_GMODULE and in $(libdir) otherwise.
-
-2000-01-12  Martin Baulig  <martin@home-of-linux.org>
-
-	* Makefile.am: Install everything in $(LIBGTOP_BACKEND_DIR).
-
-	* libgtop-common.backend: New file.
-
-	* backend-common.c (glibtop_backend_common): Renamed to
-	`LibGTopBackendInfo'.
-
-2000-01-12  Martin Baulig  <martin@home-of-linux.org>
-
-	Initial version of the "glibtop-backend-common" backend.
-
-	* backend-common.c: New file.
-	* glibtop-backend-private.h: New file.
-	* marshal.pl: New file. Automatically creates `marshal.c'.
-

backends/common/Makefile.am

@@ -1,47 +0,0 @@
-LINK		= $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
-
-INCLUDES	= @INCLUDES@
-
-backenddir	= @LIBGTOP_BACKEND_DIR@
-
-if LIBGTOP_USE_GMODULE
-backendlibdir	= $(backenddir)
-else
-backendlibdir	= $(libdir)
-endif
-
-dynamic_ldflags	= @libgtop_dynamic_ldflags@
-
-backend_DATA = \
-	libgtop-common.backend
-
-noinst_HEADERS = \
-	backend-common.h
-
-backendlib_LTLIBRARIES = \
-	libgtop_backend_common.la
-
-libgtop_backend_common_la_SOURCES = \
-	backend-common.c		\
-	marshal.c
-
-libgtop_backend_common_la_LDFLAGS = \
-	$(LT_VERSION_INFO) $(dynamic_ldflags)
-
-libgtop_backend_common_la_LIBADD = \
-	$(top_builddir)/sysdeps/common/libgtop_common.la	\
-	$(top_builddir)/lib/libgtop_server.la
-
-BUILT_SOURCES = \
-	marshal.c
-
-EXTRA_DIST = \
-	marshal.pl	\
-	libgtop-common.backend
-
-CLEANFILES = $(BUILT_SOURCES)
-
-marshal.c: marshal.pl $(top_builddir)/config.h $(top_srcdir)/features.def $(top_srcdir)/scripts/c_types.pl
-	$(PERL) -I $(top_srcdir)/scripts $(srcdir)/marshal.pl < $(top_srcdir)/features.def > tmp-t
-	mv tmp-t marshal.c
-

backends/common/backend-common.c

@@ -1,61 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
-/* $Id$ */
-
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#include <backend-common.h>
-
-static int
-_open_common (glibtop_server *, glibtop_backend *, guint64, const char **);
-
-static int
-_close_common (glibtop_server *, glibtop_backend *, void *closure);
-
-extern glibtop_call_vector glibtop_backend_common_call_vector;
-
-#ifdef LIBGTOP_USE_GMODULE
-glibtop_backend_info LibGTopBackendInfo = {
-    "glibtop-backend-common", _open_common, _close_common,
-    &glibtop_backend_common_call_vector
-};
-#else
-glibtop_backend_info LibGTopBackendInfo_Common = {
-    "glibtop-backend-common", _open_common, _close_common,
-    &glibtop_backend_common_call_vector
-};
-#endif
-
-static int
-_open_common (glibtop_server *server, glibtop_backend *backend,
-	      guint64 features, const char **backend_args)
-{
-    return 0;
-}
-
-static int
-_close_common (glibtop_server *server, glibtop_backend *backend,
-	       void *closure)
-{
-    return 0;
-}
-

backends/common/backend-common.h

@@ -1,36 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
-/* $Id$ */
-
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __GLIBTOP_BACKEND_COMMON_H__
-#define __GLIBTOP_BACKEND_COMMON_H__
-
-#include <glibtop.h>
-#include <glibtop/global.h>
-
-#include <glibtop/open.h>
-#include <glibtop/glibtop-backend.h>
-#include <glibtop/glibtop-backend-info.h>
-
-#endif

backends/common/libgtop-common.backend

@@ -1,13 +0,0 @@
-<?xml version="1.0"?> <!-- -*-xml-*- -->
-<!DOCTYPE libgtop:backends SYSTEM 'libgtop-backends.dtd'>
-<libgtop:Backends xmlns:libgtop="http://www.home-of-linux.org/libgtop/1.1">
-
-  <libgtop:Backend>
-    <libgtop:Name>glibtop-backend-common</libgtop:Name>
-    <libgtop:Location>
-      <libgtop:LibtoolName>libgtop_backend_common.la</libgtop:LibtoolName>
-      <libgtop:ShlibName>libgtop_backend_common.so</libgtop:ShlibName>
-    </libgtop:Location>
-  </libgtop:Backend>
-
-</libgtop:Backends>

backends/common/marshal.pl

@@ -1,175 +0,0 @@
-#!/usr/bin/perl
-
-require 'c_types.pl';
-
-$[ = 1;			# set array base to 1
-$, = ' ';		# set output field separator
-$\ = "\n";		# set output record separator
-
-$always_use_temp_storage = 1;
-
-sub toupper {
-    local($_) = @_;
-    tr/a-z/A-Z/;
-    return $_;
-}
-
-sub tolower {
-    local($_) = @_;
-    tr/A-Z/a-z/;
-    return $_;
-}
-
-print '/* marshal.c */';
-print "/* This is a generated file.  Please modify `marshal.pl' */";
-print '';
-
-print '#include <backend-common.h>';
-print '';
-print '#include <glibtop/sysdeps.h>';
-print '#include <glibtop/union.h>';
-print '';
-print '#include <glibtop/call-vector.h>';
-print '';
-
-$feature_count = 0;
-
-while (<>) {
-    chop;	# strip record separator
-
-    if (/^[^#]/) {
-	&output($_);
-    }
-}
-
-sub output {
-    local($line) = @_;
-    @line_fields = split(/\|/, $line, 9999);
-    $retval = $line_fields[1];
-    $feature = $line_fields[2];
-    $param_def = $line_fields[4];
-
-    $orig = $feature;
-    $feature =~ s/^@//;
-    $space = $feature;
-    $space =~ s/./ /g;
-
-    $features{++$feature_count} = $orig;
-
-    return unless $orig =~ /^@/;
-
-    if ($retval eq 'retval') {
-      $retval_param = '&retval';
-      $call_prefix = '';
-      $call_prefix_space = '';
-      $prefix = 'retval = ';
-      $prefix_space = '         ';
-      $retval = 'int';
-    }
-    elsif ($retval !~ /^void$/) {
-      $retval_param = 'NULL';
-      $prefix = 'retval = ';
-      $prefix_space = '         ';
-      $call_prefix = 'retval = ';
-      $call_prefix_space = '         ';
-    }
-    else {
-      $retval_param = 'NULL';
-      $call_prefix = '';
-      $call_prefix_space = '';
-      $prefix = '';
-      $prefix_space = '';
-    }
-
-    if ($retval =~ /^(array|pointer)\((.*)\)$/) {
-      $retval = ($2 eq 'string') ? 'char **' : "$2 *";
-    }
-
-    $need_temp_storage = $always_use_temp_storage;
-    $first_param_name = '';
-
-    $call_param = '';
-    $param_decl = '';
-    $need_temp_len = 0;
-    $nr_params = (@params = split(/:/, $param_def, 9999));
-    for ($param = 1; $param <= $nr_params; $param++) {
-      $list = $params[$param];
-      $type = $params[$param];
-      $type =~ s/\(.*//;
-      $list =~ s/^.*\(//;
-      $list =~ s/\)$//;
-      $count = (@fields = split(/,/, $list, 9999));
-      for ($field = 1; $field <= $count; $field++) {
-	my $c_type = $typeinfo->{$type}->[1];
-
-	if ($first_param_name eq '') {
-	  $first_param_name = $fields[$field];
-	}
-
-	if ($typeinfo->{$type}->[2]) {
-	  $need_temp_storage = 1;
-	}
-
-	if ($param_decl eq '') {
-	  $param_decl = ",\n             " . $space . '    ';
-	}
-	else {
-	  $param_decl = $param_decl . ', ';
-	}
-	$param_decl = $param_decl . $c_type . ' ' . $fields[$field];
-	$call_param = $call_param . ', ' . $fields[$field];
-      }
-    }
-
-    if ($line_fields[3] eq '') {
-      $total_code = sprintf
-	("\treturn glibtop_get_%s_s (server%s);\n", $feature, $call_param);
-    } elsif ($line_fields[3] eq 'array') {
-      $total_code = sprintf
-	("\treturn glibtop_get_%s_s (server, array%s);\n", $feature, $call_param);
-    } elsif ($line_fields[3] =~ /^array/) {
-      $total_code = sprintf
-	("\treturn glibtop_get_%s_s (server, array, buf%s);\n", $feature, $call_param);
-    } else {
-      $total_code = sprintf
-	("\treturn glibtop_get_%s_s (server, buf%s);\n", $feature, $call_param);
-    }
-
-    $func_decl = 'static '.$retval."\n";
-    if ($line_fields[3] eq '') {
-      $func_decl .= sprintf ("_glibtop_get_%s_c (glibtop_server *server, void *closure%s)\n",
-			     $feature, $param_decl);
-    } elsif ($line_fields[3] eq 'array') {
-      $func_decl .= sprintf ("_glibtop_get_%s_c (glibtop_server *server, void *closure, glibtop_array *array%s)\n",
-			     $feature, $param_decl);
-    } elsif ($line_fields[3] =~ /^array/) {
-      $func_decl .= sprintf ("_glibtop_get_%s_c (glibtop_server *server, void *closure, glibtop_array *array, %s *buf%s)\n",
-			     $feature, 'glibtop_'.$feature, $param_decl);
-    } else {
-      $func_decl .= sprintf ("_glibtop_get_%s_c (glibtop_server *server, void *closure, %s *buf%s)\n",
-			     $feature, 'glibtop_'.$feature, $param_decl);
-    }
-
-    $total_code = sprintf ("%s{\n%s\n%s}\n", $func_decl, $total_code);
-
-    print $total_code;
-}
-
-$call_vector_code = '';
-for ($nr = 1; $nr <= $feature_count; $nr++) {
-  $feature = $features{$nr};
-
-  if ($feature =~ /^@/) {
-    $feature =~ s/^@//;
-
-    $call_vector_code .= sprintf (qq[\t_glibtop_get_%s_c,\n], $feature);
-  } else {
-    $call_vector_code .= sprintf (qq[\tNULL,\n]);
-  }
-}
-
-print 'glibtop_call_vector glibtop_backend_common_call_vector = {';
-print $call_vector_code;
-print '};';
-print '';
-

backends/server/.cvsignore

@@ -1,10 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.lo
-*.la
-marshal.c
-demarshal.c
-libgtop_server
-command.h

backends/server/ChangeLog

@@ -1,125 +0,0 @@
-2004-08-22  Benoît Dejean  <tazforever@dlfp.org>
-
-	* server.c: (handle_slave_connection): Replaced //comment by /*C89*/. 
-
-2004-03-09  Bastien Nocera  <hadess@hadess.net>
-
-	* command.c: (glibtop_call_i):
-	* demarshal.pl:
-	* marshal.pl:
-	* read_data.c: (glibtop_read_data_i):
-	* server.c: (handle_slave_connection): fix g_malloc usage on non-Linux
-	platforms (patch by Benoît Dejean <bnet@ifrance.com>)
-
-2003-10-20  Bastien Nocera  <hadess@hadess.net>
-
-	* backend-server.c: (_open_server):
-	* backend-server.h:
-	* command.h.in: s/u_int64_t/guint64/
-
-2003-10-20  Bastien Nocera  <hadess@hadess.net>
-
-	* backend-server.h:
-	* command.h.in:
-	* demarshal.pl:
-	* server.h: fixed compilation
-
-2003-10-20  Bastien Nocera  <hadess@hadess.net>
-
-	* backend-server.c: (_open_server):
-	* command.c: (glibtop_call_i):
-	* demarshal.pl:
-	* marshal.pl:
-	* read_data.c: (glibtop_read_data_i):
-	* server.c: (main), (handle_slave_connection):
-	replace all the xmalloc crap by glib memory management functions
-
-2003-10-20  Bastien Nocera  <hadess@hadess.net>
-
-	* Makefile.am: removed traces of guile, intllibs and libgnomesupport
-
-2000-11-27  Martin Baulig  <martin@home-of-linux.org>
-
-	* backend-server.c (backend_server_quark): New global variable.
-	(_open_server, _close_server): Use the quark.
-	* commands.c: Likewise.
-
-2000-11-26  Martin Baulig  <martin@home-of-linux.org>
-
-	* backend-server.h: New file.
-	(backend_server_private): New struct, formerly known
-	as glibtop_backend_private.
-
-	* glibtop-backend-private.h: Removed.
-
-	* backend-server.c: (_open_server): Use g_object_set_data()
-	to set add the backend_server_private data to the glibtop_backend,
-	don't override `backend->_priv'.
-	(_close_server): Use g_object_get_data() to get the data.
-	[FIXME: Use quarks directly.]
-
-	* read.c: (glibtop_read_i): Replaced the glibtop_server and
-	glibtop_backend arguments with backend_server_private.
-	* read_data.c: (glibtop_read_data_i): Likewise.
-	* write.c: (glibtop_write_i): Likewise.
-
-2000-02-22  Martin Baulig  <martin@home-of-linux.org>
-
-	* backend-sysdeps.c (LibGTopBackendInfo): Call this
-	`LibGTopBackendInfo_Server' when we don't use gmodule.
-
-2000-02-22  Martin Baulig  <martin@home-of-linux.org>
-
-	* Makefile.am: Only install the libs in $(LIBGTOP_BACKEND_DIR)
-	when we LIBGTOP_USE_GMODULE and in $(libdir) otherwise.
-
-2000-01-18  Martin Baulig  <martin@home-of-linux.org>
-
-	* demarshal.pl: Only emit code for functions which are
-	really suid/sgid.
-
-2000-01-13  Martin Baulig  <martin@home-of-linux.org>
-
-	* write.c (glibtop_write_i): The buffer which we write is
-	now a `const'.
-
-2000-01-12  Martin Baulig  <martin@home-of-linux.org>
-
-	* Makefile.am: Install everything except the server binary
-	in $(LIBGTOP_BACKEND_DIR).
-
-	* libgtop-server.backend: New file.
-
-	* backend-server.c (glibtop_backend_server): Renamed to
-	`LibGTopBackendInfo'.
-
-2000-01-08  Martin Baulig  <martin@home-of-linux.org>
-
-	* command.h.in (glibtop_response): New structure.
-
-2000-01-02  Martin Baulig  <martin@home-of-linux.org>
-
-	* command.pl: New file. Creates `command.h' from `command.h.in'.
-	* command.h.in: New file. Template file for `command.h'.
-
-	* io.c, version.c: New files. Copied here from `src/daemon'.
-
-	* demarshal.pl: New file. Automatically creates `demarshal.c'.
-	* demarshal.c: This automatically created file handles the
-	demarshalling in the libgtop_server.
-
-	* Makefile.am: Build the `libgtop_server' here.
-	* server.c, server.h: New files. Copied here from `src/daemon'.
-
-2000-01-01  Martin Baulig  <martin@home-of-linux.org>
-
-	Initial version of the "glibtop-backend-server" backend.
-
-	* command.c, read.c, read_data.c, write.c: New files. Moved here
-	from the `lib' directory.
-
-	* backend-server.c: New file.
-	* glibtop-backend-private.h: New file.
-
-	* marshal.pl: New file. Automatically creates `marshal.c'.
-

backends/server/Makefile.am

@@ -1,84 +0,0 @@
-LINK		= $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
-
-INCLUDES	= @INCLUDES@ -D_BSD \
-		  -DLIBGTOP_COMPILE_SYSTEM=\"`uname -s`\" \
-		  -DLIBGTOP_COMPILE_RELEASE=\"`uname -r`\" \
-		  -DLIBGTOP_COMPILE_MACHINE=\"`uname -m`\"
-
-backenddir	= @LIBGTOP_BACKEND_DIR@
-
-if LIBGTOP_USE_GMODULE
-backendlibdir	= $(backenddir)
-else
-backendlibdir	= $(libdir)
-endif
-
-dynamic_ldflags	= @libgtop_dynamic_ldflags@
-
-backend_DATA = \
-	libgtop-server.backend
-
-noinst_HEADERS = \
-	backend-server.h
-
-backendlib_LTLIBRARIES = \
-	libgtop_backend_server.la
-
-bin_PROGRAMS = \
-	@server_programs@
-
-EXTRA_PROGRAMS = \
-	libgtop_server
-
-libgtop_backend_server_la_SOURCES = \
-	backend-server.c		\
-	marshal.c			\
-	command.c			\
-	read.c				\
-	read_data.c			\
-	write.c
-
-libgtop_backend_server_la_LDFLAGS = \
-	$(LT_VERSION_INFO) $(dynamic_ldflags)
-
-libgtop_server_SOURCES = \
-	server.c		\
-	server.h		\
-	demarshal.c		\
-	version.c		\
-	io.c
-
-libgtop_server_LDADD = \
-	$(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps_suid.la \
-	$(top_builddir)/sysdeps/common/libgtop_suid_common.la
-
-if ENABLE_STATIC
-libgtop_server_LDFLAGS = -static
-endif
-
-BUILT_SOURCES = \
-	marshal.c		\
-	demarshal.c		\
-	command.h
-
-EXTRA_DIST = \
-	marshal.pl		\
-	demarshal.pl		\
-	command.pl		\
-	command.h.in		\
-	libgtop-server.backend
-
-CLEANFILES = $(BUILT_SOURCES)
-
-marshal.c: marshal.pl $(top_builddir)/config.h $(top_srcdir)/features.def $(top_srcdir)/scripts/c_types.pl
-	$(PERL) -I $(top_srcdir)/scripts $(srcdir)/marshal.pl < $(top_srcdir)/features.def > tmp-t
-	mv tmp-t marshal.c
-
-demarshal.c: demarshal.pl $(top_builddir)/config.h $(top_srcdir)/features.def $(top_srcdir)/scripts/c_types.pl
-	$(PERL) -I $(top_srcdir)/scripts $(srcdir)/demarshal.pl < $(top_srcdir)/features.def > tmp-t
-	mv tmp-t demarshal.c
-
-command.h: command.pl command.h.in $(top_builddir)/config.h $(top_srcdir)/features.def $(top_srcdir)/scripts/c_types.pl
-	$(PERL) -I $(top_srcdir)/scripts $(srcdir)/command.pl $(top_srcdir)/features.def $(srcdir)/command.h.in > tmp-t
-	mv tmp-t command.h
-

backends/server/backend-server.c

@@ -1,113 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
-/* $Id$ */
-
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#include <backend-server.h>
-
-static int
-_open_server (glibtop_server *, glibtop_backend *, guint64, const char **);
-
-static int
-_close_server (glibtop_server *, glibtop_backend *, void *);
-
-extern glibtop_call_vector glibtop_backend_server_call_vector;
-
-#ifdef LIBGTOP_USE_GMODULE
-glibtop_backend_info LibGTopBackendInfo = {
-    "glibtop-backend-server", _open_server, _close_server,
-    &glibtop_backend_server_call_vector
-};
-#else
-glibtop_backend_info LibGTopBackendInfo_Server = {
-    "glibtop-backend-server", _open_server, _close_server,
-    &glibtop_backend_server_call_vector
-};
-#endif
-
-static int
-_open_server (glibtop_server *server, glibtop_backend *backend,
-	      guint64 features, const char **backend_args)
-{
-    backend_server_private *priv;
-
-    priv = g_malloc (sizeof (backend_server_private));
-
-    glibtop_backend_set_closure_data (backend, priv);
-
-#ifdef DEBUG
-    fprintf (stderr, "open_server - %p, %p, %p\n", server, backend, priv);
-
-    fprintf (stderr, "Opening pipe to server (%s).\n", LIBGTOP_SERVER);
-#endif
-
-    if (pipe (priv->input) || pipe (priv->output)) {
-	glibtop_warn_io_r (server, "cannot make a pipe");
-	return -1;
-    }
-
-    priv->pid  = fork ();
-
-    if (priv->pid < 0) {
-	glibtop_warn_io_r (server, "fork failed");
-	return -1;
-    } else if (priv->pid == 0) {
-	close (0); close (1);
-	close (priv->input [0]);
-	close (priv->output [1]);
-	dup2 (priv->input [1], 1);
-	dup2 (priv->output [0], 0);
-	execl (LIBGTOP_SERVER, "libgtop-server", NULL);
-	glibtop_error_io_r (server, "execl (%s)",
-			    LIBGTOP_SERVER);
-	_exit (2);
-    }
-
-    close (priv->input [1]);
-    close (priv->output [0]);
-
-    glibtop_server_ref (server);
-    priv->server = server;
-
-    return 0;
-}
-
-static int
-_close_server (glibtop_server *server, glibtop_backend *backend,
-	       void *closure)
-{
-    backend_server_private *priv = closure;
-
-    kill (priv->pid, SIGKILL);
-    close (priv->input [0]);
-    close (priv->output [1]);
-
-    glibtop_server_unref (priv->server);
-
-    priv->pid = 0;
-
-    g_free (priv);
-
-    return 0;
-}
-

backends/server/backend-server.h

@@ -1,65 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
-/* $Id$ */
-
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __GLIBTOP_BACKEND_COMMON_H__
-#define __GLIBTOP_BACKEND_COMMON_H__
-
-#include <glibtop.h>
-#include <glibtop/global.h>
-
-#include <glibtop/open.h>
-#include <glibtop/glibtop-backend.h>
-#include <glibtop/glibtop-backend-info.h>
-
-typedef struct _backend_server_private backend_server_private;
-
-struct _backend_server_private
-{
-    guint64 flags;
-    int input [2];		/* Pipe client <- server */
-    int output [2];		/* Pipe client -> server */
-    pid_t pid;			/* PID of the server */
-
-    glibtop_server *server;
-};
-
-void *
-glibtop_call_i (glibtop_server *server, backend_server_private *priv,
-		unsigned command, size_t send_size, const void *send_ptr,
-		size_t data_size, const void *data_ptr,
-		size_t recv_size, void *recv_ptr,
-		int *retval_ptr);
-
-void
-glibtop_read_i (backend_server_private *priv, size_t size, void *buf);
-
-void *
-glibtop_read_data_i (backend_server_private *priv);
-
-void
-glibtop_write_i (backend_server_private *priv, size_t size, const void *buf);
-
-#endif
-

backends/server/command.c

@@ -1,94 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
-/* $Id$ */
-
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#include <backend-server.h>
-
-#include "command.h"
-
-void *
-glibtop_call_i (glibtop_server *server, backend_server_private *priv,
-		unsigned command, size_t send_size, const void *send_buf,
-		size_t data_size, const void *data_buf,
-		size_t recv_size, void *recv_ptr,
-		int *retval_ptr)
-{
-    glibtop_command cmnd = {0};
-    glibtop_response resp = {0};
-
-    cmnd.command = command;
-
-    /* If send_size is less than _GLIBTOP_PARAM_SIZE (normally 16 Bytes), we
-     * send it together with command, so we only need one system call instead
-     * of two. */
-
-    if (send_size <= _GLIBTOP_PARAM_SIZE) {
-	memcpy (cmnd.parameter, send_buf, send_size);
-	cmnd.param_size = send_size;
-    } else {
-	cmnd.send_size = send_size;
-    }
-
-    cmnd.data_size = data_size;
-
-    glibtop_write_i (priv, sizeof (glibtop_command), &cmnd);
-
-    if (data_size) {
-#ifdef SLAVE_DEBUG
-	fprintf (stderr, "SENDING %d bytes of DATA.\n", data_size);
-#endif
-	glibtop_write_i (priv, data_size, data_buf);
-    }
-
-    glibtop_read_i (priv, sizeof (glibtop_response), &resp);
-
-#ifdef SLAVE_DEBUG
-    fprintf (stderr, "RESPONSE: %d - %d - %ld - %ld - %p - %ld\n",
-	     resp.retval, resp.glibtop_errno,
-	     (long) resp.recv_size, (long) resp.data_size,
-	     recv_ptr, (long) recv_size);
-#endif
-
-    if (retval_ptr)
-	*retval_ptr = resp.glibtop_errno;
-
-    if (resp.recv_size != recv_size) {
-	glibtop_warn_r (server, "Expected %ld bytes, but got %ld.",
-			(long) recv_size, (long) resp.recv_size);
-	return NULL;
-    }
-
-    if (recv_ptr)
-	glibtop_read_i (priv, recv_size, recv_ptr);
-
-    if (resp.data_size) {
-	void *ptr = g_malloc (resp.data_size);
-
-	glibtop_read_i (priv, resp.data_size, ptr);
-
-	return ptr;
-    }
-
-    return NULL;
-}

backends/server/command.h.in

@@ -1,59 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
-/* $Id$ */
-
-@@AUTOGEN_COMMENT@@
-
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __GLIBTOP_COMMAND_H__
-#define __GLIBTOP_COMMAND_H__
-
-#include <glibtop.h>
-#include <glibtop/union.h>
-
-G_BEGIN_DECLS
-
-@@GLIBTOP_COMMAND_CONSTANTS@@
-
-#define _GLIBTOP_PARAM_SIZE		16
-
-typedef struct _glibtop_command		glibtop_command;
-typedef struct _glibtop_response	glibtop_response;
-
-struct _glibtop_command
-{
-    guint64	command;
-    guint64	param_size, send_size, data_size;
-    char	parameter [_GLIBTOP_PARAM_SIZE];
-};
-
-struct _glibtop_response
-{
-    int retval;
-    int glibtop_errno;
-    guint64 recv_size, data_size;
-};
-
-G_END_DECLS
-
-#endif

backends/server/command.pl

@@ -1,76 +0,0 @@
-#!/usr/bin/perl
-
-require 'c_types.pl';
-
-die "Usage: $0 features.def command.h.in" unless $#ARGV == 1;
-
-$[ = 1;			# set array base to 1
-$, = ' ';		# set output field separator
-$\ = "\n";		# set output record separator
-
-sub toupper {
-    local($_) = @_;
-    tr/a-z/A-Z/;
-    return $_;
-}
-
-sub tolower {
-    local($_) = @_;
-    tr/A-Z/a-z/;
-    return $_;
-}
-
-$constants_decl_code = '';
-
-open FEATURESDEF, $ARGV[1] or
-  die "open ($ARGV[1]): $!";
-
-while (<FEATURESDEF>) {
-  chop;				# strip record separator
-  
-  if (/^[^\#]/) {
-    &parse_features_def ($_);
-  }
-}
-
-close FEATURESDEF;
-
-sub parse_features_def {
-  local($line) = @_;
-  @line_fields = split(/\|/, $line, 9999);
-  $retval = $line_fields[1];
-  $element_def = $line_fields[3];
-  $feature = $line_fields[2];
-  $param_def = $line_fields[4];
-
-  $orig = $feature;
-  $feature =~ s/^@//;
-  $space = $feature;
-  $space =~ s/./ /g;
-
-  $constants_decl_code .= sprintf
-    (qq[\#define %-40s %d\n], 'GLIBTOP_CMND_'.&toupper($feature),
-     ++$feature_count);
-
-  $features{$feature_count} = $feature;
-}
-
-chop $constants_decl_code;
-
-$auto_gen_comment = sprintf
-  (qq[/*\n * This file is automatically generated.\n * Please modify `command.pl' and `command.h.in'.\n */]);
-
-open COMMAND, $ARGV[2] or
-  die "open ($ARGV[2]): $!";
-
-while (<COMMAND>) {
-  chop;
-
-  s/^\s*\@\@GLIBTOP_COMMAND_CONSTANTS\@\@\s*$/$constants_decl_code/;
-
-  s/^\s*\@\@AUTOGEN_COMMENT\@\@\s*$/$auto_gen_comment/;
-} continue {
-  print $_;
-}
-
-close COMMAND;

backends/server/demarshal.pl

@@ -1,385 +0,0 @@
-#!/usr/bin/perl
-
-require 'c_types.pl';
-
-$[ = 1;			# set array base to 1
-$, = ' ';		# set output field separator
-$\ = "\n";		# set output record separator
-
-$always_use_temp_storage = 0;
-
-sub toupper {
-    local($_) = @_;
-    tr/a-z/A-Z/;
-    return $_;
-}
-
-sub tolower {
-    local($_) = @_;
-    tr/A-Z/a-z/;
-    return $_;
-}
-
-print '/* demarshal.c */';
-print "/* This is a generated file.  Please modify `demarshal.pl' */";
-print '';
-
-print '#include <glibtop.h>';
-print '#include <glibtop/open.h>';
-print '';
-print '#include <glibtop/sysdeps.h>';
-print '#include <glibtop/union.h>';
-print '';
-print '#include <glibtop/backend.h>';
-print '';
-print '#include <glibtop-backend-private.h>';
-print '#include "server.h"';
-print '';
-
-$feature_count = 0;
-
-while (<>) {
-  chop;	# strip record separator
-
-  if (/^[^\#]/) {
-    &output($_);
-  }
-}
-
-sub output {
-  local($line) = @_;
-  @line_fields = split(/\|/, $line, 9999);
-  $retval = $line_fields[1];
-  $element_def = $line_fields[3];
-  $feature = $line_fields[2];
-  $param_def = $line_fields[4];
-
-  return if $feature =~ /^@/;
-  $name = 'glibtop_'.$feature;
-  
-  $orig = $feature;
-  $feature =~ s/^@//;
-  $space = $feature;
-  $space =~ s/./ /g;
-  
-  $features{++$feature_count} = $feature;
-
-  $orig_retval = $retval;
-  
-  if ($retval eq 'retval') {
-    $retval_param = '&retval';
-    $call_prefix = '';
-    $call_prefix_space = '';
-    $prefix = 'retval = ';
-    $prefix_space = '         ';
-    $retval = 'int';
-  } elsif ($retval !~ /^void$/) {
-    $retval_param = 'NULL';
-    $prefix = 'retval = ';
-    $prefix_space = '         ';
-    $call_prefix = 'retval = ';
-    $call_prefix_space = '         ';
-  } else {
-    $retval_param = 'NULL';
-    $call_prefix = '';
-    $call_prefix_space = '';
-    $prefix = '';
-    $prefix_space = '';
-  }
-  
-  if ($retval =~ /^(array|pointer)\((.*)\)$/) {
-    $retval = ($2 eq 'string') ? 'char **' : "$2 *";
-  }
-  
-  $need_temp_storage = $always_use_temp_storage;
-  $first_param_name = '';
-  $size_code = "\t/* send size */\n";
-  $size_code .= "\t_LIBGTOP_SEND_len = 0;\n";
-  
-  $local_var_decl_code = '';
-  $local_var_decl_code .= "\tsize_t _LIBGTOP_SEND_len, _LIBGTOP_RECV_len;\n";
-  $local_var_decl_code .= "\toff_t _LIBGTOP_SEND_offset;\n";
-  $local_var_decl_code .= "\tchar *_LIBGTOP_RECV_buf, *_LIBGTOP_RECV_ptr;\n";
-  $local_var_decl_code .= "\tconst char *_LIBGTOP_SEND_ptr;\n";
-  $local_var_decl_code .= sprintf
-    (qq[\tglibtop_%s %s;\n], $feature, $feature);
-  if ($retval !~ /^void$/) {
-    $local_var_decl_code .= sprintf ("\t%s retval = (%s) 0;\n",
-				     $retval, $retval);
-  }
-
-  $init_local_var_code = "\t/* variable initialization */\n";
-  $init_local_var_code .= sprintf
-    (qq[\tmemset (&%s, 0, sizeof (glibtop_%s));\n], $feature, $feature);
-  $init_local_var_code .= "\t_LIBGTOP_SEND_offset = 0;\n";
-  $init_local_var_code .= "\t_LIBGTOP_SEND_ptr = ".
-    "(char *) send_ptr;\n";
-
-  $demarshal_code = '';
-
-  $call_param = '';
-  $param_decl = '';
-  $need_temp_len = 0;
-  $nr_params = (@params = split(/:/, $param_def, 9999));
-  for ($param = 1; $param <= $nr_params; $param++) {
-    $list = $params[$param];
-    $type = $params[$param];
-    $type =~ s/\(.*//;
-    $list =~ s/^.*\(//;
-    $list =~ s/\)$//;
-    $count = (@fields = split(/,/, $list, 9999));
-    for ($field = 1; $field <= $count; $field++) {
-      my $c_type = $typeinfo->{$type}->[1];
-      
-      if ($first_param_name eq '') {
-	$first_param_name = $fields[$field];
-      }
-      
-      if ($typeinfo->{$type}->[2]) {
-	$need_temp_storage = 1;
-      }
-      
-      if ($param_decl eq '') {
-	$param_decl = ",\n            " . $space . '    ';
-      } else {
-	$param_decl = $param_decl . ', ';
-      }
-      $param_decl = $param_decl . $c_type . ' ' . $fields[$field];
-      $call_param = $call_param . ', _LIBGTOP_demarshal_' . $fields[$field];
-
-      $size_code .= "\t_LIBGTOP_SEND_len += ";
-      if ($typeinfo->{$type}->[2]) {
-	$size_code .= sprintf ("sizeof (size_t)");
-      } else {
-	$size_code .= sprintf ("sizeof (%s)", $c_type);
-      }
-      $size_code .= ";\n";
-
-      $local_var_decl_code .= sprintf
-	(qq[\t%s _LIBGTOP_demarshal_%s;\n], $c_type, $fields[$field]);
-      $init_local_var_code .= sprintf
-	(qq[\tmemset (&_LIBGTOP_demarshal_%s, 0, sizeof (%s));\n],
-	 $fields[$field], $c_type);
-
-      $demarshal_code .= "\t_LIBGTOP_SEND_ptr = ".
-	"(char *) send_ptr + _LIBGTOP_SEND_offset;\n";
-
-      if ($typeinfo->{$type}->[2]) {
-	$demarshal_code .= sprintf ("\tmemcpy (&_LIBGTOP_TEMP_len, _LIBGTOP_SEND_ptr, sizeof (size_t));\n");
-	$demarshal_code .= sprintf
-	  (qq[\t_LIBGTOP_DATA_len += _LIBGTOP_TEMP_len;\n]);
-	$demarshal_code .= sprintf
-	  (qq[\tif (_LIBGTOP_DATA_len > data_size)\n\t\treturn -GLIBTOP_ERROR_DEMARSHAL_ERROR;\n]);
-	$demarshal_code .= sprintf
-	  (qq[\t_LIBGTOP_DATA_offset += _LIBGTOP_TEMP_len;\n]);
-      }
-
-      if (defined $demarshal_funcs->{$type}) {
-	$demarshal_code .= $demarshal_funcs->{$type}->($c_type, $fields[$field], "\t");
-      } else {
-	$demarshal_code .= sprintf ("\tmemcpy (&_LIBGTOP_demarshal_%s, _LIBGTOP_SEND_ptr, %s);\n",
-				    $fields[$field], "sizeof ($c_type)");
-      }
-
-      $demarshal_code .= "\t_LIBGTOP_SEND_offset += ";
-      if ($typeinfo->{$type}->[2]) {
-	$demarshal_code .= sprintf ("sizeof (size_t)");
-      } else {
-	$demarshal_code .= sprintf ("sizeof (%s)", $c_type);
-      }
-      $demarshal_code .= ";\n";
-    }
-  }
-
-  if (!($demarshal_code eq '')) {
-    $demarshal_code = sprintf (qq[\t/* demarshal start */\n%s\n],
-			       $demarshal_code);
-  }
-
-  if ($line_fields[3] eq '') {
-    $call_code = sprintf
-      ("\tretval = glibtop_get_%s_p (server%s);\n",
-       $feature, $call_param);
-  } elsif ($line_fields[3] eq 'array') {
-    $call_code = sprintf
-      ("\tretval = glibtop_get_%s_p (server, &array%s);\n",
-       $feature, $call_param);
-    $local_var_decl_code .= sprintf (qq[\tglibtop_array array;\n]);
-  } elsif ($line_fields[3] =~ /^array/) {
-    $call_code = sprintf
-      ("\tretval = glibtop_get_%s_p (server, &array, &%s%s);\n",
-       $feature, $feature, $call_param);
-    $local_var_decl_code .= sprintf (qq[\tglibtop_array array;\n]);
-  } else {
-    $call_code = sprintf
-      ("\tretval = glibtop_get_%s_p (server, &%s%s);\n",
-       $feature, $feature, $call_param);
-  }
-
-  if ($orig_retval eq 'retval') {
-    $call_code .= sprintf
-      (qq[\tif (retval_ptr)\n\t\t*retval_ptr = retval;\n]);
-  } else {
-    $call_code .= sprintf
-      (qq[\tif (retval_ptr)\n\t\t*retval_ptr = server->glibtop_errno;\n]);
-  }
-
-  $size_code .= sprintf
-    (qq[\tif (_LIBGTOP_SEND_len != send_size)\n\t\treturn -GLIBTOP_ERROR_DEMARSHAL_ERROR;\n\n]);
-
-  $size_code .= "\t/* recv size */\n";
-  $size_code .= "\t_LIBGTOP_RECV_len = 0;\n";
-  if ($line_fields[3] eq '') {
-  } elsif ($line_fields[3] eq 'array') {
-    $size_code .= "\t_LIBGTOP_RECV_len += sizeof (glibtop_array);\n";
-  } elsif ($line_fields[3] =~ /^array/) {
-    $size_code .= "\t_LIBGTOP_RECV_len += sizeof (glibtop_array);\n";
-    $size_code .= sprintf
-      (qq[\t_LIBGTOP_RECV_len += sizeof (glibtop_%s);\n], $feature);
-  } else {
-    $size_code .= sprintf
-      (qq[\t_LIBGTOP_RECV_len += sizeof (glibtop_%s);\n], $feature);
-  }
-  $size_code .= "\n";
-
-  $size_code .= "\t/* recv buffer */\n";
-  if ($line_fields[3] eq '') {
-    $size_code .= "\t_LIBGTOP_RECV_buf = NULL;\n";
-  } else {
-    $size_code .= "\t_LIBGTOP_RECV_buf = g_malloc (_LIBGTOP_RECV_len);\n";
-  }
-  $size_code .= "\t_LIBGTOP_RECV_ptr = _LIBGTOP_RECV_buf;\n\n";
-
-  $recv_buf_code = '';
-  if ($line_fields[3] eq '') {
-  } elsif ($line_fields[3] eq 'array') {
-    $recv_buf_code = "\t/* write recv buffer */\n";
-    $recv_buf_code .= sprintf
-      (qq[\tmemcpy (_LIBGTOP_RECV_ptr, &array, sizeof (glibtop_array));\n]);
-    $recv_buf_code .= sprintf
-      (qq[\t_LIBGTOP_RECV_ptr += sizeof (glibtop_array);\n]);
-  } elsif ($line_fields[3] =~ /^array/) {
-    $recv_buf_code = "\t/* write recv buffer */\n";
-    $recv_buf_code .= sprintf
-      (qq[\tmemcpy (_LIBGTOP_RECV_ptr, &array, sizeof (glibtop_array));\n]);
-    $recv_buf_code .= sprintf
-      (qq[\t_LIBGTOP_RECV_ptr += sizeof (glibtop_array);\n]);
-    $recv_buf_code .= sprintf
-      (qq[\tmemcpy (_LIBGTOP_RECV_ptr, &%s, sizeof (glibtop_%s));\n],
-       $feature, $feature);
-    $recv_buf_code .= sprintf
-      (qq[\t_LIBGTOP_RECV_ptr += sizeof (glibtop_%s);\n], $feature);
-  } else {
-    $recv_buf_code = "\t/* write recv buffer */\n";
-    $recv_buf_code .= sprintf
-      (qq[\tmemcpy (_LIBGTOP_RECV_ptr, &%s, sizeof (glibtop_%s));\n],
-       $feature, $feature);
-    $recv_buf_code .= sprintf
-      (qq[\t_LIBGTOP_RECV_ptr += sizeof (glibtop_%s);\n], $feature);
-  }
-
-  $recv_buf_code .= "\n";
-  $recv_buf_code .= "\t*recv_buf_ptr = _LIBGTOP_RECV_buf;\n";
-  $recv_buf_code .= "\t*recv_size_ptr = _LIBGTOP_RECV_len;\n";
-
-  if ($orig_retval eq 'pointer(string)') {
-    $need_temp_storage = 1;
-    $local_var_decl_code .= "\tchar **_LIBGTOP_TEMP_ptr;\n";
-    $local_var_decl_code .= "\tchar *_LIBGTOP_ARRAY_ptr;\n";
-    $local_var_decl_code .= "\tchar *_LIBGTOP_ARRAY_base;\n";
-    $local_var_decl_code .= "\toff_t _LIBGTOP_ARRAY_offset;\n";
-    $local_var_decl_code .= "\toff_t *_LIBGTOP_ARRAY_off_ptr;\n";
-
-    $recv_buf_code .= "\n";
-    $recv_buf_code .= "\t_LIBGTOP_TEMP_len = 0;\n";
-    $recv_buf_code .= "\t_LIBGTOP_TEMP_ptr = retval;\n";
-    $recv_buf_code .= "\tfor (_LIBGTOP_TEMP_ptr = retval; _LIBGTOP_TEMP_ptr && *_LIBGTOP_TEMP_ptr; _LIBGTOP_TEMP_ptr++)\n";
-    $recv_buf_code .= "\t\t_LIBGTOP_TEMP_len += strlen (*_LIBGTOP_TEMP_ptr)+1;\n";
-    $recv_buf_code .= "\n";
-    $recv_buf_code .= "\t_LIBGTOP_TEMP_len += sizeof (off_t) + 1;\n";
-    $recv_buf_code .= "\t_LIBGTOP_TEMP_len += array.number * sizeof (off_t);\n";
-    $recv_buf_code .= "\t_LIBGTOP_ARRAY_base = g_malloc (_LIBGTOP_TEMP_len);";
-    $recv_buf_code .= "\t_LIBGTOP_ARRAY_ptr = _LIBGTOP_ARRAY_base;\n";
-    $recv_buf_code .= "\t_LIBGTOP_ARRAY_offset = array.number * sizeof (off_t);\n";
-    $recv_buf_code .= "\t_LIBGTOP_ARRAY_offset += sizeof (off_t);\n";
-    $recv_buf_code .= "\t_LIBGTOP_ARRAY_off_ptr = (off_t *) _LIBGTOP_ARRAY_ptr;\n";
-    $recv_buf_code .= "\n";
-    $recv_buf_code .= "\t*_LIBGTOP_ARRAY_off_ptr++ = _LIBGTOP_ARRAY_offset;\n";
-    $recv_buf_code .= "\tfor (_LIBGTOP_TEMP_ptr = retval; _LIBGTOP_TEMP_ptr && *_LIBGTOP_TEMP_ptr; _LIBGTOP_TEMP_ptr++) {\n";
-    $recv_buf_code .= "\t\t*_LIBGTOP_ARRAY_off_ptr++ = _LIBGTOP_ARRAY_offset;\n";
-    $recv_buf_code .= "\t\t_LIBGTOP_ARRAY_offset += strlen (*_LIBGTOP_TEMP_ptr)+1;\n";
-    $recv_buf_code .= "\t}\n\n";
-    $recv_buf_code .= "\t_LIBGTOP_ARRAY_ptr = (char *) _LIBGTOP_ARRAY_off_ptr;\n";
-    $recv_buf_code .= "\tfor (_LIBGTOP_TEMP_ptr = retval; _LIBGTOP_TEMP_ptr && *_LIBGTOP_TEMP_ptr; _LIBGTOP_TEMP_ptr++) {\n";
-    $recv_buf_code .= "\t\tstrcpy (_LIBGTOP_ARRAY_ptr, *_LIBGTOP_TEMP_ptr);\n";
-    $recv_buf_code .= "\t\t_LIBGTOP_ARRAY_ptr += strlen (*_LIBGTOP_TEMP_ptr)+1;\n";
-    $recv_buf_code .= "\t}\n\n";
-    $recv_buf_code .= "\tif (recv_data_ptr) {\n";
-    $recv_buf_code .= "\t\t*recv_data_ptr = _LIBGTOP_ARRAY_base;\n";
-    $recv_buf_code .= "\t\t*recv_data_size_ptr = _LIBGTOP_TEMP_len;\n";
-    $recv_buf_code .= "\t}\n";
-
-  } elsif ($line_fields[3] =~ /^array/) {
-    $recv_buf_code .= "\n";
-    $recv_buf_code .= "\tif (recv_data_ptr) {\n";
-    $recv_buf_code .= "\t\t*recv_data_ptr = retval;\n";
-    $recv_buf_code .= "\t\t*recv_data_size_ptr = array.total;\n";
-    $recv_buf_code .= "\t}\n";
-  }
-
-  if ($need_temp_storage) {
-    $local_var_decl_code .= "\tsize_t _LIBGTOP_TEMP_len;\n";
-    $local_var_decl_code .= "\tsize_t _LIBGTOP_DATA_len;\n";
-    $local_var_decl_code .= "\toff_t _LIBGTOP_DATA_offset;\n";
-    $local_var_decl_code .= "\tchar *_LIBGTOP_DATA_ptr;\n";
-
-    $init_local_var_code .= "\t_LIBGTOP_DATA_len = 0;\n";
-    $init_local_var_code .= "\t_LIBGTOP_DATA_offset = 0;\n";
-    $init_local_var_code .= "\t_LIBGTOP_DATA_ptr = ".
-      "(char *) data_ptr;\n";
-  }
-
-  $func_decl_code = sprintf
-    (qq[static int\n_glibtop_demarshal_%s_i (glibtop *server, glibtop_backend *backend, const void *send_ptr, size_t send_size, void *data_ptr, size_t data_size, void **recv_buf_ptr, size_t *recv_size_ptr, void **recv_data_ptr, size_t *recv_data_size_ptr, int *retval_ptr)\n], $feature);
-
-  if (!($call_code eq '')) {
-    $call_code .= "\n";
-  }
-  
-  $func_body_code = sprintf
-    (qq[%s%s%s%s], $size_code, $demarshal_code, $call_code, $recv_buf_code);
-  
-  $total_code = sprintf
-    (qq[%s{\n%s\n%s\n%s\n\treturn 0;\n}\n],
-     $func_decl_code, $local_var_decl_code, $init_local_var_code,
-     $func_body_code);
-  
-  $total_code = sprintf ("#if GLIBTOP_SUID_%s\n\n%s\n#endif /* GLIBTOP_SUID_%s */\n\n",
-			 &toupper($feature), $total_code,
-			 &toupper($feature));
-
-  print $total_code;
-}
-
-$func_decl_code = sprintf
-  (qq[int\nglibtop_demarshal_func_i (glibtop *server, glibtop_backend *backend, unsigned command, const void *send_ptr, size_t send_size, void *data_ptr, size_t data_size, void **recv_buf_ptr, size_t *recv_size_ptr, void **recv_data_ptr, size_t *recv_data_size_ptr, int *retval_ptr)]);
-
-$switch_body_code = '';
-
-for ($nr = 1; $nr <= $feature_count; $nr++) {
-  $feature = $features{$nr};
-
-  $switch_body_code .= sprintf
-    (qq[#if GLIBTOP_SUID_%s\n\tcase GLIBTOP_CMND_%s:\n\t\treturn _glibtop_demarshal_%s_i\n\t\t\t(server, backend, send_ptr, send_size,\n\t\t\t data_ptr, data_size,\n\t\t\t recv_buf_ptr, recv_size_ptr,\n\t\t\t recv_data_ptr, recv_data_size_ptr, retval_ptr);\n#endif /* GLIBTOP_SUID_%s */\n],
-     &toupper ($feature), &toupper ($feature), $feature, &toupper ($feature));
-}
-
-$switch_code = sprintf
-  (qq[\tswitch (command) {\n%s\tdefault:\n\t\treturn -GLIBTOP_ERROR_INVALID_ARGUMENT;\n\t}\n], $switch_body_code);
-
-$total_code = sprintf
-  (qq[%s\n{\n%s}\n\n], $func_decl_code, $switch_code);
-
-print $total_code;
-
-1;

backends/server/io.c

@@ -1,114 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
-/* $Id$ */
-
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#include "server.h"
-
-void
-do_output (int s, glibtop_response *resp, const void *recv_ptr,
-	   const void *data_ptr)
-{
-#ifdef DEBUG
-    fprintf (stderr, "Really writing %d bytes.\n",
-	     sizeof (glibtop_response));
-#endif
-
-    if (s == 0) {
-	if (write (1, (const void *) resp, sizeof (glibtop_response)) < 0)
-	    glibtop_warn_io ("write");
-    } else {
-	if (send (s, (const void *) resp, sizeof (glibtop_response), 0) < 0)
-	    glibtop_warn_io ("send");
-    }
-
-    if (resp->recv_size) {
-#ifdef DEBUG
-	fprintf (stderr, "Writing %ld bytes of data.\n",
-		 (long) resp->recv_size);
-#endif
-
-	if (s == 0) {
-	    if (write (1, recv_ptr, resp->recv_size) < 0)
-		glibtop_warn_io ("write");
-	} else {
-	    if (send (s, recv_ptr, resp->recv_size, 0) < 0)
-		glibtop_warn_io ("send");
-	}
-    }
-
-    if (resp->data_size) {
-#ifdef DEBUG
-	fprintf (stderr, "Writing %ld bytes of extra data.\n",
-		 (long) resp->data_size);
-#endif
-
-	if (s == 0) {
-	    if (write (1, data_ptr, resp->data_size) < 0)
-		glibtop_warn_io ("write");
-	} else {
-	    if (send (s, data_ptr, resp->data_size, 0) < 0)
-		glibtop_warn_io ("send");
-	}
-    }
-
-}
-
-int
-do_read (int s, void *ptr, size_t total_size)
-{
-    int nread;
-    char *tmp_ptr;
-    size_t already_read = 0, remaining = total_size;
-
-    while (already_read < total_size) {
-	if (s)
-	    nread = recv (s, ptr, remaining, 0);
-	else
-	    nread = read (0, ptr, remaining);
-
-	if ((already_read == 0) && (nread == 0)) {
-	    glibtop_warn ("pid %d received eof.", getpid ());
-	    return 0;
-	}
-
-	if (nread <= 0) {
-	    glibtop_warn_io ("recv");
-	    return 0;
-	}
-
-	already_read += nread;
-	remaining -= nread;
-	/* (char *) ptr += nread; */
-	tmp_ptr = ptr;
-	tmp_ptr += nread;
-	ptr = tmp_ptr;
-
-#ifdef DEBUG
-	fprintf (stderr, "READ (%d): %d - %d - %d\n",
-		 nread, already_read, remaining, total_size);
-#endif
-    }
-
-    return already_read;
-}

backends/server/libgtop-server.backend

@@ -1,13 +0,0 @@
-<?xml version="1.0"?> <!-- -*-xml-*- -->
-<!DOCTYPE libgtop:backends SYSTEM 'libgtop-backends.dtd'>
-<libgtop:Backends xmlns:libgtop="http://www.home-of-linux.org/libgtop/1.1">
-
-  <libgtop:Backend>
-    <libgtop:Name>glibtop-backend-server</libgtop:Name>
-    <libgtop:Location>
-      <libgtop:LibtoolName>libgtop_backend_server.la</libgtop:LibtoolName>
-      <libgtop:ShlibName>libgtop_backend_server.so</libgtop:ShlibName>
-    </libgtop:Location>
-  </libgtop:Backend>
-
-</libgtop:Backends>

backends/server/marshal.pl

@@ -1,305 +0,0 @@
-#!/usr/bin/perl
-
-require 'c_types.pl';
-
-$[ = 1;			# set array base to 1
-$, = ' ';		# set output field separator
-$\ = "\n";		# set output record separator
-
-$always_use_temp_storage = 1;
-
-sub toupper {
-    local($_) = @_;
-    tr/a-z/A-Z/;
-    return $_;
-}
-
-sub tolower {
-    local($_) = @_;
-    tr/A-Z/a-z/;
-    return $_;
-}
-
-print '/* marshal.c */';
-print "/* This is a generated file.  Please modify `marshal.pl' */";
-print '';
-
-print '#include <backend-server.h>';
-print '';
-print '#include <glibtop/sysdeps.h>';
-print '#include <glibtop/union.h>';
-print '';
-print '#include "command.h"';
-print '#include <glibtop/call-vector.h>';
-print '';
-
-$feature_count = 0;
-
-while (<>) {
-    chop;	# strip record separator
-
-    if (/^[^#]/) {
-	&output($_);
-    }
-}
-
-sub output {
-    local($line) = @_;
-    @line_fields = split(/\|/, $line, 9999);
-    $retval = $line_fields[1];
-    $feature = $line_fields[2];
-    $param_def = $line_fields[4];
-
-    $orig = $feature;
-    $feature =~ s/^@//;
-    $space = $feature;
-    $space =~ s/./ /g;
-
-    $features{++$feature_count} = $orig;
-    return if $orig =~ /^@/;
-
-    $orig_retval = $retval;
-    if ($retval eq 'retval') {
-      $retval_param = '&retval';
-      $call_prefix = '';
-      $call_prefix_space = '';
-      $prefix = 'retval = ';
-      $prefix_space = '         ';
-      $retval = 'int';
-    }
-    elsif ($retval !~ /^void$/) {
-      $retval_param = 'NULL';
-      $prefix = 'retval = ';
-      $prefix_space = '         ';
-      $call_prefix = 'retval = ';
-      $call_prefix_space = '         ';
-    }
-    else {
-      $retval_param = 'NULL';
-      $call_prefix = '';
-      $call_prefix_space = '';
-      $prefix = '';
-      $prefix_space = '';
-    }
-
-    if ($retval =~ /^(array|pointer)\((.*)\)$/) {
-      $retval = ($2 eq 'string') ? 'char **' : "$2 *";
-    }
-
-    $need_temp_storage = $always_use_temp_storage;
-    $local_var_init_code = "\t/* variable initialization */\n";
-    $local_var_init_code .= "\t_LIBGTOP_SEND_len = 0;\n";
-    $local_var_init_code .= "\t_LIBGTOP_DATA_len = 0;\n";
-    $local_var_init_code .= "\t_LIBGTOP_SEND_offset = 0;\n";
-    $local_var_init_code  .= "\t_LIBGTOP_SEND_ptr = ".
-	  "(char *) _LIBGTOP_SEND_buf;\n";
-    $marshal_code = "\t/* marshal start */\n";
-    $marshal_code .= "\tmemset (_LIBGTOP_SEND_buf, 0, _LIBGTOP_SEND_len);\n";
-    $first_param_name = '';
-    $size_code = '';
-
-    $call_param = '';
-    $param_decl = '';
-    $need_temp_len = 0;
-    $nr_params = (@params = split(/:/, $param_def, 9999));
-    for ($param = 1; $param <= $nr_params; $param++) {
-      $list = $params[$param];
-      $type = $params[$param];
-      $type =~ s/\(.*//;
-      $list =~ s/^.*\(//;
-      $list =~ s/\)$//;
-      $count = (@fields = split(/,/, $list, 9999));
-      for ($field = 1; $field <= $count; $field++) {
-	my $c_type = $typeinfo->{$type}->[1];
-
-	if ($first_param_name eq '') {
-	  $first_param_name = $fields[$field];
-	}
-
-	if ($typeinfo->{$type}->[2]) {
-	  $need_temp_storage = 1;
-	}
-
-	if ($param_decl eq '') {
-	  $param_decl = ",\n            " . $space . '    ';
-	}
-	else {
-	  $param_decl = $param_decl . ', ';
-	}
-	$param_decl = $param_decl . $c_type . ' ' . $fields[$field];
-	$call_param = $call_param . ', ' . $fields[$field];
-
-	$size_code .= "\t_LIBGTOP_SEND_len += ";
-	if ($typeinfo->{$type}->[2]) {
-	  $size_code .= sprintf ("sizeof (size_t)");
-	} else {
-	  $size_code .= sprintf ("sizeof (%s)", $c_type);
-	}
-	$size_code .= ";\n";
-
-	if (defined $sizeof_funcs->{$type}) {
-	  $size_code .= "\t_LIBGTOP_DATA_len += ";
-	  $size_code .= $sizeof_funcs->{$type}->($fields[$field]);
-	  $size_code .= ";\n";
-	}
-
-	$marshal_code .= "\t_LIBGTOP_SEND_ptr = ".
-	  "(char *) _LIBGTOP_SEND_buf + _LIBGTOP_SEND_offset;\n";
-
-	if (defined $marshal_funcs->{$type}) {
-	  $marshal_code .= $marshal_funcs->{$type}->($c_type, $fields[$field], "\t");
-	} else {
-	  $marshal_code .= sprintf ("\tmemcpy (_LIBGTOP_SEND_ptr, %s, %s);\n",
-				    '&'.$fields[$field], "sizeof ($c_type)");
-	}
-
-	$marshal_code .= "\t_LIBGTOP_SEND_offset += ";
-	if ($typeinfo->{$type}->[2]) {
-	  $marshal_code .= sprintf ("sizeof (size_t)");
-	} else {
-	  $marshal_code .= sprintf ("sizeof (%s)", $c_type);
-	}
-	$marshal_code .= ";\n";
-      }
-    }
-
-    $local_var_code = "";
-    $local_var_code .= "\tunsigned _LIBGTOP_SEND_offset, _LIBGTOP_SEND_len;\n";
-    $local_var_code .= "\tunsigned _LIBGTOP_DATA_len;\n";
-    if ($need_temp_len) {
-      $local_var_code .= "\tunsigned _LIBGTOP_SEND_temp_len;\n";
-    }
-    $local_var_code .= "\tvoid *_LIBGTOP_SEND_buf, *_LIBGTOP_DATA_buf;\n";
-    $local_var_code .= "\tchar *_LIBGTOP_SEND_ptr, *_LIBGTOP_DATA_ptr;\n";
-    if ($retval !~ /^void$/) {
-      $local_var_code .= sprintf ("\t%s retval = (%s) 0;\n",
-				  $retval, $retval);
-    }
-
-    $total_code = '';
-
-    $send_buf_code = "\t/* send buffer */\n";
-    $send_buf_code .= "\t_LIBGTOP_SEND_buf = ";
-    if ($need_temp_storage) {
-      $send_buf_code .= "g_malloc (_LIBGTOP_SEND_len+1)";
-    } else {
-      $send_buf_code .= '(void *) &'.$first_param_name;
-    }
-    $send_buf_code .= ";\n\n";
-
-    $send_buf_code .= "\t/* data buffer */\n";
-    $send_buf_code .= "\t_LIBGTOP_DATA_buf = ";
-    if ($need_temp_storage) {
-      $send_buf_code .= "g_malloc (_LIBGTOP_DATA_len+1)";
-    } else {
-      $send_buf_code .= 'NULL';
-    }
-    $send_buf_code .= ";\n";
-    $send_buf_code .= "\t_LIBGTOP_DATA_ptr = _LIBGTOP_DATA_buf;\n";
-
-    $call_code = '';
-    $call_code .= sprintf ("\t%sglibtop_call_i (server, closure, GLIBTOP_CMND_%s,\n",
-			   $call_prefix, &toupper($feature));
-    $call_code .= sprintf ("\t\t\t%s%s, %s,\n", $call_prefix_space,
-			   "_LIBGTOP_SEND_len", "_LIBGTOP_SEND_buf");
-    $call_code .= sprintf ("\t\t\t%s%s, %s,\n", $call_prefix_space,
-			   "_LIBGTOP_DATA_len", "_LIBGTOP_DATA_buf");
-    if ($line_fields[3] eq '') {
-      $call_code .= sprintf ("\t\t\t%s0, NULL,\n", $call_prefix_space);
-    } elsif ($line_fields[3] eq  'array') {
-      $call_code .= sprintf ("\t\t\t%ssizeof (glibtop_array), array,\n",
-			     $call_prefix_space);
-    } else {
-      $call_code .= sprintf ("\t\t\t%ssizeof (glibtop_%s), buf,\n",
-			     $call_prefix_space, $feature);
-    }
-    $call_code .= sprintf ("\t\t\t%s%s);\n", $call_prefix_space, $retval_param);
-
-    if ($need_temp_storage) {
-      $send_buf_free_code = "\tg_free (_LIBGTOP_SEND_buf);\n";
-      $send_buf_free_code .= "\tg_free (_LIBGTOP_DATA_buf);\n";
-    } else {
-      $send_buf_free_code = "";
-    }
-
-    if (!($size_code eq '')) {
-      $size_code = sprintf (qq[\t/* send size */\n%s\n], $size_code);
-    }
-
-    if ($orig_retval eq 'pointer(string)') {
-      $call_code .= "\n";
-      $local_var_code .= "\tchar *_LIBGTOP_ARRAY_ptr, **ptrlist;\n";
-      $local_var_code .= "\toff_t *_LIBGTOP_ARRAY_off_ptr;\n";
-      $local_var_code .= "\tint i;\n";
-      $call_code .= "\tptrlist = g_malloc (array->number+1 * sizeof (char *));\n";
-      $call_code .= "\t_LIBGTOP_ARRAY_off_ptr = (off_t *) retval;\n";
-      $call_code .= "\t_LIBGTOP_ARRAY_ptr = (char *) retval;\n";
-      $call_code .= "\t_LIBGTOP_ARRAY_off_ptr++;\n\n";
-      $call_code .= "\tfor (i = 0; i < array->number; i++)\n";
-      $call_code .= "\t\tptrlist [i] = g_strdup (_LIBGTOP_ARRAY_ptr + *_LIBGTOP_ARRAY_off_ptr++);\n";
-      $call_code .= "\tptrlist [array->number] = NULL;\n\n";
-      $call_code .= "\tg_free (retval);\n";
-      $call_code .= "\tretval = ptrlist;\n";
-    }
-
-    $total_code .= sprintf ("%s%s\n%s\n%s\n%s\n",
-			    $size_code, $send_buf_code, $marshal_code,
-			    $call_code, $send_buf_free_code);
-
-    $return_code = '';
-    if ($retval !~ /^void$/) {
-      $return_code .= "\treturn retval;\n";
-    } else {
-      $return_code .= "\treturn;\n";
-    }
-
-    $total_code .= $return_code;
-
-    $func_decl = 'static '.$retval."\n";
-    if ($line_fields[3] eq '') {
-      $func_decl .= sprintf ("_glibtop_get_%s_c (glibtop_server *server, void *closure%s)\n",
-			     $feature, $param_decl);
-    } elsif ($line_fields[3] eq 'array') {
-      $func_decl .= sprintf ("_glibtop_get_%s_c (glibtop_server *server, void *closure, glibtop_array *array%s)\n",
-			     $feature, $param_decl);
-    } elsif ($line_fields[3] =~ /^array/) {
-      $func_decl .= sprintf ("_glibtop_get_%s_c (glibtop_server *server, void *closure, glibtop_array *array, %s *buf%s)\n",
-			     $feature, 'glibtop_'.$feature, $param_decl);
-    } else {
-      $func_decl .= sprintf ("_glibtop_get_%s_c (glibtop_server *server, void *closure, %s *buf%s)\n",
-			     $feature, 'glibtop_'.$feature, $param_decl);
-    }
-
-    $total_code = sprintf ("%s{\n%s\n%s\n%s\n%s}\n", $func_decl,
-			   $local_var_code, $local_var_init_code,
-			   $total_code);
-
-
-    $total_code = sprintf ("#if GLIBTOP_SUID_%s\n\n%s\n#endif /* GLIBTOP_SUID_%s */\n\n",
-			   &toupper($feature), $total_code,
-			   &toupper($feature));
-
-    print $total_code;
-}
-
-$call_vector_code = '';
-for ($nr = 1; $nr <= $feature_count; $nr++) {
-  $feature = $features{$nr};
-
-  $orig = $feature;
-  $feature =~ s/^@//;
-
-  if ($orig =~ /^@/) {
-    $call_vector_code .= sprintf (qq[\tNULL,\n]);
-  } else {
-    $call_vector_code .= sprintf
-      (qq[\#if GLIBTOP_SUID_%s\n\t_glibtop_get_%s_c,\n\#else\n\tNULL,\n\#endif\n],
-       &toupper($feature), $feature);
-  }
-}
-
-print 'glibtop_call_vector glibtop_backend_server_call_vector = {';
-print $call_vector_code;
-print '};';
-print '';
-

backends/server/read.c

@@ -1,46 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
-/* $Id$ */
-
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#include <backend-server.h>
-
-void
-glibtop_read_i (backend_server_private *priv, size_t size, void *buf)
-{
-    int ret = 0;
-
-#ifdef DEBUG
-    fprintf (stderr, "LIBRARY: really reading %d bytes from %d.\n",
-	     size, priv->input [0]);
-#endif
-
-    ret = read (priv->input [0], buf, size);
-
-#ifdef DEBUG
-    fprintf (stderr, "LIBRARY: read %d bytes.\n", ret);
-#endif
-
-    if (ret < 0)
-	glibtop_error_io_r (priv->server, "read %d bytes", size);
-}

backends/server/read_data.c

@@ -1,58 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
-/* $Id$ */
-
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#include <backend-server.h>
-
-void *
-glibtop_read_data_i (backend_server_private *priv)
-{
-    size_t size;
-    void *ptr;
-    int ret;
-
-#ifdef DEBUG
-    fprintf (stderr, "LIBRARY: reading %d data bytes.\n", sizeof (size_t));
-#endif
-
-    ret = read (priv->input [0], (void *)&size, sizeof (size_t));
-
-    if (ret < 0)
-	glibtop_error_io_r (priv->server, "read data size");
-
-#ifdef DEBUG
-    fprintf (stderr, "LIBRARY: really reading %d data bytes (ret = %d).\n", size, ret);
-#endif
-
-    if (!size) return NULL;
-
-    ptr = g_malloc (size);
-
-    ret = read (priv->input [0], ptr, size);
-
-    if (ret < 0)
-	glibtop_error_io_r (priv->server, "read data %d bytes");
-
-    return ptr;
-}

backends/server/server.c

@@ -1,189 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
-/* $Id$ */
-
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#include "server.h"
-
-static glibtop _glibtop_global_server;
-glibtop *glibtop_global_server = &_glibtop_global_server;
-
-#include <glibtop.h>
-#include <glibtop/union.h>
-#include <glibtop/sysdeps.h>
-
-#include <sys/utsname.h>
-
-const unsigned long glibtop_server_features =
-GLIBTOP_SUID_CPU +
-GLIBTOP_SUID_MEM +
-GLIBTOP_SUID_SWAP +
-GLIBTOP_SUID_UPTIME +
-GLIBTOP_SUID_LOADAVG +
-GLIBTOP_SUID_SHM_LIMITS +
-GLIBTOP_SUID_MSG_LIMITS +
-GLIBTOP_SUID_SEM_LIMITS +
-GLIBTOP_SUID_PROCLIST +
-GLIBTOP_SUID_PROC_STATE +
-GLIBTOP_SUID_PROC_UID +
-GLIBTOP_SUID_PROC_MEM +
-GLIBTOP_SUID_PROC_TIME +
-GLIBTOP_SUID_PROC_SIGNAL +
-GLIBTOP_SUID_PROC_KERNEL +
-GLIBTOP_SUID_PROC_SEGMENT +
-GLIBTOP_SUID_PROC_ARGS +
-GLIBTOP_SUID_PROC_MAP +
-GLIBTOP_SUID_NETINFO +
-GLIBTOP_SUID_NETLOAD +
-GLIBTOP_SUID_INTERFACE_NAMES +
-GLIBTOP_SUID_PPP;
-
-#include <fcntl.h>
-#include <locale.h>
-
-int
-main(int argc, char *argv[])
-{
-    struct utsname uts;
-    int uid, euid, gid, egid;
-    glibtop *server;
-
-    /* !!! WE ARE ROOT HERE - CHANGE WITH CAUTION !!! */
-
-    uid = getuid (); euid = geteuid ();
-    gid = getgid (); egid = getegid ();
-
-    if (uname (&uts) < 0) _exit (1);
-
-    if (strcmp (uts.sysname, LIBGTOP_COMPILE_SYSTEM) ||
-	strcmp (uts.release, LIBGTOP_COMPILE_RELEASE) ||
-	strcmp (uts.machine, LIBGTOP_COMPILE_MACHINE)) {
-	fprintf (stderr, "Can only run on %s %s %s\n",
-		 LIBGTOP_COMPILE_SYSTEM,
-		 LIBGTOP_COMPILE_RELEASE,
-		 LIBGTOP_COMPILE_MACHINE);
-	_exit (1);
-    }
-
-    server = glibtop_global_server;
-
-    if (!server->_priv)
-	server->_priv = g_malloc (sizeof (glibtop_server_private));
-
-    glibtop_init_p (server, 0, 0);
-
-    if (setreuid (euid, uid)) _exit (1);
-
-    if (setregid (egid, gid)) _exit (1);
-
-    /* !!! END OF SUID ROOT PART !!! */
-
-    handle_slave_connection (0, 0);
-
-    _exit (0);
-}
-
-void
-handle_slave_connection (int input, int output)
-{
-    glibtop_command _cmnd, *cmnd = &_cmnd;
-    glibtop *server = glibtop_global_server;
-
-    /* glibtop_send_version_i (glibtop_global_server, output); */
-
-    while (do_read (input, cmnd, sizeof (glibtop_command))) {
-	size_t recv_size = 0, send_size = 0, recv_data_size = 0;
-	void *recv_ptr = NULL, *recv_data_ptr = NULL, *data_ptr = NULL;
-	char parameter [BUFSIZ];
-	int retval, func_retval;
-	glibtop_response resp;
-
-#ifdef DEBUG
-	fprintf (stderr, "Slave %d received command "
-		 "%ld from client.\n", getpid (), (long) cmnd->command);
-#endif
-
-	if (cmnd->send_size >= BUFSIZ)
-	    glibtop_error ("Client sent %d bytes, but buffer is %d",
-			   cmnd->send_size, BUFSIZ);
-	else if (cmnd->param_size >= BUFSIZ)
-	    glibtop_error ("Client sent %d bytes, but buffer is %d",
-			   cmnd->param_size, BUFSIZ);
-
-	memset (parameter, 0, sizeof (parameter));
-
-	if (cmnd->send_size) {
-#ifdef DEBUG
-	    fprintf (stderr, "Client has %d bytes of data.\n",
-		     cmnd->send_size);
-#endif
-
-	    send_size = cmnd->send_size;
-	    do_read (input, parameter, send_size);
-	} else if (cmnd->param_size) {
-#ifdef DEBUG
-	    fprintf (stderr, "Client has %d bytes of parameter data.\n",
-		     cmnd->param_size);
-#endif
-	    send_size = cmnd->param_size;
-	    memcpy (parameter, cmnd->parameter, send_size);
-	}
-
-	if (cmnd->data_size) {
-#ifdef DEBUG
-	    fprintf (stderr, "CLIENT has %d bytes of extra data for us.\n",
-		     cmnd->data_size);
-#endif
-
-	    data_ptr = g_malloc (cmnd->data_size);
-	    do_read (input, data_ptr, cmnd->data_size);
-	}
-
-	retval = glibtop_demarshal_func_i (server, NULL,
-					   cmnd->command,
-					   parameter, send_size,
-					   data_ptr, cmnd->data_size,
-					   &recv_ptr, &recv_size,
-					   &recv_data_ptr, &recv_data_size,
-					   &func_retval);
-
-#ifdef DEBUG
-	fprintf (stderr, "Retval %d / %d - %p - %d\n",
-		 retval, func_retval, recv_ptr, recv_size);
-
-	if (recv_data_size) {
-	    fprintf (stderr, "Returning %d bytes of data from %p.\n",
-		     recv_data_size, recv_data_ptr);
-	}
-#endif
-
-	memset (&resp, 0, sizeof (glibtop_response));
-
-	resp.retval = retval;
-	resp.glibtop_errno = func_retval;
-	resp.recv_size = recv_size;
-	resp.data_size = recv_data_size;
-
-	do_output (output, &resp, recv_ptr, recv_data_ptr);
-    }
-}

backends/server/server.h

@@ -1,84 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
-/* $Id$ */
-
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __GLIBTOP_DAEMON_H__
-#define __GLIBTOP_DAEMON_H__
-
-#include <glibtop.h>
-#include <glibtop/error.h>
-
-#include <glibtop/open.h>
-#include <glibtop/union.h>
-#include <glibtop/parameter.h>
-
-#include <fcntl.h>
-#include <sys/wait.h>
-#include <sys/socket.h>
-#include <syslog.h>
-
-#include <glibtop/backend.h>
-#include <glibtop-backend-private.h>
-
-#include "command.h"
-
-G_BEGIN_DECLS
-
-/* Some don't have LOG_PERROR */
-#ifndef LOG_PERROR
-#define LOG_PERROR 0
-#endif
-
-#define LIBGTOP_VERSION_STRING "Libgtop %s server version %s (%u,%u,%u,%u)."
-
-#if defined(HAVE_GETDTABLESIZE)
-#define GET_MAX_FDS() getdtablesize()
-#else
-/* Fallthrough case - please add other #elif cases above
-   for different OS's as necessary */
-#define GET_MAX_FDS() 256
-#endif
-
-void
-do_output (int s, glibtop_response *resp, const void *recv_ptr,
-	   const void *data_ptr);
-
-int
-do_read (int s, void *ptr, size_t total_size);
-
-void
-handle_slave_connection (int input, int output);
-
-int
-glibtop_demarshal_func_i (glibtop *server, glibtop_backend *backend, unsigned command, const void *send_ptr, size_t send_size, void *data_ptr, size_t data_size, void **recv_buf_ptr, size_t *recv_size_ptr, void **recv_data_ptr, size_t *recv_data_size_ptr, int *retval_ptr);
-
-void
-glibtop_send_version_i (glibtop *server, int fd);
-
-extern int enable_debug;
-extern int verbose_output;
-
-G_END_DECLS
-
-#endif

backends/server/version.c

@@ -1,62 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
-/* $Id$ */
-
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#include "server.h"
-
-void
-glibtop_send_version_i (glibtop *server, int fd)
-{
-    char buffer [BUFSIZ];
-    size_t size;
-
-    sprintf (buffer, LIBGTOP_VERSION_STRING,
-	     LIBGTOP_VERSION, LIBGTOP_SERVER_VERSION,
-	     sizeof (glibtop_command),
-	     sizeof (glibtop_response),
-	     sizeof (glibtop_union),
-	     sizeof (glibtop_sysdeps));
-
-    size = strlen (buffer) + 1;
-
-#ifdef DEBUG
-    fprintf (stderr, "SERVER ID: |%s|\n", buffer);
-#endif
-
-    if (fd == 0) {
-	if (write (1, (const void *) &size, sizeof (size)) < 0)
-	    glibtop_warn_io_r (server, "write");
-    } else {
-	if (send (fd, (const void *) &size, sizeof (size), 0) < 0)
-	    glibtop_warn_io_r (server, "send");
-    }
-
-    if (fd == 0) {
-	if (write (1, (const void *) buffer, size) < 0)
-	    glibtop_warn_io_r (server, "write");
-    } else {
-	if (send (fd, (const void *) buffer, size, 0) < 0)
-	    glibtop_warn_io_r (server, "send");
-    }
-}

backends/server/write.c

@@ -1,43 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
-/* $Id$ */
-
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#include <backend-server.h>
-
-void
-glibtop_write_i (backend_server_private *priv, size_t size, const void *buf)
-{
-    int ret;
-
-    if (size == 0) return;
-
-#ifdef DEBUG
-    fprintf (stderr, "LIBRARY: really writing %d bytes.\n", size);
-#endif
-
-    ret = write (priv->output [1], buf, size);
-
-    if (ret < 0)
-	glibtop_error_io_r (priv->server, "write %d bytes", size);
-}

backends/sysdeps/.cvsignore

@@ -1,7 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.lo
-*.la
-marshal.c

backends/sysdeps/ChangeLog

@@ -1,68 +0,0 @@
-2003-10-20  Bastien Nocera  <hadess@hadess.net>
-
-	* backend-sysdeps.c: (_open_sysdeps): s/u_int64_t/guint64/
-
-2003-10-20  Bastien Nocera  <hadess@hadess.net>
-
-	* backend-sysdeps.h: fixed compilation
-
-2000-11-26  Martin Baulig  <martin@home-of-linux.org>
-
-	* glibtop-backend-private.h: Removed.
-
-	* backend-sysdeps.h: New files.
-
-	* backend-sysdeps.c (_open_sysdeps): Don't overwrite
-	`backend->_priv'.
-
-2000-11-22  Martin Baulig  <martin@home-of-linux.org>
-
-	* Makefile.am: Link libgtop_backend_sysdeps.la against
-	$(top_builddir)/sysdeps/$(sysdeps_dir)/libgtop_sysdeps.la and
-	$(top_builddir)/lib/libgtop_server.la.
-
-	* libgtop-sysdeps.backend: Removed the ExtraLibs section.
-
-2000-02-22  Martin Baulig  <martin@home-of-linux.org>
-
-	* backend-sysdeps.c (LibGTopBackendInfo): Call this
-	`LibGTopBackendInfo_Sysdeps' when we don't use gmodule.
-
-2000-02-22  Martin Baulig  <martin@home-of-linux.org>
-
-	* Makefile.am: Only install the libs in $(LIBGTOP_BACKEND_DIR)
-	when we LIBGTOP_USE_GMODULE and in $(libdir) otherwise.
-
-2000-01-22  Martin Baulig  <martin@home-of-linux.org>
-
-	* libgtop-sysdeps.backend: Added "ExtraLibs" section to
-	load `-lgtop_sysdeps'.
-
-2000-01-12  Martin Baulig  <martin@home-of-linux.org>
-
-	* Makefile.am: Install everything in $(LIBGTOP_BACKEND_DIR).
-
-	* libgtop-sysdeps.backend: New file.
-
-	* backend-sysdeps.c (glibtop_backend_sysdeps): Renamed to
-	`LibGTopBackendInfo'.
-
-2000-01-12  Martin Baulig  <martin@home-of-linux.org>
-
-	* marshal.pl: Create the `_glibtop_init_hook_s' as well.
-
-	* marshal.pl: Don't create code for things which are now
-	in the new `glibtop-backend-common' backend.
-
-2000-01-02  Martin Baulig  <martin@home-of-linux.org>
-
-	* marshal.pl: New file. Automatically creates `marshal.c'.
-	* call-vector.c: Removed.
-
-2000-01-01  Martin Baulig  <martin@home-of-linux.org>
-
-	Initial version of the "glibtop-backend-sysdeps" backend.
-
-	* backend-sysdeps.c: New file.
-	* glibtop-backend-private.h: New file.
-

backends/sysdeps/Makefile.am

@@ -1,47 +0,0 @@
-LINK		= $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
-
-INCLUDES	= @INCLUDES@
-
-backenddir	= @LIBGTOP_BACKEND_DIR@
-
-if LIBGTOP_USE_GMODULE
-backendlibdir	= $(backenddir)
-else
-backendlibdir	= $(libdir)
-endif
-
-dynamic_ldflags	= @libgtop_dynamic_ldflags@
-
-backend_DATA = \
-	libgtop-sysdeps.backend
-
-noinst_HEADERS = \
-	backend-sysdeps.h
-
-backendlib_LTLIBRARIES = \
-	libgtop_backend_sysdeps.la
-
-libgtop_backend_sysdeps_la_SOURCES = \
-	backend-sysdeps.c		\
-	marshal.c
-
-libgtop_backend_sysdeps_la_LDFLAGS = \
-	$(LT_VERSION_INFO) $(dynamic_ldflags)
-
-libgtop_backend_sysdeps_la_LIBADD = \
-	$(top_builddir)/sysdeps/$(sysdeps_dir)/libgtop_sysdeps.la
-	$(top_builddir)/lib/libgtop_server.la
-
-BUILT_SOURCES = \
-	marshal.c
-
-EXTRA_DIST = \
-	marshal.pl	\
-	libgtop-sysdeps.backend
-
-CLEANFILES = $(BUILT_SOURCES)
-
-marshal.c: marshal.pl $(top_builddir)/config.h $(top_srcdir)/features.def $(top_srcdir)/scripts/c_types.pl
-	$(PERL) -I $(top_srcdir)/scripts $(srcdir)/marshal.pl < $(top_srcdir)/features.def > tmp-t
-	mv tmp-t marshal.c
-

backends/sysdeps/backend-sysdeps.c

@@ -1,76 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
-/* $Id$ */
-
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#include <backend-sysdeps.h>
-
-static int
-_open_sysdeps (glibtop_server *, glibtop_backend *, guint64, const char **);
-
-static int
-_close_sysdeps (glibtop_server *, glibtop_backend *, void *);
-
-extern glibtop_call_vector glibtop_backend_sysdeps_call_vector;
-
-#ifdef LIBGTOP_USE_GMODULE
-glibtop_backend_info LibGTopBackendInfo = {
-    "glibtop-backend-sysdeps", _open_sysdeps, _close_sysdeps,
-    &glibtop_backend_sysdeps_call_vector
-};
-#else
-glibtop_backend_info LibGTopBackendInfo_Sysdeps = {
-    "glibtop-backend-sysdeps", _open_sysdeps, _close_sysdeps,
-    &glibtop_backend_sysdeps_call_vector
-};
-#endif
-
-static int
-_open_sysdeps (glibtop_server *server, glibtop_backend *backend,
-	       guint64 features, const char **backend_args)
-{
-    glibtop_init_func_t *init_fkt;
-
-    /* Do the initialization, but only if not already initialized. */
-
-    if ((server->flags & _GLIBTOP_INIT_STATE_SYSDEPS) == 0) {
-	glibtop_open_s (server, "glibtop", features, 0);
-
-	for (init_fkt = _glibtop_init_hook_s; *init_fkt; init_fkt++)
-	    (*init_fkt) (server);
-
-	server->info->sysdeps.pointer_size = sizeof (void*)*8;
-
-	server->flags |= _GLIBTOP_INIT_STATE_SYSDEPS;
-    }
-
-    return 0;
-}
-
-static int
-_close_sysdeps (glibtop_server *server, glibtop_backend *backend,
-		void *closure)
-{
-    return 0;
-}
-

backends/sysdeps/backend-sysdeps.h

@@ -1,36 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
-/* $Id$ */
-
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __GLIBTOP_BACKEND_SYSDEPS_H__
-#define __GLIBTOP_BACKEND_SYSDEPS_H__
-
-#include <glibtop.h>
-#include <glibtop/global.h>
-
-#include <glibtop/open.h>
-#include <glibtop/glibtop-backend.h>
-#include <glibtop/glibtop-backend-info.h>
-
-#endif

backends/sysdeps/libgtop-sysdeps.backend

@@ -1,13 +0,0 @@
-<?xml version="1.0"?> <!-- -*-xml-*- -->
-<!DOCTYPE libgtop:backends SYSTEM 'libgtop-backends.dtd'>
-<libgtop:Backends xmlns:libgtop="http://www.home-of-linux.org/libgtop/1.1">
-
-  <libgtop:Backend>
-    <libgtop:Name>glibtop-backend-sysdeps</libgtop:Name>
-    <libgtop:Location>
-      <libgtop:LibtoolName>libgtop_backend_sysdeps.la</libgtop:LibtoolName>
-      <libgtop:ShlibName>libgtop_backend_sysdeps.so</libgtop:ShlibName>
-    </libgtop:Location>
-  </libgtop:Backend>
-
-</libgtop:Backends>

backends/sysdeps/marshal.pl

@@ -1,195 +0,0 @@
-#!/usr/bin/perl
-
-require 'c_types.pl';
-
-$[ = 1;			# set array base to 1
-$, = ' ';		# set output field separator
-$\ = "\n";		# set output record separator
-
-$always_use_temp_storage = 1;
-
-sub toupper {
-    local($_) = @_;
-    tr/a-z/A-Z/;
-    return $_;
-}
-
-sub tolower {
-    local($_) = @_;
-    tr/A-Z/a-z/;
-    return $_;
-}
-
-print '/* marshal.c */';
-print "/* This is a generated file.  Please modify `marshal.pl' */";
-print '';
-
-print '#include <backend-sysdeps.h>';
-print '';
-print '#include <glibtop/sysdeps.h>';
-print '#include <glibtop/union.h>';
-print '';
-print '#include <glibtop/call-vector.h>';
-print '';
-
-$feature_count = 0;
-
-while (<>) {
-    chop;	# strip record separator
-
-    if (/^[^#]/) {
-	&output($_);
-    }
-}
-
-sub output {
-    local($line) = @_;
-    @line_fields = split(/\|/, $line, 9999);
-    $retval = $line_fields[1];
-    $feature = $line_fields[2];
-    $param_def = $line_fields[4];
-
-    $orig = $feature;
-    $feature =~ s/^@//;
-    $space = $feature;
-    $space =~ s/./ /g;
-
-    $features{++$feature_count} = $orig;
-
-    return if $orig =~ /^@/;
-
-    if ($retval eq 'retval') {
-      $retval_param = '&retval';
-      $call_prefix = '';
-      $call_prefix_space = '';
-      $prefix = 'retval = ';
-      $prefix_space = '         ';
-      $retval = 'int';
-    }
-    elsif ($retval !~ /^void$/) {
-      $retval_param = 'NULL';
-      $prefix = 'retval = ';
-      $prefix_space = '         ';
-      $call_prefix = 'retval = ';
-      $call_prefix_space = '         ';
-    }
-    else {
-      $retval_param = 'NULL';
-      $call_prefix = '';
-      $call_prefix_space = '';
-      $prefix = '';
-      $prefix_space = '';
-    }
-
-    if ($retval =~ /^(array|pointer)\((.*)\)$/) {
-      $retval = ($2 eq 'string') ? 'char **' : "$2 *";
-    }
-
-    $need_temp_storage = $always_use_temp_storage;
-    $first_param_name = '';
-
-    $call_param = '';
-    $param_decl = '';
-    $need_temp_len = 0;
-    $nr_params = (@params = split(/:/, $param_def, 9999));
-    for ($param = 1; $param <= $nr_params; $param++) {
-      $list = $params[$param];
-      $type = $params[$param];
-      $type =~ s/\(.*//;
-      $list =~ s/^.*\(//;
-      $list =~ s/\)$//;
-      $count = (@fields = split(/,/, $list, 9999));
-      for ($field = 1; $field <= $count; $field++) {
-	my $c_type = $typeinfo->{$type}->[1];
-
-	if ($first_param_name eq '') {
-	  $first_param_name = $fields[$field];
-	}
-
-	if ($typeinfo->{$type}->[2]) {
-	  $need_temp_storage = 1;
-	}
-
-	if ($param_decl eq '') {
-	  $param_decl = ",\n             " . $space . '    ';
-	}
-	else {
-	  $param_decl = $param_decl . ', ';
-	}
-	$param_decl = $param_decl . $c_type . ' ' . $fields[$field];
-	$call_param = $call_param . ', ' . $fields[$field];
-      }
-    }
-
-    if ($line_fields[3] eq '') {
-      $total_code = sprintf
-	("\treturn glibtop_get_%s_s (server%s);\n", $feature, $call_param);
-    } elsif ($line_fields[3] eq 'array') {
-      $total_code = sprintf
-	("\treturn glibtop_get_%s_s (server, array%s);\n", $feature, $call_param);
-    } elsif ($line_fields[3] =~ /^array/) {
-      $total_code = sprintf
-	("\treturn glibtop_get_%s_s (server, array, buf%s);\n", $feature, $call_param);
-    } else {
-      $total_code = sprintf
-	("\treturn glibtop_get_%s_s (server, buf%s);\n", $feature, $call_param);
-    }
-
-    $func_decl = 'static '.$retval."\n";
-    if ($line_fields[3] eq '') {
-      $func_decl .= sprintf ("_glibtop_get_%s_c (glibtop_server *server, void *closure%s)\n",
-			     $feature, $param_decl);
-    } elsif ($line_fields[3] eq 'array') {
-      $func_decl .= sprintf ("_glibtop_get_%s_c (glibtop_server *server, void *closure, glibtop_array *array%s)\n",
-			     $feature, $param_decl);
-    } elsif ($line_fields[3] =~ /^array/) {
-      $func_decl .= sprintf ("_glibtop_get_%s_c (glibtop_server *server, void *closure, glibtop_array *array, %s *buf%s)\n",
-			     $feature, 'glibtop_'.$feature, $param_decl);
-    } else {
-      $func_decl .= sprintf ("_glibtop_get_%s_c (glibtop_server *server, void *closure, %s *buf%s)\n",
-			     $feature, 'glibtop_'.$feature, $param_decl);
-    }
-
-    $total_code = sprintf ("%s{\n%s\n%s}\n", $func_decl, $total_code);
-
-    $total_code = sprintf ("#if (!GLIBTOP_SUID_%s)\n\n%s\n#endif /* not GLIBTOP_SUID_%s */\n\n",
-			   &toupper($feature), $total_code,
-			   &toupper($feature));
-
-    print $total_code;
-}
-
-$init_hook_code = '';
-$call_vector_code = '';
-for ($nr = 1; $nr <= $feature_count; $nr++) {
-  $feature = $features{$nr};
-
-  if ($feature =~ /^@/) {
-    $call_vector_code .= sprintf (qq[\tNULL,\n]);
-  } else {
-    $call_vector_code .= sprintf
-      (qq[\#if GLIBTOP_SUID_%s\n\tNULL,\n\#else\n\t_glibtop_get_%s_c,\n\#endif\n],
-       &toupper($feature), $feature);
-  }
-
-  if (!($feature =~ /^@/)) {
-    $init_hook_code .= sprintf
-      (qq[\#if !GLIBTOP_SUID_%s\n\tglibtop_init_%s_s,\n\#endif\n],
-       &toupper($feature), $feature);
-  }
-}
-$init_hook_code .= sprintf (qq[\tNULL\n]);
-
-chop $init_hook_code;
-chop $call_vector_code;
-
-print 'glibtop_call_vector glibtop_backend_sysdeps_call_vector = {';
-print $call_vector_code;
-print '};';
-print '';
-
-print 'glibtop_init_func_t _glibtop_init_hook_s [] = {';
-print $init_hook_code;
-print '};';
-print '';
-

config.guess

@@ -0,0 +1,883 @@
+#! /bin/sh
+# Attempt to guess a canonical system name.
+#   Copyright (C) 1992, 93, 94, 95, 96, 1997 Free Software Foundation, Inc.
+#
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# Written by Per Bothner <bothner@cygnus.com>.
+# The master version of this file is at the FSF in /home/gd/gnu/lib.
+#
+# This script attempts to guess a canonical system name similar to
+# config.sub.  If it succeeds, it prints the system name on stdout, and
+# exits with 0.  Otherwise, it exits with 1.
+#
+# The plan is that this can be called by configure scripts if you
+# don't specify an explicit system type (host/target name).
+#
+# Only a few systems have been added to this list; please add others
+# (but try to keep the structure clean).
+#
+
+# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
+# (ghazi@noc.rutgers.edu 8/24/94.)
+if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
+	PATH=$PATH:/.attbin ; export PATH
+fi
+
+UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
+UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
+UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
+UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+
+trap 'rm -f dummy.c dummy.o dummy; exit 1' 1 2 15
+
+# Note: order is significant - the case branches are not exclusive.
+
+case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+    alpha:OSF1:*:*)
+	if test $UNAME_RELEASE = "V4.0"; then
+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
+	fi
+	# A Vn.n version is a released version.
+	# A Tn.n version is a released field test version.
+	# A Xn.n version is an unreleased experimental baselevel.
+	# 1.2 uses "1.2" for uname -r.
+	cat <<EOF >dummy.s
+	.globl main
+	.ent main
+main:
+	.frame \$30,0,\$26,0
+	.prologue 0
+	.long 0x47e03d80 # implver $0
+	lda \$2,259
+	.long 0x47e20c21 # amask $2,$1
+	srl \$1,8,\$2
+	sll \$2,2,\$2
+	sll \$0,3,\$0
+	addl \$1,\$0,\$0
+	addl \$2,\$0,\$0
+	ret \$31,(\$26),1
+	.end main
+EOF
+	${CC-cc} dummy.s -o dummy 2>/dev/null
+	if test "$?" = 0 ; then
+		./dummy
+		case "$?" in
+			7)
+				UNAME_MACHINE="alpha"
+				;;
+			15)
+				UNAME_MACHINE="alphaev5"
+				;;
+			14)
+				UNAME_MACHINE="alphaev56"
+				;;
+			10)
+				UNAME_MACHINE="alphapca56"
+				;;
+			16)
+				UNAME_MACHINE="alphaev6"
+				;;
+		esac
+	fi
+	rm -f dummy.s dummy
+	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr [[A-Z]] [[a-z]]`
+	exit 0 ;;
+    21064:Windows_NT:50:3)
+	echo alpha-dec-winnt3.5
+	exit 0 ;;
+    Amiga*:UNIX_System_V:4.0:*)
+	echo m68k-cbm-sysv4
+	exit 0;;
+    amiga:NetBSD:*:*)
+      echo m68k-cbm-netbsd${UNAME_RELEASE}
+      exit 0 ;;
+    amiga:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    arc64:OpenBSD:*:*)
+	echo mips64el-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    arc:OpenBSD:*:*)
+	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    hkmips:OpenBSD:*:*)
+	echo mips-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    pmax:OpenBSD:*:*)
+	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    sgi:OpenBSD:*:*)
+	echo mips-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    wgrisc:OpenBSD:*:*)
+	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
+	echo arm-acorn-riscix${UNAME_RELEASE}
+	exit 0;;
+    arm32:NetBSD:*:*)
+	echo arm-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+	exit 0 ;;
+    SR2?01:HI-UX/MPP:*:*)
+	echo hppa1.1-hitachi-hiuxmpp
+	exit 0;;
+    Pyramid*:OSx*:*:*|MIS*:OSx*:*:*)
+	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
+	if test "`(/bin/universe) 2>/dev/null`" = att ; then
+		echo pyramid-pyramid-sysv3
+	else
+		echo pyramid-pyramid-bsd
+	fi
+	exit 0 ;;
+    NILE:*:*:dcosx)
+	echo pyramid-pyramid-svr4
+	exit 0 ;;
+    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
+	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit 0 ;;
+    i86pc:SunOS:5.*:*)
+	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit 0 ;;
+    sun4*:SunOS:6*:*)
+	# According to config.sub, this is the proper way to canonicalize
+	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
+	# it's likely to be more like Solaris than SunOS4.
+	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit 0 ;;
+    sun4*:SunOS:*:*)
+	case "`/usr/bin/arch -k`" in
+	    Series*|S4*)
+		UNAME_RELEASE=`uname -v`
+		;;
+	esac
+	# Japanese Language versions have a version number like `4.1.3-JL'.
+	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
+	exit 0 ;;
+    sun3*:SunOS:*:*)
+	echo m68k-sun-sunos${UNAME_RELEASE}
+	exit 0 ;;
+    sun*:*:4.2BSD:*)
+	UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
+	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
+	case "`/bin/arch`" in
+	    sun3)
+		echo m68k-sun-sunos${UNAME_RELEASE}
+		;;
+	    sun4)
+		echo sparc-sun-sunos${UNAME_RELEASE}
+		;;
+	esac
+	exit 0 ;;
+    aushp:SunOS:*:*)
+	echo sparc-auspex-sunos${UNAME_RELEASE}
+	exit 0 ;;
+    atari*:NetBSD:*:*)
+	echo m68k-atari-netbsd${UNAME_RELEASE}
+	exit 0 ;;
+    atari*:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    sun3*:NetBSD:*:*)
+	echo m68k-sun-netbsd${UNAME_RELEASE}
+	exit 0 ;;
+    sun3*:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mac68k:NetBSD:*:*)
+	echo m68k-apple-netbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mac68k:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mvme68k:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mvme88k:OpenBSD:*:*)
+	echo m88k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    powerpc:machten:*:*)
+	echo powerpc-apple-machten${UNAME_RELEASE}
+	exit 0 ;;
+    RISC*:Mach:*:*)
+	echo mips-dec-mach_bsd4.3
+	exit 0 ;;
+    RISC*:ULTRIX:*:*)
+	echo mips-dec-ultrix${UNAME_RELEASE}
+	exit 0 ;;
+    VAX*:ULTRIX*:*:*)
+	echo vax-dec-ultrix${UNAME_RELEASE}
+	exit 0 ;;
+    2020:CLIX:*:*)
+	echo clipper-intergraph-clix${UNAME_RELEASE}
+	exit 0 ;;
+    mips:*:*:UMIPS | mips:*:*:RISCos)
+	sed 's/^	//' << EOF >dummy.c
+	int main (argc, argv) int argc; char **argv; {
+	#if defined (host_mips) && defined (MIPSEB)
+	#if defined (SYSTYPE_SYSV)
+	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
+	#endif
+	#if defined (SYSTYPE_SVR4)
+	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
+	#endif
+	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
+	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
+	#endif
+	#endif
+	  exit (-1);
+	}
+EOF
+	${CC-cc} dummy.c -o dummy \
+	  && ./dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
+	  && rm dummy.c dummy && exit 0
+	rm -f dummy.c dummy
+	echo mips-mips-riscos${UNAME_RELEASE}
+	exit 0 ;;
+    Night_Hawk:Power_UNIX:*:*)
+	echo powerpc-harris-powerunix
+	exit 0 ;;
+    m88k:CX/UX:7*:*)
+	echo m88k-harris-cxux7
+	exit 0 ;;
+    m88k:*:4*:R4*)
+	echo m88k-motorola-sysv4
+	exit 0 ;;
+    m88k:*:3*:R3*)
+	echo m88k-motorola-sysv3
+	exit 0 ;;
+    AViiON:dgux:*:*)
+        # DG/UX returns AViiON for all architectures
+        UNAME_PROCESSOR=`/usr/bin/uname -p`
+        if [ $UNAME_PROCESSOR = mc88100 -o $UNAME_PROCESSOR = mc88110 ] ; then
+	if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx \
+	     -o ${TARGET_BINARY_INTERFACE}x = x ] ; then
+		echo m88k-dg-dgux${UNAME_RELEASE}
+	else
+		echo m88k-dg-dguxbcs${UNAME_RELEASE}
+	fi
+        else echo i586-dg-dgux${UNAME_RELEASE}
+        fi
+ 	exit 0 ;;
+    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
+	echo m88k-dolphin-sysv3
+	exit 0 ;;
+    M88*:*:R3*:*)
+	# Delta 88k system running SVR3
+	echo m88k-motorola-sysv3
+	exit 0 ;;
+    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
+	echo m88k-tektronix-sysv3
+	exit 0 ;;
+    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
+	echo m68k-tektronix-bsd
+	exit 0 ;;
+    *:IRIX*:*:*)
+	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
+	exit 0 ;;
+    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
+	echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
+	exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
+    i?86:AIX:*:*)
+	echo i386-ibm-aix
+	exit 0 ;;
+    *:AIX:2:3)
+	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
+		sed 's/^		//' << EOF >dummy.c
+		#include <sys/systemcfg.h>
+
+		main()
+			{
+			if (!__power_pc())
+				exit(1);
+			puts("powerpc-ibm-aix3.2.5");
+			exit(0);
+			}
+EOF
+		${CC-cc} dummy.c -o dummy && ./dummy && rm dummy.c dummy && exit 0
+		rm -f dummy.c dummy
+		echo rs6000-ibm-aix3.2.5
+	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
+		echo rs6000-ibm-aix3.2.4
+	else
+		echo rs6000-ibm-aix3.2
+	fi
+	exit 0 ;;
+    *:AIX:*:4)
+	if /usr/sbin/lsattr -EHl proc0 | grep POWER >/dev/null 2>&1; then
+		IBM_ARCH=rs6000
+	else
+		IBM_ARCH=powerpc
+	fi
+	if [ -x /usr/bin/oslevel ] ; then
+		IBM_REV=`/usr/bin/oslevel`
+	else
+		IBM_REV=4.${UNAME_RELEASE}
+	fi
+	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
+	exit 0 ;;
+    *:AIX:*:*)
+	echo rs6000-ibm-aix
+	exit 0 ;;
+    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
+	echo romp-ibm-bsd4.4
+	exit 0 ;;
+    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC NetBSD and
+	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
+	exit 0 ;;                           # report: romp-ibm BSD 4.3
+    *:BOSX:*:*)
+	echo rs6000-bull-bosx
+	exit 0 ;;
+    DPX/2?00:B.O.S.:*:*)
+	echo m68k-bull-sysv3
+	exit 0 ;;
+    9000/[34]??:4.3bsd:1.*:*)
+	echo m68k-hp-bsd
+	exit 0 ;;
+    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
+	echo m68k-hp-bsd4.4
+	exit 0 ;;
+    9000/[3478]??:HP-UX:*:*)
+	case "${UNAME_MACHINE}" in
+	    9000/31? )            HP_ARCH=m68000 ;;
+	    9000/[34]?? )         HP_ARCH=m68k ;;
+	    9000/7?? | 9000/8?[1679] ) HP_ARCH=hppa1.1 ;;
+	    9000/8?? )            HP_ARCH=hppa1.0 ;;
+	esac
+	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
+	exit 0 ;;
+    3050*:HI-UX:*:*)
+	sed 's/^	//' << EOF >dummy.c
+	#include <unistd.h>
+	int
+	main ()
+	{
+	  long cpu = sysconf (_SC_CPU_VERSION);
+	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
+	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
+	     results, however.  */
+	  if (CPU_IS_PA_RISC (cpu))
+	    {
+	      switch (cpu)
+		{
+		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
+		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
+		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
+		  default: puts ("hppa-hitachi-hiuxwe2"); break;
+		}
+	    }
+	  else if (CPU_IS_HP_MC68K (cpu))
+	    puts ("m68k-hitachi-hiuxwe2");
+	  else puts ("unknown-hitachi-hiuxwe2");
+	  exit (0);
+	}
+EOF
+	${CC-cc} dummy.c -o dummy && ./dummy && rm dummy.c dummy && exit 0
+	rm -f dummy.c dummy
+	echo unknown-hitachi-hiuxwe2
+	exit 0 ;;
+    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
+	echo hppa1.1-hp-bsd
+	exit 0 ;;
+    9000/8??:4.3bsd:*:*)
+	echo hppa1.0-hp-bsd
+	exit 0 ;;
+    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
+	echo hppa1.1-hp-osf
+	exit 0 ;;
+    hp8??:OSF1:*:*)
+	echo hppa1.0-hp-osf
+	exit 0 ;;
+    i?86:OSF1:*:*)
+	if [ -x /usr/sbin/sysversion ] ; then
+	    echo ${UNAME_MACHINE}-unknown-osf1mk
+	else
+	    echo ${UNAME_MACHINE}-unknown-osf1
+	fi
+	exit 0 ;;
+    parisc*:Lites*:*:*)
+	echo hppa1.1-hp-lites
+	exit 0 ;;
+    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
+	echo c1-convex-bsd
+        exit 0 ;;
+    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
+	if getsysinfo -f scalar_acc
+	then echo c32-convex-bsd
+	else echo c2-convex-bsd
+	fi
+        exit 0 ;;
+    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
+	echo c34-convex-bsd
+        exit 0 ;;
+    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
+	echo c38-convex-bsd
+        exit 0 ;;
+    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
+	echo c4-convex-bsd
+        exit 0 ;;
+    CRAY*X-MP:*:*:*)
+	echo xmp-cray-unicos
+        exit 0 ;;
+    CRAY*Y-MP:*:*:*)
+	echo ymp-cray-unicos${UNAME_RELEASE}
+	exit 0 ;;
+    CRAY*[A-Z]90:*:*:*)
+	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
+	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
+	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/
+	exit 0 ;;
+    CRAY*TS:*:*:*)
+	echo t90-cray-unicos${UNAME_RELEASE}
+	exit 0 ;;
+    CRAY-2:*:*:*)
+	echo cray2-cray-unicos
+        exit 0 ;;
+    F300:UNIX_System_V:*:*)
+        FUJITSU_SYS=`uname -p | tr [A-Z] [a-z] | sed -e 's/\///'`
+        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+        echo "f300-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+        exit 0 ;;
+    F301:UNIX_System_V:*:*)
+       echo f301-fujitsu-uxpv`echo $UNAME_RELEASE | sed 's/ .*//'`
+       exit 0 ;;
+    hp3[0-9][05]:NetBSD:*:*)
+	echo m68k-hp-netbsd${UNAME_RELEASE}
+	exit 0 ;;
+    hp300:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    i?86:BSD/386:*:* | *:BSD/OS:*:*)
+	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
+	exit 0 ;;
+    *:FreeBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+	exit 0 ;;
+    *:NetBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+	exit 0 ;;
+    *:OpenBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+	exit 0 ;;
+    i*:CYGWIN*:*)
+	echo i386-pc-cygwin32
+	exit 0 ;;
+    i*:MINGW*:*)
+	echo i386-pc-mingw32
+	exit 0 ;;
+    p*:CYGWIN*:*)
+	echo powerpcle-unknown-cygwin32
+	exit 0 ;;
+    prep*:SunOS:5.*:*)
+	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit 0 ;;
+    *:GNU:*:*)
+	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+	exit 0 ;;
+    *:Linux:*:*)
+	# The BFD linker knows what the default object file format is, so
+	# first see if it will tell us.
+	ld_help_string=`ld --help 2>&1`
+	ld_supported_emulations=`echo $ld_help_string \
+			 | sed -ne '/supported emulations:/!d
+				    s/[ 	][ 	]*/ /g
+				    s/.*supported emulations: *//
+				    s/ .*//
+				    p'`
+        case "$ld_supported_emulations" in
+	  i?86linux)  echo "${UNAME_MACHINE}-pc-linux-gnuaout"      ; exit 0 ;;
+	  i?86coff)   echo "${UNAME_MACHINE}-pc-linux-gnucoff"      ; exit 0 ;;
+	  sparclinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
+	  m68klinux)  echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
+	  elf32ppc)   echo "powerpc-unknown-linux-gnu"              ; exit 0 ;;
+	esac
+
+	if test "${UNAME_MACHINE}" = "alpha" ; then
+		sed 's/^	//'  <<EOF >dummy.s
+		.globl main
+		.ent main
+	main:
+		.frame \$30,0,\$26,0
+		.prologue 0
+		.long 0x47e03d80 # implver $0
+		lda \$2,259
+		.long 0x47e20c21 # amask $2,$1
+		srl \$1,8,\$2
+		sll \$2,2,\$2
+		sll \$0,3,\$0
+		addl \$1,\$0,\$0
+		addl \$2,\$0,\$0
+		ret \$31,(\$26),1
+		.end main
+EOF
+		LIBC=""
+		${CC-cc} dummy.s -o dummy 2>/dev/null
+		if test "$?" = 0 ; then
+			./dummy
+			case "$?" in
+			7)
+				UNAME_MACHINE="alpha"
+				;;
+			15)
+				UNAME_MACHINE="alphaev5"
+				;;
+			14)
+				UNAME_MACHINE="alphaev56"
+				;;
+			10)
+				UNAME_MACHINE="alphapca56"
+				;;
+			16)
+				UNAME_MACHINE="alphaev6"
+				;;
+			esac	
+
+			objdump --private-headers dummy | \
+			  grep ld.so.1 > /dev/null
+			if test "$?" = 0 ; then
+				LIBC="libc1"
+			fi
+		fi	
+		rm -f dummy.s dummy
+		echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ; exit 0
+	elif test "${UNAME_MACHINE}" = "mips" ; then
+	  cat >dummy.c <<EOF
+main(argc, argv)
+     int argc;
+     char *argv[];
+{
+#ifdef __MIPSEB__
+  printf ("%s-unknown-linux-gnu\n", argv[1]);
+#endif
+#ifdef __MIPSEL__
+  printf ("%sel-unknown-linux-gnu\n", argv[1]);
+#endif
+  return 0;
+}
+EOF
+	  ${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy "${UNAME_MACHINE}" && rm dummy.c dummy && exit 0
+	  rm -f dummy.c dummy
+	else
+	  # Either a pre-BFD a.out linker (linux-gnuoldld)
+	  # or one that does not give us useful --help.
+	  # GCC wants to distinguish between linux-gnuoldld and linux-gnuaout.
+	  # If ld does not provide *any* "supported emulations:"
+	  # that means it is gnuoldld.
+	  echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations:"
+	  test $? != 0 && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0
+
+	  case "${UNAME_MACHINE}" in
+	  i?86)
+	    VENDOR=pc;
+	    ;;
+	  *)
+	    VENDOR=unknown;
+	    ;;
+	  esac
+	  # Determine whether the default compiler is a.out or elf
+	  cat >dummy.c <<EOF
+#include <features.h>
+main(argc, argv)
+     int argc;
+     char *argv[];
+{
+#ifdef __ELF__
+# ifdef __GLIBC__
+#  if __GLIBC__ >= 2
+    printf ("%s-${VENDOR}-linux-gnu\n", argv[1]);
+#  else
+    printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
+#  endif
+# else
+   printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
+# endif
+#else
+  printf ("%s-${VENDOR}-linux-gnuaout\n", argv[1]);
+#endif
+  return 0;
+}
+EOF
+	  ${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy "${UNAME_MACHINE}" && rm dummy.c dummy && exit 0
+	  rm -f dummy.c dummy
+	fi ;;
+# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.  earlier versions
+# are messed up and put the nodename in both sysname and nodename.
+    i?86:DYNIX/ptx:4*:*)
+	echo i386-sequent-sysv4
+	exit 0 ;;
+    i?86:UNIX_SV:4.2MP:2.*)
+        # Unixware is an offshoot of SVR4, but it has its own version
+        # number series starting with 2...
+        # I am not positive that other SVR4 systems won't match this,
+	# I just have to hope.  -- rms.
+        # Use sysv4.2uw... so that sysv4* matches it.
+	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
+	exit 0 ;;
+    i?86:*:4.*:* | i?86:SYSTEM_V:4.*:*)
+	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
+		echo ${UNAME_MACHINE}-univel-sysv${UNAME_RELEASE}
+	else
+		echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
+	fi
+	exit 0 ;;
+    i?86:*:3.2:*)
+	if test -f /usr/options/cb.name; then
+		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
+		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
+	elif /bin/uname -X 2>/dev/null >/dev/null ; then
+		UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
+		(/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
+		(/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
+			&& UNAME_MACHINE=i586
+		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
+	else
+		echo ${UNAME_MACHINE}-pc-sysv32
+	fi
+	exit 0 ;;
+    pc:*:*:*)
+        # uname -m prints for DJGPP always 'pc', but it prints nothing about
+        # the processor, so we play safe by assuming i386.
+	echo i386-pc-msdosdjgpp
+        exit 0 ;;
+    Intel:Mach:3*:*)
+	echo i386-pc-mach3
+	exit 0 ;;
+    paragon:*:*:*)
+	echo i860-intel-osf1
+	exit 0 ;;
+    i860:*:4.*:*) # i860-SVR4
+	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
+	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
+	else # Add other i860-SVR4 vendors below as they are discovered.
+	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
+	fi
+	exit 0 ;;
+    mini*:CTIX:SYS*5:*)
+	# "miniframe"
+	echo m68010-convergent-sysv
+	exit 0 ;;
+    M68*:*:R3V[567]*:*)
+	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
+    3[34]??:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0)
+	OS_REL=''
+	test -r /etc/.relid \
+	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	  && echo i486-ncr-sysv4.3${OS_REL} && exit 0
+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+	  && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
+    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
+        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+          && echo i486-ncr-sysv4 && exit 0 ;;
+    m68*:LynxOS:2.*:*)
+	echo m68k-unknown-lynxos${UNAME_RELEASE}
+	exit 0 ;;
+    mc68030:UNIX_System_V:4.*:*)
+	echo m68k-atari-sysv4
+	exit 0 ;;
+    i?86:LynxOS:2.*:*)
+	echo i386-unknown-lynxos${UNAME_RELEASE}
+	exit 0 ;;
+    TSUNAMI:LynxOS:2.*:*)
+	echo sparc-unknown-lynxos${UNAME_RELEASE}
+	exit 0 ;;
+    rs6000:LynxOS:2.*:* | PowerPC:LynxOS:2.*:*)
+	echo rs6000-unknown-lynxos${UNAME_RELEASE}
+	exit 0 ;;
+    SM[BE]S:UNIX_SV:*:*)
+	echo mips-dde-sysv${UNAME_RELEASE}
+	exit 0 ;;
+    RM*:SINIX-*:*:*)
+	echo mips-sni-sysv4
+	exit 0 ;;
+    *:SINIX-*:*:*)
+	if uname -p 2>/dev/null >/dev/null ; then
+		UNAME_MACHINE=`(uname -p) 2>/dev/null`
+		echo ${UNAME_MACHINE}-sni-sysv4
+	else
+		echo ns32k-sni-sysv
+	fi
+	exit 0 ;;
+    PENTIUM:CPunix:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+                           # says <Richard.M.Bartel@ccMail.Census.GOV>
+        echo i586-unisys-sysv4
+        exit 0 ;;
+    *:UNIX_System_V:4*:FTX*)
+	# From Gerald Hewes <hewes@openmarket.com>.
+	# How about differentiating between stratus architectures? -djm
+	echo hppa1.1-stratus-sysv4
+	exit 0 ;;
+    *:*:*:FTX*)
+	# From seanf@swdc.stratus.com.
+	echo i860-stratus-sysv4
+	exit 0 ;;
+    mc68*:A/UX:*:*)
+	echo m68k-apple-aux${UNAME_RELEASE}
+	exit 0 ;;
+    news*:NEWS-OS:*:6*)
+	echo mips-sony-newsos6
+	exit 0 ;;
+    R3000:*System_V*:*:* | R4000:UNIX_SYSV:*:*)
+	if [ -d /usr/nec ]; then
+	        echo mips-nec-sysv${UNAME_RELEASE}
+	else
+	        echo mips-unknown-sysv${UNAME_RELEASE}
+	fi
+        exit 0 ;;
+esac
+
+#echo '(No uname command or uname output not recognized.)' 1>&2
+#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
+
+cat >dummy.c <<EOF
+#ifdef _SEQUENT_
+# include <sys/types.h>
+# include <sys/utsname.h>
+#endif
+main ()
+{
+#if defined (sony)
+#if defined (MIPSEB)
+  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
+     I don't know....  */
+  printf ("mips-sony-bsd\n"); exit (0);
+#else
+#include <sys/param.h>
+  printf ("m68k-sony-newsos%s\n",
+#ifdef NEWSOS4
+          "4"
+#else
+	  ""
+#endif
+         ); exit (0);
+#endif
+#endif
+
+#if defined (__arm) && defined (__acorn) && defined (__unix)
+  printf ("arm-acorn-riscix"); exit (0);
+#endif
+
+#if defined (hp300) && !defined (hpux)
+  printf ("m68k-hp-bsd\n"); exit (0);
+#endif
+
+#if defined (NeXT)
+#if !defined (__ARCHITECTURE__)
+#define __ARCHITECTURE__ "m68k"
+#endif
+  int version;
+  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
+  printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
+  exit (0);
+#endif
+
+#if defined (MULTIMAX) || defined (n16)
+#if defined (UMAXV)
+  printf ("ns32k-encore-sysv\n"); exit (0);
+#else
+#if defined (CMU)
+  printf ("ns32k-encore-mach\n"); exit (0);
+#else
+  printf ("ns32k-encore-bsd\n"); exit (0);
+#endif
+#endif
+#endif
+
+#if defined (__386BSD__)
+  printf ("i386-pc-bsd\n"); exit (0);
+#endif
+
+#if defined (sequent)
+#if defined (i386)
+  printf ("i386-sequent-dynix\n"); exit (0);
+#endif
+#if defined (ns32000)
+  printf ("ns32k-sequent-dynix\n"); exit (0);
+#endif
+#endif
+
+#if defined (_SEQUENT_)
+    struct utsname un;
+
+    uname(&un);
+
+    if (strncmp(un.version, "V2", 2) == 0) {
+	printf ("i386-sequent-ptx2\n"); exit (0);
+    }
+    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
+	printf ("i386-sequent-ptx1\n"); exit (0);
+    }
+    printf ("i386-sequent-ptx\n"); exit (0);
+
+#endif
+
+#if defined (vax)
+#if !defined (ultrix)
+  printf ("vax-dec-bsd\n"); exit (0);
+#else
+  printf ("vax-dec-ultrix\n"); exit (0);
+#endif
+#endif
+
+#if defined (alliant) && defined (i860)
+  printf ("i860-alliant-bsd\n"); exit (0);
+#endif
+
+  exit (1);
+}
+EOF
+
+${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy && rm dummy.c dummy && exit 0
+rm -f dummy.c dummy
+
+# Apollos put the system type in the environment.
+
+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
+
+# Convex versions that predate uname can use getsysinfo(1)
+
+if [ -x /usr/convex/getsysinfo ]
+then
+    case `getsysinfo -f cpu_type` in
+    c1*)
+	echo c1-convex-bsd
+	exit 0 ;;
+    c2*)
+	if getsysinfo -f scalar_acc
+	then echo c32-convex-bsd
+	else echo c2-convex-bsd
+	fi
+	exit 0 ;;
+    c34*)
+	echo c34-convex-bsd
+	exit 0 ;;
+    c38*)
+	echo c38-convex-bsd
+	exit 0 ;;
+    c4*)
+	echo c4-convex-bsd
+	exit 0 ;;
+    esac
+fi
+
+#echo '(Unable to guess system type)' 1>&2
+
+exit 1

config.sub

@@ -0,0 +1,954 @@
+#! /bin/sh
+# Configuration validation subroutine script, version 1.1.
+#   Copyright (C) 1991, 92, 93, 94, 95, 96, 1997 Free Software Foundation, Inc.
+# This file is (in principle) common to ALL GNU software.
+# The presence of a machine in this file suggests that SOME GNU software
+# can handle that machine.  It does not imply ALL GNU software can.
+#
+# This file is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# Configuration subroutine to validate and canonicalize a configuration type.
+# Supply the specified configuration type as an argument.
+# If it is invalid, we print an error message on stderr and exit with code 1.
+# Otherwise, we print the canonical config type on stdout and succeed.
+
+# This file is supposed to be the same for all GNU packages
+# and recognize all the CPU types, system types and aliases
+# that are meaningful with *any* GNU software.
+# Each package is responsible for reporting which valid configurations
+# it does not support.  The user should be able to distinguish
+# a failure to support a valid configuration from a meaningless
+# configuration.
+
+# The goal of this file is to map all the various variations of a given
+# machine specification into a single specification in the form:
+#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
+# or in some cases, the newer four-part form:
+#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
+# It is wrong to echo any other type of specification.
+
+if [ x$1 = x ]
+then
+	echo Configuration name missing. 1>&2
+	echo "Usage: $0 CPU-MFR-OPSYS" 1>&2
+	echo "or     $0 ALIAS" 1>&2
+	echo where ALIAS is a recognized configuration type. 1>&2
+	exit 1
+fi
+
+# First pass through any local machine types.
+case $1 in
+	*local*)
+		echo $1
+		exit 0
+		;;
+	*)
+	;;
+esac
+
+# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
+# Here we must recognize all the valid KERNEL-OS combinations.
+maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+case $maybe_os in
+  linux-gnu*)
+    os=-$maybe_os
+    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+    ;;
+  *)
+    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
+    if [ $basic_machine != $1 ]
+    then os=`echo $1 | sed 's/.*-/-/'`
+    else os=; fi
+    ;;
+esac
+
+### Let's recognize common machines as not being operating systems so
+### that things like config.sub decstation-3100 work.  We also
+### recognize some manufacturers as not being operating systems, so we
+### can provide default operating systems below.
+case $os in
+	-sun*os*)
+		# Prevent following clause from handling this invalid input.
+		;;
+	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
+	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
+	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
+	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
+	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
+	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
+	-apple)
+		os=
+		basic_machine=$1
+		;;
+	-hiux*)
+		os=-hiuxwe2
+		;;
+	-sco5)
+		os=sco3.2v5
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco4)
+		os=-sco3.2v4
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco3.2.[4-9]*)
+		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco3.2v[4-9]*)
+		# Don't forget version if it is 3.2v4 or newer.
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco*)
+		os=-sco3.2v2
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-isc)
+		os=-isc2.2
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-clix*)
+		basic_machine=clipper-intergraph
+		;;
+	-isc*)
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-lynx*)
+		os=-lynxos
+		;;
+	-ptx*)
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
+		;;
+	-windowsnt*)
+		os=`echo $os | sed -e 's/windowsnt/winnt/'`
+		;;
+	-psos*)
+		os=-psos
+		;;
+esac
+
+# Decode aliases for certain CPU-COMPANY combinations.
+case $basic_machine in
+	# Recognize the basic CPU types without company name.
+	# Some are omitted here because they have special meanings below.
+	tahoe | i860 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
+		| arme[lb] | pyramid | mn10200 | mn10300 \
+		| tron | a29k | 580 | i960 | h8300 | hppa | hppa1.0 | hppa1.1 \
+		| alpha | alphaev5 | alphaev56 | we32k | ns16k | clipper \
+		| i370 | sh | powerpc | powerpcle | 1750a | dsp16xx | pdp11 \
+		| mips64 | mipsel | mips64el | mips64orion | mips64orionel \
+		| mipstx39 | mipstx39el \
+		| sparc | sparclet | sparclite | sparc64 | v850)
+		basic_machine=$basic_machine-unknown
+		;;
+	# We use `pc' rather than `unknown'
+	# because (1) that's what they normally are, and
+	# (2) the word "unknown" tends to confuse beginning users.
+	i[3456]86)
+	  basic_machine=$basic_machine-pc
+	  ;;
+	# Object if more than one company name word.
+	*-*-*)
+		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+		exit 1
+		;;
+	# Recognize the basic CPU types with company name.
+	vax-* | tahoe-* | i[3456]86-* | i860-* | m32r-* | m68k-* | m68000-* \
+	      | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \
+	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
+	      | power-* | none-* | 580-* | cray2-* | h8300-* | i960-* \
+	      | xmp-* | ymp-* | hppa-* | hppa1.0-* | hppa1.1-* \
+	      | alpha-* | alphaev5-* | alphaev56-* | we32k-* | cydra-* \
+	      | ns16k-* | pn-* | np1-* | xps100-* | clipper-* | orion-* \
+	      | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
+	      | sparc64-* | mips64-* | mipsel-* \
+	      | mips64el-* | mips64orion-* | mips64orionel-*  \
+	      | mipstx39-* | mipstx39el-* \
+	      | f301-*)
+		;;
+	# Recognize the various machine names and aliases which stand
+	# for a CPU type and a company and sometimes even an OS.
+	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
+		basic_machine=m68000-att
+		;;
+	3b*)
+		basic_machine=we32k-att
+		;;
+	alliant | fx80)
+		basic_machine=fx80-alliant
+		;;
+	altos | altos3068)
+		basic_machine=m68k-altos
+		;;
+	am29k)
+		basic_machine=a29k-none
+		os=-bsd
+		;;
+	amdahl)
+		basic_machine=580-amdahl
+		os=-sysv
+		;;
+	amiga | amiga-*)
+		basic_machine=m68k-cbm
+		;;
+	amigaos | amigados)
+		basic_machine=m68k-cbm
+		os=-amigaos
+		;;
+	amigaunix | amix)
+		basic_machine=m68k-cbm
+		os=-sysv4
+		;;
+	apollo68)
+		basic_machine=m68k-apollo
+		os=-sysv
+		;;
+	aux)
+		basic_machine=m68k-apple
+		os=-aux
+		;;
+	balance)
+		basic_machine=ns32k-sequent
+		os=-dynix
+		;;
+	convex-c1)
+		basic_machine=c1-convex
+		os=-bsd
+		;;
+	convex-c2)
+		basic_machine=c2-convex
+		os=-bsd
+		;;
+	convex-c32)
+		basic_machine=c32-convex
+		os=-bsd
+		;;
+	convex-c34)
+		basic_machine=c34-convex
+		os=-bsd
+		;;
+	convex-c38)
+		basic_machine=c38-convex
+		os=-bsd
+		;;
+	cray | ymp)
+		basic_machine=ymp-cray
+		os=-unicos
+		;;
+	cray2)
+		basic_machine=cray2-cray
+		os=-unicos
+		;;
+	[ctj]90-cray)
+		basic_machine=c90-cray
+		os=-unicos
+		;;
+	crds | unos)
+		basic_machine=m68k-crds
+		;;
+	da30 | da30-*)
+		basic_machine=m68k-da30
+		;;
+	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
+		basic_machine=mips-dec
+		;;
+	delta | 3300 | motorola-3300 | motorola-delta \
+	      | 3300-motorola | delta-motorola)
+		basic_machine=m68k-motorola
+		;;
+	delta88)
+		basic_machine=m88k-motorola
+		os=-sysv3
+		;;
+	dpx20 | dpx20-*)
+		basic_machine=rs6000-bull
+		os=-bosx
+		;;
+	dpx2* | dpx2*-bull)
+		basic_machine=m68k-bull
+		os=-sysv3
+		;;
+	ebmon29k)
+		basic_machine=a29k-amd
+		os=-ebmon
+		;;
+	elxsi)
+		basic_machine=elxsi-elxsi
+		os=-bsd
+		;;
+	encore | umax | mmax)
+		basic_machine=ns32k-encore
+		;;
+	fx2800)
+		basic_machine=i860-alliant
+		;;
+	genix)
+		basic_machine=ns32k-ns
+		;;
+	gmicro)
+		basic_machine=tron-gmicro
+		os=-sysv
+		;;
+	h3050r* | hiux*)
+		basic_machine=hppa1.1-hitachi
+		os=-hiuxwe2
+		;;
+	h8300hms)
+		basic_machine=h8300-hitachi
+		os=-hms
+		;;
+	harris)
+		basic_machine=m88k-harris
+		os=-sysv3
+		;;
+	hp300-*)
+		basic_machine=m68k-hp
+		;;
+	hp300bsd)
+		basic_machine=m68k-hp
+		os=-bsd
+		;;
+	hp300hpux)
+		basic_machine=m68k-hp
+		os=-hpux
+		;;
+	hp9k2[0-9][0-9] | hp9k31[0-9])
+		basic_machine=m68000-hp
+		;;
+	hp9k3[2-9][0-9])
+		basic_machine=m68k-hp
+		;;
+	hp9k7[0-9][0-9] | hp7[0-9][0-9] | hp9k8[0-9]7 | hp8[0-9]7)
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k8[0-9][0-9] | hp8[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		;;
+	hppa-next)
+		os=-nextstep3
+		;;
+	i370-ibm* | ibm*)
+		basic_machine=i370-ibm
+		os=-mvs
+		;;
+# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
+	i[3456]86v32)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv32
+		;;
+	i[3456]86v4*)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv4
+		;;
+	i[3456]86v)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv
+		;;
+	i[3456]86sol2)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-solaris2
+		;;
+	iris | iris4d)
+		basic_machine=mips-sgi
+		case $os in
+		    -irix*)
+			;;
+		    *)
+			os=-irix4
+			;;
+		esac
+		;;
+	isi68 | isi)
+		basic_machine=m68k-isi
+		os=-sysv
+		;;
+	m88k-omron*)
+		basic_machine=m88k-omron
+		;;
+	magnum | m3230)
+		basic_machine=mips-mips
+		os=-sysv
+		;;
+	merlin)
+		basic_machine=ns32k-utek
+		os=-sysv
+		;;
+	miniframe)
+		basic_machine=m68000-convergent
+		;;
+	mipsel*-linux*)
+		basic_machine=mipsel-unknown
+		os=-linux-gnu
+		;;
+	mips*-linux*)
+		basic_machine=mips-unknown
+		os=-linux-gnu
+		;;
+	mips3*-*)
+		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
+		;;
+	mips3*)
+		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
+		;;
+	ncr3000)
+		basic_machine=i486-ncr
+		os=-sysv4
+		;;
+	news | news700 | news800 | news900)
+		basic_machine=m68k-sony
+		os=-newsos
+		;;
+	news1000)
+		basic_machine=m68030-sony
+		os=-newsos
+		;;
+	news-3600 | risc-news)
+		basic_machine=mips-sony
+		os=-newsos
+		;;
+	next | m*-next )
+		basic_machine=m68k-next
+		case $os in
+		    -nextstep* )
+			;;
+		    -ns2*)
+		      os=-nextstep2
+			;;
+		    *)
+		      os=-nextstep3
+			;;
+		esac
+		;;
+	nh3000)
+		basic_machine=m68k-harris
+		os=-cxux
+		;;
+	nh[45]000)
+		basic_machine=m88k-harris
+		os=-cxux
+		;;
+	nindy960)
+		basic_machine=i960-intel
+		os=-nindy
+		;;
+	np1)
+		basic_machine=np1-gould
+		;;
+	pa-hitachi)
+		basic_machine=hppa1.1-hitachi
+		os=-hiuxwe2
+		;;
+	paragon)
+		basic_machine=i860-intel
+		os=-osf
+		;;
+	pbd)
+		basic_machine=sparc-tti
+		;;
+	pbb)
+		basic_machine=m68k-tti
+		;;
+        pc532 | pc532-*)
+		basic_machine=ns32k-pc532
+		;;
+	pentium | p5)
+		basic_machine=i586-intel
+		;;
+	pentiumpro | p6)
+		basic_machine=i686-intel
+		;;
+	pentium-* | p5-*)
+		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentiumpro-* | p6-*)
+		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	k5)
+		# We don't have specific support for AMD's K5 yet, so just call it a Pentium
+		basic_machine=i586-amd
+		;;
+	nexen)
+		# We don't have specific support for Nexgen yet, so just call it a Pentium
+		basic_machine=i586-nexgen
+		;;
+	pn)
+		basic_machine=pn-gould
+		;;
+	power)	basic_machine=rs6000-ibm
+		;;
+	ppc)	basic_machine=powerpc-unknown
+	        ;;
+	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ppcle | powerpclittle | ppc-le | powerpc-little)
+		basic_machine=powerpcle-unknown
+	        ;;
+	ppcle-* | powerpclittle-*)
+		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ps2)
+		basic_machine=i386-ibm
+		;;
+	rm[46]00)
+		basic_machine=mips-siemens
+		;;
+	rtpc | rtpc-*)
+		basic_machine=romp-ibm
+		;;
+	sequent)
+		basic_machine=i386-sequent
+		;;
+	sh)
+		basic_machine=sh-hitachi
+		os=-hms
+		;;
+	sps7)
+		basic_machine=m68k-bull
+		os=-sysv2
+		;;
+	spur)
+		basic_machine=spur-unknown
+		;;
+	sun2)
+		basic_machine=m68000-sun
+		;;
+	sun2os3)
+		basic_machine=m68000-sun
+		os=-sunos3
+		;;
+	sun2os4)
+		basic_machine=m68000-sun
+		os=-sunos4
+		;;
+	sun3os3)
+		basic_machine=m68k-sun
+		os=-sunos3
+		;;
+	sun3os4)
+		basic_machine=m68k-sun
+		os=-sunos4
+		;;
+	sun4os3)
+		basic_machine=sparc-sun
+		os=-sunos3
+		;;
+	sun4os4)
+		basic_machine=sparc-sun
+		os=-sunos4
+		;;
+	sun4sol2)
+		basic_machine=sparc-sun
+		os=-solaris2
+		;;
+	sun3 | sun3-*)
+		basic_machine=m68k-sun
+		;;
+	sun4)
+		basic_machine=sparc-sun
+		;;
+	sun386 | sun386i | roadrunner)
+		basic_machine=i386-sun
+		;;
+	symmetry)
+		basic_machine=i386-sequent
+		os=-dynix
+		;;
+	tx39)
+		basic_machine=mipstx39-unknown
+		;;
+	tx39el)
+		basic_machine=mipstx39el-unknown
+		;;
+	tower | tower-32)
+		basic_machine=m68k-ncr
+		;;
+	udi29k)
+		basic_machine=a29k-amd
+		os=-udi
+		;;
+	ultra3)
+		basic_machine=a29k-nyu
+		os=-sym1
+		;;
+	vaxv)
+		basic_machine=vax-dec
+		os=-sysv
+		;;
+	vms)
+		basic_machine=vax-dec
+		os=-vms
+		;;
+	vpp*|vx|vx-*)
+               basic_machine=f301-fujitsu
+               ;;
+	vxworks960)
+		basic_machine=i960-wrs
+		os=-vxworks
+		;;
+	vxworks68)
+		basic_machine=m68k-wrs
+		os=-vxworks
+		;;
+	vxworks29k)
+		basic_machine=a29k-wrs
+		os=-vxworks
+		;;
+	xmp)
+		basic_machine=xmp-cray
+		os=-unicos
+		;;
+        xps | xps100)
+		basic_machine=xps100-honeywell
+		;;
+	none)
+		basic_machine=none-none
+		os=-none
+		;;
+
+# Here we handle the default manufacturer of certain CPU types.  It is in
+# some cases the only manufacturer, in others, it is the most popular.
+	mips)
+		if [ x$os = x-linux-gnu ]; then
+			basic_machine=mips-unknown
+		else
+			basic_machine=mips-mips
+		fi
+		;;
+	romp)
+		basic_machine=romp-ibm
+		;;
+	rs6000)
+		basic_machine=rs6000-ibm
+		;;
+	vax)
+		basic_machine=vax-dec
+		;;
+	pdp11)
+		basic_machine=pdp11-dec
+		;;
+	we32k)
+		basic_machine=we32k-att
+		;;
+	sparc)
+		basic_machine=sparc-sun
+		;;
+        cydra)
+		basic_machine=cydra-cydrome
+		;;
+	orion)
+		basic_machine=orion-highlevel
+		;;
+	orion105)
+		basic_machine=clipper-highlevel
+		;;
+	*)
+		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+		exit 1
+		;;
+esac
+
+# Here we canonicalize certain aliases for manufacturers.
+case $basic_machine in
+	*-digital*)
+		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
+		;;
+	*-commodore*)
+		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
+		;;
+	*)
+		;;
+esac
+
+# Decode manufacturer-specific aliases for certain operating systems.
+
+if [ x"$os" != x"" ]
+then
+case $os in
+        # First match some system type aliases
+        # that might get confused with valid system types.
+	# -solaris* is a basic system type, with this one exception.
+	-solaris1 | -solaris1.*)
+		os=`echo $os | sed -e 's|solaris1|sunos4|'`
+		;;
+	-solaris)
+		os=-solaris2
+		;;
+	-svr4*)
+		os=-sysv4
+		;;
+	-unixware*)
+		os=-sysv4.2uw
+		;;
+	-gnu/linux*)
+		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
+		;;
+	# First accept the basic system types.
+	# The portable systems comes first.
+	# Each alternative MUST END IN A *, to match a version number.
+	# -sysv* is not here because it comes later, after sysvr4.
+	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
+	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
+	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
+	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
+	      | -aos* \
+	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
+	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
+	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
+	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* \
+	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+	      | -cygwin32* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+	      | -mingw32* | -linux-gnu* | -uxpv*)
+	# Remember, each alternative MUST END IN *, to match a version number.
+		;;
+	-linux*)
+		os=`echo $os | sed -e 's|linux|linux-gnu|'`
+		;;
+	-sunos5*)
+		os=`echo $os | sed -e 's|sunos5|solaris2|'`
+		;;
+	-sunos6*)
+		os=`echo $os | sed -e 's|sunos6|solaris3|'`
+		;;
+	-osfrose*)
+		os=-osfrose
+		;;
+	-osf*)
+		os=-osf
+		;;
+	-utek*)
+		os=-bsd
+		;;
+	-dynix*)
+		os=-bsd
+		;;
+	-acis*)
+		os=-aos
+		;;
+	-ctix* | -uts*)
+		os=-sysv
+		;;
+	-ns2 )
+	        os=-nextstep2
+		;;
+	# Preserve the version number of sinix5.
+	-sinix5.*)
+		os=`echo $os | sed -e 's|sinix|sysv|'`
+		;;
+	-sinix*)
+		os=-sysv4
+		;;
+	-triton*)
+		os=-sysv3
+		;;
+	-oss*)
+		os=-sysv3
+		;;
+	-svr4)
+		os=-sysv4
+		;;
+	-svr3)
+		os=-sysv3
+		;;
+	-sysvr4)
+		os=-sysv4
+		;;
+	# This must come after -sysvr4.
+	-sysv*)
+		;;
+	-xenix)
+		os=-xenix
+		;;
+	-none)
+		;;
+	*)
+		# Get rid of the `-' at the beginning of $os.
+		os=`echo $os | sed 's/[^-]*-//'`
+		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
+		exit 1
+		;;
+esac
+else
+
+# Here we handle the default operating systems that come with various machines.
+# The value should be what the vendor currently ships out the door with their
+# machine or put another way, the most popular os provided with the machine.
+
+# Note that if you're going to try to match "-MANUFACTURER" here (say,
+# "-sun"), then you have to tell the case statement up towards the top
+# that MANUFACTURER isn't an operating system.  Otherwise, code above
+# will signal an error saying that MANUFACTURER isn't an operating
+# system, and we'll never get to this point.
+
+case $basic_machine in
+	*-acorn)
+		os=-riscix1.2
+		;;
+	arm*-semi)
+		os=-aout
+		;;
+        pdp11-*)
+		os=-none
+		;;
+	*-dec | vax-*)
+		os=-ultrix4.2
+		;;
+	m68*-apollo)
+		os=-domain
+		;;
+	i386-sun)
+		os=-sunos4.0.2
+		;;
+	m68000-sun)
+		os=-sunos3
+		# This also exists in the configure program, but was not the
+		# default.
+		# os=-sunos4
+		;;
+	*-tti)	# must be before sparc entry or we get the wrong os.
+		os=-sysv3
+		;;
+	sparc-* | *-sun)
+		os=-sunos4.1.1
+		;;
+	*-ibm)
+		os=-aix
+		;;
+	*-hp)
+		os=-hpux
+		;;
+	*-hitachi)
+		os=-hiux
+		;;
+	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
+		os=-sysv
+		;;
+	*-cbm)
+		os=-amigaos
+		;;
+	*-dg)
+		os=-dgux
+		;;
+	*-dolphin)
+		os=-sysv3
+		;;
+	m68k-ccur)
+		os=-rtu
+		;;
+	m88k-omron*)
+		os=-luna
+		;;
+	*-next )
+		os=-nextstep
+		;;
+	*-sequent)
+		os=-ptx
+		;;
+	*-crds)
+		os=-unos
+		;;
+	*-ns)
+		os=-genix
+		;;
+	i370-*)
+		os=-mvs
+		;;
+	*-next)
+		os=-nextstep3
+		;;
+        *-gould)
+		os=-sysv
+		;;
+        *-highlevel)
+		os=-bsd
+		;;
+	*-encore)
+		os=-bsd
+		;;
+        *-sgi)
+		os=-irix
+		;;
+        *-siemens)
+		os=-sysv4
+		;;
+	*-masscomp)
+		os=-rtu
+		;;
+	f301-fujitsu)
+		os=-uxpv
+		;;
+	*)
+		os=-none
+		;;
+esac
+fi
+
+# Here we handle the case where we know the os, and the CPU type, but not the
+# manufacturer.  We pick the logical manufacturer.
+vendor=unknown
+case $basic_machine in
+	*-unknown)
+		case $os in
+			-riscix*)
+				vendor=acorn
+				;;
+			-sunos*)
+				vendor=sun
+				;;
+			-aix*)
+				vendor=ibm
+				;;
+			-hpux*)
+				vendor=hp
+				;;
+			-hiux*)
+				vendor=hitachi
+				;;
+			-unos*)
+				vendor=crds
+				;;
+			-dgux*)
+				vendor=dg
+				;;
+			-luna*)
+				vendor=omron
+				;;
+			-genix*)
+				vendor=ns
+				;;
+			-mvs*)
+				vendor=ibm
+				;;
+			-ptx*)
+				vendor=sequent
+				;;
+			-vxsim* | -vxworks*)
+				vendor=wrs
+				;;
+			-aux*)
+				vendor=apple
+				;;
+		esac
+		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
+		;;
+esac
+
+echo $basic_machine$os

configure.in

@@ -1,157 +1,70 @@
 dnl
-dnl Configure script for the Gnome library
+Mnl Configure script for the Gnome library
 dnl
 
 AC_INIT(copyright.txt)
 AM_CONFIG_HEADER(config.h)
-AC_CANONICAL_SYSTEM
 
-LIBGTOP_MAJOR_VERSION=2
+AM_INIT_AUTOMAKE(libgtop, 0.01)
-LIBGTOP_MINOR_VERSION=8
-LIBGTOP_MICRO_VERSION=2
-LIBGTOP_VERSION=$LIBGTOP_MAJOR_VERSION.$LIBGTOP_MINOR_VERSION.$LIBGTOP_MICRO_VERSION
-AM_INIT_AUTOMAKE(libgtop, $LIBGTOP_VERSION)
 
-dnl  increment if the interface has additions, changes, removals.
+AM_MAINTAINER_MODE
-LIBGTOP_CURRENT=4
 
-dnl  increment any time the source changes; set to
+AM_ACLOCAL_INCLUDE(macros)
-dnl  0 if you increment CURRENT
-LIBGTOP_REVISION=0
 
-dnl  increment if any interfaces have been added; set to 0
+AC_CANONICAL_HOST
-dnl  if any interfaces have been removed. removal has
-dnl  precedence over adding, so set to 0 if both happened.
-LIBGTOP_AGE=0
-
-# you can set this to `-snap' for instance to create
-# a `libgtop-1.x.y-snap.tar.gz' tarball.
-LIBGTOP_VERSION_SUFFIX=
-
-# Increase each time you change the client/server protocol.
-LIBGTOP_SERVER_VERSION=5
-
-# Version code calculation
-LIBGTOP_VERSION_CODE=`expr $LIBGTOP_MAJOR_VERSION \* 1000000 + $LIBGTOP_MINOR_VERSION \* 1000 + $LIBGTOP_MICRO_VERSION`
-
-AC_SUBST(LIBGTOP_MAJOR_VERSION)
-AC_SUBST(LIBGTOP_MINOR_VERSION)
-AC_SUBST(LIBGTOP_MICRO_VERSION)
-AC_SUBST(LIBGTOP_INTERFACE_AGE)
-AC_SUBST(LIBGTOP_BINARY_AGE)
-AC_SUBST(LIBGTOP_SERVER_VERSION)
-AC_SUBST(LIBGTOP_VERSION)
-AC_SUBST(LIBGTOP_VERSION_CODE)
-AC_SUBST(LIBGTOP_VERSION_SUFFIX)
-
-# libtool versioning
-LT_RELEASE=$LIBGTOP_MAJOR_VERSION.$LIBGTOP_MINOR_VERSION
-LT_CURRENT=$LIBGTOP_CURRENT
-LT_REVISION=$LIBGTOP_REVISION
-LT_AGE=$LIBGTOP_AGE
-LT_VERSION_INFO="-version-info ${LT_CURRENT}:${LT_REVISION}:${LT_AGE}"
-AC_SUBST(LT_VERSION_INFO)
-AC_SUBST(LT_RELEASE)
-AC_SUBST(LT_CURRENT)
-AC_SUBST(LT_REVISION)
-AC_SUBST(LT_AGE)
-
-ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I ."
-
-AC_ISC_POSIX
-AC_PROG_CC
-AC_STDC_HEADERS
-dnl AC_ARG_PROGRAM
-
-dnl We need this at some places.
-libgtop_top_builddir=`pwd`
-AC_SUBST(libgtop_top_builddir)
-
-dnl We don't use `AC_PROG_AWK' since it checks for mawk first which
-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(CXX,g++)
 AC_CHECK_TOOL(RANLIB,ranlib)
+AC_CHECK_TOOL(LD,ld)
 AC_CHECK_TOOL(AS,as)
 AC_CHECK_TOOL(AR,ar)
+AC_CHECK_TOOL(NM,nm)
 
-export CC CXX RANLIB LD AS AR
+NM=`which $NM`
+export CC CXX RANLIB LD AS AR NM
 
+dnl If you want to use libgtop without gnome, comment the following line out.
+GNOME_INIT
+
+AC_LC_SYSDEPS
+
+if test x$libgtop_want_guile = xyes ; then
+  GNOME_CHECK_GUILE
+  if test x$ac_cv_guile_found = xyes ; then
+    if test x$libgtop_want_names = xyes ; then
+      AC_DEFINE(GLIBTOP_GUILE_NAMES)
+    fi
+    guile_examples='third third_static third_linux'
+    guile_subdirs='guile'
+  else
+    guile_examples=
+    guile_subdirs=
+  fi
+else
+  guile_examples=
+  guile_subdirs=
+fi
+
+AC_SUBST(guile_examples)
+AC_SUBST(guile_subdirs)
+
+AC_ISC_POSIX
+AC_PROG_CXX
+AC_PROG_CC
+AC_PROG_CPP
+AC_STDC_HEADERS
+AC_ARG_PROGRAM
+AM_PROG_LEX
 AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
 
 export cross_compiling
-
 AM_PROG_LIBTOOL
 
-AM_CONDITIONAL(CROSS_COMPILING, test "x$cross_compiling" = xyes)
+dnl You need to uncomment the following line if you want to use libgtop without Gnome.
-
+dnl GNOME_SUPPORT_CHECKS
-GNOME_LIBGTOP_SYSDEPS
-GNOME_LIBGTOP_TYPES
-
-AC_ARG_WITH(libgtop-inodedb,
-[  --with-libgtop-inodedb  Build the inodedb stuff (default=no)],
-[build_inodedb="$withval"], [build_inodedb=no])
-
-LIBGTOP_EXTRA_LIBS=
-
-if test x$build_inodedb = xyes ; then
-  AC_CHECK_LIB(gdbm, gdbm_open, LIBGTOP_EXTRA_LIBS='-lgdbm', build_inodedb=no)
-fi
-
-AM_CONDITIONAL(INODEDB, test x$build_inodedb = xyes)
-
-if test x$build_inodedb = xyes ; then
-  AC_DEFINE(GLIBTOP_INODEDB)
-fi
-
-AC_DEFINE(GLIBTOP_NAMES)
-
-if test x$libgtop_smp = xyes ; then
-  smp_examples='smp'
-  smp_static_examples='smp_static'
-else
-  smp_examples=
-  smp_static_examples=
-fi
-
-if test "x$enable_static" != xno; then
-  static_targets="first_static second_static mountlist_static procmap_static netload_static sysdeps_static timings_static $smp_static_examples pprint_static procargs_static df_static"
-else
-  static_targets=""
-fi
-
-AM_CONDITIONAL(ENABLE_STATIC, test x$enable_static = xyes)
-AM_CONDITIONAL(ENABLE_SHARED, test x$enable_static = xyes)
-
-AC_SUBST(static_targets)
-AC_SUBST(smp_examples)
-
-GLIB_REQUIRED=2.4.0
-
-PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED)
-AC_SUBST(GLIB_CFLAGS)
-AC_SUBST(GLIB_LIBS)
-
-AC_CHECK_HEADER(popt.h,[POPT=yes],[POPT=no])
-AC_MSG_CHECKING(for popt.h)
-if test x$POPT = xyes ; then
-   AC_MSG_RESULT(yes)
-else
-   AC_MSG_ERROR([libgtop requires the popt development libraries])
-fi
-
-AC_CHECK_HEADER(ifaddrs.h, [HAVE_IFADDRS_H=yes], [HAVE_IFADDRS_H=no])
-if test x$HAVE_IFADDRS_H = xyes ; then
-	AC_DEFINE(HAVE_IFADDRS_H, 1, [defined if you have ifaddrs.h])
-fi
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
@@ -169,85 +82,11 @@ AC_CHECK_TYPE(ssize_t, int)
 AC_CHECK_HEADERS(memory.h)
 AC_CHECK_HEADERS(string.h strings.h, break)
 AC_REPLACE_FUNCS(strerror)
-
+AC_CHECK_LIB(kvm, kvm_open)
-dnl dlopen() and dlsym()
-DL_LIB=
-AC_CHECK_FUNCS(dlopen,,[
-  AC_CHECK_LIB(dl, dlopen, DL_LIB="-ldl", [
-    AC_CHECK_LIB(dld, shl_load, DL_LIB="-ldld", [
-      AC_CHECK_FUNCS(dlopen, DL_LIB="", DL_LIB="")
-    ])
-  ])
-])
-oLIBS="$LIBS"
-LIBS="$LIBS $DL_LIB"
-AC_CHECK_FUNCS(dlerror,,)
-LIBS="$oLIBS"
-AC_SUBST(DL_LIB)
-
-dnl Linux
-AC_CHECK_HEADER(linux/isdn.h,[HAVE_ISDN_H=yes],[HAVE_ISDN_H=no])
-if test x$HAVE_ISDN_H = xyes ; then
-	AC_DEFINE(HAVE_ISDN_H, 1, [defined if you have linux/isdn.h])
-fi
-
-dnl AIX
-AH_TEMPLATE(HAVE_VMGETINFO, [Define to 1 if you have the 'vmgetinfo' function in libperfstat])
-AC_CHECK_LIB(perfstat, vmgetinfo, AC_DEFINE(HAVE_VMGETINFO))
-
-dnl Solaris
-AC_CHECK_LIB(kstat, kstat_open)
-AC_CHECK_FUNCS(getloadavg swapctl)
-AC_CHECK_HEADERS(procfs.h sys/procfs.h, break)
-
-dnl Some versions of Solaris require -lelf for -lkvm
-AC_CHECK_LIB(kvm, kvm_open,[
-  LIBS="-lkvm $LIBS"
-],[AC_MSG_CHECKING(for kvm_open in -lkvm with -lelf)
-   AC_CACHE_VAL(ac_cv_lib_kvm_with_elf,
-   [ac_save_LIBS="$LIBS"
-    LIBS="-lkvm -lelf $LIBS"
-    AC_TRY_LINK([char kvm_open();], [kvm_open()],
-                ac_cv_lib_kvm_with_elf=yes, ac_cv_lib_kvm_with_elf=no)
-    LIBS="$ac_save_LIBS"
-   ])
-   if test "$ac_cv_lib_kvm_with_elf" = "yes"; then
-     AC_MSG_RESULT(yes)
-     LIBS="-lkvm -lelf $LIBS"
-   else
-     AC_MSG_RESULT(no)
-   fi
-])
 
 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
-
-AC_CHECK_FUNC(socket,
- [AC_CHECK_HEADER(netinet/in.h,
-   [AC_CHECK_HEADER(arpa/inet.h, [
-  AC_DEFINE(HAVE_SOCKETS)
-      AC_MSG_CHECKING("for sun_len member in struct sockaddr_un")
-      AC_TRY_LINK([
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/un.h>
-      ],
-      [static struct sockaddr_un x; x.sun_len = 1;],
-      [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_SOCKADDR_SUN_LEN)],
-      [AC_MSG_RESULT(no)])])])])
-
 dnl Checks for library functions.
 AC_FUNC_ALLOCA
 AC_FUNC_MMAP
@@ -255,159 +94,116 @@ AC_TYPE_SIGNAL
 AC_FUNC_STRFTIME
 AC_CHECK_FUNCS(getcwd gettimeofday getwd putenv strdup strtoul uname)
 
-ALL_LINGUAS="am ar az be bg bn bs ca cs cy da de el en_CA en_GB es et eu fa fi fr ga gl gu he hi hr hu id it ja ko lt lv mi mk ml mn ms nb nl nn no or pa pl pt pt_BR ro ru sk sl sq sr sr@Latn sv ta tr uk vi zh_CN zh_TW"
+ALL_LINGUAS=""
+AM_GNU_GETTEXT
 
-GETTEXT_PACKAGE=libgtop-2.0
+CFLAGS="$CFLAGS -D_IN_LIBGTOP"
-AC_SUBST(GETTEXT_PACKAGE)
-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE")
 
-AM_GLIB_GNU_GETTEXT
+AC_SUBST(CFLAGS)
+AC_SUBST(CPPFLAGS)
+AC_SUBST(LDFLAGS)
 
-AC_PATH_XTRA
+AC_ARG_ENABLE(debug, [  --enable-debug          turn on debugging [default=no]],AC_DEFINE(GNOME_ENABLE_DEBUG),)
 
-dnl For Solaris
+dnl If you want to use libgtop without gnome, uncomment the following paragraph:
-dnl Please don't move this before AC_PATH_XTRA
+dnl LIBSUPPORT=
-AC_CHECK_FUNC(gethostbyname,,[AC_CHECK_LIB(nsl,gethostbyname)])
+dnl SUPPORTINCS=
-AC_CHECK_FUNC(connect,,[AC_CHECK_LIB(socket,connect)])
+dnl if test "$need_gnome_support" = yes; then
-AC_CHECK_FUNC(inet_aton,,[AC_CHECK_LIB(resolv,inet_aton)])
+dnl    LIBSUPPORT='$(top_builddir)/support/libgnomesupport.la'
+dnl    SUPPORTINCS='-I$(top_srcdir)/support'
+dnl fi
+dnl AC_SUBST(LIBSUPPORT)
+dnl AC_SUBST(SUPPORTINCS)
 
-dnl The construct foo=`echo $w1 $w2 $w3` fails on some systems if $w1 = -e or -n
+dnl Some ugly hack; if '-lgnomesupport' is part of $GNOME_LIBS, we include it here.
-dnl So we use the following instead.
+echo "$GNOME_LIBS" | grep -q -e '-lgnomesupport'
-dnl XE_SPACE(var, words)
+if test $? = 0 ; then
-define([XE_SPACE],[
+  LIBSUPPORT="$GNOME_LIBDIR -lgnomesupport"
-T=""
+  SUPPORTINCS="$GNOME_INCLUDEDIR"
-for W in $2; do if test -z "$T"; then T="$W"; else T="$T $W"; fi; done
-$1="$T"
-])dnl
-
-dnl Autodetect Xauth
-dnl -lXau is only used by gnuclient, so use a special variable for Xauth X libs
-saved_CPPFLAGS="$CPPFLAGS"
-CPPFLAGS="$CPPFLAGS $X_CFLAGS"
-test -z "$with_xauth" && { AC_CHECK_HEADER(X11/Xauth.h,          ,with_xauth=no) }
-test -z "$with_xauth" && { AC_CHECK_LIB(Xau, XauGetAuthByAddr,[:],with_xauth=no, $X_LIBS) }
-test -z "$with_xauth" && with_xauth=yes
-if test "$with_xauth" = "yes"; then
-  AC_DEFINE(HAVE_XAUTH)
-  XE_SPACE(libs_xauth, $X_LIBS -lXau)
 fi
-CPPFLAGS="$saved_CPPFLAGS"
+AC_SUBST(LIBSUPPORT)
-AC_SUBST(libs_xauth)
+AC_SUBST(SUPPORTINCS)
-
-dnl For diskusage stuff
-GNOME_FILEUTILS_CHECKS
-
-dnl Debugging
-AC_ARG_ENABLE(debug, [  --enable-debug          turn on debugging [default=no]],AC_DEFINE(LIBGTOP_ENABLE_DEBUG),)
-AC_ARG_ENABLE(fatal-warnings, [  --enable-fatal-warnings make all warnings fatal [debug=no]],AC_DEFINE(LIBGTOP_FATAL_WARNINGS),)
 
 dnl These definitions are expanded in make.
 LIBGTOP_LIBS='-L$(libdir)'
-LIBGTOP_INCS='-I$(includedir)/libgtop-2.0'
+LIBGTOP_INCS='-I$(includedir)'
-
+LIBGTOP_GUILE_LIBS="$LIBGTOP_LIBS"
-if test x$libgtop_use_machine_h = xyes ; then
+LIBGTOP_GUILE_INCS="$LIBGTOP_INCS"
-  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
-
-LIBGTOP_INCS="$LIBGTOP_INCS $GLIB_CFLAGS"
-
 LIBGTOP_BINDIR='$(bindir)'
-LIBGTOP_SERVER='$(bindir)/libgtop_server2'
+LIBGTOP_SERVER='$(bindir)/gtop_server'
 
 sysdeps_dir="$libgtop_sysdeps_dir"
 AC_SUBST(sysdeps_dir)
 
-if test -z "$LIBGTOP_EXTRA_LIBS" ; then
+if test x$ac_cv_guile_found = xyes ; then
-  LIBGTOP_EXTRA_LIBS="$libs_xauth"
+  LIBGTOP_GUILE_LIBS="$LIBGTOP_GUILE_LIBS -lgtop_guile"
+  libgtop_guile_found=yes
 else
-  LIBGTOP_EXTRA_LIBS="$LIBGTOP_EXTRA_LIBS $libs_xauth"
+  libgtop_guile_found=no
 fi
 
-LIBGTOP_EXTRA_LIBS="$LIBGTOP_EXTRA_LIBS $GLIB_LIBS"
+AC_SUBST(libgtop_guile_found)
 
-LIBGTOP_LIBS="$LIBGTOP_LIBS"
+if test x$libgtop_want_names = xyes ; then
-LIBGTOP_NAMES_LIBS="$LIBGTOP_LIBS"
+  if test x$ac_cv_guile_found = xyes ; then
+    LIBGTOP_GUILE_LIBS="$LIBGTOP_GUILE_LIBS -lgtop_guile_names"
+    libgtop_want_guile_names=yes
+  else
+    libgtop_want_guile_names=no
+  fi
+  LIBGTOP_LIBS="$LIBGTOP_LIBS -lgtop_names"
+  LIBGTOP_GUILE_LIBS="$LIBGTOP_GUILE_LIBS -lgtop_names"
+fi
 
-LIBGTOP_LIBS="$LIBGTOP_LIBS" 
+AC_SUBST(libgtop_want_guile_names)
-LIBGTOP_NAMES_LIBS="$LIBGTOP_NAMES_LIBS"
 
-LIBGTOP_NAMES_INCS="$LIBGTOP_INCS -DGLIBTOP_NAMES"
+LIBGTOP_LIBS="$LIBGTOP_LIBS -lgtop_common"
+LIBGTOP_GUILE_LIBS="$LIBGTOP_GUILE_LIBS -lgtop_common"
 
-machine_incs="-I\$(top_srcdir)/sysdeps/$sysdeps_dir"
+if test "x$need_server" = "xyes" ; then
+  LIBGTOP_LIBS="$LIBGTOP_LIBS -lgtop"
+  LIBGTOP_GUILE_LIBS="$LIBGTOP_GUILE_LIBS -lgtop"
+else
+  LIBGTOP_LIBS="$LIBGTOP_LIBS -lgtop_sysdeps"
+  LIBGTOP_GUILE_LIBS="$LIBGTOP_GUILE_LIBS -lgtop_sysdeps"
+fi
+
+if test "x$ac_cv_guile_found" = "xyes" ; then
+  LIBGTOP_INCS="$LIBGTOP_INCS $GUILE_INCS"
+  LIBGTOP_GUILE_INCS="$LIBGTOP_INCS $GUILE_INCS"
+  LIBGTOP_GUILE_LIBS="$LIBGTOP_GUILE_LIBS $GUILE_LIBS"
+fi
+
+if test "x$libgtop_use_machine_h" = "xyes" ; then
+  machine_incs='-I$(top_srcdir)/sysdeps/@sysdeps_dir@'
+fi
 
 AC_SUBST(machine_incs)
 
-if test "$GCC" = "yes" ; then
-        CFLAGS="\
-	-Winline \
-	-Wall \
-	-std=gnu89 \
-	-Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes \
-	-Wnested-externs -Wpointer-arith \
-	-Wcast-align -Wsign-compare \
-	-fno-strict-aliasing \
-	$CFLAGS"
-fi
-
-INCLUDES="-D_IN_LIBGTOP -D_GNU_SOURCE -DGLIBTOP_NAMES -I\$(top_builddir) -I\$(top_srcdir) -I\$(top_srcdir)/sysdeps/$sysdeps_dir -I\$(top_srcdir)/include $GLIB_CFLAGS $CFLAGS $X_CFLAGS "'-DGTOPLOCALEDIR=\"$(datadir)/locale\" -DLIBGTOP_VERSION=\"'"$LIBGTOP_VERSION"'\" -DLIBGTOP_SERVER_VERSION=\"'"$LIBGTOP_SERVER_VERSION"'\" -DLIBGTOP_VERSION_CODE='$LIBGTOP_VERSION_CODE' -DLIBGTOP_SERVER=\"'"$LIBGTOP_SERVER"'\"'
-
-AC_SUBST(INCLUDES)
-
-AC_SUBST(LIBGTOP_EXTRA_LIBS)
-AC_SUBST(GLIB_LIBS)
 AC_SUBST(LIBGTOP_LIBS)
 AC_SUBST(LIBGTOP_INCS)
-AC_SUBST(LIBGTOP_NAMES_LIBS)
+AC_SUBST(LIBGTOP_GUILE_LIBS)
-AC_SUBST(LIBGTOP_NAMES_INCS)
+AC_SUBST(LIBGTOP_GUILE_INCS)
 AC_SUBST(LIBGTOP_BINDIR)
 AC_SUBST(LIBGTOP_SERVER)
 
-if test x$libgtop_need_server = xyes ; then
-   sysdeps_suid_lib="\$(top_builddir)/sysdeps/\$(sysdeps_dir)/libgtop_sysdeps_suid-2.0.la"
-   server_programs='libgtop_server2'
-else
-   sysdeps_suid_lib=
-   server_programs=
-fi
-AC_SUBST(sysdeps_suid_lib)
-AC_SUBST(server_programs)
-
 AC_OUTPUT([
 Makefile
-libgtop.spec
 po/Makefile.in
-misc/Makefile
+intl/Makefile
 include/Makefile
 include/glibtop/Makefile
 sysdeps/Makefile
 sysdeps/common/Makefile
 sysdeps/names/Makefile
+sysdeps/guile/Makefile
+sysdeps/guile/names/Makefile
 sysdeps/stub/Makefile
-sysdeps/stub_suid/Makefile
 sysdeps/sun4/Makefile
 sysdeps/osf1/Makefile
 sysdeps/linux/Makefile
-sysdeps/kernel/Makefile
-sysdeps/freebsd/Makefile
-sysdeps/solaris/Makefile
-sysdeps/aix/Makefile
 src/Makefile
-src/daemon/Makefile
+src/server/Makefile
-src/inodedb/Makefile
 lib/Makefile
 examples/Makefile
-doc/Makefile
+macros/Makefile],[sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile])
-libgtop-2.0.pc
-])

copyright.txt

@@ -1,23 +1,21 @@
 /* $Id$ */
 
-/* Copyright (C) 1998-99 Martin Baulig
+/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
-   This file is part of LibGTop 1.0.
+   This file is part of the Gnome Top Library.
-
    Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
 
-   LibGTop is free software; you can redistribute it and/or modify it
+   The Gnome Top Library is free software; you can redistribute it and/or
-   under the terms of the GNU General Public License as published by
+   modify it under the terms of the GNU Library General Public License as
-   the Free Software Foundation; either version 2 of the License,
+   published by the Free Software Foundation; either version 2 of the
-   or (at your option) any later version.
+   License, or (at your option) any later version.
 
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
+   The Gnome Top Library is distributed in the hope that it will be useful,
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   for more details.
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
+   You should have received a copy of the GNU Library General Public
-   along with LibGTop; see the file COPYING. If not, write to the
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   Boston, MA 02111-1307, USA.  */
-*/
 

debian/.cvsignore

@@ -1,9 +0,0 @@
-control
-rules
-build
-tmp
-*.postinst
-*.debhelper
-*.files
-files
-substvars

debian/README.Debian

@@ -1,9 +0,0 @@
-LibGTop CVS snapshots for Debian
---------------------------------
-
-This is a debian package made from a stable release of LibGTop, but it
-should be considered "unofficial" since I'm not a Debian Maintainer.
-
-
-Martin Baulig <martin@home-of-linux.org>, Wed, 16 Feb 2000 16:40:50 +0100
-

debian/changelog

@@ -1,121 +0,0 @@
-libgtop (1.0.7-1) unstable; urgency=low
-  * New upstream source (1.0.7 "Copenhagen" release)
-  * Non-maintainer upload; since I'm not a Debian maintainer, this is some
-    kind of "unofficial" debian package for LibGTop 1.0.7 - but I think it
-    can be considered stable and working.
-
- -- Martin Baulig <martin@home-of-linux.org>  Wed, 16 Feb 2000 16:40:50 +0100
-
-libgtop (1.0.6-1) unstable; urgency=low
-  * New upstream source
-
- -- Ian Lynagh (wibble) <igloo@debian.org>  Wed, 20 Oct 1999 16:16:27 +0100
-
-libgtop (1.0.4.5pre1-1) frozen unstable; urgency=low
-  * New upstream source (1.0.5 pre release)
-  * Maintainer e-mail address changed to igloo@debian.org
-
- -- Ian Lynagh (wibble) <igloo@debian.org>  Thu, 30 Sep 1999 22:37:33 +0100
-
-libgtop (1.0.4-1) frozen unstable; urgency=low
-  * New upstream source
-  * Removed nasty sed stuff from the rules in favour of make install prefix=...
-  * Added .la files to libgtop-dev
-  * Added info to the copyright file
-  * Wrote simple man page for libgtop-config.
-  * Recompiled with later debhelper so docs go to /usr/share/doc as per FHS
-  * changed infodir to /usr/share/info
-
- -- Ian Lynagh (wibble) <igloo@debian.org>  Mon, 20 Sep 1999 00:06:16 +0100
-
-libgtop (1.0.1-2) frozen unstable; urgency=low
-
-  * Didn't actually use wildcards in libgtop-dev.files because tar complained
-  * Set section names properly
-
- -- Ian Lynagh <ian@lynagh.demon.co.uk>  Sun,  7 Mar 1999 00:53:50 +0000
-
-libgtop (1.0.1-1) frozen unstable; urgency=low
-
-  * SONAME changed back to 1. Fun fun fun.
-  * Added RELNOTES-1.0 to debian/libgtop1.docs and debian/rules
-  * Changed libgtop1.README.Debian to at least make sense
-  * Used wildcards in libgtop-dev.files
-
- -- Ian Lynagh <ian@lynagh.demon.co.uk>  Sun,  7 Mar 1999 00:53:50 +0000
-
-libgtop (1.0.1-0.1) unstable; urgency=low
-
-  * Non-maintainer upload for GNOME 1.0
-
- -- Jules Bean <jules@debian.org>  Thu,  4 Mar 1999 22:34:12 +0000
-
-libgtop (0.99.2-0.2) unstable; urgency=low
-
-  * Oops, forgot some files.
-
- -- Jim Pick <jim@jimpick.com>  Sun, 24 Jan 1999 02:12:24 -0800
-
-libgtop (0.99.2-0.1) unstable; urgency=low
-
-  * Non-maintainer upload.
-  * New upstream source.
-  * SONAME is now 0 again.  Hmmm.
-
- -- Jim Pick <jim@jimpick.com>  Sat, 23 Jan 1999 20:21:38 -0800
-
-libgtop (0.26.2-4) frozen unstable; urgency=low
-
-  * Upstream changelog installed as changelog
-  * debian/shlibs.local removed in favour of the LD_LIBRARY_PATH line
-
- -- Ian Lynagh <ian@lynagh.demon.co.uk>  Thu, 26 Nov 1998 17:20:24 +0000
-
-libgtop (0.26.2-3.1) frozen unstable; urgency=low
-
-  * Non-maintainer upload.
-  * Upload to frozen, corrects Bug #29110, Bug #29111, which were
-    already fixed.
-  * Noticed that guile option is no longer being used, so I removed
-    the dependency.
-  * Added changelog (to fix lintian error).
-  * Changed control file to use macro substitutions.  This is a much
-    less error-prone way of building dependencies than doing them by
-    hand.
-  * Added -V option to dh_makeshlibs to put version number on shlibs
-    file.
-  * Added shlibs.local file with null entry for "libgtop 1" (and
-    others) so libgtop1 doesn't declare a relationship on itself.
-
- -- Jim Pick <jim@jimpick.com>  Wed, 25 Nov 1998 12:03:12 -0800
-
-libgtop (0.26.2-3) frozen unstable; urgency=low
-
-  * libgtop0 changed to libgtop1
-  * Added an #ifndef strstr around the prototype of strstr in
-    sysdeps/common/mountlist.c as this is a macro under glibc 2.1.
-
- -- Ian Lynagh <ian@lynagh.demon.co.uk>  Sun,  8 Nov 1998 12:06:09 +0000
-
-libgtop (0.26.2-2) frozen unstable; urgency=low
-
-  * Fixes minor bugs in debian/rules
-
- -- Ian Lynagh <ian@lynagh.demon.co.uk>  Fri, 16 Oct 1998 05:30:16 +0200
-
-libgtop (0.26.2-1) unstable; urgency=low
-
-  * New upstream version
-  * Non-maintainer release
-
- -- Martin Schulze <joey@finlandia.infodrom.north.de>  Fri, 16 Oct 1998 05:30:16 +0200
-
-libgtop (0.26.0-1) unstable; urgency=low
-
-  * Initial Release.
-
- -- Jim Pick <jim@jimpick.com>  Thu, 24 Sep 1998 18:42:48 -0700
-
-Local variables:
-mode: debian-changelog
-End:

debian/control.in

@@ -1,33 +0,0 @@
-Source: libgtop@SUFFIX@
-Maintainer: Martin Baulig <martin@home-of-linux.org>
-Section: libs
-Priority: optional
-Standards-Version: 3.0.0
-
-Package: libgtop1@SUFFIX@
-Architecture: any
-Section: libs
-Depends: ${shlibs:Depends}
-Description: Portable system access library (part of Gnome)
- Gnome is the "GNU Network Object Model Environment"
- .
- It is a project to build a complete, user-friendly desktop based
- entirely on free software.
- .
- This package contains the gtop libraries which read information about
- processes and the running systems.
-
-Package: libgtop-dev@SUFFIX@
-Architecture: any
-Section: devel
-Depends: libgtop1@SUFFIX@ (= ${Source-Version})
-Description: Dev libraries for the portable system access library (part of Gnome)
- Gnome is the "GNU Network Object Model Environment"
- .
- It is a project to build a complete, user-friendly desktop based
- entirely on free software.
- .
- This package contains the include files and static library for the
- gtop libraries which read information about processes and the running
- systems.
-

debian/debconfigure

@@ -1,109 +0,0 @@
-#! /bin/sh
-#
-# debconfigure
-#
-# A script to generate a debian/rules file, with options.
-#
-# By Jim Pick <jim@jimpick.com>, GPL'd of course.
-# Adjusted for LibGTop by Martin Baulig <martin@home-of-linux.org>
-#
-
-if [ ! -r rules.in ]; then
-	echo "Please run the debconfigure script in the debian directory" 1>&2
-	exit 1
-fi
-
-debtype='official'
-prefix='/usr'
-gnomeprefix='/usr'
-localstatedir='/var/lib'
-pkgsuffix=''
-
-for dc_option
-do
-    case "$dc_option" in
-	-*=*) dc_optarg=`echo "$dc_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-	*) dc_optarg= ;;
-    esac
-
-    case "$dc_option" in
-
-	--clean)
-	    rm -f control rules *~ core *files *menu *substvars *.postinst *.debhelper
-	    exit ;;
-
-	--prefix=*)
-	    prefix="$dc_optarg" ;;
-
-        --localstatedir=*)
-	    prefix="$dc_optarg" ;;
-
-	--pkgsuffix=*)
-	    pkgsuffix="$dc_optarg" ;;
-
-	--gnome-prefix=*)
-	    gnomeprefix="$dc_optarg" ;;
-
-	--debtype=*)
-	    debtype="$dc_optarg" ;;
-
-	*)
-	    cat <<EOF 1>&2
-Usage: debconfigure [options]
-Options: [defaults in brackets after descriptions]
-  --help                  print this message
-  --clean		  remove generated files
-  --prefix=PREFIX         install files under under PREFIX dir [/usr]
-  --gnome-prefix=PREFIX   look for GNOME under PREFIX dir [/usr]
-  --localstatedir=DIR     directory for things like game scores [/var/lib]
-  --pkgsuffix=SUFFIX      append SUFFIX onto package names []
-  --debtype=DEBTYPE       enable macros with the name of DEBTYPE [official]
-EOF
-	    exit ;;
-
-    esac
-done
-
-# Strip leading slash
-prefix=`expr $prefix : '/\(.*\)'`
-gnomeprefix=`expr $gnomeprefix : '/\(.*\)'`
-localstatedir=`expr $localstatedir : '/\(.*\)'`
-
-for infile in `ls control.in rules.in`
-do
-    tofile=`expr $infile : '\(.*\)\.in'`
-    cat $infile | \
-       sed "s,@SUFFIX@,$pkgsuffix,g" | \
-       sed "s,@PREFIX@,$prefix,g" | \
-       sed "s,@GNOMEPREFIX@,$gnomeprefix,g" | \
-       sed "s,@LOCALSTATEDIR@,$localstatedir,g" | \
-       sed "s,%$debtype>,," | sed '/^%/d' > $tofile
-done
-chmod +x rules
-
-for filesfile in `ls *.files.in`
-do
-    tofile=`expr $filesfile : '\(.*\)\.files\.in'`
-    tofile=`echo $tofile$pkgsuffix.files`
-    cat $filesfile | \
-       sed "s,@SUFFIX@,$pkgsuffix,g" | \
-       sed "s,@PREFIX@,$prefix,g" | \
-       sed "s,@GNOMEPREFIX@,$gnomeprefix,g" | \
-       sed "s,@LOCALSTATEDIR@,$localstatedir,g" | \
-       sed "s,%$debtype>,," | sed '/^%/d' > $tofile
-done
-
-for postinst in libgtop1$pkgsuffix
-do
-
-cat > $postinst.postinst <<EOF
-#! /bin/sh
-
-set -e
-ldconfig
-
-#DEBHELPER#
-EOF
-
-done
-

debian/libgtop-config.1

@@ -1,34 +0,0 @@
-.TH GTOP l "15 September 1999"
-.SH NAME
-\fBlibgtop-config\fP \- libgtop libraries and component information retrieval.
-.SH SYNTAX
-.B libgtop-config
-.RI [ --version ]
-.RI [ --config ]
-.RI [ --features-def-file ]
-.SH DESCRIPTION
-.B libgtop-config
-is used to retrieve information from installed libraries in the system.
-
-This manual page was written for the Debian GNU/Linux distribution because the original program does not have a manual page.
-.LP
-.SH OPTIONS
-.TP
-.B \-\-version
-.PD
-Prints the version of libgtop that you're using.
-.TP
-.B \-\-config
-.PD
-Prints the location of libgtopConf.sh.
-.TP
-.B \-\-version
-.PD
-Prints the location of libgtop-features.def.
-.SH BUGS
-None known
-
-.SH AUTHORS
-Martin Baulig (martin@home-of-linux.org)
-.TP
-Josh Sled (jsled@scam.XCF.Berkeley.EDU)

debian/libgtop-dev.files.in

@@ -1,24 +0,0 @@
-@PREFIX@/lib/libgtop.a
-@PREFIX@/lib/libgtop_common.a
-@PREFIX@/lib/libgtop_names.a
-@PREFIX@/lib/libgtop_suid_common.a
-@PREFIX@/lib/libgtop_sysdeps.a
-@PREFIX@/lib/libgtop.la
-@PREFIX@/lib/libgtop_common.la
-@PREFIX@/lib/libgtop_names.la
-@PREFIX@/lib/libgtop_suid_common.la
-@PREFIX@/lib/libgtop_sysdeps.la
-@PREFIX@/lib/libgtopConf.sh
-@PREFIX@/lib/libgtop.so
-@PREFIX@/lib/libgtop_common.so
-@PREFIX@/lib/libgtop_names.so
-@PREFIX@/lib/libgtop_suid_common.so
-@PREFIX@/lib/libgtop_sysdeps.so
-@PREFIX@/lib/libgtop-features.def
-@PREFIX@/lib/libgtop/include/*.h
-@PREFIX@/include/glibtop/*.h
-@PREFIX@/include/glibtop.h
-@PREFIX@/include/glibtop_server.h
-@PREFIX@/include/glibtop_machine.h
-@PREFIX@/info/libgtop.info
-@PREFIX@/bin/libgtop-config

debian/libgtop1.README.Debian

@@ -1,5 +0,0 @@
-
-The Debian package of libgtop, a GNOME library.
-
--- 
-Martin Baulig <martin@home-of-linux.org>

debian/libgtop1.copyright

@@ -1,12 +0,0 @@
-
-libgtop is released under the GPL.
-On Debian GNU/Linux systems, the complete text of the GNU General
-Public License can be found in /usr/share/common-licenses/GPL
-
-Original authors: Martin Baulig <martin@home-of-linux.org>
-                  Drazen Kacar <dave@srce.hr>
-
-Originally Debianised by Jim Pick <jim@jimpick.com>
-Then re-Debianised in October 1998 by Martin Schulze
-<joey@finlandia.infodrom.north.de> before being taken over by Ian Lynagh
-<ian@lynagh.demon.co.uk> in November 1998.

debian/libgtop1.docs

@@ -1,5 +0,0 @@
-RELNOTES-0.25
-RELNOTES-1.0.x
-NEWS
-AUTHORS
-debian/changelog

debian/libgtop1.files.in

@@ -1,4 +0,0 @@
-@PREFIX@/lib/libgtop*.so.[0-9].[0-9][0-9].[0-9]
-@PREFIX@/lib/libgtop*.so.[0-9].[0-9].[0-9]
-@PREFIX@/lib/libgtop*.so.[0-9]
-@PREFIX@/share/locale/*/*/libgtop.mo

debian/libgtop2.README.Debian

@@ -1,5 +0,0 @@
-
-The Debian package of libgtop, a GNOME library.
-
--- 
-Ian Lynagh <ian@lynagh.demon.co.uk>

debian/libgtop2.copyright

@@ -1,12 +0,0 @@
-
-libgtop is released under the GPL.
-On Debian GNU/Linux systems, the complete text of the GNU General
-Public License can be found in /usr/share/common-licenses/GPL
-
-Original authors: Martin Baulig <martin@home-of-linux.org>
-                  Drazen Kacar <dave@srce.hr>
-
-Originally Debianised by Jim Pick <jim@jimpick.com>
-Then re-Debianised in October 1998 by Martin Schulze
-<joey@finlandia.infodrom.north.de> before being taken over by Ian Lynagh
-<ian@lynagh.demon.co.uk> in November 1998.

debian/libgtop2.docs

@@ -1,7 +0,0 @@
-RELNOTES-0.25
-RELNOTES-1.0
-RELNOTES-1.1.x
-NEWS
-AUTHORS
-TODO
-debian/changelog

debian/libgtop2.files.in

@@ -1,2 +0,0 @@
-@PREFIX@/lib/libgtop*-1.1.so.*.*
-@PREFIX@/lib/libgtop*-1.1.so.*

debian/rules.in

@@ -1,115 +0,0 @@
-#!/usr/bin/make -f
-# Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess.
-# This version is for a hypothetical package that builds an
-# architecture-dependant package, as well as an architecture-independent
-# package.
-
-# Uncomment this to turn on verbose mode. 
-#export DH_VERBOSE=1
-
-i=$(shell pwd)/debian/tmp
-b=$(shell pwd)/debian/build
-
-configure: configure.in
-	@echo "--- Making configure script and configuring"
-	chmod +x autogen.sh
-	./autogen.sh --prefix=/@PREFIX@ --with-gnome=/@GNOMEPREFIX@ \
-	  --localstatedir=/@LOCALSTATEDIR@
-
-Makefile: configure
-	@echo "--- Configuring"
-	./configure --prefix=/@PREFIX@ --with-gnome=/@GNOMEPREFIX@ \
-	  --localstatedir=/@LOCALSTATEDIR@
-
-build: configure Makefile build-debstamp
-build-debstamp:
-	@echo "--- Compiling"
-	dh_testdir
-	$(MAKE) all
-	touch build-debstamp
-
-clean: Makefile
-	@echo "--- Cleaning"
-	dh_testdir
-	dh_clean
-	-rm -rf static shared
-	-rm -f build-debstamp install-debstamp
-	-make -k distclean
-	-rm -f `find . -name "*~"`
-	-rm -f `find . -name "*\.la"`
-	-rm -rf `find . -name "\.deps"`
-	-rm -rf `find . -name "\.libs"`
-	-rm -rf `find . -name "*\.rej"`
-	-rm -rf debian/tmp `find debian/* -type d ! -name CVS` debian/files* core
-	-rm -f debian/*substvars
-
-install: build install-debstamp
-install-debstamp:
-	@echo "--- Installing"
-	dh_testdir
-	dh_testroot
-	rm -rf $(b)
-	$(MAKE) install prefix=$(i)/@PREFIX@ exec_prefix=$(i)/@PREFIX@ \
-	  localstatedir=$(i)/@LOCALSTATEDIR@
-	touch install-debstamp
-
-install-save: install
-	rm -rf $(i).saved
-	cp -a $(i) $(i).saved
-
-install-saved:
-	rm -rf $(i)
-	cp -a $(i).saved $(i)
-	rm -rf $(b)
-	touch install-debstamp
-
-binary-indep: build install
-
-binary-arch: build install \
-		libgtop1@SUFFIX@ \
-		libgtop-dev@SUFFIX@
-
-#
-# libgtop1@SUFFIX@
-#
-
-libgtop1@SUFFIX@: install
-	@echo "--- Building: $@"
-	dh_installdocs       -p$@ -P$(b)/$@ README NEWS AUTHORS
-	dh_installchangelogs -p$@ -P$(b)/$@ ChangeLog
-	dh_movefiles         -p$@ -P$(b)/$@
-	dh_strip             -p$@ -P$(b)/$@ 
-	dh_compress          -p$@ -P$(b)/$@ 
-	dh_fixperms          -p$@ -P$(b)/$@ 
-	dh_installdeb        -p$@ -P$(b)/$@
-	dh_shlibdeps         -p$@ -P$(b)/$@
-	dh_gencontrol        -p$@ -P$(b)/$@
-	dh_makeshlibs        -p$@ -P$(b)/$@ -V
-	dh_md5sums           -p$@ -P$(b)/$@
-	dh_builddeb          -p$@ -P$(b)/$@
-
-#
-# libgtop-dev
-#
-
-libgtop-dev@SUFFIX@: install
-	@echo "--- Building: $@"
-	mkdir -p $(b)/$@/usr/doc
-	cd $(b)/$@/usr/doc; ln -s libgtop1@SUFFIX@ $@	
-	dh_movefiles         -p$@ -P$(b)/$@
-	dh_strip             -p$@ -P$(b)/$@ 
-	dh_compress          -p$@ -P$(b)/$@ 
-	dh_fixperms          -p$@ -P$(b)/$@ 
-	dh_installdeb        -p$@ -P$(b)/$@
-	dh_shlibdeps         -p$@ -P$(b)/$@
-	dh_gencontrol        -p$@ -P$(b)/$@
-	dh_makeshlibs        -p$@ -P$(b)/$@ -V
-	dh_undocumented      -p$@ -P$(b)/$@ \
-				libgtop-config.1
-	dh_md5sums           -p$@ -P$(b)/$@
-	dh_builddeb          -p$@ -P$(b)/$@
-
-binary: binary-indep binary-arch
-.PHONY: binary clean binary-indep binary-arch build install install-save install-saved
-
-

doc/.cvsignore

@@ -1,11 +1,22 @@
-texinfo.tex
+*.shml
-*.info
+.timestamp
-Makefile.in
+.timestamp2
-Makefile
+.timestamp3
-*.log *.toc *.dvi *.aux *.cp *.fn *.vr *.tp *.ky *.pg
+dbtohtml-1.shtml
-*.ps
+dbtohtml-2.shtml
-auto-macros.texi
+dbtohtml-3.shtml
-version.texi
+dbtohtml.shtml
-stamp-vti
+gnome-hackers
-*.html *.pdf
+gnome-hackers.ced
-mdate-sh
+libgtop
+libgtop-1.shtml
+libgtop-2.shtml
+libgtop-3.shtml
+libgtop-4.shtml
+libgtop-5.shtml
+libgtop-INDEX.shtml
+libgtop-ref
+libgtop-ref.ced
+libgtop.ced
+libgtop.fot
+libgtop.shtml

doc/ChangeLog

@@ -1,75 +0,0 @@
-2004-12-04  Benoît Dejean  <tazforever@dlfp.org>
-
-	* reference.texi: Updated.
-
-2004-08-03  Benoît Dejean  <tazforever@dlfp.org>
-
-	* reference.texi: Updated.
-
-2004-07-07  Benoît Dejean  <tazforever@dlfp.org>
-
-	* reference.texi: updated.
-	Added glibtop_get_proc_argv.
-	Added glibtop_fsusage.block_size.
-
-2004-03-05  Bastien Nocera  <hadess@hadess.net>
-
-	* reference.texi: update for new API
-
-2003-10-20  Bastien Nocera  <hadess@hadess.net>
-
-	* reference.texi: s/u_int64_t/guint64/
-
-2003-10-20  Bastien Nocera  <hadess@hadess.net>
-
-	* Makefile.am: removed traces of guile, intllibs and libgnomesupport
-
-2002-03-12  James Henstridge  <james@daa.com.au>
-
-	* Makefile.am (MAKEINFO): using += seems to screw up the build
-	with newer automakes.  Set it explicitly (using @MAKEINFO@) seems
-	to be compatible with both.
-
-2001-11-26  Abel Cheung  <maddog@linux.org.hk>
-
-	* libgtop.texi, Makefile.am: Renamed to libgtop2.texi
-	* about.texi: Very minor update.
-
-1999-10-18  Martin Baulig  <martin@home-of-linux.org>
-
-	* about.texi: Added a note about LibGTop and GNOME.
-
-	* reference.texi (glibtop_proc_state): Fix description of the `state'
- 	field for LibGTop 1.0.x.
-
-1999-09-29  Martin Baulig  <martin@home-of-linux.org>
-
-	* Makefile.am (MAKEINFO): Add `-I @libgtop_top_builddir@/doc' here.
-
-1999-05-16  Martin Baulig  <martin@home-of-linux.org>
-
-	* main.texi: This is now the main file which will @include all
-	chapter files so we can use `texinfo-multiple-files-update'.
-
-	* reference.texi: Added all missing sections with a "not yet written"
-	notice.
-
-1999-05-16  Martin Baulig  <martin@home-of-linux.org>
-
-	* white-paper.texi: Initial version of the LibGTop White Paper.
-
-	* Makefile.am: Create `auto-macros.texi' from `auto-macros.texi.in'
- 	which will contain some `@set' commands for the LibGTop version etc.
-
-	* auto-macros.texi.in: New file. This is a template for
-	`auto-macros.texi' which will be automatically generated.
-
-1999-05-09  Martin Baulig  <martin@home-of-linux.org>
-
-	* about.texi: Split the `libgtop.texi' into one file pro chapter,
-	this is the "About LibGTop".
-
-	* reference.texi: The "LibGTop Reference Manual".
-
-	* libgtop.texi: Initial version of the new LibGTop Manual.
-

doc/Makefile

@@ -0,0 +1,22 @@
+all:	.timestamp .timestamp2 .timestamp3
+
+.timestamp:	libgtop.sgml
+	rm -rf libgtop
+	mkdir libgtop
+	jade -D /usr/lib/sgml/jade_dsl -d libgtop.dsl -t sgml \
+		-V %no-make-index% libgtop.sgml > /dev/null && \
+		touch .timestamp
+
+.timestamp2:	gnome-hackers.sgml
+	rm -rf gnome-hackers
+	mkdir gnome-hackers
+	jade -D /usr/lib/sgml/jade_dsl -d gnome-hackers.dsl -t sgml \
+		-V %no-make-index% gnome-hackers.sgml > /dev/null && \
+		touch .timestamp2
+
+.timestamp3:	libgtop-ref.sgml ../guile/reference.sgml
+	rm -rf libgtop-ref
+	mkdir libgtop-ref
+	jade -D /usr/lib/sgml/jade_dsl -d libgtop-ref.dsl -t sgml \
+		-V %no-make-index% libgtop-ref.sgml > /dev/null && \
+		touch .timestamp3

doc/Makefile.am

@@ -1,40 +0,0 @@
-info_TEXINFOS		= libgtop2.texi
-
-libgtop2_TEXINFOS	= libgtop2.texi about.texi reference.texi \
-			  auto-macros.texi version.texi main.texi \
-			  white-paper.texi
-
-MAKEINFO		= @MAKEINFO@ -I @libgtop_top_builddir@/doc
-
-EXTRA_DIST		= auto-macros.texi.in
-
-auto-macros.texi: auto-macros.texi.in Makefile
-## Use sed and then mv to avoid problems if the user interrupts.
-	sed -e 's#\%LIBGTOP_LIBDIR\%#$(libdir)#g' \
-	  -e 's#\%LIBGTOP_INCLUDEDIR\%#$(includedir)/libgtop-2.0#g' \
-	  -e 's#\%LIBGTOP_DATADIR\%#$(datadir)#g' \
-	  -e 's#\%LIBGTOP_EXTRA_LIBS\%#$(LIBGTOP_EXTRA_LIBS)#g' \
-	  -e 's#\%LIBGTOP_LIBS\%#$(LIBGTOP_LIBS)#g' \
-	  -e 's#\%LIBGTOP_INCS\%#$(LIBGTOP_INCS)#g' \
-	  -e 's#\%LIBGTOP_NAMES_LIBS\%#$(LIBGTOP_NAMES_LIBS)#g' \
-	  -e 's#\%LIBGTOP_NAMES_INCS\%#$(LIBGTOP_NAMES_INCS)#g' \
-	  -e 's#\%LIBGTOP_BINDIR\%#$(LIBGTOP_BINDIR)#g' \
-	  -e 's#\%LIBGTOP_SERVER\%#$(LIBGTOP_SERVER)#g' \
-	  -e 's#\%LIBGTOP_MAJOR_VERSION\%#$(LIBGTOP_MAJOR_VERSION)#g' \
-	  -e 's#\%LIBGTOP_MINOR_VERSION\%#$(LIBGTOP_MINOR_VERSION)#g' \
-	  -e 's#\%LIBGTOP_MICRO_VERSION\%#$(LIBGTOP_MICRO_VERSION)#g' \
-	  -e 's#\%LIBGTOP_VERSION\%#$(LIBGTOP_VERSION)#g' \
-	  -e 's#\%LIBGTOP_VERSION_CODE\%#$(LIBGTOP_VERSION_CODE)#g' \
-	  -e 's#\%LIBGTOP_SERVER_VERSION\%#$(LIBGTOP_SERVER_VERSION)#g' \
-	  -e 's#\%libgtop_sysdeps_dir\%#$(libgtop_sysdeps_dir)#g' \
-	  -e 's#\%libgtop_need_server\%#$(libgtop_need_server)#g' \
-	  -e 's#\%libgtop_use_machine_h\%#$(libgtop_use_machine_h)#g' \
-	  -e 's#\%libgtop_want_examples\%#$(libgtop_want_examples)#g' \
-	      < $(srcdir)/auto-macros.texi.in > auto-macros.tmp
-	echo '@c Set this if this is LibGTop 1.1.x' >> auto-macros.tmp
-	if [ $(LIBGTOP_VERSION_CODE) -ge 1001000 ] ; then \
-	  echo '@set LIBGTOP-1-1' >> auto-macros.tmp ; \
-	else \
-	  echo '@clear LIBGTOP-1-1' >> auto-macros.tmp ; \
-	fi
-	mv auto-macros.tmp auto-macros.texi

doc/about.texi

@@ -1,123 +0,0 @@
-@node About, White Paper, Top, Top
-@chapter About LibGTop
-
-LibGTop is a library to get system specific data such as CPU and Memory Usage
-and information about running Processes.
-
-On Systems like Solaris or Digital Unix where you need special privileges to
-get those data, it uses a setuid/setgid server to do so.
-
-Even if LibGTop is a part of the GNOME desktop environment
-(@uref{http://www.gnome.org}), the main interface of LibGTop is totally
-independent from any particular desktop environment, so you can also use it
-as a standalone library in any piece of GPLed software.
-
-@menu
-* Availability::                Where to get LibGTop
-* Supported Platforms::         Supported Platforms
-* Mailing List::                Helping with LibGTop development
-* Thanks::                      People who contributed to LibGTop
-@end menu
-
-@node Availability, Supported Platforms, About, About
-@section Availability
-
-The master source of LibGTop is the GNOME CVS tree
-(see @uref{http://www.gnome.org} for details), but you can also get the
-latest release tarballs from
-
-@display
-@uref{ftp://ftp.gnome.org/pub/GNOME/sources/libgtop/}
-@end display
-
-@noindent
-or any of its mirror sites.
-
-The latest stable version of LibGTop is 1.0.12 which is also the one that comes
-together with GNOME 1.0. It belongs to @code{LIBGTOP_STABLE_1_0} branch in CVS.
-Actual development occurs in the @code{libgtop-GNOME-2-0-port} which is
-currently versioned 1.90.0.
-
-@node Supported Platforms, Mailing List, Availability, About
-@section Supported Platforms
-
-The stable branch currently supports the following platforms:
-
-@itemize @bullet
-@item All versions of Linux
-
-LibGTop was tested under Linux 2.0.x and 2.2.x on the ix86 and the alpha, but
-it should also work without problems on SparcLinux or Linux 2.4.x.
-
-Note: I'm speaking of the Linux kernel here, not the GNU/Linux operating system.
-
-@item FreeBSD, NetBSD and OpenBSD
-
-LibGTop was tested under FreeBSD 2.2.6 and 3.0, NetBSD 1.3.2 and OpenBSD 2.4.
-Support for NetBSD 1.4 was added in LibGTop 1.0.2.
-
-@end itemize
-
-The platforms listed above are known to be stable and working. However, if
-you're using the latest development version, you can use it on the following
-platforms as well:
-
-@itemize @bullet
-@item BSD/OS
-
-There is a port for BSD/OS (aka BSDI) 2.x and 3.x from Timur Bakeyev which
-should also work with 4.x. This isn't tested very well, but it should be
-working.
-
-@item Digital Unix
-
-There is some basic support for Digital Unix (formerly DEC OSF/1) V3.2C, but
-this may still be a bit unstable. I'm currently working on this port as time
-permits so it should be fully supported soon.
-
-@item Solaris
-
-The Solaris port currently works on Solaris 7 and maybe also on other releases.
-Thanks a lot to Drazen Kacar and everyone who helped working on this port. They
-have really done excellent work here and I'm pretty sure that this port will be
-fully functional on most Solaris versions in near future.
-
-@end itemize
-
-@node Mailing List, Thanks, Supported Platforms, About
-@section Mailing List
-
-There is a @email{libgtop-devel-list@@egroups.com} mailing list for people who
-want to help with the development of LibGTop.
-
-It is meant as a low-traffic, but high content-list where we can discuss
-technical details such as adding new sysdeps ports etc. 
-
-Especially, I'd like to see people with a deeper knowledge of operating systems
-internals joining my list so we can discuss technical details of the sysdeps
-code. 
-
-It is *not* for users that want to know how to compile LibGTop etc.
-
-You can subscribe to this mailing list and view the mailing list archives
-on the LibGTop Page at @uref{http://www.home-of-linux.org/gnome/libgtop}.
-
-@node Thanks,  , Mailing List, About
-@section Thanks
-
-At the place I'd like to thank the following people who contributed to
-LibGTop (listed in chronological order):
-
-@itemize @bullet
-@item Sebastian Wilhelmi who had the initial idea of LibGTop and helped
-me a lot in the early beginning.
-@item Josh Sled for the initial FreeBSD port.
-@item Jeremy Lea for his BSD patches.
-@item Timur Bakeyev for the BSDI port.
-@item Drazen Kacar and the other people on the LibGTop development mailing
-list for the Solaris port.
-@item Kevin Vandersloot for the effort to port to GNOME 2.0.
-@item All people sending me patches, having good ideas, ...
-@item Everyone I have forgotten in this list ...
-@end itemize
-

doc/auto-macros.texi.in

@@ -1,12 +0,0 @@
-@c LibGTop major, minor and micro version.
-@set LIBGTOP_MAJOR_VERSION %LIBGTOP_MAJOR_VERSION%
-@set LIBGTOP_MINOR_VERSION %LIBGTOP_MINOR_VERSION%
-@set LIBGTOP_MICRO_VERSION %LIBGTOP_MICRO_VERSION%
-
-@c LibGTop version and numerical version code ("1.234.567" -> 1234567).
-@set LIBGTOP_VERSION "%LIBGTOP_VERSION%"
-@set LIBGTOP_VERSION_CODE %LIBGTOP_VERSION_CODE%
-
-@c LibGTop server version, increased each time the protocol changes.
-@set LIBGTOP_SERVER_VERSION %LIBGTOP_SERVER_VERSION%
-

doc/catalog

@@ -0,0 +1,3 @@
+PUBLIC "-//James Clark//DTD DSSSL Flow Object Tree//EN" "fot.dtd"
+PUBLIC "ISO/IEC 10179:1996//DTD DSSSL Architecture//EN" "dsssl.dtd"
+PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" "style-sheet.dtd"

doc/gnome-hackers.dsl

@@ -0,0 +1,12 @@
+<!doctype style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
+<!ENTITY dbtohtml.dsl SYSTEM "dbtohtml.dsl" CDATA DSSSL >
+]>
+
+<style-specification id="gnomehackersdbotohtml" use="dbtohtml">
+
+(define %output-basename% "gnome-hackers")
+(define %output-directory% "gnome-hackers")
+
+</style-specification>
+
+<external-specification id="dbtohtml" document="dbtohtml.dsl">

doc/gnome-hackers.sgml

@@ -0,0 +1,393 @@
+<!-- $Id$ -->
+
+<!doctype book PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
+<!entity libgtopConf.sh SYSTEM "../libgtopConf.sh" >
+]>
+<book>
+  <bookinfo>
+    <title>Using LibGTop in the Gnome Project</title>
+    <authorgroup>
+      <author>
+	<firstname>Martin</firstname>
+	<surname>Baulig</surname>
+	<affiliation>
+	  <address>
+	    <email>martin@home-of-linux.org</email>
+	  </address>
+	</affiliation>
+      </author>
+    </authorgroup>
+    <copyright>
+      <year>1998</year>
+      <holder>Martin Baulig</holder>
+    </copyright>
+
+    <legalnotice>
+
+      <para>
+	This documentation is free software; you can redistribute
+	it and/or modify it under the terms of the GNU General Public
+	License as published by the Free Software Foundation; either
+	version 2 of the License, or (at your option) any later
+	version.
+	
+      <para>
+	This library is distributed in the hope that it will be
+	useful, but WITHOUT ANY WARRANTY; without even the implied
+	warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+	PURPOSE.  See the GNU General Public License for more
+	details.
+
+      <para>
+	You should have received a copy of the GNU General Public
+	License along with this program; if not, write to the Free
+	Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+	MA 02111-1307 USA
+
+      <para>
+	For more details see the file COPYING in the source
+	distribution of LibGTop.</para>
+
+    </legalnotice>
+
+    <abstract>
+
+      <para>
+	This is a short introduction in how to use
+	<productname>libgtop</productname> in the GNOME project.
+	It describes the additional options <filename>configure</filename>
+	takes and the information stored in the automatically generated
+	<filename>libgtopConf.sh</filename> configuration script.
+
+    </abstract>
+
+  </bookinfo>
+
+  <toc></toc>
+
+  <chapter id="macros">
+    <title>Autoconf macros</title>
+
+    <sect1 id="gnome-libgtop-check">
+      <title><filename>macros/gnome-libgtop-check.m4</filename></title>
+
+      <para>
+	Contains all that you need to include libgtop in any Gnome application. It defines
+	<function>GNOME_INIT_LIBGTOP</function> which you can use in the same way like
+	<function>GNOME_INIT</function> to check whether libgtop is installed and to read
+	its <filename>libgtopConf.sh</filename> script. It automatically invokes
+	<function>GNOME_LIBGTOP_SYSDEPS</function>.
+
+      <para>
+	When libgtop can be found, it defines <parameter>HAVE_LIBGTOP</parameter>. There's
+	also an automake conditional <parameter>HAVE_LIBGTOP</parameter> which you can use.
+
+    <sect1 id="gnome-libgtop-sysdeps">
+      <title><filename>macros/gnome-libgtop-sysdeps.m4</filename></title>
+
+      <para>
+	This file defines <function>GNOME_LIBGTOP_SYSDEPS</function> which you can
+	use to check which sysdeps directory <productname>libgtop</productname> should
+	use and whether the <filename>gtop_server</filename> is needed.
+
+      <para>
+	It defines the following variables:
+	
+	<variablelist>
+	      
+	  <varlistentry>
+	    <term><parameter>libgtop_sysdeps_dir</parameter>
+		  
+	    <listitem>
+	      <para>
+		The sysdeps dir <productname>libgtop</productname> uses.
+		    
+	  <varlistentry>
+	    <term><parameter>libgtop_use_machine_h</parameter></term>
+
+	    <listitem>
+	      <para>
+		Some of the system dependent parts of <productname>libgtop</productname>
+		provide a structure <structname>_glibtop_machine</structname> defined in
+		a header file <filename>glibtop_machine.h</filename> they provide. This
+		structure gets inserted into the <structfield>machine</structfield> member
+		of <structname>_glibtop</structname> when <filename>config.h</filename>
+		defines <parameter>HAVE_GLIBTOP_MACHINE_H</parameter>.
+
+	      <para>
+		This variable is either <literal>yes</literal> or <literal>no</literal> and
+		tells you whether this is the case. If it is true, this macro wil automatically
+		define <parameter>HAVE_GLIBTOP_MACHINE_H</parameter>.
+
+	  <varlistentry>
+	    <term><parameter>libgtop_need_server</parameter></term>
+
+	    <listitem>
+	      <para>
+		Is either <literal>yes</literal> or <literal>no</literal> and tells you
+		whether the server is needed. If it is needed, it will automatically
+		define <parameter>NEED_LIBGTOP</parameter>.
+
+	      <para>
+		This macro also provides a conditional <parameter>NEED_LIBGTOP</parameter>
+		which you can use in you <filename>Makefile.am</filename>.
+
+	</variablelist>
+
+    </sect1>
+    
+  <chapter id="configure">
+    <title>Configuration</title>
+
+    <para>
+      The <filename>configure</filename> script of <productname>libgtop</productname>
+      takes some non-standard options to let you decide which parts of the library
+      should be build.
+
+      <itemizedlist>
+	<listitem>
+
+	  <para>
+	    Normally, <filename>configure</filename> decides whether or not using the
+	    server is required. Depending upon this decision, it adds either
+	    <literal>-lgtop</literal> (when it's needed) or
+	    <literal>-lgtop_systems</literal> (when it's not needed) to
+	    <parameter>LIBGTOP_LIBS</parameter> and <parameter>LIBGTOP_GUILE_LIBS</parameter>.
+
+	  <para>
+	    You can change this behaviour with the following options:
+
+	    <variablelist>
+	      
+	      <varlistentry>
+		<term><parameter>--enable-libgtop-server</parameter>
+		  
+		<listitem>
+		  <para>
+		    Use the server regardless whether or not it is required.
+		    
+	      <varlistentry>
+		<term><parameter>--disable-libgtop-server</parameter></term>
+		
+		<listitem>
+		  <para>
+		    Do not use the server regardless wheter or not it is required.
+		    
+	    </variablelist>
+
+	<listitem>
+
+	  <para>
+	    Normally, the guile interface of <productname>libgtop</productname> is build
+	    when <productname>guile</productname> can be found on the system.
+
+	    <variablelist>
+	      
+	      <varlistentry>
+		<term><parameter>--disable-libgtop-guile</parameter>
+		  
+		<listitem>
+		  <para>
+		    Disables building the guile interface even if you have
+		    <productname>guile</productname> installed.
+		    
+	      <varlistentry>
+		<term><parameter>--enable-libgtop-guile</parameter></term>
+		
+		<listitem>
+		  <para>
+		    Has no effect at all since you cannot build the guile interface without
+		    having <productname>guile</productname> installed on your system.
+		    
+	    </variablelist>
+
+	<listitem>
+
+	  <para>
+	    If you do not need the <filename>names</filename> subdirs, you can disable
+	    their building with the following option:
+
+	    <variablelist>
+	      
+	      <varlistentry>
+		<term><parameter>--disable-libgtop-names</parameter>
+		  
+		<listitem>
+		  <para>
+		    Disables building of the <filename>names</filename> subdirs.
+		    
+	      <varlistentry>
+		<term><parameter>--enable-libgtop-names</parameter></term>
+		
+		<listitem>
+		  <para>
+		    Is the default.
+		    
+	    </variablelist>
+
+	  <para>
+	    If it is enables, <parameter>GLIBTOP_NAMES</parameter> will be defined.
+
+	<listitem>
+
+	  <para>
+	    To disable building of the examples, you can say:
+
+	    <variablelist>
+	      
+	      <varlistentry>
+		<term><parameter>--without-examples</parameter>
+		  
+		<listitem>
+		  <para>
+		    Disables building of the examples.
+		    
+	    </variablelist>
+
+      </itemizedlist>
+    
+  <chapter id="libgtopConf">
+    <title>The <filename>libgtopConf.sh</filename> script</title>
+
+    <para>
+      After a successful build of <productname>libgtop</productname>, a
+      <filename>libgtopConf.sh</filename> script is generated which will later
+      be used to decide how to link a program with <filename>libgtop</filename>.
+
+    <para>
+      It defines the following variables:
+
+      <variablelist>
+	      
+	<varlistentry>
+	  <term><parameter>LIBGTOP_LIBDIR</parameter>
+		  
+	  <listitem>
+	    <para>
+	      Defaults to <literal>$(prefix)/lib</literal>. It is the directory
+	      where the <productname>libgtop</productname> libraries get installed.
+
+	<varlistentry>
+	  <term><parameter>LIBGTOP_INCLUDEDIR</parameter></term>
+		
+	  <listitem>
+	    <para>
+	      Defaults to <literal>$(prefix)/include</literal>. It is the directory
+	      where the <productname>libgtop</productname> header files get installed.
+
+	<varlistentry>
+	  <term><parameter>LIBGTOP_LIBS</parameter></term>
+	  
+	  <listitem>
+	    <para>
+	      Contains everything that you need to add to the <parameter>_LDADD</parameter>
+	      variable of <productname>automake</productname> to link a program with
+	      <productname>libgtop</productname>.
+
+	<varlistentry>
+	  <term><parameter>LIBGTOP_INCS</parameter></term>
+	  
+	  <listitem>
+	    <para>
+	      Contains everything that you need to add to the <parameter>_INCLUDES</parameter>
+	      variable of <productname>automake</productname> to compile a program that uses
+	      <productname>libgtop</productname>.
+
+	<varlistentry>
+	  <term><parameter>LIBGTOP_GUILE_INCS</parameter></term>
+	  
+	  <listitem>
+	    <para>
+	      Contains everything that you need to add to the <parameter>_INCLUDES</parameter>
+	      variable of <productname>automake</productname> to compile a program that uses both
+	      <productname>libgtop</productname> and its guile interface.
+
+	<varlistentry>
+	  <term><parameter>LIBGTOP_BINDIR</parameter></term>
+	  
+	  <listitem>
+	    <para>
+	      Defaults to <literal>$(bindir)</literal>. It is the directory where the
+	      <productname>libgtop</productname> binaries get installed.
+
+	<varlistentry>
+	  <term><parameter>LIBGTOP_SERVER</parameter></term>
+	  
+	  <listitem>
+	    <para>
+	      Defaults to <literal>$(bindir)/gtop_server</literal>. It is the full pathname
+	      where the server gets installed.
+
+	<varlistentry>
+	  <term><parameter>libgtop_sysdeps_dir</parameter></term>
+	  
+	  <listitem>
+	    <para>
+	      The sysdeps directory that is used on your system.
+
+	<varlistentry>
+	  <term><parameter>libgtop_need_server</parameter></term>
+	  
+	  <listitem>
+	    <para>
+	      Is either <literal>yes</literal> or <literal>no</literal> and tells you
+	      whether using the server is needed or not.
+
+	<varlistentry>
+	  <term><parameter>libgtop_use_machine_h</parameter></term>
+	  
+	  <listitem>
+	    <para>
+	      Is either <literal>yes</literal> or <literal>no</literal> and tells you
+	      whether <filename>glibtop_machine_h</filename> should be included in
+	      <filename>glibtop.h</filename>.
+
+	      The system dependent part of the library may provide an additional header
+	      file, <filename>glibtop_machine_h</filename>. In this case, they define
+	      a structure <structname>_glibtop_machine</structname> in this header file.
+	      This structure represents the <structfield>machine</structfield> member of
+	      <structname>_glibtop</structname>.
+
+	<varlistentry>
+	  <term><parameter>libgtop_guile_found</parameter></term>
+	  
+	  <listitem>
+	    <para>
+	      Is either <literal>yes</literal> or <literal>no</literal> and tells you
+	      whether <productname>guile</productname> has been found on your system
+	      (or if building the guile interface was disabled).
+
+	<varlistentry>
+	  <term><parameter>libgtop_want_names</parameter></term>
+	  
+	  <listitem>
+	    <para>
+	      Is either <literal>yes</literal> or <literal>no</literal> and tells you
+	      whether the <filename>sysdeps/names</filename> subdirectory was build.
+
+	<varlistentry>
+	  <term><parameter>libgtop_want_guile_names</parameter></term>
+	  
+	  <listitem>
+	    <para>
+	      Is either <literal>yes</literal> or <literal>no</literal> and tells you
+	      whether the <filename>sysdeps/guile/names</filename> subdirectory was build.
+
+	<varlistentry>
+	  <term><parameter>libgtop_want_examples</parameter></term>
+	  
+	  <listitem>
+	    <para>
+	      Is either <literal>yes</literal> or <literal>no</literal> and tells you
+	      whether the examples were build.
+
+      </variablelist>
+
+      <example>
+	<title>Sample <filename>libgtopConf.sh</filename></title>
+
+	<programlisting>&libgtopConf.sh;</programlisting>
+      </example>
+
+    
+</book>

doc/internals.texi

@@ -1,107 +0,0 @@
-@node LibGTop Internals, , Reference Manual, Top
-@chapter LibGTop Internals
-
-@menu
-* General Internals::           General Internals
-* Sysdeps Internals::           Sysdeps Internals
-@end menu
-
-@node General Internals, Sysdeps Internals, LibGTop Internals, LibGTop Internals
-@section General Internals
-
-@menu
-* glibtop::                     The server structure
-@end menu
-
-@node glibtop,  , General Internals, General Internals
-@subsection The server structure - @code{glibtop}
-
-@example
-@cartouche
-typedef struct _glibtop         glibtop;
-
-struct _glibtop
-@{
-        unsigned flags;
-        unsigned method;
-        unsigned error_method;
-#ifdef HAVE_GLIBTOP_MACHINE_H
-        glibtop_machine machine;
-#endif
-        int input [2];
-        int output [2];
-        int socket;
-        int ncpu;
-        unsigned long os_version_code;
-        const char *name;
-        const char *server_command;
-        const char *server_host;
-        const char *server_user;
-        const char *server_rsh;
-        unsigned long features;
-        unsigned long server_port;
-        glibtop_sysdeps sysdeps;
-        glibtop_sysdeps required;
-        glibtop_sysdeps wanted;
-        pid_t pid;
-@};
-@end cartouche
-@end example
-
-@node Sysdeps Internals,  , General Internals, LibGTop Internals
-@section Sysdeps Internals
-
-@menu
-* glibtop_open_s::              Non-privileged initializations
-* glibtop_close_s::             Non-privileged cleanups
-@end menu
-
-@node glibtop_open_s, glibtop_close_s, Sysdeps Internals, Sysdeps Internals
-@subsection glibtop_open_s
-
-This function is used in the non-suid sysdeps library @samp{-lgtop_sysdeps} to
-initialize a server. It should do all initializations that do not need any
-privileges.
-
-@example
-@cartouche
-void
-glibtop_open_s (glibtop *server, const char *program_name,
-		const unsigned long features,
-		const unsigned flags);
-@end cartouche
-@end example
-
-@table @code
-@item server
-Pointer to the @code{glibtop} server structure.
-@item program_name
-Name of the calling program; the implementation will usually
-set @samp{server->name} to this so it'll be used as the program
-name in error messages.
-@end table
-
-Typically, this function will set @code{server->name}, @code{server->ncpu} and
-@code{server->os_version_code} and initialize any of the @code{server->machine}
-fields which do not need any privileges.
-
-It is normally implemented in @file{open.c} in the sysdeps directory.
-
-@node glibtop_close_s,  , glibtop_open_s, Sysdeps Internals
-@subsection glibtop_close_s
-
-This function is used in the non-suid sysdeps library @samp{-lgtop_sysdeps} to
-clean-up a server when it's no longer used.
-
-It must free all resources that were allocated in @code{glibtop_open_s}.
-
-@example
-@cartouche
-void
-glibtop_close_s (glibtop *server);
-@end cartouche
-@end example
-
-It is normally implemented in @file{close.c} in the sysdeps directory, but may
-be empty.
-

doc/libgtop-ref.dsl

@@ -0,0 +1,12 @@
+<!doctype style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
+<!ENTITY dbtohtml.dsl SYSTEM "dbtohtml.dsl" CDATA DSSSL >
+]>
+
+<style-specification id="libgtoprefdbtohtml" use="dbtohtml">
+
+(define %output-basename% "libgtop-ref")
+(define %output-directory% "libgtop-ref")
+
+</style-specification>
+
+<external-specification id="dbtohtml" document="dbtohtml.dsl">

doc/libgtop-ref.sgml

@@ -0,0 +1,67 @@
+<!-- $Id$ -->
+
+<!doctype book PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
+<!entity reference.sgml SYSTEM "../guile/reference.sgml" >
+]>
+<book>
+  <bookinfo>
+    <title>LibGTop Reference Manual</title>
+    <authorgroup>
+      <author>
+	<firstname>Martin</firstname>
+	<surname>Baulig</surname>
+	<affiliation>
+	  <address>
+	    <email>martin@home-of-linux.org</email>
+	  </address>
+	</affiliation>
+      </author>
+    </authorgroup>
+    <abstract>
+      <para>
+	<literal>$Id$</literal>
+
+      <para>
+	This reference manual is automatically generated from <filename>doc/make-docbook.scm</filename>.
+	It uses the guile interface of <productname>libgtop</productname> to get the names of all
+	features the library defines and a description of the structures.
+    </abstract>
+
+    <copyright>
+      <year>1998</year>
+      <holder>Martin Baulig</holder>
+    </copyright>
+    <legalnotice>
+
+      <para>
+	This documentation is free software; you can redistribute
+	it and/or modify it under the terms of the GNU General Public
+	License as published by the Free Software Foundation; either
+	version 2 of the License, or (at your option) any later
+	version.
+	
+      <para>
+	This library is distributed in the hope that it will be
+	useful, but WITHOUT ANY WARRANTY; without even the implied
+	warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+	PURPOSE.  See the GNU General Public License for more
+	details.
+
+      <para>
+	You should have received a copy of the GNU General Public
+	License along with this program; if not, write to the Free
+	Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+	MA 02111-1307 USA
+
+      <para>
+	For more details see the file COPYING in the source
+	distribution of LibGTop.</para>
+
+    </legalnotice>
+  </bookinfo>
+  
+  <toc></toc>
+  
+    &reference.sgml;
+
+</book>

doc/libgtop.dsl

@@ -0,0 +1,12 @@
+<!doctype style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
+<!ENTITY dbtohtml.dsl SYSTEM "dbtohtml.dsl" CDATA DSSSL >
+]>
+
+<style-specification id="libgtopdbtohtml" use="dbtohtml">
+
+(define %output-basename% "libgtop")
+(define %output-directory% "libgtop")
+
+</style-specification>
+
+<external-specification id="dbtohtml" document="dbtohtml.dsl">

doc/libgtop2.texi

@@ -1,89 +0,0 @@
-\input texinfo   @c -*-texinfo-*-
-@c %**start of header
-@setfilename libgtop2.info
-@settitle LibGTop Reference Manual
-@setchapternewpage odd
-@c %**end of header
-
-@include auto-macros.texi
-@include version.texi
-
-@ifinfo
-This is the LibGTop Reference Manual version @value{VERSION}
-(last modified @value{UPDATED}).
-
-Copyright 1999 Free Software Foundation, Inc.
-     
-Permission is granted to make and distribute verbatim
-copies of this manual provided the copyright notice and
-this permission notice are preserved on all copies.
-     
-@ignore
-Permission is granted to process this file through TeX
-and print the results, provided the printed document
-carries a copying permission notice identical to this
-one except for the removal of this paragraph (this
-paragraph not being relevant to the printed manual).
-     
-@end ignore
-Permission is granted to copy and distribute modified
-versions of this manual under the conditions for
-verbatim copying, provided also that the sections
-entitled ``Copying'' and ``GNU General Public License''
-are included exactly as in the original, and provided
-that the entire resulting derived work is distributed
-under the terms of a permission notice identical to this
-one.
-     
-Permission is granted to copy and distribute
-translations of this manual into another language,
-under the above conditions for modified versions,
-except that this permission notice may be stated in a
-translation approved by the Free Software Foundation.
-
-@format
-@dircategory Libraries:
-@direntry
-* LibGTop2: (libgtop2).			Library to get system specific data
-					such as cpu and memory usage, active
-					processes
-@end direntry
-@end format
-
-@end ifinfo
-
-@titlepage
-@title LibGTop Reference Manual
-@subtitle Version @value{VERSION} - @value{UPDATED}
-@author Martin Baulig
-
-@page
-@vskip 0pt plus 1filll
-Copyright @copyright{} 1999 Free Software Foundation, Inc.
-
-Permission is granted to make and distribute verbatim
-copies of this manual provided the copyright notice and
-this permission notice are preserved on all copies.
-     
-Permission is granted to copy and distribute modified
-versions of this manual under the conditions for
-verbatim copying, provided also that the sections
-entitled ``Copying'' and ``GNU General Public License''
-are included exactly as in the original, and provided
-that the entire resulting derived work is distributed
-under the terms of a permission notice identical to this
-one.
-     
-Permission is granted to copy and distribute
-translations of this manual into another language,
-under the above conditions for modified versions,
-except that this permission notice may be stated in a
-translation approved by the Free Software Foundation.
-@end titlepage
-
-@contents
-
-@include main.texi
-
-@bye
-

doc/main.texi

@@ -1,68 +0,0 @@
-@node Top, About, (dir), (dir)
-
-@menu
-* About::                       About LibGTop
-* White Paper::                 LibGTop White Paper
-* Reference Manual::            LibGTop Reference Manual
-
- --- The Detailed Node Listing ---
-
-About LibGTop
-
-* Availability::                Where to get LibGTop
-* Supported Platforms::         Supported Platforms
-* Mailing List::                Helping with LibGTop development
-* Thanks::                      People who contributed to LibGTop
-
-LibGTop White Paper
-
-* Introduction::                Introduction
-* Overview::                    Overview
-
-Overview
-
-* Interface Design::            Things that need to be considered
-* Server Implementation::       The LibGTop "server"
-
-LibGTop Reference Manual
-
-* System Dependent::            System Dependent Functions.
-* Common Functions::            Common Functions.
-* Library Functions::           Library Functions.
-
-System Dependent Functions
-
-* glibtop_cpu::                 CPU Usage.
-* glibtop_mem::                 Memory Usage.
-* glibtop_swap::                Swap Usage.
-* glibtop_uptime::              System Uptime.
-* glibtop_loadavg::             Load Average.
-* glibtop_proclist::            Process List.
-* glibtop_proc_state::          Process State.
-* glibtop_proc_uid::            Process UID and TTY Information.
-* glibtop_proc_mem::            Process Memory Information.
-* glibtop_proc_time::           Process Time Information.
-* glibtop_proc_signal::         Process Signal Information.
-* glibtop_proc_kernel::         Process Kernel Data Information.
-* glibtop_proc_segment::        Process Segment Information.
-* glibtop_proc_args::           Process Arguments.
-* glibtop_proc_map::            Process Memory Maps.
-* glibtop_netload::             Network Load.
-* glibtop_ppp::                 PPP Usage.
-
-Common Functions
-
-* glibtop_mountlist::           Mount List.
-* glibtop_fsusage::             File System Usage.
-
-Library Functions
-
-* glibtop_init::                Server Initialization.
-* glibtop_sysdeps::             Server Sysdeps.
-* Library Parameters::          Library Parameters.
-@end menu
-
-@include about.texi
-@include white-paper.texi
-@include reference.texi
-

doc/white-paper.texi

@@ -1,90 +0,0 @@
-@node White Paper, Reference Manual, About, Top
-@chapter LibGTop White Paper
-
-@menu
-* Introduction::                Introduction
-* Overview::                    Overview
-@end menu
-
-@node Introduction, Overview, White Paper, White Paper
-@section Introduction
-
-Many modern UNIX systems like Solaris, BSD or Digitial Unix only allow
-priviledged processes to read information like CPU and Memory Usage or
-information about running processes.
-
-@itemize @bullet
-@item
-BSD, for instance, doesn't have any other way to get those data than reading
-directly from @file{/dev/kmem} and you need to be in the @code{kmem} group to
-be able to read this.
-
-@item
-Other systems, like Digital Unix, allow all users to get things like CPU and
-Memory statistics, but only root may read information about any process other
-than the current one (you may not even get information about your own processes
-if you're not root).
-
-@item
-Linux has a very nice @file{/proc} filesystem, but reading and parsing
-@file{/proc} is very slow and inefficient.
-
-@item
-Solaris is a bit better, but you still need to be in the @code{sys} group or
-even root to get some data.
-@end itemize
-
-Because of this system utilities like @code{ps}, @code{uptime} or @code{top}
-often are setgid kmem or setuid root. Usually, they're also very specific to
-the system they're written for and not easily portable to other systems without
-a lot of work.
-
-This, of cause, becomes a problem for graphical tools like @code{gtop} - making
-a GTK+ program setgid or even setuid would be a security hole as big as you can
-drive the entire X11 source code through. For the GNOME project, we also needed
-some kind of library which provides all the required information in a portable
-since there's more than just one single program that wants to use them - for
-instance @code{gtop} and the @code{multiload}, @code{cpumemusage} and
-@code{netload} panel applets.
-
-@node Overview,  , Introduction, White Paper
-@section Overview
-
-This section should give you a short overview on how LibGTop was developed, which
-things needed to be considered and how it works.
-
-@menu
-* Interface Design::            Things that need to be considered
-* Server Implementation::       The LibGTop "server"
-@end menu
-
-@node Interface Design, Server Implementation, Overview, Overview
-@subsection Interface Design
-
-At the very beginning, it was necessary to collect all the data the library part
-should provide and put them into some C structures. This was not that easiy as it
-might sound since LibGTop should be portable to any modern UNIX system with a common
-library part on all those systems, but the data that should be returned vary from
-system to system. For instance some systems support shared memory, but some others
-may not.
-
-The header files where we define these C structures (which are system-independent) are
-shared between client and server. This way we can call the system dependent code
-directly where we do not need any special privileges to do so.
-
-All of those structures contain a @code{flags} member which is interpreted as a bit
-mask and tells the caller of the library functions which of the fields in the returned
-structure are valid and which are not.
-
-@node Server Implementation,  , Interface Design, Overview
-@subsection Server Implementation
-
-The LibGTop @dfn{server} is a setgid/setuid binary which contains all the system
-dependent code which needs special privileges. It is only build if it's required
-on the current system (for instance, the Linux kernel provides all the required
-data via its @file{/proc} filesystem so we do not need the server at all) and it
-only contains the @dfn{features} which need privileges.
-
-Whenever we do not need any privileges to get all the data for some of the requested
-structures (here called @dfn{features}) the library calls the sysdeps code directly
-rather than using the server.

dtd/.cvsignore

@@ -1,2 +0,0 @@
-Makefile.in
-Makefile

dtd/Makefile.am

@@ -1,9 +0,0 @@
-backenddir	= @LIBGTOP_BACKEND_DIR@
-
-backend_DATA	= \
-	libgtop-backends.dtd	\
-	libgtop-backend-info.dtd
-
-EXTRA_DIST	= |
-	$(backend_DATA)
-

dtd/libgtop-backend-info.dtd

@@ -1,23 +0,0 @@
-<!ELEMENT BackendInfo (name,description?,comments?,authors,legalnotice)>
-<!ELEMENT name (short_name,long_name?)>
-<!ELEMENT short_name (#PCDATA)>
-<!ELEMENT long_name (#PCDATA)>
-
-<!ELEMENT description (#PCDATA)>
-
-<!ELEMENT authors (author)+>
-<!ELEMENT author (author_name,author_email?)>
-<!ELEMENT author_name (#PCDATA)>
-<!ELEMENT author_email (#PCDATA)>
-
-<!ELEMENT legalnotice (license,copyright?)>
-<!ELEMENT license (#PCDATA)>
-
-<!ELEMENT copyright (holder)+>
-<!ELEMENT holder (holder_year?,holder_name,holder_email?)>
-<!ELEMENT holder_year (#PCDATA)>
-<!ELEMENT holder_name (#PCDATA)>
-<!ELEMENT holder_email (#PCDATA)>
-
-<!ELEMENT comments (comment)+>
-<!ELEMENT comment (#PCDATA)>

dtd/libgtop-backends.dtd

@@ -1,11 +0,0 @@
-<!ELEMENT Backends (Backend)+>
-
-<!ELEMENT Backend (Name,Location)>
-<!ELEMENT Name (#PCDATA)>
-
-<!ELEMENT Location (LibtoolName?,ShlibName,ExtraLibs?)>
-<!ELEMENT LibtoolName (#PCDATA)>
-<!ELEMENT ShlibName (#PCDATA)>
-
-<!ELEMENT ExtraLibs (ExtraLib)+>
-<!ELEMENT ExtraLib (LibtoolName?,ShlibName)>

examples/.cvsignore

@@ -11,13 +11,3 @@ third_linux
 third_static
 second_static
 second_linux
-smp_static sysdeps_static netload_static procmap_static mountlist_static
-smp sysdeps netload procmap mountlist
-timings timings_static
-pprint
-pprint_static
-procargs
-procargs_static
-df
-df_static
-

examples/ChangeLog

@@ -1,185 +0,0 @@
-2004-09-25  Benoît Dejean  <tazforever@dlfp.org>
-
-	* pprint.c: (main): Re-added pprint_get_msg_limits()
-
-i2004-09-25  Benoît Dejean  <tazforever@dlfp.org>
-
-	* df.c: (main):
-	* pprint.c: (main):
-	* procargs.c: (main): Added missing call to glibgtop_init() / glibtop_close()
-
-2004-09-24  Benoît Dejean  <tazforever@dlfp.org>
-
-	* .cvsignore:
-	* Makefile.am:
-	* ../configure.in
-	* df.c: (print_fsusage), (main): Added new example, just like 'df'.
-
-2004-09-22  Benoît Dejean  <tazforever@dlfp.org>
-
-	* pprint.c: (main): Disable pprint_get_msg_limits() because it can fail.
-
-2004-09-21  Benoît Dejean  <tazforever@dlfp.org>
-
-	* pprint.c: (pprint_get_swap), (main): Updated.
-
-2004-09-21  Benoît Dejean  <tazforever@dlfp.org>
-
-	* procargs.c: (show_args), (main): Updated.
-
-2004-09-21  Benoît Dejean  <tazforever@dlfp.org>
-
-	* pprint.c: (pprint_get_mountlist), (pprint_get_netload),
-	(pprint_get_uptime), (main): Updated.
-
-2004-09-21  Benoît Dejean  <tazforever@dlfp.org>
-
-	* pprint.c: (pprint_get_mountlist): Updated.
-
-2004-09-21  Benoît Dejean  <tazforever@dlfp.org>
-
-	* procargs.c: (show_args), (main): Updated.
-
-2004-09-20  Benoît Dejean  <tazforever@dlfp.org>
-
-	* .cvsignore:
-	* Makefile.am:
-	* pprint.c: (pprint_get_cpu), (pprint_get_fsusage),
-	(pprint_get_loadavg), (pprint_get_mem), (pprint_get_mountlist),
-	(pprint_get_msg_limits), (main): Added new example : pretty prints
-	the result of glibtop_*. Work in progress.
-	
-	Now builds procargs.
-	
-	* ../configure.in: Added to static list.
-
-2004-07-07  Benoît Dejean  <tazforever@dlfp.org>
-
-	* procargs.c: Added glibtop_get_proc_argv demo.
-
-2003-12-27  Ole Laursen  <olau@hardworking.dk>
-
-	* mountlist.c: Updated to display block size too.
-
-2004-03-04  Bastien Nocera  <hadess@hadess.net>
-
-	* smp.c: use libgtop-i18n.h
-
-2003-10-21  Bastien Nocera  <hadess@hadess.net>
-
-	* Makefile.am:
-	* smp.c:
-	* sysdeps.c: (main): install only one library, libgtop-2.0
-	Fix build-time warnings due to the redefinition of guint64
-	Fix building smp.c and sysdeps.c
-
-2003-10-20  Bastien Nocera  <hadess@hadess.net>
-
-	* first.c:
-	* mountlist.c:
-	* netload.c:
-	* procmap.c:
-	* second.c:
-	* smp.c:
-	* sysdeps.c:
-	* third.c:
-	* timings.c: fixed compilation
-
-2003-10-20  Bastien Nocera  <hadess@hadess.net>
-
-	* Makefile.am: removed traces of guile, intllibs and libgnomesupport
-
-2001-01-14  Abel Cheung  <maddog@linux.org.hk>
-
-	* \*.c: bindtextdomain and textdomain uses GETTEXT_PACKAGE.
-
-	* Makefile.am, first.c, second.c, sysdeps.c: Make them at least
-	compile for now, by disabling chunks which should belong to
-	HEAD branch.
-
-1999-05-28  Martin Baulig  <martin@home-of-linux.org>
-
-	* first.c, second.c, sysdeps.c: Use LibGTop version conditionals
- 	so we can more easily merge the code into LIBGTOP_STABLE_1_0.
-
-1999-05-07  Martin Baulig  <martin@home-of-linux.org>
-
-	* timings.c (timersub): Renamed this to `libgtop_timersub' and define
-	it on all systems.
-
-Fri Apr  9 00:14:52 1999 Timur Bakeyev  <timur@gnu.org>
-
-	* timings.c: Added timersub defenition, to make code compilable on
-	BSDI.
-
-1999-03-24  Martin Baulig  <martin@home-of-linux.org>
-
-	* timings.c: New example.
-
-1999-03-17  Martin Baulig  <martin@home-of-linux.org>
-
-	* first.c, second.c: Fixed a bug that caused a core dump when
-	the sysdeps code does not return all data.
-
-1998-11-22  Martin Baulig  <baulig@taurus.uni-trier.de>
-
-	* netload.c: Call inet_ntoa () to get address and subnet
-	in quatted dot notation (like 136.199.14.201) and not just
-	as a number (like 0xc90ec788).
-
-1998-11-02  Martin Baulig  <martin@home-of-linux.org>
-
-	* sysdeps.c: New example.
-
-1998-10-26  Martin Baulig  <martin@home-of-linux.org>
-
-	* netload.c: New file. Gets network load for the interface
-	given as command line argument.
-
-1998-10-26  Martin Baulig  <martin@home-of-linux.org>
-
-	* first.c (glibtop_get_proc_args): Get command line arguments.
-	* second.c: Likewise.
-
-1998-10-25  Martin Baulig  <martin@home-of-linux.org>
-
-	* first.c (glibtop_get_ppp): Get PPP/ISDN statistics.
-
-1998-09-28  Martin Baulig  <martin@home-of-linux.org>
-
-	* Makefile.am: Install everything in $(libexecdir)/libgtop.
-
-1998-09-09  Martin Baulig <baulig@Stud.Informatik.uni-trier.de>
-
-	* smp.c: New file. Nice tool to show CPU statistics on SMP systems.
-
-1998-08-25  Martin Baulig  <martin@home-of-linux.org>
-
-	* first.c, second.c, procmap.c: Fixed some compiler warnings.
-
-1998-08-18  Martin Baulig  <martin@home-of-linux.org>
-
-	* procmap.c: We now display filenames when compiled
-	`--with-libgtop-inodedb'.
-
-1998-08-12  Martin Baulig  <martin@home-of-linux.org>
-
-	* second.c: Works a little bit more like `ps' - you can
-	give an optional command line argument to get information
-	about a single process.
-
-1998-07-22  Martin Baulig  <martin@home-of-linux.org>
-
-	* mountlist.c: New file.
-
-1998-06-12  Martin Baulig  <martin@home-of-linux.org>
-
-	* test.scm: New file.
-
-1998-06-07  Martin Baulig  <martin@home-of-linux.org>
-
-	* Makefile.am (CFLAGS): Disable optimize.
-
-	* first.c (PROFILE_COUNT): Number of times each function
-	should be called. Defaults to 1; to profile the code, you
-	can increase this when compiling.

examples/Makefile.am

@@ -2,110 +2,70 @@
 
 LINK			= $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
 
-INCLUDES		= @INCLUDES@
+INCLUDES		= -I$(top_builddir) -I$(top_srcdir) @machine_incs@ \
+			  -I$(top_srcdir)/include -I$(top_srcdir)/intl @GUILE_INCS@ \
+			  -DGTOPLOCALEDIR=\"$(datadir)/locale\" -D_GNU_SOURCE
+
+CFLAGS			= -Wall -W @CFLAGS@
 
 DEFS			= @DEFS@
 
-noinst_PROGRAMS	= 	first second pprint procargs df \
+bin_PROGRAMS		= first first_static first_linux \
-			  mountlist procmap netload sysdeps timings \
+			  second second_static second_linux \
-			  @static_targets@ @smp_examples@
+			  @guile_examples@
 
-EXTRA_PROGRAMS		= first_static second_static \
+EXTRA_PROGRAMS		= third third_static third_linux
-			  mountlist_static procmap_static \
-			  third third_static smp smp_static \
-			  netload_static sysdeps_static \
-			  timings_static pprint_static procargs_static \
-			  df_static
 
 first_SOURCES		= first.c
-first_LDADD		= $(top_builddir)/lib/libgtop-2.0.la
+first_LDADD		= $(top_builddir)/sysdeps/common/libgtop_common.la \
+			  $(top_builddir)/lib/libgtop.la \
+			  @INTLLIBS@ @LIBSUPPORT@
 
 first_static_SOURCES	= $(first_SOURCES)
 first_static_LDADD	= $(first_LDADD)
 first_static_LDFLAGS	= -static
 
+first_linux_SOURCES	= $(first_SOURCES)
+first_linux_LDADD	= $(top_builddir)/sysdeps/common/libgtop_common.la \
+			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps.la \
+			  @INTLLIBS@ @LIBSUPPORT@
+first_linux_LDFLAGS	= -static
+
 second_SOURCES		= second.c
-second_LDADD		= $(top_builddir)/lib/libgtop-2.0.la -lm
+second_LDADD		= $(top_builddir)/sysdeps/common/libgtop_common.la \
+			  $(top_builddir)/lib/libgtop.la \
+			  @INTLLIBS@ @LIBSUPPORT@
 
 second_static_SOURCES	= $(second_SOURCES)
 second_static_LDADD	= $(second_LDADD)
 second_static_LDFLAGS	= -static
 
-procmap_SOURCES		= procmap.c
+second_linux_SOURCES	= $(second_SOURCES)
-procmap_LDADD		= $(top_builddir)/lib/libgtop-2.0.la
+second_linux_LDADD	= $(top_builddir)/sysdeps/common/libgtop_common.la \
+			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps.la \
+			  @INTLLIBS@ @LIBSUPPORT@
+second_linux_LDFLAGS	= -static
 
-procmap_static_SOURCES	= $(procmap_SOURCES)
+if GLIBTOP_NAMES
-procmap_static_LDADD	= $(procmap_LDADD)
+third_guile_names_LIBS	= $(top_builddir)/sysdeps/guile/names/libgtop_guile_names.la
-procmap_static_LDFLAGS	= -static
+third_names_LIBS	= $(top_builddir)/sysdeps/names/libgtop_names.la
-
+endif
-netload_SOURCES		= netload.c
-netload_LDADD		= $(top_builddir)/lib/libgtop-2.0.la
-
-netload_static_SOURCES	= $(netload_SOURCES)
-netload_static_LDADD	= $(netload_LDADD)
-netload_static_LDFLAGS	= -static
-
-sysdeps_SOURCES		= sysdeps.c
-sysdeps_LDADD		= $(top_builddir)/lib/libgtop-2.0.la
-
-sysdeps_static_SOURCES	= $(sysdeps_SOURCES)
-sysdeps_static_LDADD	= $(sysdeps_LDADD)
-sysdeps_static_LDFLAGS	= -static
-
-third_names_LIBS	= $(top_builddir)/sysdeps/names/libgtop_names-2.0.la
 
 third_SOURCES		= third.c
-third_LDADD		= $(third_names_LIBS) \
+third_LDADD		= $(top_builddir)/sysdeps/guile/libgtop_guile.la \
-			  $(top_builddir)/lib/libgtop-2.0.la \
+			  $(third_guile_names_LIBS) $(third_names_LIBS) \
-			  @INTLLIBS@
+			  $(top_builddir)/sysdeps/common/libgtop_common.la \
+			  $(top_builddir)/lib/libgtop.la \
+			  @GUILE_LIBS@ @INTLLIBS@ @LIBSUPPORT@
 
 third_static_SOURCES	= $(third_SOURCES)
 third_static_LDADD	= $(third_LDADD)
 third_static_LDFLAGS	= -static
 
-mountlist_SOURCES	= mountlist.c
+third_linux_SOURCES	= $(third_SOURCES)
-mountlist_LDADD		= $(top_builddir)/lib/libgtop-2.0.la
+third_linux_LDADD	= $(top_builddir)/sysdeps/guile/libgtop_guile.la \
-
+			  $(third_guile_names_LIBS) $(third_names_LIBS) \
-mountlist_static_SOURCES= $(mountlist_SOURCES)
+			  $(top_builddir)/sysdeps/common/libgtop_common.la \
-mountlist_static_LDADD	= $(mountlist_LDADD)
+			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps.la \
-mountlist_static_LDFLAGS= -static
+			  @GUILE_LIBS@ @INTLLIBS@ @LIBSUPPORT@
-
+third_linux_LDFLAGS	= -static
-
-smp_SOURCES		= smp.c
-smp_LDADD		= $(top_builddir)/lib/libgtop-2.0.la -lm
-
-smp_static_SOURCES	= $(smp_SOURCES)
-smp_static_LDADD	= $(smp_LDADD)
-smp_static_LDFLAGS	= -static
-
-timings_SOURCES		= timings.c
-timings_LDADD		= $(top_builddir)/lib/libgtop-2.0.la
-
-timings_static_SOURCES	= $(timings_SOURCES)
-timings_static_LDADD	= $(timings_LDADD)
-timings_static_LDFLAGS	= -static
-
-
-pprint_SOURCES	        = pprint.c
-pprint_LDADD		= $(top_builddir)/lib/libgtop-2.0.la
-
-pprint_static_SOURCES   = $(pprint_SOURCES)
-pprint_static_LDADD	= $(pprint_LDADD)
-pprint_static_LDFLAGS   = -static
-
-
-procargs_SOURCES	  = procargs.c
-procargs_LDADD		  = $(top_builddir)/lib/libgtop-2.0.la
-
-procargs_static_SOURCES   = $(procargs_SOURCES)
-procargs_static_LDADD	  = $(procargs_LDADD)
-procargs_static_LDFLAGS   = -static
-
-
-df_SOURCES	  = df.c
-df_LDADD		  = $(top_builddir)/lib/libgtop-2.0.la
-
-df_static_SOURCES   = $(df_SOURCES)
-df_static_LDADD	  = $(df_LDADD)
-df_static_LDFLAGS   = -static
-

examples/df.c

@@ -1,48 +0,0 @@
-#include <glibtop.h>
-
-#include <glibtop/fsusage.h>
-#include <glibtop/mountlist.h>
-
-#include <stdio.h>
-
-
-static void print_fsusage(const char *mountpoint)
-{
-  glibtop_fsusage buf;
-
-  glibtop_get_fsusage(&buf, mountpoint);
-
-  printf("%-20s %-10llu %-10llu %-10llu %.1f\n",
-	 mountpoint,
-	 buf.blocks * buf.block_size >> 20,
-	 (buf.blocks - buf.bavail) * buf.block_size >> 20,
-	 buf.bavail * buf.block_size >> 20,
-	 (buf.blocks - buf.bavail) * 100.0 / buf.blocks
-	 );
-}
-
-
-int main()
-{
-  glibtop_mountlist buf;
-  glibtop_mountentry *entries;
-  size_t i;
-
-  glibtop_init();
-
-  printf("%-20s %-10s %-10s %-10s %-10s\n",
-	 "Filesystem", "Size", "Used", "Avail", "Use%");
-
-  entries = glibtop_get_mountlist(&buf, FALSE);
-
-  for(i = 0; i < buf.number; ++i)
-    {
-      print_fsusage(entries[i].mountdir);
-    }
-
-  g_free(entries);
-
-  glibtop_close();
-
-  return 0;
-}

examples/first.c

@@ -1,576 +1,328 @@
 /* $Id$ */
 
-/* Copyright (C) 1998-99 Martin Baulig
+/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
-   This file is part of LibGTop 1.0.
+   This file is part of the Gnome Top Library.
-
    Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
 
-   LibGTop is free software; you can redistribute it and/or modify it
+   The Gnome Top Library is free software; you can redistribute it and/or
-   under the terms of the GNU General Public License as published by
+   modify it under the terms of the GNU Library General Public License as
-   the Free Software Foundation; either version 2 of the License,
+   published by the Free Software Foundation; either version 2 of the
-   or (at your option) any later version.
+   License, or (at your option) any later version.
 
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
+   The Gnome Top Library is distributed in the hope that it will be useful,
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   for more details.
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
+   You should have received a copy of the GNU Library General Public
-   along with LibGTop; see the file COPYING. If not, write to the
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   Boston, MA 02111-1307, USA.  */
-*/
 
 #include <locale.h>
-#include <libintl.h>
-#include <stdio.h>
 
 #include <glibtop.h>
 #include <glibtop/open.h>
 #include <glibtop/close.h>
-
+#include <glibtop/xmalloc.h>
-#include <glibtop/parameter.h>
 
 #include <glibtop/union.h>
 #include <glibtop/sysdeps.h>
 
-#include <sys/resource.h>
-
-#ifndef PROFILE_COUNT
-#define PROFILE_COUNT	1
-#endif
-
 int
 main (int argc, char *argv [])
 {
 	glibtop_union data;
 	glibtop_sysdeps sysdeps;
-	unsigned c, method, count, port, i, *ptr;
+	unsigned i, *ptr;
-	char buffer [BUFSIZ];
 	pid_t pid, ppid;
-	char *args;
-
-	count = PROFILE_COUNT;
 
 	setlocale (LC_ALL, "");
-	bindtextdomain (GETTEXT_PACKAGE, GTOPLOCALEDIR);
+	bindtextdomain (PACKAGE, GTOPLOCALEDIR);
-	textdomain (GETTEXT_PACKAGE);
+	textdomain (PACKAGE);
+	
+	glibtop_init__r (&glibtop_global_server);
 
-	glibtop_init_r (&glibtop_global_server, 0, GLIBTOP_INIT_NO_OPEN);
+	glibtop_get_cpu (&data.cpu);
 
-	glibtop_get_parameter (GLIBTOP_PARAM_METHOD, &method, sizeof (method));
+	fprintf (stderr, "CPU          (0x%08lx): %lu, %lu, %lu, %lu, %lu, %lu\n",
+		 data.cpu.flags, data.cpu.total, data.cpu.user, data.cpu.nice,
+		 data.cpu.sys, data.cpu.idle, data.cpu.frequency);
 
-	printf ("Method = %d\n", method);
+	glibtop_get_mem (&data.mem);
 
-	count = glibtop_get_parameter (GLIBTOP_PARAM_COMMAND, buffer, BUFSIZ);
+	fprintf (stderr, "Memory       (0x%08lx): %lu, %lu, %lu, %lu, %lu, %lu, %lu, %lu\n",
-	buffer [count] = 0;
+		 data.mem.flags, data.mem.total, data.mem.used, data.mem.free,
+		 data.mem.shared, data.mem.buffer, data.mem.cached,
+		 data.mem.user, data.mem.locked);
 
-	printf ("Command = '%s'\n", buffer);
+	glibtop_get_swap (&data.swap);
 
-	count = glibtop_get_parameter (GLIBTOP_PARAM_HOST, buffer, BUFSIZ);
+	fprintf (stderr, "Swap         (0x%08lx): %lu, %lu, %lu\n", data.swap.flags,
-	buffer [count] = 0;
+		 data.swap.total, data.swap.used, data.swap.free);
 
-	glibtop_get_parameter (GLIBTOP_PARAM_PORT, &port, sizeof (port));
+	glibtop_get_uptime (&data.uptime);
 
-	printf ("Host = '%s' - %u\n\n", buffer, port);
+	fprintf (stderr, "Uptime       (0x%08lx): %f, %f\n", data.uptime.flags,
+		 data.uptime.uptime, data.uptime.idletime);
 
-	glibtop_init_r (&glibtop_global_server, 0, 0);
+	glibtop_get_loadavg (&data.loadavg);
 
-	for (c = 0; c < PROFILE_COUNT; c++)
+	fprintf (stderr, "Loadavg      (0x%08lx): %f, %f, %f\n", data.loadavg.flags,
-	  	glibtop_get_cpu (&data.cpu);
+		 data.loadavg.loadavg [0], data.loadavg.loadavg [1],
+		 data.loadavg.loadavg [2]);
 
-	printf ("CPU          (0x%08lx): %lu, %lu, %lu, %lu, %lu, %lu\n",
+	glibtop_get_shm_limits (&data.shm_limits);
-		(unsigned long) data.cpu.flags,
+	
-		(unsigned long) data.cpu.total,
+	fprintf (stderr, "Shm Limits   (0x%08lx): %ld, %ld, %ld, %ld, %ld\n",
-		(unsigned long) data.cpu.user,
+		 data.shm_limits.flags, data.shm_limits.shmmax,
-		(unsigned long) data.cpu.nice,
+		 data.shm_limits.shmmin, data.shm_limits.shmmni,
-		(unsigned long) data.cpu.sys,
+		 data.shm_limits.shmseg, data.shm_limits.shmall);
-		(unsigned long) data.cpu.idle,
-		(unsigned long) data.cpu.frequency);
 
-	for (c = 0; c < PROFILE_COUNT; c++)
+	glibtop_get_msg_limits (&data.msg_limits);
-		glibtop_get_mem (&data.mem);
 
-	printf ("Memory       (0x%08lx): "
+	fprintf (stderr, "Msg Limits   (0x%08lx): %ld, %ld, %ld, %ld, %ld, %ld, %ld\n",
-		"%lu, %lu, %lu, %lu, %lu, %lu, %lu, %lu\n",
+		 data.msg_limits.flags, data.msg_limits.msgpool,
-		(unsigned long) data.mem.flags,
+		 data.msg_limits.msgmap, data.msg_limits.msgmax,
-		(unsigned long) data.mem.total,
+		 data.msg_limits.msgmnb, data.msg_limits.msgmni,
-		(unsigned long) data.mem.used,
+		 data.msg_limits.msgssz, data.msg_limits.msgtql);
-		(unsigned long) data.mem.free,
-		(unsigned long) data.mem.shared,
-		(unsigned long) data.mem.buffer,
-		(unsigned long) data.mem.cached,
-		(unsigned long) data.mem.user,
-		(unsigned long) data.mem.locked);
 
-	for (c = 0; c < PROFILE_COUNT; c++)
+	glibtop_get_sem_limits (&data.sem_limits);
-		glibtop_get_swap (&data.swap);
+	
+	fprintf (stderr, "Sem Limits   (0x%08lx): "
+		 "%ld, %ld, %ld, %ld, %ld, %ld, %ld, %ld, %ld, %ld\n",
+		 data.sem_limits.flags, data.sem_limits.semmap,
+		 data.sem_limits.semmni, data.sem_limits.semmns,
+		 data.sem_limits.semmnu, data.sem_limits.semmsl,
+		 data.sem_limits.semopm, data.sem_limits.semume,
+		 data.sem_limits.semusz, data.sem_limits.semvmx,
+		 data.sem_limits.semaem);
 
-	printf ("Swap         (0x%08lx): %lu, %lu, %lu, %lu, %lu\n",
+	fprintf (stderr, "\n");
-		(unsigned long) data.swap.flags,
-		(unsigned long) data.swap.total,
-		(unsigned long) data.swap.used,
-		(unsigned long) data.swap.free,
-		(unsigned long) data.swap.pagein,
-		(unsigned long) data.swap.pageout);
-
-	for (c = 0; c < PROFILE_COUNT; c++)
-		glibtop_get_uptime (&data.uptime);
-
-	printf ("Uptime       (0x%08lx): %f, %f\n",
-		(unsigned long) data.uptime.flags,
-		data.uptime.uptime, data.uptime.idletime);
-
-	for (c = 0; c < PROFILE_COUNT; c++)
-		glibtop_get_loadavg (&data.loadavg);
-
-	printf ("Loadavg      (0x%08lx): %f, %f, %f - %lu, %lu, %lu\n",
-		(unsigned long) data.loadavg.flags,
-		(double) data.loadavg.loadavg [0],
-		(double) data.loadavg.loadavg [1],
-		(double) data.loadavg.loadavg [2],
-		(unsigned long) data.loadavg.nr_running,
-		(unsigned long) data.loadavg.nr_tasks,
-		(unsigned long) data.loadavg.last_pid);
-
-	for (c = 0; c < PROFILE_COUNT; c++)
-		glibtop_get_shm_limits (&data.shm_limits);
-
-	printf ("Shm Limits   (0x%08lx): %lu, %lu, %lu, %lu, %lu\n",
-		(unsigned long) data.shm_limits.flags,
-		(unsigned long) data.shm_limits.shmmax,
-		(unsigned long) data.shm_limits.shmmin,
-		(unsigned long) data.shm_limits.shmmni,
-		(unsigned long) data.shm_limits.shmseg,
-		(unsigned long) data.shm_limits.shmall);
-
-	for (c = 0; c < PROFILE_COUNT; c++)
-		glibtop_get_msg_limits (&data.msg_limits);
-
-	printf ("Msg Limits   (0x%08lx): %lu, %lu, %lu, %lu, %lu, %lu, %lu\n",
-		(unsigned long) data.msg_limits.flags,
-		(unsigned long) data.msg_limits.msgpool,
-		(unsigned long) data.msg_limits.msgmap,
-		(unsigned long) data.msg_limits.msgmax,
-		(unsigned long) data.msg_limits.msgmnb,
-		(unsigned long) data.msg_limits.msgmni,
-		(unsigned long) data.msg_limits.msgssz,
-		(unsigned long)  data.msg_limits.msgtql);
-
-	for (c = 0; c < PROFILE_COUNT; c++)
-		glibtop_get_sem_limits (&data.sem_limits);
-
-	printf ("Sem Limits   (0x%08lx): "
-		"%lu, %lu, %lu, %lu, %lu, %lu, %lu, %lu, %lu, %lu\n",
-		(unsigned long) data.sem_limits.flags,
-		(unsigned long) data.sem_limits.semmap,
-		(unsigned long) data.sem_limits.semmni,
-		(unsigned long) data.sem_limits.semmns,
-		(unsigned long) data.sem_limits.semmnu,
-		(unsigned long) data.sem_limits.semmsl,
-		(unsigned long) data.sem_limits.semopm,
-		(unsigned long) data.sem_limits.semume,
-		(unsigned long) data.sem_limits.semusz,
-		(unsigned long) data.sem_limits.semvmx,
-		(unsigned long) data.sem_limits.semaem);
-
-	printf ("\n");
-
-	for (c = 0; c < PROFILE_COUNT; c++)
-		glibtop_get_ppp (&data.ppp, 0);
-
-	printf ("PPP          (0x%08lx): %lu, %lu, %lu\n",
-		(unsigned long) data.ppp.flags,
-		(unsigned long) data.ppp.state,
-		(unsigned long) data.ppp.bytes_in,
-		(unsigned long) data.ppp.bytes_out);
-
-	printf ("\n");
 
 	glibtop_get_sysdeps (&sysdeps);
 
-	printf ("Sysdeps      (0x%08lx): %lu, %lu, %lu, %lu, %lu, "
+	fprintf (stderr, "Sysdeps      (0x%08lx): %lu, %lu, %lu, %lu, %lu, "
-		"%lu, %lu, %lu, %lu, %lu, %lu, %lu, %lu, %lu, %lu, %lu, "
+		 "%lu, %lu, %lu, %lu, %lu, %lu, %lu, %lu, %lu, %lu, %lu\n",
-		"%lu, %lu, %lu, %lu, %lu, %lu\n",
+		 sysdeps.flags, sysdeps.cpu, sysdeps.mem, sysdeps.swap,
-		(unsigned long) sysdeps.flags,
+		 sysdeps.uptime, sysdeps.loadavg, sysdeps.shm_limits,
-		(unsigned long) sysdeps.cpu,
+		 sysdeps.msg_limits, sysdeps.sem_limits,
-		(unsigned long) sysdeps.mem,
+		 sysdeps.proclist, sysdeps.proc_state,
-		(unsigned long) sysdeps.swap,
+		 sysdeps.proc_uid, sysdeps.proc_mem,
-		(unsigned long) sysdeps.uptime,
+		 sysdeps.proc_time, sysdeps.proc_signal,
-		(unsigned long) sysdeps.loadavg,
+		 sysdeps.proc_kernel, sysdeps.proc_segment);
-		(unsigned long) sysdeps.shm_limits,
-		(unsigned long) sysdeps.msg_limits,
-		(unsigned long) sysdeps.sem_limits,
-		(unsigned long) sysdeps.proclist,
-		(unsigned long) sysdeps.proc_state,
-		(unsigned long) sysdeps.proc_uid,
-		(unsigned long) sysdeps.proc_mem,
-		(unsigned long) sysdeps.proc_time,
-		(unsigned long) sysdeps.proc_signal,
-		(unsigned long) sysdeps.proc_kernel,
-		(unsigned long) sysdeps.proc_segment,
-		(unsigned long) sysdeps.proc_args,
-		(unsigned long) sysdeps.proc_map,
-		(unsigned long) sysdeps.mountlist,
-		(unsigned long) sysdeps.fsusage,
-		(unsigned long) sysdeps.netload,
-		(unsigned long) sysdeps.ppp);
 
-	printf ("\n");
+	fprintf (stderr, "\n");
+	
+	ptr = glibtop_get_proclist (&data.proclist);
 
-	ptr = glibtop_get_proclist (&data.proclist, 0, 0);
+	fprintf (stderr, "Proclist     (0x%08lx): %ld, %ld, %ld\n",
-
+		 data.proclist.flags, data.proclist.number,
-	printf ("Proclist     (0x%08lx): %lu, %lu, %lu\n",
+		 data.proclist.size, data.proclist.total);
-		(unsigned long) data.proclist.flags,
-		(unsigned long) data.proclist.number,
-		(unsigned long) data.proclist.size,
-		(unsigned long) data.proclist.total);
 
 	if (ptr) {
-		printf ("\nProcess: ");
+		fprintf (stderr, "\nProcess: ");
 		for (i = 0; i < data.proclist.number; i++)
-			printf ("%s%u", i ? ", " : "", ptr [i]);
+			fprintf (stderr, "%s%u", i ? ", " : "", ptr [i]);
-		printf ("\n");
+		fprintf (stderr, "\n");
 	}
 
-	g_free (ptr);
+	glibtop_free (ptr);
 
 	pid = getpid ();
 	ppid = getppid ();
 
-	printf ("\n");
+	fprintf (stderr, "\n");
 
-	for (c = 0; c < PROFILE_COUNT; c++)
+	glibtop_get_proc_state (&data.proc_state, pid);
-		glibtop_get_proc_state (&data.proc_state, pid);
 
-	printf ("Proc_State   PID  %5d (0x%08lx): '%s', %c, %lu, %lu\n",
+	fprintf (stderr, "Proc_State   PID  %5u (0x%08lx): '%s', %c, %u, %u\n",
-		(int) pid, (unsigned long) data.proc_state.flags,
+		 pid, data.proc_state.flags, data.proc_state.cmd,
-		data.proc_state.cmd, data.proc_state.state,
+		 data.proc_state.state, data.proc_state.uid,
-		(unsigned long) data.proc_state.uid,
+		 data.proc_state.gid);
-		(unsigned long) data.proc_state.gid);
 
-	for (c = 0; c < PROFILE_COUNT; c++)
+	glibtop_get_proc_uid (&data.proc_uid, pid);
-		glibtop_get_proc_uid (&data.proc_uid, pid);
 
-	printf ("Proc_Uid     PID  %5d (0x%08lx): "
+	fprintf (stderr, "Proc_Uid     PID  %5u (0x%08lx): "
-		"%d %d %d %d %d %d %d %d %d %d %d %d\n", (int) pid,
+		 "%d %d %d %d %d %d %d %d %d %d %d %d\n",
-		(unsigned long) data.proc_uid.flags,
+		 pid, data.proc_uid.flags, data.proc_uid.uid,
-		data.proc_uid.uid, data.proc_uid.euid,
+		 data.proc_uid.euid, data.proc_uid.gid,
-		data.proc_uid.gid, data.proc_uid.egid,
+		 data.proc_uid.egid, data.proc_uid.pid,
-		data.proc_uid.pid, data.proc_uid.ppid,
+		 data.proc_uid.ppid, data.proc_uid.pgrp,
-		data.proc_uid.pgrp, data.proc_uid.session,
+		 data.proc_uid.session, data.proc_uid.tty,
-		data.proc_uid.tty, data.proc_uid.tpgid,
+		 data.proc_uid.tpgid, data.proc_uid.priority,
-		data.proc_uid.priority, data.proc_uid.nice);
+		 data.proc_uid.nice);
 
-	for (c = 0; c < PROFILE_COUNT; c++)
+	glibtop_get_proc_mem (&data.proc_mem, pid);
-		glibtop_get_proc_mem (&data.proc_mem, pid);
 
-	printf ("Proc_Mem     PID  %5d (0x%08lx): "
+	fprintf (stderr, "Proc_Mem     PID  %5u (0x%08lx): "
-		"%lu %lu %lu %lu %lu %lu\n", (int) pid,
+		 "%ld %ld %ld %ld %ld %ld\n", pid, data.proc_mem.flags,
-		(unsigned long) data.proc_mem.flags,
+		 data.proc_mem.size, data.proc_mem.vsize,
-		(unsigned long) data.proc_mem.size,
+		 data.proc_mem.resident, data.proc_mem.share,
-		(unsigned long) data.proc_mem.vsize,
+		 data.proc_mem.rss, data.proc_mem.rss_rlim);
-		(unsigned long) data.proc_mem.resident,
-		(unsigned long) data.proc_mem.share,
-		(unsigned long) data.proc_mem.rss,
-		(unsigned long) data.proc_mem.rss_rlim);
 
-	for (c = 0; c < PROFILE_COUNT; c++)
+	glibtop_get_proc_time (&data.proc_time, pid);
-		glibtop_get_proc_segment (&data.proc_segment, pid);
 
-	printf ("Proc_Segment PID  %5d (0x%08lx): "
+	fprintf (stderr, "Proc_Time    PID  %5u (0x%08lx): "
-		"%lu %lu %lu %lu %lu %lu %lu %lu\n", (int) pid,
+		 "%ld %ld %ld %ld %ld %ld %ld\n", pid, data.proc_time.flags,
-		(unsigned long) data.proc_segment.flags,
+		 data.proc_time.start_time, data.proc_time.utime,
-		(unsigned long) data.proc_segment.text_rss,
+		 data.proc_time.stime, data.proc_time.cutime,
-		(unsigned long) data.proc_segment.shlib_rss,
+		 data.proc_time.cstime, data.proc_time.timeout,
-		(unsigned long) data.proc_segment.data_rss,
+		 data.proc_time.it_real_value);
-		(unsigned long) data.proc_segment.stack_rss,
-		(unsigned long) data.proc_segment.dirty_size,
-		(unsigned long) data.proc_segment.start_code,
-		(unsigned long) data.proc_segment.end_code,
-		(unsigned long) data.proc_segment.start_stack);
 
-	for (c = 0; c < PROFILE_COUNT; c++)
+	glibtop_get_proc_signal (&data.proc_signal, pid);
-		glibtop_get_proc_time (&data.proc_time, pid);
+	
+	fprintf (stderr, "Proc_Signal  PID  %5u (0x%08lx): "
+		 "%d %d %d %d\n", pid, data.proc_signal.flags,
+		 data.proc_signal.signal, data.proc_signal.blocked,
+		 data.proc_signal.sigignore, data.proc_signal.sigcatch);
 
-	printf ("Proc_Time    PID  %5d (0x%08lx): "
+	glibtop_get_proc_kernel (&data.proc_kernel, pid);
-		"%lu %lu %lu %lu %lu %lu %lu %lu %lu\n", (int) pid,
-		(unsigned long) data.proc_time.flags,
-		(unsigned long) data.proc_time.start_time,
-		(unsigned long) data.proc_time.rtime,
-		(unsigned long) data.proc_time.utime,
-		(unsigned long) data.proc_time.stime,
-		(unsigned long) data.proc_time.cutime,
-		(unsigned long) data.proc_time.cstime,
-		(unsigned long) data.proc_time.timeout,
-		(unsigned long) data.proc_time.it_real_value,
-		(unsigned long) data.proc_time.frequency);
 
-	for (c = 0; c < PROFILE_COUNT; c++)
+	fprintf (stderr, "Proc_Kernel  PID  %5u (0x%08lx): "
-		glibtop_get_proc_signal (&data.proc_signal, pid);
+		 "%lu %lu %lu %lu %lu %lu %lu %lu\n", pid,
+		 data.proc_kernel.flags, data.proc_kernel.k_flags,
+		 data.proc_kernel.min_flt, data.proc_kernel.maj_flt,
+		 data.proc_kernel.cmin_flt, data.proc_kernel.cmaj_flt,
+		 data.proc_kernel.kstk_esp, data.proc_kernel.kstk_eip,
+		 data.proc_kernel.wchan);
 
-	printf ("Proc_Signal  PID  %5d (0x%08lx): "
+	glibtop_get_proc_segment (&data.proc_segment, pid);
-		"%lu %lu %lu %lu\n", (int) pid,
-		(unsigned long) data.proc_signal.flags,
-		(unsigned long) data.proc_signal.signal,
-		(unsigned long) data.proc_signal.blocked,
-		(unsigned long) data.proc_signal.sigignore,
-		(unsigned long) data.proc_signal.sigcatch);
 
-	for (c = 0; c < PROFILE_COUNT; c++)
+	fprintf (stderr, "Proc_Segment PID  %5u (0x%08lx): "
-		glibtop_get_proc_kernel (&data.proc_kernel, pid);
+		 "%ld %ld %ld %ld %lu %lu %lu\n", pid, data.proc_segment.flags,
+		 data.proc_segment.trs, data.proc_segment.lrs,
+		 data.proc_segment.drs, data.proc_segment.dt,
+		 data.proc_segment.start_code, data.proc_segment.end_code,
+		 data.proc_segment.start_stack);
 
-	printf ("Proc_Kernel  PID  %5d (0x%08lx): "
+	fprintf (stderr, "\n");
-		"%lu %lu %lu %lu %lu 0x%lx 0x%lx 0x%lx (%s)\n", (int) pid,
-		(unsigned long) data.proc_kernel.flags,
-		(unsigned long) data.proc_kernel.k_flags,
-		(unsigned long) data.proc_kernel.min_flt,
-		(unsigned long) data.proc_kernel.maj_flt,
-		(unsigned long) data.proc_kernel.cmin_flt,
-		(unsigned long) data.proc_kernel.cmaj_flt,
-		(unsigned long) data.proc_kernel.kstk_esp,
-		(unsigned long) data.proc_kernel.kstk_eip,
-		(unsigned long) data.proc_kernel.nwchan,
-		data.proc_kernel.wchan);
 
-	printf ("\n");
+	glibtop_get_proc_state (&data.proc_state, ppid);
 
-	args = glibtop_get_proc_args (&data.proc_args, pid, 0);
+	fprintf (stderr, "Proc_State   PPID %5u (0x%08lx): '%s', %c, %u, %u\n",
+		 ppid, data.proc_state.flags, data.proc_state.cmd,
+		 data.proc_state.state, data.proc_state.uid,
+		 data.proc_state.gid);
 
-	for (i = 0; i < data.proc_args.size; i++) {
+	glibtop_get_proc_uid (&data.proc_uid, ppid);
-		if (args [i]) continue;
-		args [i] = '|';
-	}
 
-	printf ("Proc_Args    PID  %5d (0x%08lx): %lu - '%s'\n", (int) pid,
+	fprintf (stderr, "Proc_Uid     PPID %5u (0x%08lx): "
-		(unsigned long) data.proc_args.flags,
+		 "%d %d %d %d %d %d %d %d %d %d %d %d\n",
-		(unsigned long) data.proc_args.size,
+		 ppid, data.proc_uid.flags, data.proc_uid.uid,
-		args ? args : "");
+		 data.proc_uid.euid, data.proc_uid.gid,
+		 data.proc_uid.egid, data.proc_uid.pid,
+		 data.proc_uid.ppid, data.proc_uid.pgrp,
+		 data.proc_uid.session, data.proc_uid.tty,
+		 data.proc_uid.tpgid, data.proc_uid.priority,
+		 data.proc_uid.nice);
 
-	g_free (args);
+	glibtop_get_proc_mem (&data.proc_mem, ppid);
 
-	printf ("\n");
+	fprintf (stderr, "Proc_Mem     PPID %5u (0x%08lx): "
+		 "%ld %ld %ld %ld %ld %ld\n", ppid, data.proc_mem.flags,
+		 data.proc_mem.size, data.proc_mem.vsize,
+		 data.proc_mem.resident, data.proc_mem.share,
+		 data.proc_mem.rss, data.proc_mem.rss_rlim);
 
-	for (c = 0; c < PROFILE_COUNT; c++)
+	glibtop_get_proc_time (&data.proc_time, ppid);
-		glibtop_get_proc_state (&data.proc_state, ppid);
 
-	printf ("Proc_State   PPID %5d (0x%08lx): '%s', %c, %lu, %lu\n",
+	fprintf (stderr, "Proc_Time    PPID %5u (0x%08lx): "
-		(int) ppid, (unsigned long) data.proc_state.flags,
+		 "%ld %ld %ld %ld %ld %ld %ld\n", ppid, data.proc_time.flags,
-		data.proc_state.cmd, data.proc_state.state,
+		 data.proc_time.start_time, data.proc_time.utime,
-		(unsigned long) data.proc_state.uid,
+		 data.proc_time.stime, data.proc_time.cutime,
-		(unsigned long) data.proc_state.gid);
+		 data.proc_time.cstime, data.proc_time.timeout,
+		 data.proc_time.it_real_value);
 
-	for (c = 0; c < PROFILE_COUNT; c++)
+	glibtop_get_proc_signal (&data.proc_signal, ppid);
-		glibtop_get_proc_uid (&data.proc_uid, ppid);
 
-	printf ("Proc_Uid     PPID %5d (0x%08lx): "
+	fprintf (stderr, "Proc_Signal  PPID %5u (0x%08lx): "
-		"%d %d %d %d %d %d %d %d %d %d %d %d\n", (int) ppid,
+		 "%d %d %d %d\n", ppid, data.proc_signal.flags,
-		(unsigned long) data.proc_uid.flags,
+		 data.proc_signal.signal, data.proc_signal.blocked,
-		data.proc_uid.uid, data.proc_uid.euid,
+		 data.proc_signal.sigignore, data.proc_signal.sigcatch);
-		data.proc_uid.gid, data.proc_uid.egid,
-		data.proc_uid.pid, data.proc_uid.ppid,
-		data.proc_uid.pgrp, data.proc_uid.session,
-		data.proc_uid.tty, data.proc_uid.tpgid,
-		data.proc_uid.priority, data.proc_uid.nice);
 
-	for (c = 0; c < PROFILE_COUNT; c++)
+	glibtop_get_proc_kernel (&data.proc_kernel, ppid);
-		glibtop_get_proc_mem (&data.proc_mem, ppid);
 
-	printf ("Proc_Mem     PPID %5d (0x%08lx): "
+	fprintf (stderr, "Proc_Kernel  PPID %5u (0x%08lx): "
-		"%lu %lu %lu %lu %lu %lu\n", (int) ppid,
+		 "%lu %lu %lu %lu %lu %lu %lu %lu\n", ppid,
-		(unsigned long) data.proc_mem.flags,
+		 data.proc_kernel.flags, data.proc_kernel.k_flags,
-		(unsigned long) data.proc_mem.size,
+		 data.proc_kernel.min_flt, data.proc_kernel.maj_flt,
-		(unsigned long) data.proc_mem.vsize,
+		 data.proc_kernel.cmin_flt, data.proc_kernel.cmaj_flt,
-		(unsigned long) data.proc_mem.resident,
+		 data.proc_kernel.kstk_esp, data.proc_kernel.kstk_eip,
-		(unsigned long) data.proc_mem.share,
+		 data.proc_kernel.wchan);
-		(unsigned long) data.proc_mem.rss,
-		(unsigned long) data.proc_mem.rss_rlim);
 
-	for (c = 0; c < PROFILE_COUNT; c++)
+	glibtop_get_proc_segment (&data.proc_segment, ppid);
-		glibtop_get_proc_segment (&data.proc_segment, ppid);
 
-	printf ("Proc_Segment PPID %5d (0x%08lx): "
+	fprintf (stderr, "Proc_Segment PPID %5u (0x%08lx): "
-		"%lu %lu %lu %lu %lu %lu %lu %lu\n", (int) ppid,
+		 "%ld %ld %ld %ld %lu %lu %lu\n", ppid, data.proc_segment.flags,
-		(unsigned long) data.proc_segment.flags,
+		 data.proc_segment.trs, data.proc_segment.lrs,
-		(unsigned long) data.proc_segment.text_rss,
+		 data.proc_segment.drs, data.proc_segment.dt,
-		(unsigned long) data.proc_segment.shlib_rss,
+		 data.proc_segment.start_code, data.proc_segment.end_code,
-		(unsigned long) data.proc_segment.data_rss,
+		 data.proc_segment.start_stack);
-		(unsigned long) data.proc_segment.stack_rss,
-		(unsigned long) data.proc_segment.dirty_size,
-		(unsigned long) data.proc_segment.start_code,
-		(unsigned long) data.proc_segment.end_code,
-		(unsigned long) data.proc_segment.start_stack);
 
-	for (c = 0; c < PROFILE_COUNT; c++)
+	fprintf (stderr, "\n");
-		glibtop_get_proc_time (&data.proc_time, ppid);
 
-	printf ("Proc_Time    PPID %5d (0x%08lx): "
+	glibtop_get_proc_state (&data.proc_state, 1);
-		"%lu %lu %lu %lu %lu %lu %lu %lu %lu\n", (int) ppid,
-		(unsigned long) data.proc_time.flags,
-		(unsigned long) data.proc_time.start_time,
-		(unsigned long) data.proc_time.rtime,
-		(unsigned long) data.proc_time.utime,
-		(unsigned long) data.proc_time.stime,
-		(unsigned long) data.proc_time.cutime,
-		(unsigned long) data.proc_time.cstime,
-		(unsigned long) data.proc_time.timeout,
-		(unsigned long) data.proc_time.it_real_value,
-		(unsigned long) data.proc_time.frequency);
 
-	for (c = 0; c < PROFILE_COUNT; c++)
+	fprintf (stderr, "Proc_State   INIT %5u (0x%08lx): '%s', %c, %u, %u\n",
-		glibtop_get_proc_signal (&data.proc_signal, ppid);
+		 1, data.proc_state.flags, data.proc_state.cmd,
+		 data.proc_state.state, data.proc_state.uid,
+		 data.proc_state.gid);
 
-	printf ("Proc_Signal  PPID %5d (0x%08lx): %lu %lu %lu %lu\n",
+	glibtop_get_proc_uid (&data.proc_uid, 1);
-		(int) ppid, (unsigned long) data.proc_signal.flags,
-		(unsigned long) data.proc_signal.signal,
-		(unsigned long) data.proc_signal.blocked,
-		(unsigned long) data.proc_signal.sigignore,
-		(unsigned long) data.proc_signal.sigcatch);
 
-	for (c = 0; c < PROFILE_COUNT; c++)
+	fprintf (stderr, "Proc_Uid     INIT %5u (0x%08lx): "
-		glibtop_get_proc_kernel (&data.proc_kernel, ppid);
+		 "%d %d %d %d %d %d %d %d %d %d %d %d\n",
+		 1, data.proc_uid.flags, data.proc_uid.uid,
+		 data.proc_uid.euid, data.proc_uid.gid,
+		 data.proc_uid.egid, data.proc_uid.pid,
+		 data.proc_uid.ppid, data.proc_uid.pgrp,
+		 data.proc_uid.session, data.proc_uid.tty,
+		 data.proc_uid.tpgid, data.proc_uid.priority,
+		 data.proc_uid.nice);
 
-	printf ("Proc_Kernel  PPID %5d (0x%08lx): "
+	glibtop_get_proc_mem (&data.proc_mem, 1);
-		"%lu %lu %lu %lu %lu 0x%lx 0x%lx 0x%lx (%s)\n", (int) ppid,
-		(unsigned long) data.proc_kernel.flags,
-		(unsigned long) data.proc_kernel.k_flags,
-		(unsigned long) data.proc_kernel.min_flt,
-		(unsigned long) data.proc_kernel.maj_flt,
-		(unsigned long) data.proc_kernel.cmin_flt,
-		(unsigned long) data.proc_kernel.cmaj_flt,
-		(unsigned long) data.proc_kernel.kstk_esp,
-		(unsigned long) data.proc_kernel.kstk_eip,
-		(unsigned long) data.proc_kernel.nwchan,
-		data.proc_kernel.wchan);
 
-	printf ("\n");
+	fprintf (stderr, "Proc_Mem     INIT %5u (0x%08lx): "
+		 "%ld %ld %ld %ld %ld %ld\n", 1, data.proc_mem.flags,
+		 data.proc_mem.size, data.proc_mem.vsize,
+		 data.proc_mem.resident, data.proc_mem.share,
+		 data.proc_mem.rss, data.proc_mem.rss_rlim);
 
-	args = glibtop_get_proc_args (&data.proc_args, ppid, 0);
+	glibtop_get_proc_time (&data.proc_time, 1);
 
-	for (i = 0; i < data.proc_args.size; i++) {
+	fprintf (stderr, "Proc_Time    INIT %5u (0x%08lx): "
-		if (args [i]) continue;
+		 "%ld %ld %ld %ld %ld %ld %ld\n", 1, data.proc_time.flags,
-		args [i] = '|';
+		 data.proc_time.start_time, data.proc_time.utime,
-	}
+		 data.proc_time.stime, data.proc_time.cutime,
+		 data.proc_time.cstime, data.proc_time.timeout,
+		 data.proc_time.it_real_value);
 
-	printf ("Proc_Args    PID  %5d (0x%08lx): %lu - '%s'\n", (int) ppid,
+	glibtop_get_proc_signal (&data.proc_signal, 1);
-		(unsigned long) data.proc_args.flags,
-		(unsigned long) data.proc_args.size,
-		args ? args : "");
 
-	g_free (args);
+	fprintf (stderr, "Proc_Signal  INIT %5u (0x%08lx): "
+		 "%d %d %d %d\n", 1, data.proc_signal.flags,
+		 data.proc_signal.signal, data.proc_signal.blocked,
+		 data.proc_signal.sigignore, data.proc_signal.sigcatch);
 
-	printf ("\n");
+	glibtop_get_proc_kernel (&data.proc_kernel, 1);
 
-	for (c = 0; c < PROFILE_COUNT; c++)
+	fprintf (stderr, "Proc_Kernel  INIT %5u (0x%08lx): "
-		glibtop_get_proc_state (&data.proc_state, 1);
+		 "%lu %lu %lu %lu %lu %lu %lu %lu\n", 1,
+		 data.proc_kernel.flags, data.proc_kernel.k_flags,
+		 data.proc_kernel.min_flt, data.proc_kernel.maj_flt,
+		 data.proc_kernel.cmin_flt, data.proc_kernel.cmaj_flt,
+		 data.proc_kernel.kstk_esp, data.proc_kernel.kstk_eip,
+		 data.proc_kernel.wchan);
 
-	printf ("Proc_State   INIT %5d (0x%08lx): '%s', %c, %lu, %lu\n", 1,
+	glibtop_get_proc_segment (&data.proc_segment, 1);
-		(unsigned long) data.proc_state.flags,
-		data.proc_state.cmd, data.proc_state.state,
-		(unsigned long) data.proc_state.uid,
-		(unsigned long) data.proc_state.gid);
 
-	for (c = 0; c < PROFILE_COUNT; c++)
+	fprintf (stderr, "Proc_Segment INIT %5u (0x%08lx): "
-		glibtop_get_proc_uid (&data.proc_uid, 1);
+		 "%ld %ld %ld %ld %lu %lu %lu\n", 1, data.proc_segment.flags,
-
+		 data.proc_segment.trs, data.proc_segment.lrs,
-	printf ("Proc_Uid     INIT %5d (0x%08lx): "
+		 data.proc_segment.drs, data.proc_segment.dt,
-		"%d %d %d %d %d %d %d %d %d %d %d %d\n", 1,
+		 data.proc_segment.start_code, data.proc_segment.end_code,
-		(unsigned long) data.proc_uid.flags,
+		 data.proc_segment.start_stack);
-		data.proc_uid.uid, data.proc_uid.euid,
-		data.proc_uid.gid, data.proc_uid.egid,
-		data.proc_uid.pid, data.proc_uid.ppid,
-		data.proc_uid.pgrp, data.proc_uid.session,
-		data.proc_uid.tty, data.proc_uid.tpgid,
-		data.proc_uid.priority, data.proc_uid.nice);
-
-	for (c = 0; c < PROFILE_COUNT; c++)
-		glibtop_get_proc_mem (&data.proc_mem, 1);
-
-	printf ("Proc_Mem     INIT %5d (0x%08lx): "
-		"%lu %lu %lu %lu %lu %lu\n", 1,
-		(unsigned long) data.proc_mem.flags,
-		(unsigned long) data.proc_mem.size,
-		(unsigned long) data.proc_mem.vsize,
-		(unsigned long) data.proc_mem.resident,
-		(unsigned long) data.proc_mem.share,
-		(unsigned long) data.proc_mem.rss,
-		(unsigned long) data.proc_mem.rss_rlim);
-
-	for (c = 0; c < PROFILE_COUNT; c++)
-		glibtop_get_proc_segment (&data.proc_segment, 1);
-
-	printf ("Proc_Segment INIT %5d (0x%08lx): "
-		"%lu %lu %lu %lu %lu %lu %lu %lu\n", 1,
-		(unsigned long) data.proc_segment.flags,
-		(unsigned long) data.proc_segment.text_rss,
-		(unsigned long) data.proc_segment.shlib_rss,
-		(unsigned long) data.proc_segment.data_rss,
-		(unsigned long) data.proc_segment.stack_rss,
-		(unsigned long) data.proc_segment.dirty_size,
-		(unsigned long) data.proc_segment.start_code,
-		(unsigned long) data.proc_segment.end_code,
-		(unsigned long) data.proc_segment.start_stack);
-
-	for (c = 0; c < PROFILE_COUNT; c++)
-		glibtop_get_proc_time (&data.proc_time, 1);
-
-	printf ("Proc_Time    INIT %5d (0x%08lx): "
-		"%lu %lu %lu %lu %lu %lu %lu %lu %lu\n", 1,
-		(unsigned long) data.proc_time.flags,
-		(unsigned long) data.proc_time.start_time,
-		(unsigned long) data.proc_time.rtime,
-		(unsigned long) data.proc_time.utime,
-		(unsigned long) data.proc_time.stime,
-		(unsigned long) data.proc_time.cutime,
-		(unsigned long) data.proc_time.cstime,
-		(unsigned long) data.proc_time.timeout,
-		(unsigned long) data.proc_time.it_real_value,
-		(unsigned long) data.proc_time.frequency);
-
-	for (c = 0; c < PROFILE_COUNT; c++)
-		glibtop_get_proc_signal (&data.proc_signal, 1);
-
-	printf ("Proc_Signal  INIT %5d (0x%08lx): "
-		"%lu %lu %lu %lu\n", 1,
-		(unsigned long) data.proc_signal.flags,
-		(unsigned long) data.proc_signal.signal,
-		(unsigned long) data.proc_signal.blocked,
-		(unsigned long) data.proc_signal.sigignore,
-		(unsigned long) data.proc_signal.sigcatch);
-
-	for (c = 0; c < PROFILE_COUNT; c++)
-		glibtop_get_proc_kernel (&data.proc_kernel, 1);
-
-	printf ("Proc_Kernel  INIT %5d (0x%08lx): "
-		"%lu %lu %lu %lu %lu 0x%lx 0x%lx 0x%lx (%s)\n", 1,
-		(unsigned long) data.proc_kernel.flags,
-		(unsigned long) data.proc_kernel.k_flags,
-		(unsigned long) data.proc_kernel.min_flt,
-		(unsigned long) data.proc_kernel.maj_flt,
-		(unsigned long) data.proc_kernel.cmin_flt,
-		(unsigned long) data.proc_kernel.cmaj_flt,
-		(unsigned long) data.proc_kernel.kstk_esp,
-		(unsigned long) data.proc_kernel.kstk_eip,
-		(unsigned long) data.proc_kernel.nwchan,
-		data.proc_kernel.wchan);
-
-	printf ("\n");
-
-	args = glibtop_get_proc_args (&data.proc_args, 1, 0);
-
-	for (i = 0; i < data.proc_args.size; i++) {
-		if (args [i]) continue;
-		args [i] = '|';
-	}
-
-	printf ("Proc_Args    PID  %5d (0x%08lx): %lu - '%s'\n", 1,
-		(unsigned long) data.proc_args.flags,
-		(unsigned long) data.proc_args.size,
-		args ? args : "");
-
-	g_free (args);
-
-	glibtop_close ();
 
 	exit (0);
 }

examples/mountlist.c

@@ -1,114 +0,0 @@
-/* $Id$ */
-
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#include <locale.h>
-#include <libintl.h>
-#include <stdio.h>
-
-#include <glibtop.h>
-#include <glibtop/open.h>
-#include <glibtop/close.h>
-
-#include <glibtop/parameter.h>
-
-#include <glibtop/mountlist.h>
-#include <glibtop/fsusage.h>
-
-#ifndef PROFILE_COUNT
-#define PROFILE_COUNT	1000
-#endif
-
-int
-main (int argc, char *argv [])
-{
-	glibtop_fsusage fsusage;
-	glibtop_mountlist mount_list;
-	glibtop_mountentry *mount_entries;
-	unsigned c, index, method, count, port;
-	char buffer [BUFSIZ];
-
-	setlocale (LC_ALL, "");
-	bindtextdomain (GETTEXT_PACKAGE, GTOPLOCALEDIR);
-	textdomain (GETTEXT_PACKAGE);
-
-	glibtop_init_r (&glibtop_global_server, 0, GLIBTOP_INIT_NO_OPEN);
-
-	glibtop_get_parameter (GLIBTOP_PARAM_METHOD, &method, sizeof (method));
-
-	printf ("Method = %d\n", method);
-
-	count = glibtop_get_parameter (GLIBTOP_PARAM_COMMAND, buffer, BUFSIZ);
-	buffer [count] = 0;
-
-	printf ("Command = '%s'\n", buffer);
-
-	count = glibtop_get_parameter (GLIBTOP_PARAM_HOST, buffer, BUFSIZ);
-	buffer [count] = 0;
-
-	glibtop_get_parameter (GLIBTOP_PARAM_PORT, &port, sizeof (port));
-
-	printf ("Host = '%s' - %u\n\n", buffer, port);
-
-	printf ("sbrk (0) = %p\n\n", sbrk (0));
-
-	for (c = 0; c < PROFILE_COUNT; c++) {
-		mount_entries = glibtop_get_mountlist (&mount_list, 1);
-
-		g_free (mount_entries);
-	}
-
-	printf ("sbrk (0) = %p\n\n", sbrk (0));
-
-	mount_entries = glibtop_get_mountlist (&mount_list, 1);
-
-	if (mount_entries == NULL)
-		_exit (1);
-
-	for (index = 0; index < mount_list.number; index++)
-		printf ("Mount_Entry: %-30s %-10s %-20s\n",
-			mount_entries [index].mountdir,
-			mount_entries [index].type,
-			mount_entries [index].devname);
-
-	printf ("\n\n%-16s %9s %9s %9s %9s %9s %9s\n",
-		"Mount", "Blocks", "Free", "Avail", "Files", "Free", "BlockSz");
-
-	for (index = 0; index < mount_list.number; index++) {
-		glibtop_get_fsusage (&fsusage,
-				     mount_entries [index].mountdir);
-
-		printf ("%-16s %9Lu %9Lu %9Lu %9Lu %9Lu %9d\n",
-			mount_entries [index].mountdir,
-			fsusage.blocks, fsusage.bfree,
-			fsusage.bavail, fsusage.files,
-			fsusage.ffree, fsusage.block_size);
-	}
-
-	g_free (mount_entries);
-
-	printf ("\nsbrk (0) = %p\n\n", sbrk (0));
-
-	glibtop_close ();
-
-	exit (0);
-}

examples/netload.c

@@ -1,126 +0,0 @@
-/* $Id$ */
-
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#include <locale.h>
-#include <libintl.h>
-#include <stdio.h>
-
-#include <glibtop.h>
-#include <glibtop/open.h>
-#include <glibtop/close.h>
-
-#include <glibtop/parameter.h>
-
-#include <glibtop/netload.h>
-
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-#ifndef PROFILE_COUNT
-#define PROFILE_COUNT	1
-#endif
-
-int
-main (int argc, char *argv [])
-{
-	glibtop_netload netload;
-	unsigned method, count, port;
-	struct in_addr addr, subnet;
-	char *address_string, *subnet_string;
-	char buffer [BUFSIZ];
-
-	count = PROFILE_COUNT;
-
-	setlocale (LC_ALL, "");
-	bindtextdomain (GETTEXT_PACKAGE, GTOPLOCALEDIR);
-	textdomain (GETTEXT_PACKAGE);
-
-	glibtop_init_r (&glibtop_global_server, 0, GLIBTOP_INIT_NO_OPEN);
-
-	glibtop_get_parameter (GLIBTOP_PARAM_METHOD, &method, sizeof (method));
-
-	printf ("Method = %d\n", method);
-
-	count = glibtop_get_parameter (GLIBTOP_PARAM_COMMAND, buffer, BUFSIZ);
-	buffer [count] = 0;
-
-	printf ("Command = '%s'\n", buffer);
-
-	count = glibtop_get_parameter (GLIBTOP_PARAM_HOST, buffer, BUFSIZ);
-	buffer [count] = 0;
-
-	glibtop_get_parameter (GLIBTOP_PARAM_PORT, &port, sizeof (port));
-
-	printf ("Host = '%s' - %u\n\n", buffer, port);
-
-	glibtop_init_r (&glibtop_global_server, 0, 0);
-
-	if (argc != 2)
-		glibtop_error ("Usage: %s interface", argv [0]);
-
-	glibtop_get_netload (&netload, argv [1]);
-
-	addr.s_addr = netload.address;
-	subnet.s_addr = netload.subnet;
-
-	address_string = g_strdup (inet_ntoa (addr));
-	subnet_string  = g_strdup (inet_ntoa (subnet));
-
-	printf ("Network Load (0x%08lx):\n\n"
-		"\tInterface Flags:\t0x%08lx\n"
-		"\tAddress:\t\t0x%08lx - %s\n"
-		"\tSubnet:\t\t\t0x%08lx - %s\n\n"
-		"\tMTU:\t\t\t%ld\n"
-		"\tCollisions:\t\t%ld\n\n"
-		"\tPackets In:\t\t%ld\n"
-		"\tPackets Out:\t\t%ld\n"
-		"\tPackets Total:\t\t%ld\n\n"
-		"\tBytes In:\t\t%ld\n"
-		"\tBytes Out:\t\t%ld\n"
-		"\tBytes Total:\t\t%ld\n\n"
-		"\tErrors In:\t\t%ld\n"
-		"\tErrors Out:\t\t%ld\n"
-		"\tErrors Total:\t\t%ld\n\n",
-		(unsigned long) netload.flags,
-		(unsigned long) netload.if_flags,
-		(unsigned long) netload.address, address_string,
-		(unsigned long) netload.subnet,  subnet_string,
-		(unsigned long) netload.mtu,
-		(unsigned long) netload.collisions,
-		(unsigned long) netload.packets_in,
-		(unsigned long) netload.packets_out,
-		(unsigned long) netload.packets_total,
-		(unsigned long) netload.bytes_in,
-		(unsigned long) netload.bytes_out,
-		(unsigned long) netload.bytes_total,
-		(unsigned long) netload.errors_in,
-		(unsigned long) netload.errors_out,
-		(unsigned long) netload.errors_total);
-
-	g_free (address_string);
-	g_free (subnet_string);
-
-	glibtop_close ();
-
-	exit (0);
-}

examples/pprint.c

@@ -1,246 +0,0 @@
-#include <glibtop.h>
-
-#include <glibtop/union.h>
-
-
-#include <stdio.h>
-#include <stddef.h>
-
-
-#define buf_offsetof(MEMBER) ((ptrdiff_t)&(buf.MEMBER) - (ptrdiff_t)&buf)
-
-#define HEADER_PPRINT(FUNC) printf(#FUNC "\tsizeof = %lu B\n", \
-(unsigned long) sizeof buf)
-
-#define PPRINT(DATA, FORMAT) printf("\t%4lu B %3lu " #DATA " = " FORMAT "\n", \
-(unsigned long) sizeof buf.DATA, (unsigned long) buf_offsetof(DATA), buf.DATA)
-
-#define PPRINT_ARRAY(ARRAY, SIZE, FORMAT) do { \
-size_t i; \
-printf("\t%4lu B %3lu " #ARRAY "[%lu] = { ", \
-(unsigned long) sizeof buf.ARRAY, (unsigned long) buf_offsetof(ARRAY),\
-(unsigned long) G_N_ELEMENTS(buf.ARRAY)); \
-for(i = 0; i < (SIZE - 1); ++i) printf(".%u = " FORMAT ", ", i, buf.ARRAY[i]); \
-printf(".%u = " FORMAT " }\n", SIZE - 1 , buf.ARRAY[SIZE - 1]); \
-} while(0)
-
-#define FOOTER_PPRINT() putchar('\n')
-
-
-
-static void pprint_get_cpu()
-{
-  glibtop_cpu buf;
-
-  glibtop_get_cpu(&buf);
-
-  HEADER_PPRINT(glibtop_get_cpu);
-  PPRINT(flags, "%#llx");
-  PPRINT(total, "%llu");
-  PPRINT(user, "%llu");
-  PPRINT(nice, "%llu");
-  PPRINT(sys, "%llu");
-  PPRINT(idle, "%llu");
-  PPRINT(frequency, "%llu");
-  PPRINT_ARRAY(xcpu_total, GLIBTOP_NCPU, "%llu");
-  PPRINT_ARRAY(xcpu_user, GLIBTOP_NCPU, "%llu");
-  PPRINT_ARRAY(xcpu_nice, GLIBTOP_NCPU, "%llu");
-  PPRINT_ARRAY(xcpu_sys, GLIBTOP_NCPU, "%llu");
-  PPRINT_ARRAY(xcpu_idle, GLIBTOP_NCPU, "%llu");
-  PPRINT(xcpu_flags, "%llx");
-  FOOTER_PPRINT();
-}
-
-
-
-static void pprint_get_fsusage(const char *mountpoint)
-{
-  glibtop_fsusage buf;
-
-  glibtop_get_fsusage(&buf, mountpoint);
-
-  HEADER_PPRINT(glibtop_get_fsusage);
-  PPRINT(flags, "%#llx");
-  PPRINT(blocks, "%llu");
-  PPRINT(bfree, "%llu");
-  PPRINT(bavail, "%llu");
-  PPRINT(files, "%llu");
-  PPRINT(ffree, "%llu");
-  PPRINT(block_size, "%u");
-  PPRINT(read, "%llu");
-  PPRINT(write, "%llu");
-  FOOTER_PPRINT();
-}
-
-
-
-static void pprint_get_loadavg()
-{
-  glibtop_loadavg buf;
-
-  glibtop_get_loadavg(&buf);
-
-  HEADER_PPRINT(glibtop_get_loadavg);
-  PPRINT(flags, "%#llx");
-  PPRINT_ARRAY(loadavg, 3, "%f");
-  PPRINT(nr_running, "%llu");
-  PPRINT(nr_tasks, "%llu");
-  PPRINT(last_pid, "%llu");
-  FOOTER_PPRINT();
-}
-
-
-
-static void pprint_get_mem()
-{
-  glibtop_mem buf;
-
-  glibtop_get_mem(&buf);
-
-  HEADER_PPRINT(glibtop_get_mem);
-  PPRINT(flags, "%#llx");
-  PPRINT(total, "%llu");
-  PPRINT(used, "%llu");
-  PPRINT(free, "%llu");
-  PPRINT(shared, "%llu");
-  PPRINT(buffer, "%llu");
-  PPRINT(cached, "%llu");
-  PPRINT(user, "%llu");
-  PPRINT(locked, "%llu");
-  FOOTER_PPRINT();
-}
-
-
-
-static void pprint_get_mountlist(gboolean allfs)
-{
-  glibtop_mountlist buf;
-  glibtop_mountentry *entries;
-  size_t i;
-
-  entries = glibtop_get_mountlist(&buf, allfs);
-
-  HEADER_PPRINT(glibtop_get_mountlist);
-  PPRINT(flags, "%#llx");
-  PPRINT(number, "%llu");
-  PPRINT(total, "%llu");
-  PPRINT(size, "%llu");
-
-  printf("\t%4llu B entries[%llu] = \n\t\t{\n", buf.total, buf.number);
-
-  for(i = 0; i < buf.number; ++i)
-    {
-      printf("\t\t .%lu = { .dev = %#llx,"
-	     " .devname = \"%s\","
-	     " .mountir = \"%s\","
-	     " .type = \"%s\" }\n",
-	     (unsigned long) i, entries[i].dev,
-	     entries[i].devname,
-	     entries[i].mountdir,
-	     entries[i].type);
-    }
-
-  printf("\t\t}\n");
-  FOOTER_PPRINT();
-
-  g_free(entries);
-}
-
-
-
-static void pprint_get_msg_limits()
-{
-  glibtop_msg_limits buf;
-
-  glibtop_get_msg_limits(&buf);
-
-  HEADER_PPRINT(glibtop_get_msg_limits);
-  PPRINT(flags, "%#llx");
-  PPRINT(msgpool, "%llu");
-  PPRINT(msgmap, "%llu");
-  PPRINT(msgmax, "%llu");
-  PPRINT(msgmnb, "%llu");
-  PPRINT(msgmni, "%llu");
-  PPRINT(msgssz, "%llu");
-  PPRINT(msgtql, "%llu");
-  FOOTER_PPRINT();
-}
-
-
-
-static void pprint_get_netload(const char *iface)
-{
-  glibtop_netload buf;
-
-  glibtop_get_netload(&buf, iface);
-
-  HEADER_PPRINT(glibtop_get_netload);
-  FOOTER_PPRINT();
-}
-
-
-
-static void pprint_get_swap()
-{
-  glibtop_swap buf;
-
-  glibtop_get_swap(&buf);
-
-  HEADER_PPRINT(glibtop_get_swap);
-  PPRINT(flags, "%#llx");
-  PPRINT(total, "%llu");
-  PPRINT(used, "%llu");
-  PPRINT(free, "%llu");
-  PPRINT(pagein, "%llu");
-  PPRINT(pageout, "%llu");
-  FOOTER_PPRINT();
-}
-
-
-
-static void pprint_get_uptime()
-{
-  glibtop_uptime buf;
-
-  glibtop_get_uptime(&buf);
-
-  HEADER_PPRINT(glibtop_get_uptime);
-  PPRINT(flags, "%#llx");
-  PPRINT(uptime, "%f");
-  PPRINT(idletime, "%f");
-  PPRINT(boot_time, "%llu");
-  FOOTER_PPRINT();
-}
-
-
-
-int main()
-{
-  glibtop_init();
-
-  pprint_get_cpu();
-
-  pprint_get_fsusage("/");
-
-  pprint_get_loadavg();
-
-  pprint_get_mem();
-
-  pprint_get_mountlist(TRUE);
-  pprint_get_mountlist(FALSE);
-
-  pprint_get_msg_limits();
-
-/*   pprint_get_netload("lo"); */
-
-
-  pprint_get_swap();
-
-/* pprint_get_sysinfo(); */
-
-  pprint_get_uptime();
-
-  glibtop_close();
-
-  return 0;
-}