Released 2.20.0.

svn path=/trunk/; revision=2655

.cvsignore

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

ChangeLog

@@ -1,3 +1,331 @@
+2007-05-19  Benoît Dejean  <benoit@placenet.org>
+
+	* features.def:
+	* include/glibtop/proclist.h:
+
+	Small API change.
+	get_proclist returns pid_t instead of unsigned for consistency.
+	I have checked many archs and this doesn't break the ABI.
+
+2007-05-17  Benoît Dejean  <benoit@placenet.org>
+
+	* configure.in:
+
+	Bumped version number.
+
+2007-05-14  Benoît Dejean  <benoit@placenet.org>
+
+	* include/glibtop/Makefile.am:
+	* lib/Makefile.am:
+
+	Fixed dist.
+
+2007-05-13  Benoît Dejean  <benoit@placenet.org>
+
+	* NEWS:
+	* configure.in:
+	
+	Released 2.19.2.
+
+2007-05-10  Benoît Dejean  <benoit@placenet.org>
+
+	* lib/libgtop.sym:
+
+	Added missing *_p symbols.
+
+2007-05-07  Benoît Dejean  <benoit@placenet.org>
+
+	* configure.in:
+	* lib/Makefile.am:
+	* lib/libgtop.sym:
+
+	Updated libtool version.
+	Now uses a symbol list instead of a regex.
+
+2007-05-07  Benoît Dejean  <benoit@placenet.org>
+
+	* New API to get cwd, root and exe path
+	of a process. API not frozen yet.
+
+2007-04-27  Benoît Dejean  <benoit@placenet.org>
+
+	Got rid of InodeDB.
+	This feature was optionnal and i have never heard of anyone using
+	it. I have never touched it so it may be broken since 2.6.
+
+2007-04-11  Benoît Dejean  <benoit@placenet.org>
+
+	* *:
+	
+	Renamed all glibtop_init_xxx functions
+	to _glibtop_init_xxx so they get internal visibility.
+
+	* configure.in:
+	
+	Bumped version number.
+
+2007-03-13  Benoît Dejean  <benoit@placenet.org>
+
+	* MAINTAINERS:
+	
+	Updated.
+
+2007-02-25  Benoît Dejean  <benoit@placenet.org>
+
+	* NEWS:
+	
+	Released 2.14.8.
+
+2007-02-20  Benoît Dejean  <benoit@placenet.org>
+
+	* *:
+	
+	Removed noisy $Id$.
+
+2007-02-18  Benoît Dejean  <benoit@placenet.org>
+
+	* configure.in:
+	* libgtop-sysdeps.m4:
+	* sysdeps/Makefile.am:
+	
+	Huge (k)FreeBSD update.
+	(k)FreeBSD support is freebsd/
+	Other BSD are in bsd/
+	
+	Patch by Joe Marcus Clarke  <marcus@freebsd.org>
+	Alexander Nedotsukov  <bland@FreeBSD.org>
+	
+	Closes #407693.
+
+2007-02-14  Benoît Dejean  <benoit@placenet.org>
+
+	* lib/read.c: (glibtop_read_l):
+	* lib/write.c: (glibtop_write_l):
+
+	Handle EINTR.
+	
+	* configure.in:
+	
+	Post release version bump.
+
+2007-02-10  Benoît Dejean  <benoit@placenet.org>
+
+	* NEWS:
+	* configure.in:
+	
+	Released 2.14.7.
+
+2007-01-14  Benoît Dejean  <benoit@placenet.org>
+
+	* NEWS:
+
+	Released 2.14.6.
+
+2007-01-11  Benoît Dejean  <benoit@placenet.org>
+
+	* configure.in:
+	
+	Bumped version number to 2.14.6.
+	
+	* *:
+	
+	Got rid of CVS admin files.
+
+2006-12-03  Benoît Dejean  <benoit@placenet.org>
+
+	* doc/reference/libgtop-docs.xml:
+	* glibtop.h:
+	* include/glibtop/sysinfo.h:
+	
+	Made gtk-doc happy in order to dist.
+
+2006-12-03  Benoît Dejean  <benoit@placenet.org>
+
+	* NEWS:
+	
+	Released 2.14.5.
+
+2006-12-02  Benoît Dejean  <benoit@placenet.org>
+
+	* Makefile.am:
+	* configure.in:
+	* doc/Makefile.am:
+	* doc/reference/Makefile.am:
+	* doc/reference/libgtop-docs.xml:
+	* doc/reference/libgtop-sections.txt:
+	* doc/reference/version.xml.in:
+	* gtk-doc.make:
+	* sysdeps/common/default.c:
+
+	Converted to gtk-doc.
+	Patch by Germán Poó-Caamaño <gpoo@ubiobio.cl>.
+
+2006-12-01  Julio M. Merino Vidal  <jmmv@NetBSD.org>
+
+	* configure.in:
+	* libgtop-sysdeps.m4:
+
+	Use the AS_HELP_STRING macro to format help messages.
+	Fixes bug #337068.
+
+2006-11-27  Benoît Dejean  <benoit@placenet.org>
+
+	* libgtop-sysdeps.m4:
+	
+	Added kfreebsd support.
+	Patch by Petr Salinger <Petr.Salinger@seznam.cz>.
+
+2006-11-27  Benoît Dejean  <benoit@placenet.org>
+
+	* configure.in:
+	
+	Bumped version number.
+
+2006-09-16  Benoît Dejean  <benoit@placenet.org>
+
+	* NEWS:
+	* configure.in:
+	
+	Released 2.14.4.
+
+2006-09-10  Benoît Dejean  <benoit@placenet.org>
+
+	* configure.in:
+	* include/glibtop/procstate.h:
+	
+	Removed wrong inline documentation.
+	Closes #355286.
+
+2006-09-05  Benoît Dejean  <benoit@placenet.org>
+
+	* NEWS:
+	
+	Released 2.14.3.
+
+2006-08-14  Benoît Dejean  <benoit@placenet.org>
+
+	* src/inodedb/Makefile.am:
+
+	Fixed inodedb build with --as-needed to please people
+	who want to compile and optimize broken, deprecated and
+	never-used feature.
+	Patch by Daniel Gryniewicz <dang@gentoo.org>
+	Closes #341041.
+
+2006-08-10  Benoît Dejean  <benoit@placenet.org>
+
+	* configure.in:
+	
+	Bumped version number.
+	
+	* glibtop.h:
+	* include/glibtop/init_hooks.h:
+
+	Added missing G_(BEGIN|END)_DECLS.
+
+2006-07-27  Benoît Dejean  <benoit@placenet.org>
+
+	* NEWS:
+
+	Released 2.14.2.
+
+2006-07-27  Benoît Dejean  <benoit@placenet.org>
+
+	* include/glibtop/netload.h:
+	
+	Tiny interface addition to handle wireless interfaces.
+
+2006-06-26  Benoît Dejean  <benoit@placenet.org>
+
+	* po/Makefile.in.in.in:
+	
+	Dropped dead file.
+
+2006-06-25  Benoît Dejean  <benoit@placenet.org>
+
+	* Makefile.am: 
+	
+	Fixed build.
+	Closes #341779.
+
+2006-06-24  Benoît Dejean  <benoit@placenet.org>
+
+	* Makefile.am:
+
+	Build examples only when needed.
+	Patch by dmacks@netspace.org.
+	Closes #342863.
+
+2006-06-24  Benoît Dejean  <benoit@placenet.org>
+
+	* libgtop-sysdeps.m4:
+	* sysdeps/solaris/glibtop_machine.h:
+	
+	Updated the GLIBTOP_SOLARIS_RELEASE
+	
+	Patch by hua.zhang@sun.com.
+	Closes #345821.
+
+2006-06-24  Benoît Dejean  <benoit@placenet.org>
+
+	* configure.in:
+	
+	Don't use kvm on newer solaris.
+	Patch by hua.zhang@sun.com.
+	Closes #345811.
+
+2006-06-04  Benoît Dejean  <benoit@placenet.org>
+
+	* libgtop-sysdeps.m4:
+	
+	Removed undefined LIBGTOP_HACKER_TESTS.
+	Closes #342890.
+
+2006-06-03  Benoît Dejean  <benoit@placenet.org>
+
+	* .cvsignore:
+	* Makefile.am:
+	* configure.in:
+	* po/LINGUAS:
+	
+	Use po/LINGUAS.
+	Closes #337902.
+
+2006-04-18  German Poo-Caaman~o  <gpoo@ubiobio.cl>
+
+	* /include/glibtop/cpu.h:
+	* /include/glibtop/fsusage.h:
+	* /include/glibtop/loadavg.h:
+	* /include/glibtop/mem.h:
+	* /include/glibtop/mountlist.h:
+	* /include/glibtop/msg_limits.h:
+	* /include/glibtop/netload.h:
+	* /include/glibtop/ppp.h:
+	* /include/glibtop/procargs.h:
+	* /include/glibtop/prockernel.h:
+	* /include/glibtop/proclist.h:
+	* /include/glibtop/procmap.h:
+	* /include/glibtop/procmem.h:
+	* /include/glibtop/procopenfiles.h:
+	* /include/glibtop/procsegment.h:
+	* /include/glibtop/procsignal.h:
+	* /include/glibtop/procstate.h:
+	* /include/glibtop/proctime.h:
+	* /include/glibtop/procuid.h:
+	* /include/glibtop/sem_limits.h:
+	* /include/glibtop/shm_limits.h:
+	* /include/glibtop/swap.h:
+	* /include/glibtop/sysdeps.h:
+	* /include/glibtop/uptime.h:
+
+	Changed struct's definitions to be one type-one member.  To
+	avoid problems with any further gtk-doc's implementation.
+
+2006-04-18  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* configure.in: Remove obsolete entry for no_NO
+	* po/no.po: And the translation.
+
 2006-04-10  Benoît Dejean  <benoit@placenet.org>
 
 	* NEWS:

MAINTAINERS

@@ -1,3 +1,4 @@
-Email: martin@home-of-linux.org
-Email: dave@srce.hr
-Current maintainer : Benoît Dejean (benoit@placenet.org)
+Benoît Dejean
+E-mail: benoit@placenet.org
+Userid: bdejean
+

Makefile.am

@@ -1,5 +1,11 @@
 
-SUBDIRS = po misc include sysdeps lib src examples doc
+if EXAMPLES
+EXAMPLES_DIR = examples
+else
+EXAMPLES_DIR = 
+endif
+
+SUBDIRS = po misc include sysdeps lib src $(EXAMPLES_DIR) doc
 
 libgtopinclude_HEADERS = glibtop.h libgtopconfig.h
 libgtopincludedir = $(includedir)/libgtop-2.0
@@ -7,7 +13,15 @@ libgtopincludedir = $(includedir)/libgtop-2.0
 EXTRA_DIST = autogen.sh libgtop.spec.in copyright.txt \
 	 features.def libgtopconfig.h.in \
 	libgtop-sysdeps.m4 README \
-	 libgtop-2.0.pc.in acinclude.m4
+	 libgtop-2.0.pc.in acinclude.m4 \
+	intltool-extract.in \
+	intltool-merge.in \
+	intltool-update.in
+
+DISTCLEANFILES = \
+	intltool-extract \
+	intltool-merge \
+	intltool-update
 
 dist-hook:
 	cp libgtop.spec $(distdir)
@@ -18,3 +32,4 @@ pkgconfig_DATA = libgtop-2.0.pc
 libgtop-features.def: features.def
 	@LN_S@ $< $@
 
+DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc

NEWS

@@ -1,3 +1,91 @@
+16 September 2007: Overview of changes in 2.20.0
+================================================
+* Updated translations.
+
+27 August 2007: Overview of changes in 2.19.92
+==============================================
+* Fixed stupid hardwired path in linux/sysinfo.c
+
+26 August 2007: Overview of changes in 2.19.91
+==============================================
+* Translations updates.
+* linux:
+  - Small internal improvement. Might fix sysinfo when having more than
+  8 CPUS.
+
+9 July 2007: Overview of changes in 2.19.5
+==========================================
+* linux:
+  - fixed proc_map for >= 2.6.22
+* freebsd:
+  - implemented procwd and procopenfiles
+    Joe Marcus Clarke
+
+18 June 2007: Overview of changes in 2.19.4
+===========================================
+* solaris:
+  - fixed build. Damien Carbery.
+
+3 June 2007: Overview of changes in 2.19.3
+==========================================
+* Small API change. get_proclist returns pid_t instead of unsigned
+  for consistency.
+* linux:
+  - fixed an typo bug in open_files.
+  - got rid of useless glibtop_init_s calls.
+* Enable example build by defaut.
+* Dropped G_GNUC_INTERNAL attributes no longer needed.
+  This will please people trying to implement G_GNUC macro with a non
+  GNU Compiler.
+
+13 May 2007: Overview of changes in 2.19.2
+==========================================
+* This is the first release of the 2.19.x series.
+* Got rid of inodedb (you don't even know what it is ;)
+* New unstable API glibtop_get_proc_wd to get working directories of
+  a process.
+* Fixed OpenBSD build. Jasper Lievisse Adriaanse.
+
+25 February 2007: Overview of changes in 2.14.8
+===============================================
+* bsd implementations have been splitted by Joe Marcus Clarke
+  and Alexander Nedotsukov. (k)freeBSD now has a separate implementation.
+
+February 10, 2007: Overview of changes in 2.14.7
+================================================
+* bsd:
+  - massive kfreeBSD and FreeBSD updates by Roy Marples and Petr Salinger.
+* mountlist can now ignore objfs and ctfs filesystems.
+* fsusage won't return bavail > bfree anymore.
+
+January 14, 2007: Overview of changes in 2.14.6
+===============================================
+* linux:
+  - fixed stack overflow in glibtop_get_proc_map
+  - fixed handling of long filenames in glibtop_get_proc_map and glibtop_get_proc_open_files.
+  - micro-optimization
+
+December 3, 2006: Overview of changes in 2.14.5
+===============================================
+* Added kfreebsd support (Petr Salinger <Petr.Salinger@seznam.cz>).
+* Added solaris glibtop_get_proc_open_files (Henry Zhang <hua.zhang@sun.com>).
+* Migrated to gtk-doc (Germán Poó-Caamaño <gpoo@ubiobio.cl>).
+* glibtop_get_mountlist can now ignore nsfd FS. 
+
+September 16, 2006: Overview of changes in 2.14.4
+=================================================
+* Fixed linux maps/smaps parsing on 64bit kernel.
+
+September 5, 2006: Overview of changes in 2.14.3
+================================================
+* Fixed build with --as-needed.
+* Added missing G_BEGIN_DECLS/G_END_DECLS.
+
+July 27, 2006: Overview of changes in 2.14.2
+============================================
+* Updated solaris support (hua.zhang@sun.com)
+* Small linux updates and improvments.
+
 April 10, 2006: Overview of changes in 2.14.1
 =============================================
 * Updated translations.

configure.in

@@ -3,12 +3,12 @@ dnl Configure script for the Gnome library
 dnl
 
 m4_define([libgtop_major_version], [2])
-m4_define([libgtop_minor_version], [14])
-m4_define([libgtop_micro_version], [1])
+m4_define([libgtop_minor_version], [20])
+m4_define([libgtop_micro_version], [0])
 m4_define([libgtop_version], [libgtop_major_version.libgtop_minor_version.libgtop_micro_version])
 
 dnl  increment if the interface has additions, changes, removals.
-m4_define([libgtop_current], [7])
+m4_define([libgtop_current], [8])
 
 dnl  increment any time the source changes; set to
 dnl  0 if you increment CURRENT
@@ -17,7 +17,7 @@ m4_define([libgtop_revision], [0])
 dnl  increment if any interfaces have been added; set to 0
 dnl  if any interfaces have been removed. removal has
 dnl  precedence over adding, so set to 0 if both happened.
-m4_define([libgtop_age], [0])
+m4_define([libgtop_age], [1])
 
 # Increase each time you change the client/server protocol.
 m4_define([libgtop_server_version], [5])
@@ -25,6 +25,7 @@ m4_define([libgtop_server_version], [5])
 # Version code calculation
 m4_define([libgtop_version_code], [m4_eval(libgtop_major_version * 1000000 + libgtop_minor_version * 1000 + libgtop_micro_version)])
 
+AC_PREREQ(2.59)
 AC_INIT([libgtop], [libgtop_version],
         [http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop])
 AC_CONFIG_SRCDIR(copyright.txt)
@@ -86,37 +87,12 @@ AM_CONDITIONAL(CROSS_COMPILING, test "x$cross_compiling" = xyes)
 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, 1,
-            [Define if the libgtop inodedb should be built])
-fi
-
 GLIB_REQUIRED=2.6.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])
@@ -174,6 +150,8 @@ case "$host_os" in
 
 
     dnl Some versions of Solaris require -lelf for -lkvm
+    case $host_os in
+    solaris[[8-9]] | solaris2.[[0-9]].*)
     AC_CHECK_LIB(kvm, kvm_open,[
       LIBS="-lkvm $LIBS"
     ],[AC_MSG_CHECKING(for kvm_open in -lkvm with -lelf)
@@ -192,6 +170,8 @@ case "$host_os" in
        fi
     ])
      ;;
+     esac
+     ;;
 esac
 
 dnl For DEC OSF1
@@ -230,7 +210,7 @@ AC_TYPE_SIGNAL
 AC_FUNC_STRFTIME
 AC_CHECK_FUNCS(getcwd gettimeofday getwd putenv strdup strtoul uname)
 
-ALL_LINGUAS="am ar az be bg bn 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 ka ko ku ky lt lv mi mk ml mn ms nb ne nl nn no or pa pl pt pt_BR ro ru rw sk sl sq sr sr@Latn sv ta th tr uk vi xh zh_CN zh_TW"
+IT_PROG_INTLTOOL([0.35.0])
 
 GETTEXT_PACKAGE=libgtop-2.0
 AC_SUBST(GETTEXT_PACKAGE)
@@ -275,8 +255,15 @@ 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, 1, [Define to enable debugging]),)
-AC_ARG_ENABLE(fatal-warnings, [  --enable-fatal-warnings make all warnings fatal [debug=no]],AC_DEFINE(LIBGTOP_FATAL_WARNINGS, 1, [Define to enable fatal warnings]),)
+AC_ARG_ENABLE(debug,
+              AS_HELP_STRING([--enable-debug],
+                             [Turn on debugging @<:@default=no@:>@]),
+              AC_DEFINE(LIBGTOP_ENABLE_DEBUG, 1, [Define to enable debugging]))
+AC_ARG_ENABLE(fatal-warnings,
+              AS_HELP_STRING([--enable-fatal-warnings],
+                             [Make all warnings fatal @<:@debug=no@:>@]),
+              AC_DEFINE(LIBGTOP_FATAL_WARNINGS, 1,
+                        [Define to enable fatal warnings]))
 
 dnl These definitions are expanded in make.
 LIBGTOP_LIBS='-L$(libdir)'
@@ -286,10 +273,6 @@ if test x$libgtop_use_machine_h = xyes ; then
   LIBGTOP_INCS="$LIBGTOP_INCS -DHAVE_GLIBTOP_MACHINE_H"
 fi
 
-if test x$build_inodedb = xyes ; then
-  LIBGTOP_INCS="$LIBGTOP_INCS -DGLIBTOP_INODEDB"
-fi
-
 if test x$libgtop_smp = xyes ; then
   LIBGTOP_INCS="$LIBGTOP_INCS -DHAVE_LIBGTOP_SMP"
 fi
@@ -377,6 +360,8 @@ fi
 AC_SUBST(sysdeps_suid_lib)
 AC_SUBST(server_programs)
 
+GTK_DOC_CHECK(1.4)
+
 AC_CONFIG_FILES([
 Makefile
 libgtop.spec
@@ -394,12 +379,14 @@ sysdeps/linux/Makefile
 sysdeps/freebsd/Makefile
 sysdeps/solaris/Makefile
 sysdeps/aix/Makefile
+sysdeps/bsd/Makefile
 src/Makefile
 src/daemon/Makefile
-src/inodedb/Makefile
 lib/Makefile
 examples/Makefile
 doc/Makefile
+doc/reference/Makefile
+doc/reference/version.xml
 libgtop-2.0.pc
 libgtopconfig.h
 ])

debian/.cvsignore

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

doc/.cvsignore

@@ -1,11 +0,0 @@
-texinfo.tex
-*.info
-Makefile.in
-Makefile
-*.log *.toc *.dvi *.aux *.cp *.fn *.vr *.tp *.ky *.pg
-*.ps
-auto-macros.texi
-version.texi
-stamp-vti
-*.html *.pdf
-mdate-sh

doc/ChangeLog

@@ -1,3 +1,9 @@
+2007-02-15  Benoît Dejean  <benoit@placenet.org>
+
+	* reference/Makefile.am:
+	
+	Fixed distcheck.
+
 2006-02-21  Benoît Dejean  <benoit@placenet.org>
 
 	* reference.texi: Fixed glibtop_get_proc_state doc.

doc/Makefile.am

@@ -1,3 +1,5 @@
+SUBDIRS = reference
+
 info_TEXINFOS		= libgtop2.texi
 
 libgtop2_TEXINFOS	= libgtop2.texi about.texi reference.texi \

doc/reference/Makefile.am

@@ -0,0 +1,59 @@
+AUTOMAKE_OPTIONS = 1.6
+## Process this file with automake to produce Makefile.in
+# The name of the module, e.g. 'glib'.
+DOC_MODULE=libgtop
+
+# The top-level SGML file. You can change this if you want to.
+DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.xml
+
+# Extra options to pass to gtkdoc-scangobj. Not normally needed.
+# SCANGOBJ_OPTIONS=
+
+# Extra options to supply to gtkdoc-scan.
+# e.g. SCAN_OPTIONS=--deprecated-guards="GTK_DISABLE_DEPRECATED" 
+SCAN_OPTIONS=
+
+# Extra options to supply to gtkdoc-mkdb.
+# e.g. MKDB_OPTIONS=--sgml-mode --output-format=xml
+MKDB_OPTIONS=--sgml-mode --output-format=xml --source-dir=$(top_srcdir)/sysdeps/common
+
+# The directory containing the source code. Relative to $(srcdir).
+# gtk-doc will search all .c & .h files beneath here for inline comments
+# documenting the functions and macros.
+# e.g. DOC_SOURCE_DIR=../../../gtk
+DOC_SOURCE_DIR=$(top_srcdir)/include/glibtop
+
+# Used for dependencies. The docs will be rebuilt if any of these change.
+# e.g. HFILE_GLOB=$(top_srcdir)/gtk/*.h
+# e.g. CFILE_GLOB=$(top_srcdir)/gtk/*.c
+HFILE_GLOB=$(top_srcdir)/include/glibtop/*.h
+CFILE_GLOB=$(top_srcdir)/sysdeps/common/*.c
+
+# Header files to ignore when scanning.
+# e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h
+IGNORE_HFILES=error.h global.h gnuserv.h init_hooks.h write.h read.h read_data.h config.h libgtopconfig.h
+
+EXTRA_HFILES=$(top_srcdir)/glibtop.h
+
+# Extra SGML files that are included by $(DOC_MAIN_SGML_FILE).
+# e.g. content_files=running.sgml building.sgml changes-2.0.sgml
+content_files=version.xml
+
+# Images to copy into HTML directory.
+# e.g. HTML_IMAGES=$(top_srcdir)/gtk/stock-icons/stock_about_24.png
+HTML_IMAGES=
+
+# CFLAGS and LDFLAGS for compiling gtkdoc-scangobj with your library.
+# Only needed if you are using gtkdoc-scangobj to dynamically query widget
+# signals and properties.
+# e.g. INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
+# e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
+INCLUDES=
+GTKDOC_LIBS=
+
+# This includes the standard gtk-doc make rules, copied by gtkdocize.
+include $(top_srcdir)/gtk-doc.make
+
+# Other files to distribute
+# e.g. EXTRA_DIST += version.xml.in
+EXTRA_DIST += version.xml.in

doc/reference/libgtop-docs.xml

@@ -0,0 +1,206 @@
+<?xml version="1.0"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" 
+               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
+<book id="index" xmlns:xi="http://www.w3.org/2003/XInclude">
+  <bookinfo>
+    <title>Libgtop Reference Manual</title>
+    <releaseinfo>for libgtop <xi:include href="version.xml"/></releaseinfo>
+    <authorgroup>
+      <author>
+	<firstname>Martin </firstname>
+	<surname>Baulig</surname>
+	<affiliation>
+	  <address>
+	    <email>martin@home-of-linux.org</email>
+	  </address>
+	</affiliation>
+      </author>
+      <author>
+	<firstname>Germ&#225;n</firstname>
+	<surname>Po&#243;-Caama&#241;o</surname>
+	<affiliation>
+	  <address>
+	    <email>gpoo@ubiobio.cl</email>
+	  </address>
+	</affiliation>
+      </author>
+    </authorgroup>
+
+    <legalnotice>
+      <para>Permission is granted to copy, distribute and/or modify
+      this document under the terms of the <citetitle>GNU Free
+      Documentation License</citetitle>, Version 1.1 or any later
+      version published by the Free Software Foundation with no
+      Invariant Sections, no Front-Cover Texts, and no Back-Cover
+      Texts. You may obtain a copy of the <citetitle>GNU Free
+      Documentation License</citetitle> from the Free Software
+      Foundation by visiting <ulink type="http"
+      url="http://www.fsf.org">their Web site</ulink> or by writing
+      to: Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+      Boston, MA 02111-1307, USA.</para>
+
+      <para>Many of the names used by companies to distinguish their
+      products and services are claimed as trademarks. Where those
+      names appear in any GNOME documentation, and those trademarks
+      are made aware to the members of the GNOME Documentation
+      Project, the names have been printed in caps or initial
+      caps.</para>
+    </legalnotice>
+
+    <abstract>
+      <para>
+      LibGTop is a library to get system specific data such as CPU and 
+      Memory Usage and information about running Processes.</para>
+
+      <para>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.</para>
+
+      <para>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.</para>
+
+      <para>This manual documents the interfaces of the libgtop
+      library and has some short notes to help get you up to speed
+      with using the library.</para>
+    </abstract>
+  </bookinfo>
+
+  <!--FIXME: It is missing the rest of about.texi -->
+
+  <chapter id="libgtop-white-paper">
+    <title>White paper</title>
+
+    <sect1 id="libgtop-white-paper-introduction">
+      <title>Introduction</title>
+      <para>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.</para>
+
+      <itemizedlist>
+      <listitem><para>
+      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.</para></listitem>
+
+      <listitem><para>
+      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).</para></listitem>
+
+      <listitem><para>
+      Linux has a very nice @file{/proc} filesystem, but reading and parsing
+      @file{/proc} is very slow and inefficient.</para></listitem>
+
+      <listitem><para>
+      Solaris is a bit better, but you still need to be in the @code{sys} group or
+      even root to get some data.</para></listitem>
+      </itemizedlist>
+
+      <para>
+      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.</para>
+
+      <para>
+      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.</para>
+
+    </sect1>
+
+    <sect1 id="libgtop-white-paper-overview">
+      <title>Overview</title>
+      <para>This section should give you a short overview on how LibGTop
+      was developed, which things needed to be considered and how it 
+      works.</para>
+
+      <sect2 id="libgtop-white-paper-overview-design">
+      <title>Interface Design: Things that need to be considered</title>
+      <para>
+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.</para>
+
+      <para>
+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.</para>
+
+      <para>
+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.</para>
+      </sect2>
+
+      <sect2 id="libgtop-white-paper-overview-server">
+      <title>Server Implementation: The LibGTop "server"</title>
+      <para>
+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.</para>
+
+      <para>
+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.</para>
+      </sect2>
+    </sect1>
+
+  </chapter>
+
+  <chapter id="libgtop-lib">
+    <title>Libgtop Library Reference</title>
+
+    <para>This section contains the API reference for libgtop.  All
+    the public interfaces are documented here.</para>
+
+    <xi:include href="xml/glibtop.xml"/>
+    <xi:include href="xml/close.xml"/>
+    <xi:include href="xml/command.xml"/>
+    <xi:include href="xml/glibtop-server.xml"/>
+    <xi:include href="xml/netload.xml"/>
+    <xi:include href="xml/ppp.xml"/>
+    <xi:include href="xml/shm_limits.xml"/>
+    <xi:include href="xml/uptime.xml"/>
+    <xi:include href="xml/netlist.xml"/>
+    <xi:include href="xml/open.xml"/>
+    <xi:include href="xml/parameter.xml"/>
+    <xi:include href="xml/procargs.xml"/>
+    <xi:include href="xml/procmem.xml"/>
+    <xi:include href="xml/procopenfiles.xml"/>
+    <xi:include href="xml/procsegment.xml"/>
+    <xi:include href="xml/procsignal.xml"/>
+    <xi:include href="xml/sysdeps.xml"/>
+    <xi:include href="xml/procstate.xml"/>
+    <xi:include href="xml/procuid.xml"/>
+    <xi:include href="xml/proctime.xml"/>
+    <xi:include href="xml/signal.xml"/>
+    <xi:include href="xml/procmap.xml"/>
+    <xi:include href="xml/sysinfo.xml"/>
+    <xi:include href="xml/union.xml"/>
+    <xi:include href="xml/version.xml"/>
+    <xi:include href="xml/proclist.xml"/>
+    <xi:include href="xml/sem_limits.xml"/>
+    <xi:include href="xml/prockernel.xml"/>
+    <xi:include href="xml/fsusage.xml"/>
+    <xi:include href="xml/loadavg.xml"/>
+    <xi:include href="xml/mem.xml"/>
+    <xi:include href="xml/mountlist.xml"/>
+    <xi:include href="xml/msg_limits.xml"/>
+    <xi:include href="xml/cpu.xml"/>
+    <xi:include href="xml/swap.xml"/>
+  </chapter>
+</book>

doc/reference/libgtop-sections.txt

@@ -0,0 +1,736 @@
+<INCLUDE>glibtop.h</INCLUDE>
+<SECTION>
+<FILE>glibtop</FILE>
+<TITLE>GlibTop</TITLE>
+GLIBTOP_MOUNTENTRY_LEN
+LIBGTOP_CHECK_VERSION
+glibtop
+glibtop_global_server
+glibtop_init
+glibtop_init_r
+glibtop_init_s
+glibtop_server_features
+</SECTION>
+
+<INCLUDE>glibtop/close.h</INCLUDE>
+<SECTION>
+<FILE>close</FILE>
+<TITLE>Close</TITLE>
+glibtop_close
+glibtop_close_r
+glibtop_close_s
+glibtop_close_p
+</SECTION>
+
+<INCLUDE>glibtop/command.h</INCLUDE>
+<SECTION>
+<FILE>command</FILE>
+<TITLE>Command</TITLE>
+GLIBTOP_CMND_QUIT
+GLIBTOP_CMND_SYSDEPS
+GLIBTOP_CMND_CPU
+GLIBTOP_CMND_MEM
+GLIBTOP_CMND_SWAP
+GLIBTOP_CMND_UPTIME
+GLIBTOP_CMND_LOADAVG
+GLIBTOP_CMND_SHM_LIMITS
+GLIBTOP_CMND_MSG_LIMITS
+GLIBTOP_CMND_SEM_LIMITS
+GLIBTOP_CMND_PROCLIST
+GLIBTOP_CMND_PROC_STATE
+GLIBTOP_CMND_PROC_UID
+GLIBTOP_CMND_PROC_MEM
+GLIBTOP_CMND_PROC_TIME
+GLIBTOP_CMND_PROC_SIGNAL
+GLIBTOP_CMND_PROC_KERNEL
+GLIBTOP_CMND_PROC_SEGMENT
+GLIBTOP_CMND_PROC_ARGS
+GLIBTOP_CMND_PROC_MAP
+GLIBTOP_CMND_MOUNTLIST
+GLIBTOP_CMND_FSUSAGE
+GLIBTOP_CMND_NETLOAD
+GLIBTOP_CMND_PPP
+GLIBTOP_CMND_NETLIST
+GLIBTOP_CMND_PROC_OPEN_FILES
+GLIBTOP_MAX_CMND
+glibtop_command
+glibtop_response
+glibtop_response_union
+glibtop_call
+glibtop_call_l
+glibtop_call_s
+</SECTION>
+
+<INCLUDE>glibtop/glibtop-server.h</INCLUDE>
+<SECTION>
+<FILE>glibtop-server</FILE>
+<TITLE>GlibTop Server</TITLE>
+glibtop_server
+glibtop_server_info
+glibtop_closure
+glibtop_server_new
+glibtop_server_ref
+glibtop_server_unref
+</SECTION>
+
+<INCLUDE>glibtop/netload.h</INCLUDE>
+<SECTION>
+<FILE>netload</FILE>
+<TITLE>Net Load</TITLE>
+GLIBTOP_NETLOAD_IF_FLAGS
+GLIBTOP_NETLOAD_MTU
+GLIBTOP_NETLOAD_SUBNET
+GLIBTOP_NETLOAD_ADDRESS
+GLIBTOP_NETLOAD_PACKETS_IN
+GLIBTOP_NETLOAD_PACKETS_OUT
+GLIBTOP_NETLOAD_PACKETS_TOTAL
+GLIBTOP_NETLOAD_BYTES_IN
+GLIBTOP_NETLOAD_BYTES_OUT
+GLIBTOP_NETLOAD_BYTES_TOTAL
+GLIBTOP_NETLOAD_ERRORS_IN
+GLIBTOP_NETLOAD_ERRORS_OUT
+GLIBTOP_NETLOAD_ERRORS_TOTAL
+GLIBTOP_NETLOAD_COLLISIONS
+GLIBTOP_NETLOAD_ADDRESS6
+GLIBTOP_NETLOAD_PREFIX6
+GLIBTOP_NETLOAD_SCOPE6
+GLIBTOP_NETLOAD_HWADDRESS
+GLIBTOP_MAX_NETLOAD
+glibtop_netload
+glibtop_get_netload
+glibtop_get_netload_r
+glibtop_get_netload_l
+glibtop_init_netload_p
+glibtop_get_netload_p
+glibtop_init_netload_s
+glibtop_get_netload_s
+</SECTION>
+
+<INCLUDE>glibtop/ppp.h</INCLUDE>
+<SECTION>
+<FILE>ppp</FILE>
+<TITLE>PPP</TITLE>
+GLIBTOP_PPP_STATE
+GLIBTOP_PPP_BYTES_IN
+GLIBTOP_PPP_BYTES_OUT
+GLIBTOP_MAX_PPP
+glibtop_ppp
+glibtop_get_ppp
+glibtop_get_ppp_r
+glibtop_get_ppp_l
+glibtop_init_ppp_p
+glibtop_get_ppp_p
+glibtop_init_ppp_s
+glibtop_get_ppp_s
+</SECTION>
+
+<INCLUDE>glibtop/shm_limits.h</INCLUDE>
+<SECTION>
+<FILE>shm_limits</FILE>
+<TITLE>Shared Memory Limits</TITLE>
+GLIBTOP_IPC_SHMMAX
+GLIBTOP_IPC_SHMMIN
+GLIBTOP_IPC_SHMMNI
+GLIBTOP_IPC_SHMSEG
+GLIBTOP_IPC_SHMALL
+GLIBTOP_MAX_SHM_LIMITS
+glibtop_shm_limits
+glibtop_get_shm_limits
+glibtop_get_shm_limits_r
+glibtop_get_shm_limits_l
+glibtop_init_shm_limits_p
+glibtop_get_shm_limits_p
+glibtop_init_shm_limits_s
+glibtop_get_shm_limits_s
+</SECTION>
+
+<INCLUDE>glibtop/uptime.h</INCLUDE>
+<SECTION>
+<FILE>uptime</FILE>
+<TITLE>Uptime</TITLE>
+GLIBTOP_UPTIME_UPTIME
+GLIBTOP_UPTIME_IDLETIME
+GLIBTOP_UPTIME_BOOT_TIME
+GLIBTOP_MAX_UPTIME
+glibtop_uptime
+glibtop_get_uptime
+glibtop_get_uptime_r
+glibtop_get_uptime_l
+glibtop_init_uptime_p
+glibtop_get_uptime_p
+glibtop_init_uptime_s
+glibtop_get_uptime_s
+</SECTION>
+
+<INCLUDE>glibtop/netlist.h</INCLUDE>
+<SECTION>
+<FILE>netlist</FILE>
+<TITLE>Net List</TITLE>
+GLIBTOP_NETLIST_NUMBER
+GLIBTOP_MAX_NETLIST
+glibtop_netlist
+glibtop_get_netlist
+glibtop_get_netlist_r
+glibtop_get_netlist_l
+glibtop_init_netlist_p
+glibtop_get_netlist_p
+glibtop_init_netlist_s
+glibtop_get_netlist_s
+</SECTION>
+
+<INCLUDE>glibtop/open.h</INCLUDE>
+<SECTION>
+<FILE>open</FILE>
+GLIBTOP_INIT_NO_OPEN
+GLIBTOP_INIT_NO_INIT
+GLIBTOP_FEATURES_NO_SERVER
+GLIBTOP_FEATURES_EXCEPT
+GLIBTOP_METHOD_DIRECT
+GLIBTOP_METHOD_PIPE
+GLIBTOP_METHOD_INET
+GLIBTOP_METHOD_UNIX
+GLIBTOP_ERROR_METHOD_IGNORE
+GLIBTOP_ERROR_METHOD_WARN_ONCE
+GLIBTOP_ERROR_METHOD_WARN
+GLIBTOP_ERROR_METHOD_ABORT
+GLIBTOP_ERROR_METHOD_DEFAULT
+glibtop_open_l
+glibtop_init_p
+glibtop_open_p
+glibtop_open_s
+</SECTION>
+
+<INCLUDE>glibtop/parameter.h</INCLUDE>
+<SECTION>
+<FILE>parameter</FILE>
+GLIBTOP_PARAM_METHOD
+GLIBTOP_PARAM_FEATURES
+GLIBTOP_PARAM_COMMAND
+GLIBTOP_PARAM_HOST
+GLIBTOP_PARAM_PORT
+GLIBTOP_PARAM_ERROR_METHOD
+GLIBTOP_PARAM_REQUIRED
+glibtop_get_parameter
+glibtop_set_parameter
+glibtop_get_parameter_l
+glibtop_set_parameter_l
+</SECTION>
+
+<INCLUDE>glibtop/procargs.h</INCLUDE>
+<SECTION>
+<FILE>procargs</FILE>
+GLIBTOP_PROC_ARGS_SIZE
+GLIBTOP_MAX_PROC_ARGS
+glibtop_proc_args
+glibtop_get_proc_args_l
+glibtop_get_proc_args
+glibtop_get_proc_args_r
+glibtop_init_proc_args_p
+glibtop_get_proc_args_p
+glibtop_init_proc_args_s
+glibtop_get_proc_args_s
+glibtop_get_proc_argv_l
+glibtop_get_proc_argv
+</SECTION>
+
+<INCLUDE>glibtop/procmem.h</INCLUDE>
+<SECTION>
+<FILE>procmem</FILE>
+GLIBTOP_PROC_MEM_SIZE
+GLIBTOP_PROC_MEM_VSIZE
+GLIBTOP_PROC_MEM_RESIDENT
+GLIBTOP_PROC_MEM_SHARE
+GLIBTOP_PROC_MEM_RSS
+GLIBTOP_PROC_MEM_RSS_RLIM
+GLIBTOP_MAX_PROC_MEM
+glibtop_proc_mem
+glibtop_get_proc_mem
+glibtop_get_proc_mem_r
+glibtop_get_proc_mem_l
+glibtop_init_proc_mem_p
+glibtop_get_proc_mem_p
+glibtop_init_proc_mem_s
+glibtop_get_proc_mem_s
+</SECTION>
+
+<INCLUDE>glibtop/procopenfiles.h</INCLUDE>
+<SECTION>
+<FILE>procopenfiles</FILE>
+GLIBTOP_PROC_OPEN_FILES_NUMBER
+GLIBTOP_PROC_OPEN_FILES_TOTAL
+GLIBTOP_PROC_OPEN_FILES_SIZE
+GLIBTOP_MAX_PROC_OPEN_FILES
+GLIBTOP_FILE_ENTRY_FD
+GLIBTOP_FILE_ENTRY_NAME
+GLIBTOP_FILE_ENTRY_TYPE
+GLIBTOP_FILE_ENTRY_INETSOCKET_DST_HOST
+GLIBTOP_FILE_ENTRY_INETSOCKET_DST_PORT
+GLIBTOP_MAX_OPEN_FILE_ENTRY
+GLIBTOP_OPEN_FILENAME_LEN
+GLIBTOP_OPEN_DEST_HOST_LEN
+glibtop_open_files_entry
+glibtop_proc_open_files
+glibtop_get_proc_open_files
+glibtop_get_proc_open_files_r
+glibtop_get_proc_open_files_l
+glibtop_init_proc_open_files_p
+glibtop_get_proc_open_files_p
+glibtop_init_proc_open_files_s
+glibtop_get_proc_open_files_s
+</SECTION>
+
+<INCLUDE>glibtop/procsegment.h</INCLUDE>
+<SECTION>
+<FILE>procsegment</FILE>
+GLIBTOP_PROC_SEGMENT_TEXT_RSS
+GLIBTOP_PROC_SEGMENT_SHLIB_RSS
+GLIBTOP_PROC_SEGMENT_DATA_RSS
+GLIBTOP_PROC_SEGMENT_STACK_RSS
+GLIBTOP_PROC_SEGMENT_DIRTY_SIZE
+GLIBTOP_PROC_SEGMENT_START_CODE
+GLIBTOP_PROC_SEGMENT_END_CODE
+GLIBTOP_PROC_SEGMENT_START_STACK
+GLIBTOP_MAX_PROC_SEGMENT
+glibtop_proc_segment
+glibtop_get_proc_segment
+glibtop_get_proc_segment_r
+glibtop_get_proc_segment_l
+glibtop_init_proc_segment_p
+glibtop_get_proc_segment_p
+glibtop_init_proc_segment_s
+glibtop_get_proc_segment_s
+</SECTION>
+
+<INCLUDE>glibtop/procsignal.h</INCLUDE>
+<SECTION>
+<FILE>procsignal</FILE>
+GLIBTOP_PROC_SIGNAL_SIGNAL
+GLIBTOP_PROC_SIGNAL_BLOCKED
+GLIBTOP_PROC_SIGNAL_SIGIGNORE
+GLIBTOP_PROC_SIGNAL_SIGCATCH
+GLIBTOP_MAX_PROC_SIGNAL
+glibtop_proc_signal
+glibtop_get_proc_signal
+glibtop_get_proc_signal_r
+glibtop_get_proc_signal_l
+glibtop_init_proc_signal_p
+glibtop_get_proc_signal_p
+glibtop_init_proc_signal_s
+glibtop_get_proc_signal_s
+</SECTION>
+
+<INCLUDE>glibtop/sysdeps.h</INCLUDE>
+<SECTION>
+<FILE>sysdeps</FILE>
+GLIBTOP_SYSDEPS_FEATURES
+GLIBTOP_SYSDEPS_CPU
+GLIBTOP_SYSDEPS_MEM
+GLIBTOP_SYSDEPS_SWAP
+GLIBTOP_SYSDEPS_UPTIME
+GLIBTOP_SYSDEPS_LOADAVG
+GLIBTOP_SYSDEPS_SHM_LIMITS
+GLIBTOP_SYSDEPS_MSG_LIMITS
+GLIBTOP_SYSDEPS_SEM_LIMITS
+GLIBTOP_SYSDEPS_PROCLIST
+GLIBTOP_SYSDEPS_PROC_STATE
+GLIBTOP_SYSDEPS_PROC_UID
+GLIBTOP_SYSDEPS_PROC_MEM
+GLIBTOP_SYSDEPS_PROC_TIME
+GLIBTOP_SYSDEPS_PROC_SIGNAL
+GLIBTOP_SYSDEPS_PROC_KERNEL
+GLIBTOP_SYSDEPS_PROC_SEGMENT
+GLIBTOP_SYSDEPS_PROC_ARGS
+GLIBTOP_SYSDEPS_PROC_MAP
+GLIBTOP_SYSDEPS_MOUNTLIST
+GLIBTOP_SYSDEPS_FSUSAGE
+GLIBTOP_SYSDEPS_NETLOAD
+GLIBTOP_SYSDEPS_PPP
+GLIBTOP_SYSDEPS_NETLIST
+GLIBTOP_SYSDEPS_PROC_OPEN_FILES
+GLIBTOP_MAX_SYSDEPS
+GLIBTOP_SYSDEPS_ALL
+glibtop_sysdeps
+glibtop_get_sysdeps
+glibtop_get_sysdeps_r
+</SECTION>
+
+<INCLUDE>glibtop/procstate.h</INCLUDE>
+<SECTION>
+<FILE>procstate</FILE>
+GLIBTOP_PROC_STATE_CMD
+GLIBTOP_PROC_STATE_STATE
+GLIBTOP_PROC_STATE_UID
+GLIBTOP_PROC_STATE_GID
+GLIBTOP_PROC_STATE_RUID
+GLIBTOP_PROC_STATE_RGID
+GLIBTOP_PROC_STATE_HAS_CPU
+GLIBTOP_PROC_STATE_PROCESSOR
+GLIBTOP_PROC_STATE_LAST_PROCESSOR
+GLIBTOP_MAX_PROC_STATE
+GLIBTOP_PROCESS_RUNNING
+GLIBTOP_PROCESS_INTERRUPTIBLE
+GLIBTOP_PROCESS_UNINTERRUPTIBLE
+GLIBTOP_PROCESS_ZOMBIE
+GLIBTOP_PROCESS_STOPPED
+GLIBTOP_PROCESS_SWAPPING
+GLIBTOP_PROCESS_DEAD
+glibtop_proc_state
+glibtop_get_proc_state
+glibtop_get_proc_state_r
+glibtop_get_proc_state_l
+glibtop_init_proc_state_p
+glibtop_get_proc_state_p
+glibtop_init_proc_state_s
+glibtop_get_proc_state_s
+</SECTION>
+
+<INCLUDE>glibtop/procuid.h</INCLUDE>
+<SECTION>
+<FILE>procuid</FILE>
+GLIBTOP_PROC_UID_UID
+GLIBTOP_PROC_UID_EUID
+GLIBTOP_PROC_UID_GID
+GLIBTOP_PROC_UID_EGID
+GLIBTOP_PROC_UID_SUID
+GLIBTOP_PROC_UID_SGID
+GLIBTOP_PROC_UID_FSUID
+GLIBTOP_PROC_UID_FSGID
+GLIBTOP_PROC_UID_PID
+GLIBTOP_PROC_UID_PPID
+GLIBTOP_PROC_UID_PGRP
+GLIBTOP_PROC_UID_SESSION
+GLIBTOP_PROC_UID_TTY
+GLIBTOP_PROC_UID_TPGID
+GLIBTOP_PROC_UID_PRIORITY
+GLIBTOP_PROC_UID_NICE
+GLIBTOP_PROC_UID_NGROUPS
+GLIBTOP_PROC_UID_GROUPS
+GLIBTOP_MAX_PROC_UID
+glibtop_proc_uid
+GLIBTOP_MAX_GROUPS
+glibtop_get_proc_uid
+glibtop_get_proc_uid_r
+glibtop_get_proc_uid_l
+glibtop_init_proc_uid_p
+glibtop_get_proc_uid_p
+glibtop_init_proc_uid_s
+glibtop_get_proc_uid_s
+</SECTION>
+
+<INCLUDE>glibtop/proctime.h</INCLUDE>
+<SECTION>
+<FILE>proctime</FILE>
+GLIBTOP_PROC_TIME_START_TIME
+GLIBTOP_PROC_TIME_RTIME
+GLIBTOP_PROC_TIME_UTIME
+GLIBTOP_PROC_TIME_STIME
+GLIBTOP_PROC_TIME_CUTIME
+GLIBTOP_PROC_TIME_CSTIME
+GLIBTOP_PROC_TIME_TIMEOUT
+GLIBTOP_PROC_TIME_IT_REAL_VALUE
+GLIBTOP_PROC_TIME_FREQUENCY
+GLIBTOP_PROC_TIME_XCPU_UTIME
+GLIBTOP_PROC_TIME_XCPU_STIME
+GLIBTOP_MAX_PROC_TIME
+glibtop_proc_time
+glibtop_get_proc_time
+glibtop_get_proc_time_r
+glibtop_get_proc_time_l
+glibtop_init_proc_time_p
+glibtop_get_proc_time_p
+glibtop_init_proc_time_s
+glibtop_get_proc_time_s
+</SECTION>
+
+<INCLUDE>glibtop/signal.h</INCLUDE>
+<SECTION>
+<FILE>signal</FILE>
+glibtop_signame
+</SECTION>
+
+<INCLUDE>glibtop/procmap.h</INCLUDE>
+<SECTION>
+<FILE>procmap</FILE>
+GLIBTOP_PROC_MAP_NUMBER
+GLIBTOP_PROC_MAP_TOTAL
+GLIBTOP_PROC_MAP_SIZE
+GLIBTOP_MAX_PROC_MAP
+GLIBTOP_MAP_ENTRY_START
+GLIBTOP_MAP_ENTRY_END
+GLIBTOP_MAP_ENTRY_OFFSET
+GLIBTOP_MAP_ENTRY_PERM
+GLIBTOP_MAP_ENTRY_INODE
+GLIBTOP_MAP_ENTRY_DEVICE
+GLIBTOP_MAP_ENTRY_FILENAME
+GLIBTOP_MAP_ENTRY_SIZE
+GLIBTOP_MAP_ENTRY_RSS
+GLIBTOP_MAP_ENTRY_SHARED_CLEAN
+GLIBTOP_MAP_ENTRY_SHARED_DIRTY
+GLIBTOP_MAP_ENTRY_PRIVATE_CLEAN
+GLIBTOP_MAP_ENTRY_PRIVATE_DIRTY
+GLIBTOP_MAX_MAP_ENTRY
+GLIBTOP_MAP_FILENAME_LEN
+GLIBTOP_MAP_PERM_READ
+GLIBTOP_MAP_PERM_WRITE
+GLIBTOP_MAP_PERM_EXECUTE
+GLIBTOP_MAP_PERM_SHARED
+GLIBTOP_MAP_PERM_PRIVATE
+glibtop_map_entry
+glibtop_proc_map
+glibtop_get_proc_map
+glibtop_get_proc_map_r
+glibtop_get_proc_map_l
+glibtop_init_proc_map_p
+glibtop_get_proc_map_p
+glibtop_init_proc_map_s
+glibtop_get_proc_map_s
+</SECTION>
+
+<INCLUDE>glibtop/sysinfo.h</INCLUDE>
+<SECTION>
+<FILE>sysinfo</FILE>
+GLIBTOP_SYSINFO_NCPU
+GLIBTOP_SYSINFO_CPUINFO
+GLIBTOP_MAX_SYSINFO
+glibtop_sysinfo
+glibtop_entry
+glibtop_get_sysinfo_r
+glibtop_get_sysinfo_s
+glibtop_get_sysinfo
+</SECTION>
+
+<INCLUDE>glibtop/union.h</INCLUDE>
+<SECTION>
+<FILE>union</FILE>
+glibtop_union
+</SECTION>
+
+<INCLUDE>glibtop/version.h</INCLUDE>
+<SECTION>
+<FILE>version</FILE>
+LIBGTOP_VERSION_STRING
+glibtop_send_version
+</SECTION>
+
+<INCLUDE>glibtop/proclist.h</INCLUDE>
+<SECTION>
+<FILE>proclist</FILE>
+GLIBTOP_PROCLIST_NUMBER
+GLIBTOP_PROCLIST_TOTAL
+GLIBTOP_PROCLIST_SIZE
+GLIBTOP_MAX_PROCLIST
+GLIBTOP_KERN_PROC_ALL
+GLIBTOP_KERN_PROC_PID
+GLIBTOP_KERN_PROC_PGRP
+GLIBTOP_KERN_PROC_SESSION
+GLIBTOP_KERN_PROC_TTY
+GLIBTOP_KERN_PROC_UID
+GLIBTOP_KERN_PROC_RUID
+GLIBTOP_KERN_PROC_MASK
+GLIBTOP_EXCLUDE_IDLE
+GLIBTOP_EXCLUDE_SYSTEM
+GLIBTOP_EXCLUDE_NOTTY
+glibtop_proclist
+glibtop_get_proclist
+glibtop_get_proclist_r
+glibtop_get_proclist_l
+glibtop_init_proclist_p
+glibtop_get_proclist_p
+glibtop_init_proclist_s
+glibtop_get_proclist_s
+</SECTION>
+
+<INCLUDE>glibtop/sem_limits.h</INCLUDE>
+<SECTION>
+<FILE>sem_limits</FILE>
+GLIBTOP_IPC_SEMMAP
+GLIBTOP_IPC_SEMMNI
+GLIBTOP_IPC_SEMMNS
+GLIBTOP_IPC_SEMMNU
+GLIBTOP_IPC_SEMMSL
+GLIBTOP_IPC_SEMOPM
+GLIBTOP_IPC_SEMUME
+GLIBTOP_IPC_SEMUSZ
+GLIBTOP_IPC_SEMVMX
+GLIBTOP_IPC_SEMAEM
+GLIBTOP_MAX_SEM_LIMITS
+glibtop_sem_limits
+glibtop_get_sem_limits
+glibtop_get_sem_limits_r
+glibtop_get_sem_limits_l
+glibtop_init_sem_limits_p
+glibtop_get_sem_limits_p
+glibtop_init_sem_limits_s
+glibtop_get_sem_limits_s
+</SECTION>
+
+<INCLUDE>glibtop/prockernel.h</INCLUDE>
+<SECTION>
+<FILE>prockernel</FILE>
+GLIBTOP_PROC_KERNEL_K_FLAGS
+GLIBTOP_PROC_KERNEL_MIN_FLT
+GLIBTOP_PROC_KERNEL_MAJ_FLT
+GLIBTOP_PROC_KERNEL_CMIN_FLT
+GLIBTOP_PROC_KERNEL_CMAJ_FLT
+GLIBTOP_PROC_KERNEL_KSTK_ESP
+GLIBTOP_PROC_KERNEL_KSTK_EIP
+GLIBTOP_PROC_KERNEL_NWCHAN
+GLIBTOP_PROC_KERNEL_WCHAN
+GLIBTOP_MAX_PROC_KERNEL
+glibtop_proc_kernel
+glibtop_get_proc_kernel
+glibtop_get_proc_kernel_r
+glibtop_get_proc_kernel_l
+glibtop_init_proc_kernel_p
+glibtop_get_proc_kernel_p
+glibtop_init_proc_kernel_s
+glibtop_get_proc_kernel_s
+</SECTION>
+
+<INCLUDE>glibtop/fsusage.h</INCLUDE>
+<SECTION>
+<FILE>fsusage</FILE>
+GLIBTOP_FSUSAGE_BLOCKS
+GLIBTOP_FSUSAGE_BFREE
+GLIBTOP_FSUSAGE_BAVAIL
+GLIBTOP_FSUSAGE_FILES
+GLIBTOP_FSUSAGE_FFREE
+GLIBTOP_FSUSAGE_BLOCK_SIZE
+GLIBTOP_FSUSAGE_READ
+GLIBTOP_FSUSAGE_WRITE
+GLIBTOP_MAX_FSUSAGE
+glibtop_fsusage
+glibtop_get_fsusage
+glibtop_get_fsusage_r
+glibtop_get_fsusage_l
+glibtop_get_fsusage_s
+</SECTION>
+
+<INCLUDE>glibtop/loadavg.h</INCLUDE>
+<SECTION>
+<FILE>loadavg</FILE>
+GLIBTOP_LOADAVG_LOADAVG
+GLIBTOP_LOADAVG_NR_RUNNING
+GLIBTOP_LOADAVG_NR_TASKS
+GLIBTOP_LOADAVG_LAST_PID
+GLIBTOP_MAX_LOADAVG
+glibtop_loadavg
+glibtop_get_loadavg
+glibtop_get_loadavg_r
+glibtop_get_loadavg_l
+glibtop_init_loadavg_p
+glibtop_get_loadavg_p
+glibtop_init_loadavg_s
+glibtop_get_loadavg_s
+</SECTION>
+
+<INCLUDE>glibtop/mem.h</INCLUDE>
+<SECTION>
+<FILE>mem</FILE>
+GLIBTOP_MEM_TOTAL
+GLIBTOP_MEM_USED
+GLIBTOP_MEM_FREE
+GLIBTOP_MEM_SHARED
+GLIBTOP_MEM_BUFFER
+GLIBTOP_MEM_CACHED
+GLIBTOP_MEM_USER
+GLIBTOP_MEM_LOCKED
+GLIBTOP_MAX_MEM
+glibtop_mem
+glibtop_get_mem
+glibtop_get_mem_r
+glibtop_get_mem_l
+glibtop_init_mem_p
+glibtop_get_mem_p
+glibtop_init_mem_s
+glibtop_get_mem_s
+</SECTION>
+
+<INCLUDE>glibtop/mountlist.h</INCLUDE>
+<SECTION>
+<FILE>mountlist</FILE>
+GLIBTOP_MOUNTLIST_NUMBER
+GLIBTOP_MOUNTLIST_TOTAL
+GLIBTOP_MOUNTLIST_SIZE
+GLIBTOP_MAX_MOUNTLIST
+glibtop_mountentry
+glibtop_mountlist
+glibtop_get_mountlist
+glibtop_get_mountlist_r
+glibtop_get_mountlist_l
+glibtop_get_mountlist_s
+</SECTION>
+
+<INCLUDE>glibtop/msg_limits.h</INCLUDE>
+<SECTION>
+<FILE>msg_limits</FILE>
+GLIBTOP_IPC_MSGPOOL
+GLIBTOP_IPC_MSGMAP
+GLIBTOP_IPC_MSGMAX
+GLIBTOP_IPC_MSGMNB
+GLIBTOP_IPC_MSGMNI
+GLIBTOP_IPC_MSGSSZ
+GLIBTOP_IPC_MSGTQL
+GLIBTOP_MAX_MSG_LIMITS
+glibtop_msg_limits
+glibtop_get_msg_limits
+glibtop_get_msg_limits_r
+glibtop_get_msg_limits_l
+glibtop_init_msg_limits_p
+glibtop_get_msg_limits_p
+glibtop_init_msg_limits_s
+glibtop_get_msg_limits_s
+</SECTION>
+
+<INCLUDE>glibtop/cpu.h</INCLUDE>
+<SECTION>
+<FILE>cpu</FILE>
+GLIBTOP_CPU_TOTAL
+GLIBTOP_CPU_USER
+GLIBTOP_CPU_NICE
+GLIBTOP_CPU_SYS
+GLIBTOP_CPU_IDLE
+GLIBTOP_CPU_FREQUENCY
+GLIBTOP_XCPU_TOTAL
+GLIBTOP_XCPU_USER
+GLIBTOP_XCPU_NICE
+GLIBTOP_XCPU_SYS
+GLIBTOP_XCPU_IDLE
+GLIBTOP_XCPU_FLAGS
+GLIBTOP_CPU_IOWAIT
+GLIBTOP_CPU_IRQ
+GLIBTOP_CPU_SOFTIRQ
+GLIBTOP_XCPU_IOWAIT
+GLIBTOP_XCPU_IRQ
+GLIBTOP_XCPU_SOFTIRQ
+GLIBTOP_MAX_CPU
+GLIBTOP_NCPU
+glibtop_cpu
+glibtop_get_cpu
+glibtop_get_cpu_r
+glibtop_get_cpu_l
+glibtop_init_cpu_p
+glibtop_get_cpu_p
+glibtop_init_cpu_s
+glibtop_get_cpu_s
+</SECTION>
+
+<INCLUDE>glibtop/swap.h</INCLUDE>
+<SECTION>
+<FILE>swap</FILE>
+GLIBTOP_SWAP_TOTAL
+GLIBTOP_SWAP_USED
+GLIBTOP_SWAP_FREE
+GLIBTOP_SWAP_PAGEIN
+GLIBTOP_SWAP_PAGEOUT
+GLIBTOP_MAX_SWAP
+glibtop_swap
+glibtop_get_swap
+glibtop_get_swap_r
+glibtop_get_swap_l
+glibtop_init_swap_p
+glibtop_get_swap_p
+glibtop_init_swap_s
+glibtop_get_swap_s
+</SECTION>
+

doc/reference/version.xml.in

@@ -0,0 +1,4 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
+    "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
+<phrase>@PACKAGE_VERSION@</phrase>

examples/.cvsignore

@@ -1,27 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-first
-first_linux
-first_static
-second
-third
-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
-proclist
-df
-df_static
-netlist
-netlist_static
-openfiles
-openfiles_static

examples/ChangeLog

@@ -1,3 +1,11 @@
+2007-05-19  Benoît Dejean  <benoit@placenet.org>
+
+	* Makefile.am:
+	* mem.c: (main):
+	* wd.c: (main):
+
+	Fixed wd and new simple mem example.
+
 2006-02-27  Benoît Dejean  <benoit@placenet.org>
 
 	* pprint.c: (pprint_get_proc_mem), (main):

examples/Makefile.am

@@ -8,7 +8,7 @@ DEFS			= @DEFS@
 
 noinst_PROGRAMS	= 	first second pprint procargs df netlist \
 			  mountlist procmap netload sysdeps timings \
-			  openfiles smp proclist
+			  openfiles smp proclist mem wd
 
 first_SOURCES		= first.c
 first_LDADD		= $(top_builddir)/lib/libgtop-2.0.la
@@ -51,3 +51,10 @@ openfiles_LDADD		= $(top_builddir)/lib/libgtop-2.0.la
 
 proclist_SOURCES	= proclist.c
 proclist_LDADD		= $(top_builddir)/lib/libgtop-2.0.la
+
+wd_SOURCES	= wd.c
+wd_LDADD	= $(top_builddir)/lib/libgtop-2.0.la
+
+mem_SOURCE	= mem.c
+mem_LDADD	= $(top_builddir)/lib/libgtop-2.0.la
+

examples/first.c

@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* Copyright (C) 1998-99 Martin Baulig
    This file is part of LibGTop 1.0.
 

examples/mem.c

@@ -0,0 +1,21 @@
+#include <glibtop.h>
+#include <glibtop/mem.h>
+
+#include <glib.h>
+#include <unistd.h>
+
+int main(int argc, char **argv)
+{
+	glibtop_mem buf;
+
+	glibtop_init();
+
+	g_print("%lx\n", glibtop_global_server->features);
+
+	glibtop_get_mem(&buf);
+
+	glibtop_close();
+
+	return 0;
+}
+

examples/mountlist.c

@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* Copyright (C) 1998-99 Martin Baulig
    This file is part of LibGTop 1.0.
 

examples/netload.c

@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* Copyright (C) 1998-99 Martin Baulig
    This file is part of LibGTop 1.0.
 

examples/procmap.c

@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* Copyright (C) 1998-99 Martin Baulig
    This file is part of LibGTop 1.0.
 
@@ -37,9 +35,6 @@
 
 #include <glibtop/procmap.h>
 
-#ifdef GLIBTOP_INODEDB
-#include <glibtop/inodedb.h>
-#endif
 
 #include <sys/resource.h>
 #include <sys/mman.h>
@@ -51,9 +46,6 @@
 int
 main (int argc, char *argv [])
 {
-#ifdef GLIBTOP_INODEDB
-	glibtop_inodedb *inodedb;
-#endif
 	glibtop_proc_map procmap;
 	glibtop_map_entry *maps;
 	unsigned method, count, port, i;
@@ -89,10 +81,6 @@ main (int argc, char *argv [])
 	if ((argc != 2) || (sscanf (argv [1], "%d", (int *) &pid) != 1))
 		g_error ("Usage: %s pid", argv [0]);
 
-#ifdef GLIBTOP_INODEDB
-	inodedb = glibtop_inodedb_open (0, 0);
-#endif
-
 	fprintf (stderr, "Getting memory maps for pid %d.\n\n", (int) pid);
 
 	maps = glibtop_get_proc_map (&procmap, pid);
@@ -105,12 +93,6 @@ main (int argc, char *argv [])
 		if (maps [i].flags & (1L << GLIBTOP_MAP_ENTRY_FILENAME))
 			filename = maps [i].filename;
 
-#ifdef GLIBTOP_INODEDB
-		if (inodedb && !filename)
-			filename = glibtop_inodedb_lookup
-				(inodedb, maps [i].device, maps [i].inode);
-#endif
-
 		perm [0] = (maps [i].perm & GLIBTOP_MAP_PERM_READ) ? 'r' : '-';
 		perm [1] = (maps [i].perm & GLIBTOP_MAP_PERM_WRITE) ? 'w' : '-';
 		perm [2] = (maps [i].perm & GLIBTOP_MAP_PERM_EXECUTE) ? 'x' : '-';
@@ -158,9 +140,9 @@ main (int argc, char *argv [])
 		}
 
 
-		g_print("smaps flags:%#llx size:%llu rss:%llu "
-			"shared_clean:%llu shared_dirty:%llu "
-			"private_clean:%llu private_dirty: %llu\n",
+		g_print("smaps flags:%#llx size:%lluKiB rss:%lluKiB "
+			"shared_clean:%lluKib shared_dirty:%lluKiB "
+			"private_clean:%lluKiB private_dirty: %lluKiB\n",
 			maps[i].flags,
 			maps[i].size >> 10,
 			maps[i].rss >> 10,

examples/second.c

@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* Copyright (C) 1998-99 Martin Baulig
    This file is part of LibGTop 1.0.
 

examples/smp.c

@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* Copyright (C) 1998-99 Martin Baulig
    This file is part of LibGTop 1.0.
 

examples/sysdeps.c

@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* Copyright (C) 1998-99 Martin Baulig
    This file is part of LibGTop 1.0.
 

examples/timings.c

@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* Copyright (C) 1998-99 Martin Baulig
    This file is part of LibGTop 1.0.
 

examples/wd.c

@@ -0,0 +1,35 @@
+#include <glibtop.h>
+#include <glibtop/procwd.h>
+
+#include <glib.h>
+#include <unistd.h>
+
+int main(int argc, char **argv)
+{
+	pid_t pid;
+	glibtop_proc_wd buf;
+	char **dirs, **dir;
+
+	if (argc < 2 || !(pid = strtoul(argv[1], NULL, 0)))
+		pid = getpid();
+
+	glibtop_init();
+
+	dirs = glibtop_get_proc_wd(&buf, pid);
+
+	g_print("Process %u:\n"
+		" - root: '%s'\n"
+		" - exe: '%s'\n"
+		" - working directories:\n",
+		(unsigned)pid, buf.root, buf.exe);
+
+	for (dir = dirs; *dir; ++dir)
+		g_print("   - '%s'\n", *dir);
+
+	g_strfreev(dirs);
+
+	glibtop_close();
+
+	return 0;
+}
+

features.def

@@ -6,7 +6,7 @@ void|loadavg|double(loadavg[3]):ulong(nr_running,nr_tasks,last_pid)
 void|shm_limits|ulong(shmmax,shmmin,shmmni,shmseg,shmall)
 void|msg_limits|ulong(msgpool,msgmap,msgmax,msgmnb,msgmni,msgssz,msgtql)
 void|sem_limits|ulong(semmap,semmni,semmns,semmnu,semmsl,semopm,semume,semusz,semvmx,semaem)
-unsigned *|proclist|ulong(number,size,total)|long(which,arg)
+pid_t*|proclist|ulong(number,size,total)|long(which,arg)
 void|proc_state|str(cmd):char(state):ulong(uid,gid)|pid_t(pid)
 void|proc_uid|long(uid,euid,gid,egid,pid,ppid,pgrp,session,tty,tpgid,priority,nice)|pid_t(pid)
 void|proc_mem|long(size,vsize,resident,share,rss,rss_rlim)|pid_t(pid)
@@ -22,4 +22,5 @@ void|@fsusage|ulong(blocks,bfree,bavail,files,ffree)|string|mount_dir
 void|netload|ulong(if_flags,mtu,subnet,address,packets_in,packets_out,packets_total,bytes_in,bytes_out,bytes_total,errors_in,errors_out,errors_total,collisions)|string|interface
 void|ppp|ulong(state,bytes_in,bytes_out)|ushort(device)
 char **|netlist|unsigned(number)
+char **|proc_wd|ulong(number),str(root),str(exe)|pid_t(pid)
 

glibtop.h

@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* Copyright (C) 1998-99 Martin Baulig
    This file is part of LibGTop 1.0.
 
@@ -24,6 +22,10 @@
 #ifndef __GLIBTOP_H__
 #define __GLIBTOP_H__
 
+#include <glib/gmacros.h>
+
+G_BEGIN_DECLS
+
 typedef struct _glibtop		glibtop;
 
 /**
@@ -65,14 +67,15 @@ LIBGTOP_MICRO_VERSION >= (micro)))
 
 #include <glibtop/close.h>
 
+
+#ifdef HAVE_GLIBTOP_MACHINE_H
+
 struct _glibtop
 {
 	unsigned flags;
 	unsigned method;		/* Server Method */
 	unsigned error_method;		/* Error Method */
-#ifdef HAVE_GLIBTOP_MACHINE_H
 	glibtop_machine machine;	/* Machine dependent data */
-#endif
 	int input [2];			/* Pipe client <- server */
 	int output [2];			/* Pipe client -> server */
 	int socket;			/* Accepted connection of a socket */
@@ -91,6 +94,33 @@ struct _glibtop
 	pid_t pid;			/* PID of the server */
 };
 
+#else /* !HAVE_GLIBTOP_MACHINE_H */
+
+struct _glibtop
+{
+	unsigned flags;
+	unsigned method;		/* Server Method */
+	unsigned error_method;		/* Error Method */
+	int input [2];			/* Pipe client <- server */
+	int output [2];			/* Pipe client -> server */
+	int socket;			/* Accepted connection of a socket */
+	int ncpu;			/* Number of CPUs, zero if single-processor */
+	int real_ncpu;			/* Real number of CPUs. Only ncpu are monitored */
+	unsigned long os_version_code;	/* Version code of the operating system */
+	const char *name;		/* Program name for error messages */
+	const char *server_command;	/* Command used to invoke server */
+	const char *server_host;	/* Host the server should run on */
+	const char *server_user;	/* Name of the user on the target host */
+	const char *server_rsh;		/* Command used to connect to the target host */
+	unsigned long features;		/* Server is required for this features */
+	unsigned long server_port;	/* Port on which daemon is listening */
+	glibtop_sysdeps sysdeps;	/* Detailed feature list */
+	glibtop_sysdeps required;	/* Required feature list */
+	pid_t pid;			/* PID of the server */
+};
+
+#endif /* HAVE_GLIBTOP_MACHINE_H */
+
 extern glibtop *glibtop_global_server;
 
 extern const unsigned long glibtop_server_features;
@@ -108,4 +138,6 @@ glibtop_init_s (glibtop **server_ptr,
 		unsigned long features,
 		unsigned flags);
 
+G_END_DECLS
+
 #endif

include/.cvsignore

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

include/glibtop/.cvsignore

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

include/glibtop/Makefile.am

@@ -7,7 +7,8 @@ glibtop_HEADERS		= close.h loadavg.h prockernel.h procstate.h \
 			  procsegment.h sysdeps.h global.h \
 			  procsignal.h union.h gnuserv.h \
 			  parameter.h mountlist.h fsusage.h procmap.h signal.h \
-			  inodedb.h sysinfo.h ppp.h procargs.h netload.h \
+			  sysinfo.h ppp.h procargs.h netload.h \
+			  procwd.h \
 			  netlist.h procopenfiles.h open.h
 
 noinst_HEADERS		= error.h write.h read_data.h read.h init_hooks.h

include/glibtop/call-vector.h.in

@@ -1,7 +1,5 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 
-/* $Id$ */
-
 @@AUTOGEN_COMMENT@@
 
 /* Copyright (C) 1998-99 Martin Baulig

include/glibtop/close.h

@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* Copyright (C) 1998-99 Martin Baulig
    This file is part of LibGTop 1.0.
 

include/glibtop/command.h

@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* Copyright (C) 1998-99 Martin Baulig
    This file is part of LibGTop 1.0.
 
@@ -59,8 +57,9 @@ G_BEGIN_DECLS
 #define GLIBTOP_CMND_PPP		23
 #define GLIBTOP_CMND_NETLIST		24
 #define GLIBTOP_CMND_PROC_OPEN_FILES	25
+#define GLIBTOP_CMND_PROC_WD		26
 
-#define GLIBTOP_MAX_CMND		26
+#define GLIBTOP_MAX_CMND		27
 
 #define _GLIBTOP_PARAM_SIZE		16
 

include/glibtop/cpu.h

@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* Copyright (C) 1998-99 Martin Baulig
    This file is part of LibGTop 1.0.
 
@@ -62,25 +60,25 @@ typedef struct _glibtop_cpu	glibtop_cpu;
 
 struct _glibtop_cpu
 {
-	guint64	flags,
-		total,				/* GLIBTOP_CPU_TOTAL		*/
-		user,				/* GLIBTOP_CPU_USER		*/
-		nice,				/* GLIBTOP_CPU_NICE		*/
-		sys,				/* GLIBTOP_CPU_SYS		*/
-		idle,				/* GLIBTOP_CPU_IDLE		*/
-		iowait,				/* GLIBTOP_CPU_IOWAIT		*/
-		irq,				/* GLIBTOP_CPU_IRQ		*/
-		softirq,			/* GLIBTOP_CPU_SOFTIRQ		*/
-		frequency,			/* GLIBTOP_CPU_FREQUENCY	*/
-		xcpu_total [GLIBTOP_NCPU],	/* GLIBTOP_XCPU_TOTAL		*/
-		xcpu_user [GLIBTOP_NCPU],	/* GLIBTOP_XCPU_USER		*/
-		xcpu_nice [GLIBTOP_NCPU],	/* GLIBTOP_XCPU_NICE		*/
-		xcpu_sys  [GLIBTOP_NCPU],	/* GLIBTOP_XCPU_SYS		*/
-		xcpu_idle [GLIBTOP_NCPU],	/* GLIBTOP_XCPU_IDLE		*/
-		xcpu_iowait [GLIBTOP_NCPU],	/* GLIBTOP_XCPU_IOWAIT		*/
-		xcpu_irq [GLIBTOP_NCPU],	/* GLIBTOP_XCPU_IRQ		*/
-		xcpu_softirq  [GLIBTOP_NCPU],	/* GLIBTOP_XCPU_SOFTIRQ		*/
-		xcpu_flags;	                /* GLIBTOP_XCPU_IDLE		*/
+	guint64	flags;
+	guint64 total;				/* GLIBTOP_CPU_TOTAL		*/
+	guint64 user;				/* GLIBTOP_CPU_USER		*/
+	guint64 nice;				/* GLIBTOP_CPU_NICE		*/
+	guint64 sys;				/* GLIBTOP_CPU_SYS		*/
+	guint64 idle;				/* GLIBTOP_CPU_IDLE		*/
+	guint64 iowait;				/* GLIBTOP_CPU_IOWAIT		*/
+	guint64 irq;				/* GLIBTOP_CPU_IRQ		*/
+	guint64 softirq;			/* GLIBTOP_CPU_SOFTIRQ		*/
+	guint64 frequency;			/* GLIBTOP_CPU_FREQUENCY	*/
+	guint64 xcpu_total [GLIBTOP_NCPU];	/* GLIBTOP_XCPU_TOTAL		*/
+	guint64 xcpu_user [GLIBTOP_NCPU];	/* GLIBTOP_XCPU_USER		*/
+	guint64 xcpu_nice [GLIBTOP_NCPU];	/* GLIBTOP_XCPU_NICE		*/
+	guint64 xcpu_sys  [GLIBTOP_NCPU];	/* GLIBTOP_XCPU_SYS		*/
+	guint64 xcpu_idle [GLIBTOP_NCPU];	/* GLIBTOP_XCPU_IDLE		*/
+	guint64 xcpu_iowait [GLIBTOP_NCPU];	/* GLIBTOP_XCPU_IOWAIT		*/
+	guint64 xcpu_irq [GLIBTOP_NCPU];	/* GLIBTOP_XCPU_IRQ		*/
+	guint64 xcpu_softirq  [GLIBTOP_NCPU];	/* GLIBTOP_XCPU_SOFTIRQ		*/
+	guint64 xcpu_flags;	                /* GLIBTOP_XCPU_IDLE		*/
 };
 
 void glibtop_get_cpu(glibtop_cpu *buf);
@@ -94,10 +92,10 @@ void glibtop_get_cpu(glibtop_cpu *buf);
 void glibtop_get_cpu_l (glibtop *server, glibtop_cpu *buf);
 
 #if GLIBTOP_SUID_CPU
-void glibtop_init_cpu_p (glibtop *server);
+void _glibtop_init_cpu_p (glibtop *server);
 void glibtop_get_cpu_p (glibtop *server, glibtop_cpu *buf);
 #else
-void glibtop_init_cpu_s (glibtop *server);
+void _glibtop_init_cpu_s (glibtop *server);
 void glibtop_get_cpu_s (glibtop *server, glibtop_cpu *buf);
 #endif
 

include/glibtop/error.h

@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* Copyright (C) 1998-99 Martin Baulig
    This file is part of LibGTop 1.0.
 
@@ -33,20 +31,20 @@
 
 G_BEGIN_DECLS
 
-void glibtop_error_vr (glibtop *server, const char *format, va_list args) G_GNUC_INTERNAL G_GNUC_NORETURN;
-void glibtop_warn_vr (glibtop *server, const char *format, va_list args) G_GNUC_INTERNAL;
-void glibtop_error_io_vr (glibtop *server, const char *format, int, va_list args) G_GNUC_INTERNAL G_GNUC_NORETURN;
-void glibtop_warn_io_vr (glibtop *server, const char *format, int, va_list args) G_GNUC_INTERNAL;
+void glibtop_error_vr (glibtop *server, const char *format, va_list args) G_GNUC_NORETURN;
+void glibtop_warn_vr (glibtop *server, const char *format, va_list args);
+void glibtop_error_io_vr (glibtop *server, const char *format, int, va_list args) G_GNUC_NORETURN;
+void glibtop_warn_io_vr (glibtop *server, const char *format, int, va_list args);
 
-void glibtop_error_r (glibtop *server, const char *format, ...) G_GNUC_INTERNAL G_GNUC_PRINTF(2, 3) G_GNUC_NORETURN;
-void glibtop_warn_r (glibtop *server, const char *format, ...) G_GNUC_INTERNAL G_GNUC_PRINTF(2, 3);
-void glibtop_error_io_r (glibtop *server, const char *format, ...) G_GNUC_INTERNAL G_GNUC_PRINTF(2, 3) G_GNUC_NORETURN;
-void glibtop_warn_io_r (glibtop *server, const char *format, ...) G_GNUC_INTERNAL G_GNUC_PRINTF(2, 3);
+void glibtop_error_r (glibtop *server, const char *format, ...) G_GNUC_PRINTF(2, 3) G_GNUC_NORETURN;
+void glibtop_warn_r (glibtop *server, const char *format, ...) G_GNUC_PRINTF(2, 3);
+void glibtop_error_io_r (glibtop *server, const char *format, ...) G_GNUC_PRINTF(2, 3) G_GNUC_NORETURN;
+void glibtop_warn_io_r (glibtop *server, const char *format, ...) G_GNUC_PRINTF(2, 3);
 
-void glibtop_error (const char *format, ...) G_GNUC_INTERNAL G_GNUC_PRINTF(1, 2) G_GNUC_NORETURN;
-void glibtop_warn (const char *format, ...) G_GNUC_INTERNAL G_GNUC_PRINTF(1, 2);
-void glibtop_error_io (const char *format, ...) G_GNUC_INTERNAL G_GNUC_PRINTF(1, 2) G_GNUC_NORETURN;
-void glibtop_warn_io (const char *format, ...) G_GNUC_INTERNAL G_GNUC_PRINTF(1, 2);
+void glibtop_error (const char *format, ...) G_GNUC_PRINTF(1, 2) G_GNUC_NORETURN;
+void glibtop_warn (const char *format, ...) G_GNUC_PRINTF(1, 2);
+void glibtop_error_io (const char *format, ...) G_GNUC_PRINTF(1, 2) G_GNUC_NORETURN;
+void glibtop_warn_io (const char *format, ...) G_GNUC_PRINTF(1, 2);
 
 G_END_DECLS
 

include/glibtop/fsusage.h

@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* Copyright (C) 1998-99 Martin Baulig
 
    Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
@@ -43,12 +41,12 @@ typedef struct _glibtop_fsusage		glibtop_fsusage;
 
 struct _glibtop_fsusage
 {
-	guint64	flags,
-		blocks,		/* Total number of blocks. */
-		bfree,		/* Free blocks available to superuser. */
-		bavail,		/* Free blocks available to non-superuser. */
-		files,		/* Total file nodes. */
-		ffree;		/* Free file nodes. */
+	guint64	flags;
+	guint64 blocks;		/* Total number of blocks. */
+	guint64 bfree;		/* Free blocks available to superuser. */
+	guint64 bavail;		/* Free blocks available to non-superuser. */
+	guint64 files;		/* Total file nodes. */
+	guint64 ffree;		/* Free file nodes. */
 	guint32	block_size;	/* Size of a block in bytes. */
 	guint64 read, write;    /* Total blocks read and written */
 };

include/glibtop/glibtop-server.h

@@ -1,7 +1,5 @@
 /* -*- 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 2.0.
 

include/glibtop/global.h

@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* Copyright (C) 1998-99 Martin Baulig
    This file is part of LibGTop 1.0.
 

include/glibtop/init_hooks.h

@@ -3,9 +3,13 @@
 
 #include <glibtop.h>
 
-typedef void (*glibtop_init_func_t)(glibtop *);
+G_BEGIN_DECLS
 
-extern const glibtop_init_func_t _glibtop_init_hook_s[];
-extern const glibtop_init_func_t _glibtop_init_hook_p[];
+typedef void (*_glibtop_init_func_t)(glibtop *);
+
+extern const _glibtop_init_func_t _glibtop_init_hook_s[];
+extern const _glibtop_init_func_t _glibtop_init_hook_p[];
+
+G_END_DECLS
 
 #endif /* H_LIBGTOP_INIT_HOOKS_1122955666 */

include/glibtop/inodedb.h

@@ -1,67 +0,0 @@
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __GLIBTOP_INODEDB_H__
-#define __GLIBTOP_INODEDB_H__
-
-#include <glibtop.h>
-#include <gdbm.h>
-
-#define GLIBTOP_INODEDB_SYSTEM		1
-#define GLIBTOP_INODEDB_USER		2
-#define GLIBTOP_INODEDB_CACHE		4
-
-#define GLIBTOP_INODEDB_ALL		7
-
-G_BEGIN_DECLS
-
-typedef struct _glibtop_inodedb		glibtop_inodedb;
-
-typedef struct _glibtop_inodedb_key	glibtop_inodedb_key;
-
-struct _glibtop_inodedb_key
-{
-	guint64 device, inode;
-};
-
-struct _glibtop_inodedb
-{
-	GDBM_FILE system_dbf, user_dbf;
-};
-
-#define glibtop_inodedb_open(p1,p2)	glibtop_inodedb_open_s(glibtop_global_server, p1, p2)
-#define glibtop_inodedb_lookup(p1,p2,p3) glibtop_inodedb_lookup_s(glibtop_global_server, p1, p2, p3)
-#define glibtop_inodedb_close(p1)	glibtop_inodedb_close_s(glibtop_global_server)
-
-glibtop_inodedb *
-glibtop_inodedb_open_s (glibtop *server, unsigned databases, unsigned long cache_size);
-
-const char *
-glibtop_inodedb_lookup_s (glibtop *server,
-			  glibtop_inodedb *inodedb,
-			  guint64 device, guint64 inode);
-
-void
-glibtop_inodedb_close_s (glibtop *server, glibtop_inodedb *inodedb);
-
-G_END_DECLS
-
-#endif

include/glibtop/loadavg.h

@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* Copyright (C) 1998-99 Martin Baulig
    This file is part of LibGTop 1.0.
 
@@ -42,9 +40,9 @@ struct _glibtop_loadavg
 {
 	guint64 flags;
 	double loadavg [3];		/* GLIBTOP_LOADAVG_LOADAVG	*/
-	guint64 nr_running,		/* GLIBTOP_LOADAVG_NR_RUNNING	*/
-		nr_tasks,		/* GLIBTOP_LOADAVG_NR_TASKS	*/
-		last_pid;		/* GLIBTOP_LOADAVG_LAST_PID	*/
+	guint64 nr_running;		/* GLIBTOP_LOADAVG_NR_RUNNING	*/
+	guint64 nr_tasks;		/* GLIBTOP_LOADAVG_NR_TASKS	*/
+	guint64 last_pid;		/* GLIBTOP_LOADAVG_LAST_PID	*/
 };
 
 void glibtop_get_loadavg(glibtop_loadavg *buf);
@@ -58,10 +56,10 @@ void glibtop_get_loadavg(glibtop_loadavg *buf);
 void glibtop_get_loadavg_l (glibtop *server, glibtop_loadavg *buf);
 
 #if GLIBTOP_SUID_LOADAVG
-void glibtop_init_loadavg_p (glibtop *server);
+void _glibtop_init_loadavg_p (glibtop *server);
 void glibtop_get_loadavg_p (glibtop *server, glibtop_loadavg *buf);
 #else
-void glibtop_init_loadavg_s (glibtop *server);
+void _glibtop_init_loadavg_s (glibtop *server);
 void glibtop_get_loadavg_s (glibtop *server, glibtop_loadavg *buf);
 #endif
 

include/glibtop/mem.h

@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* Copyright (C) 1998-99 Martin Baulig
    This file is part of LibGTop 1.0.
 
@@ -44,15 +42,15 @@ typedef struct _glibtop_mem	glibtop_mem;
 
 struct _glibtop_mem
 {
-	guint64	flags,
-		total,		/* GLIBTOP_MEM_TOTAL	*/
-		used,		/* GLIBTOP_MEM_USED	*/
-		free,		/* GLIBTOP_MEM_FREE	*/
-		shared,		/* GLIBTOP_MEM_SHARED	*/
-		buffer,		/* GLIBTOP_MEM_BUFFER	*/
-		cached,		/* GLIBTOP_MEM_CACHED	*/
-		user,		/* GLIBTOP_MEM_USER	*/
-		locked;		/* GLIBTOP_MEM_LOCKED	*/
+	guint64	flags;
+	guint64 total;		/* GLIBTOP_MEM_TOTAL	*/
+	guint64 used;		/* GLIBTOP_MEM_USED	*/
+	guint64 free;		/* GLIBTOP_MEM_FREE	*/
+	guint64 shared;		/* GLIBTOP_MEM_SHARED	*/
+	guint64 buffer;		/* GLIBTOP_MEM_BUFFER	*/
+	guint64 cached;		/* GLIBTOP_MEM_CACHED	*/
+	guint64 user;		/* GLIBTOP_MEM_USER	*/
+	guint64 locked;		/* GLIBTOP_MEM_LOCKED	*/
 };
 
 void glibtop_get_mem(glibtop_mem *buf);
@@ -66,10 +64,10 @@ void glibtop_get_mem(glibtop_mem *buf);
 void glibtop_get_mem_l (glibtop *server, glibtop_mem *buf);
 
 #if GLIBTOP_SUID_MEM
-void glibtop_init_mem_p (glibtop *server);
+void _glibtop_init_mem_p (glibtop *server);
 void glibtop_get_mem_p (glibtop *server, glibtop_mem *buf);
 #else
-void glibtop_init_mem_s (glibtop *server);
+void _glibtop_init_mem_s (glibtop *server);
 void glibtop_get_mem_s (glibtop *server, glibtop_mem *buf);
 #endif
 

include/glibtop/mountlist.h

@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* Copyright (C) 1998-99 Martin Baulig
    This file is part of LibGTop 1.0.
 
@@ -49,10 +47,10 @@ struct _glibtop_mountentry
 
 struct _glibtop_mountlist
 {
-	guint64	flags,
-		number,			/* GLIBTOP_MOUNTLIST_NUMBER	*/
-		total,			/* GLIBTOP_MOUNTLIST_TOTAL	*/
-		size;			/* GLIBTOP_MOUNTLIST_SIZE	*/
+	guint64	flags;
+	guint64 number;			/* GLIBTOP_MOUNTLIST_NUMBER	*/
+	guint64 total;			/* GLIBTOP_MOUNTLIST_TOTAL	*/
+	guint64 size;			/* GLIBTOP_MOUNTLIST_SIZE	*/
 };
 
 glibtop_mountentry *

include/glibtop/msg_limits.h

@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* Copyright (C) 1998-99 Martin Baulig
    This file is part of LibGTop 1.0.
 
@@ -43,14 +41,14 @@ typedef struct _glibtop_msg_limits	glibtop_msg_limits;
 
 struct _glibtop_msg_limits
 {
-	guint64	flags,
-		msgpool,	/* GLIBTOP_IPC_MSGPOOL	*/
-		msgmap,		/* GLIBTOP_IPC_MSGMAP	*/
-		msgmax,		/* GLIBTOP_IPC_MSGMAX	*/
-		msgmnb,		/* GLIBTOP_IPC_MSGMNB	*/
-		msgmni,		/* GLIBTOP_IPC_MSGMNI	*/
-		msgssz,		/* GLIBTOP_IPC_MSGSSZ	*/
-		msgtql;		/* GLIBTOP_IPC_MSGTQL	*/
+	guint64	flags;
+	guint64 msgpool;	/* GLIBTOP_IPC_MSGPOOL	*/
+	guint64 msgmap;		/* GLIBTOP_IPC_MSGMAP	*/
+	guint64 msgmax;		/* GLIBTOP_IPC_MSGMAX	*/
+	guint64 msgmnb;		/* GLIBTOP_IPC_MSGMNB	*/
+	guint64 msgmni;		/* GLIBTOP_IPC_MSGMNI	*/
+	guint64 msgssz;		/* GLIBTOP_IPC_MSGSSZ	*/
+	guint64 msgtql;		/* GLIBTOP_IPC_MSGTQL	*/
 };
 
 void glibtop_get_msg_limits(glibtop_msg_limits *buf);
@@ -64,10 +62,10 @@ void glibtop_get_msg_limits(glibtop_msg_limits *buf);
 void glibtop_get_msg_limits_l (glibtop *server, glibtop_msg_limits *buf);
 
 #if GLIBTOP_SUID_MSG_LIMITS
-void glibtop_init_msg_limits_p (glibtop *server);
+void _glibtop_init_msg_limits_p (glibtop *server);
 void glibtop_get_msg_limits_p (glibtop *server, glibtop_msg_limits *buf);
 #else
-void glibtop_init_msg_limits_s (glibtop *server);
+void _glibtop_init_msg_limits_s (glibtop *server);
 void glibtop_get_msg_limits_s (glibtop *server, glibtop_msg_limits *buf);
 #endif
 

include/glibtop/netlist.h

@@ -48,10 +48,10 @@ char** glibtop_get_netlist(glibtop_netlist *buf);
 char** glibtop_get_netlist_l (glibtop *server, glibtop_netlist *buf);
 
 #if GLIBTOP_SUID_NETLIST
-void glibtop_init_netlist_p (glibtop *server);
+void _glibtop_init_netlist_p (glibtop *server);
 char** glibtop_get_netlist_p (glibtop *server, glibtop_netlist *buf);
 #else
-void glibtop_init_netlist_s (glibtop *server);
+void _glibtop_init_netlist_s (glibtop *server);
 char** glibtop_get_netlist_s (glibtop *server, glibtop_netlist *buf);
 #endif
 

include/glibtop/netload.h

@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* Copyright (C) 1998-99 Martin Baulig
    This file is part of LibGTop 1.0.
 
@@ -68,7 +66,8 @@ enum {
 	GLIBTOP_IF_FLAGS_LINK1,
 	GLIBTOP_IF_FLAGS_LINK2,
 	GLIBTOP_IF_FLAGS_ALTPHYS,
-	GLIBTOP_IF_FLAGS_MULTICAST
+	GLIBTOP_IF_FLAGS_MULTICAST,
+	GLIBTOP_IF_FLAGS_WIRELESS
 };
 
 enum GLIBTOP_IF_IN6_SCOPE
@@ -82,23 +81,23 @@ enum GLIBTOP_IF_IN6_SCOPE
 
 struct _glibtop_netload
 {
-	guint64	flags,
-		if_flags;		/* GLIBTOP_NETLOAD_IF_FLAGS	*/
+	guint64	flags;
+	guint64 if_flags;		/* GLIBTOP_NETLOAD_IF_FLAGS	*/
 
-	guint32	mtu,			/* GLIBTOP_NETLOAD_MTU		*/
-		subnet,			/* GLIBTOP_NETLOAD_SUBNET	*/
-		address;		/* GLIBTOP_NETLOAD_ADDRESS	*/
+	guint32	mtu;			/* GLIBTOP_NETLOAD_MTU		*/
+	guint32 subnet;			/* GLIBTOP_NETLOAD_SUBNET	*/
+	guint32 address;		/* GLIBTOP_NETLOAD_ADDRESS	*/
 
-	guint64	packets_in,		/* GLIBTOP_NETLOAD_PACKETS_IN	*/
-		packets_out,		/* GLIBTOP_NETLOAD_PACKETS_OUT	*/
-		packets_total,		/* GLIBTOP_NETLOAD_PACKETS_TOTAL*/
-		bytes_in,		/* GLIBTOP_NETLOAD_BYTES_IN	*/
-		bytes_out,		/* GLIBTOP_NETLOAD_BYTES_OUT	*/
-		bytes_total,		/* GLIBTOP_NETLOAD_BYTES_TOTAL	*/
-		errors_in,		/* GLIBTOP_NETLOAD_ERRORS_IN	*/
-		errors_out,		/* GLIBTOP_NETLOAD_ERRORS_OUT	*/
-		errors_total,		/* GLIBTOP_NETLOAD_ERRORS_TOTAL	*/
-		collisions;		/* GLIBTOP_NETLOAD_COLLISIONS	*/
+	guint64	packets_in;		/* GLIBTOP_NETLOAD_PACKETS_IN	*/
+	guint64 packets_out;		/* GLIBTOP_NETLOAD_PACKETS_OUT	*/
+	guint64 packets_total;		/* GLIBTOP_NETLOAD_PACKETS_TOTAL*/
+	guint64 bytes_in;		/* GLIBTOP_NETLOAD_BYTES_IN	*/
+	guint64 bytes_out;		/* GLIBTOP_NETLOAD_BYTES_OUT	*/
+	guint64 bytes_total;		/* GLIBTOP_NETLOAD_BYTES_TOTAL	*/
+	guint64 errors_in;		/* GLIBTOP_NETLOAD_ERRORS_IN	*/
+	guint64 errors_out;		/* GLIBTOP_NETLOAD_ERRORS_OUT	*/
+	guint64 errors_total;		/* GLIBTOP_NETLOAD_ERRORS_TOTAL	*/
+	guint64 collisions;		/* GLIBTOP_NETLOAD_COLLISIONS	*/
 
 	guint8 address6[16];		/* GLIBTOP_NETLOAD_ADDRESS6     */
 	guint8 prefix6[16];		/* GLIBTOP_NETLOAD_PREXIF6      */
@@ -118,10 +117,10 @@ void glibtop_get_netload(glibtop_netload *buf, const char *interface);
 void glibtop_get_netload_l (glibtop *server, glibtop_netload *buf, const char *interface);
 
 #if GLIBTOP_SUID_NETLOAD
-void glibtop_init_netload_p (glibtop *server);
+void _glibtop_init_netload_p (glibtop *server);
 void glibtop_get_netload_p (glibtop *server, glibtop_netload *buf, const char *interface);
 #else
-void glibtop_init_netload_s (glibtop *server);
+void _glibtop_init_netload_s (glibtop *server);
 void glibtop_get_netload_s (glibtop *server, glibtop_netload *buf, const char *interface);
 #endif
 

include/glibtop/ppp.h

@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* Copyright (C) 1998-99 Martin Baulig
    This file is part of LibGTop 1.0.
 
@@ -45,10 +43,10 @@ enum {
 
 struct _glibtop_ppp
 {
-	guint64	flags,
-		state,			/* GLIBTOP_PPP_STATE		*/
-		bytes_in,		/* GLIBTOP_PPP_BYTES_IN		*/
-		bytes_out;		/* GLIBTOP_PPP_BYTES_OUT	*/
+	guint64	flags;
+	guint64 state;			/* GLIBTOP_PPP_STATE		*/
+	guint64 bytes_in;		/* GLIBTOP_PPP_BYTES_IN		*/
+	guint64 bytes_out;		/* GLIBTOP_PPP_BYTES_OUT	*/
 };
 
 void glibtop_get_ppp(glibtop_ppp *buf, unsigned short device);
@@ -62,10 +60,10 @@ void glibtop_get_ppp(glibtop_ppp *buf, unsigned short device);
 void glibtop_get_ppp_l (glibtop *server, glibtop_ppp *buf, unsigned short device);
 
 #if GLIBTOP_SUID_PPP
-void glibtop_init_ppp_p (glibtop *server);
+void _glibtop_init_ppp_p (glibtop *server);
 void glibtop_get_ppp_p (glibtop *server, glibtop_ppp *buf, unsigned short device);
 #else
-void glibtop_init_ppp_s (glibtop *server);
+void _glibtop_init_ppp_s (glibtop *server);
 void glibtop_get_ppp_s (glibtop *server, glibtop_ppp *buf, unsigned short device);
 #endif
 

include/glibtop/procargs.h

@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* Copyright (C) 1998-99 Martin Baulig
    This file is part of LibGTop 1.0.
 
@@ -37,8 +35,8 @@ typedef struct _glibtop_proc_args	glibtop_proc_args;
 
 struct _glibtop_proc_args
 {
-	guint64	flags,
-		size;			/* GLIBTOP_PROC_ARGS_SIZE	*/
+	guint64	flags;
+	guint64 size;			/* GLIBTOP_PROC_ARGS_SIZE	*/
 };
 
 
@@ -53,7 +51,7 @@ glibtop_get_proc_args (glibtop_proc_args *buf, pid_t pid, unsigned max_len);
 
 # define glibtop_get_proc_args_r		glibtop_get_proc_args_p
 
-  void glibtop_init_proc_args_p (glibtop *server);
+  void _glibtop_init_proc_args_p (glibtop *server);
 
   char *
   glibtop_get_proc_args_p (glibtop *server, glibtop_proc_args *buf,
@@ -64,7 +62,7 @@ glibtop_get_proc_args (glibtop_proc_args *buf, pid_t pid, unsigned max_len);
 
 # define glibtop_get_proc_args_r		glibtop_get_proc_args_s
 
-  void glibtop_init_proc_args_s (glibtop *server);
+  void _glibtop_init_proc_args_s (glibtop *server);
 
   char *
   glibtop_get_proc_args_s (glibtop *server, glibtop_proc_args *buf,

include/glibtop/prockernel.h

@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* Copyright (C) 1998-99 Martin Baulig
    This file is part of LibGTop 1.0.
 
@@ -48,18 +46,18 @@ typedef struct _glibtop_proc_kernel	glibtop_proc_kernel;
 struct _glibtop_proc_kernel
 {
 	guint64 flags;
-	guint64 k_flags,	/* kernel flags for the process */
-		min_flt,	/* number of minor page faults since
+	guint64 k_flags;	/* kernel flags for the process */
+	guint64 min_flt;	/* number of minor page faults since
 				 * process start */
-		maj_flt,	/* number of major page faults since
+	guint64 maj_flt;	/* number of major page faults since
 				 * process start */
-		cmin_flt,	/* cumulative min_flt of process and
+	guint64 cmin_flt;	/* cumulative min_flt of process and
 				 * child processes */
-		cmaj_flt,	/* cumulative maj_flt of process and
+	guint64 cmaj_flt;	/* cumulative maj_flt of process and
 				 * child processes */
-		kstk_esp,	/* kernel stack pointer */
-		kstk_eip,	/* kernel stack pointer */
-		nwchan;		/* address of kernel wait channel
+	guint64 kstk_esp;	/* kernel stack pointer */
+	guint64 kstk_eip;	/* kernel stack pointer */
+	guint64 nwchan;		/* address of kernel wait channel
 				 * proc is sleeping in */
 	char wchan [40];
 };
@@ -75,10 +73,10 @@ void glibtop_get_proc_kernel(glibtop_proc_kernel *buf, pid_t pid);
 void glibtop_get_proc_kernel_l (glibtop *server, glibtop_proc_kernel *buf, pid_t pid);
 
 #if GLIBTOP_SUID_PROC_KERNEL
-void glibtop_init_proc_kernel_p (glibtop *server);
+void _glibtop_init_proc_kernel_p (glibtop *server);
 void glibtop_get_proc_kernel_p (glibtop *server, glibtop_proc_kernel *buf, pid_t pid);
 #else
-void glibtop_init_proc_kernel_s (glibtop *server);
+void _glibtop_init_proc_kernel_s (glibtop *server);
 void glibtop_get_proc_kernel_s (glibtop *server, glibtop_proc_kernel *buf, pid_t pid);
 #endif
 

include/glibtop/proclist.h

@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* Copyright (C) 1998-99 Martin Baulig
    This file is part of LibGTop 1.0.
 
@@ -56,13 +54,13 @@ typedef struct _glibtop_proclist	glibtop_proclist;
 
 struct _glibtop_proclist
 {
-	guint64	flags,
-		number,			/* GLIBTOP_PROCLIST_NUMBER	*/
-		total,			/* GLIBTOP_PROCLIST_TOTAL	*/
-		size;			/* GLIBTOP_PROCLIST_SIZE	*/
+	guint64	flags;
+	guint64 number;			/* GLIBTOP_PROCLIST_NUMBER	*/
+	guint64 total;			/* GLIBTOP_PROCLIST_TOTAL	*/
+	guint64 size;			/* GLIBTOP_PROCLIST_SIZE	*/
 };
 
-unsigned *
+pid_t*
 glibtop_get_proclist(glibtop_proclist *buf, gint64 which, gint64 arg);
 
 #if GLIBTOP_SUID_PROCLIST
@@ -71,20 +69,20 @@ glibtop_get_proclist(glibtop_proclist *buf, gint64 which, gint64 arg);
 #define glibtop_get_proclist_r		glibtop_get_proclist_s
 #endif
 
-unsigned *
+pid_t*
 glibtop_get_proclist_l (glibtop *server, glibtop_proclist *buf,
 			gint64 which, gint64 arg);
 
 #if GLIBTOP_SUID_PROCLIST
-void glibtop_init_proclist_p (glibtop *server);
+void _glibtop_init_proclist_p (glibtop *server);
 
-unsigned *
+pid_t*
 glibtop_get_proclist_p (glibtop *server, glibtop_proclist *buf,
 			gint64 which, gint64 arg);
 #else
-void glibtop_init_proclist_s (glibtop *server);
+void _glibtop_init_proclist_s (glibtop *server);
 
-unsigned *
+pid_t*
 glibtop_get_proclist_s (glibtop *server, glibtop_proclist *buf,
 			gint64 which, gint64 arg);
 #endif

include/glibtop/procmap.h

@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* Copyright (C) 1998-99 Martin Baulig
    This file is part of LibGTop 1.0.
 
@@ -67,20 +65,28 @@ typedef struct _glibtop_proc_map	glibtop_proc_map;
 
 struct _glibtop_map_entry
 {
-	guint64 flags, start, end, offset, perm, inode, device;
-	guint64 size,
-		rss,
-		shared_clean, shared_dirty,
-		private_clean, private_dirty;
+	guint64 flags; 
+	guint64 start; 
+	guint64 end; 
+	guint64 offset; 
+	guint64 perm; 
+	guint64 inode; 
+	guint64 device;
+	guint64 size;
+	guint64 rss;
+	guint64 shared_clean; 
+	guint64 shared_dirty;
+	guint64 private_clean; 
+	guint64 private_dirty;
 	char filename [GLIBTOP_MAP_FILENAME_LEN+1];
 };
 
 struct _glibtop_proc_map
 {
-	guint64	flags,
-		number,			/* GLIBTOP_PROC_MAP_NUMBER	*/
-		total,			/* GLIBTOP_PROC_MAP_TOTAL	*/
-		size;			/* GLIBTOP_PROC_MAP_SIZE	*/
+	guint64	flags;
+	guint64 number;			/* GLIBTOP_PROC_MAP_NUMBER	*/
+	guint64 total;			/* GLIBTOP_PROC_MAP_TOTAL	*/
+	guint64 size;			/* GLIBTOP_PROC_MAP_SIZE	*/
 };
 glibtop_map_entry *
 glibtop_get_proc_map(glibtop_proc_map *buf, pid_t pid);
@@ -96,12 +102,12 @@ glibtop_map_entry *
 glibtop_get_proc_map_l (glibtop *server, glibtop_proc_map *buf, pid_t pid);
 
 #if GLIBTOP_SUID_PROC_MAP
-void glibtop_init_proc_map_p (glibtop *server);
+void _glibtop_init_proc_map_p (glibtop *server);
 
 glibtop_map_entry *
 glibtop_get_proc_map_p (glibtop *server, glibtop_proc_map *buf, pid_t pid);
 #else
-void glibtop_init_proc_map_s (glibtop *server);
+void _glibtop_init_proc_map_s (glibtop *server);
 
 glibtop_map_entry *
 glibtop_get_proc_map_s (glibtop *server, glibtop_proc_map *buf, pid_t pid);

include/glibtop/procmem.h

@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* Copyright (C) 1998-99 Martin Baulig
    This file is part of LibGTop 1.0.
 
@@ -44,14 +42,14 @@ typedef struct _glibtop_proc_mem	glibtop_proc_mem;
 
 struct _glibtop_proc_mem
 {
-	guint64	flags,
-		size,		/* total # of pages of memory */
-		vsize,		/* number of pages of virtual memory ... */
-		resident,	/* number of resident set
+	guint64	flags;
+	guint64 size;		/* total # of pages of memory */
+	guint64 vsize;		/* number of pages of virtual memory ... */
+	guint64 resident;	/* number of resident set
 				 * (non-swapped) pages (4k) */
-		share,		/* number of pages of shared (mmap'd) memory */
-		rss,		/* resident set size */
-		rss_rlim;	/* current limit (in bytes) of the rss
+	guint64 share;		/* number of pages of shared (mmap'd) memory */
+	guint64 rss;		/* resident set size */
+	guint64 rss_rlim;	/* current limit (in bytes) of the rss
 				 * of the process; usually 2,147,483,647 */
 };
 
@@ -66,10 +64,10 @@ void glibtop_get_proc_mem(glibtop_proc_mem *buf, pid_t pid);
 void glibtop_get_proc_mem_l (glibtop *server, glibtop_proc_mem *buf, pid_t pid);
 
 #if GLIBTOP_SUID_PROC_MEM
-void glibtop_init_proc_mem_p (glibtop *server);
+void _glibtop_init_proc_mem_p (glibtop *server);
 void glibtop_get_proc_mem_p (glibtop *server, glibtop_proc_mem *buf, pid_t pid);
 #else
-void glibtop_init_proc_mem_s (glibtop *server);
+void _glibtop_init_proc_mem_s (glibtop *server);
 void glibtop_get_proc_mem_s (glibtop *server, glibtop_proc_mem *buf, pid_t pid);
 #endif
 

include/glibtop/procopenfiles.h

@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* Copyright (C) 1998-99 Martin Baulig
    Copyright (C) 2004 Nicolás Lichtmaier
    This file is part of LibGTop 1.0.
@@ -88,10 +86,10 @@ struct _glibtop_open_files_entry
 
 struct _glibtop_proc_open_files
 {
-	guint64	flags,
-		number,			/* GLIBTOP_PROC_OPEN_FILES_NUMBER */
-		total,			/* GLIBTOP_PROC_OPEN_FILES_TOTAL  */
-		size;			/* GLIBTOP_PROC_OPEN_FILES_SIZE   */
+	guint64	flags;
+	guint64 number;			/* GLIBTOP_PROC_OPEN_FILES_NUMBER */
+	guint64 total;			/* GLIBTOP_PROC_OPEN_FILES_TOTAL  */
+	guint64 size;			/* GLIBTOP_PROC_OPEN_FILES_SIZE   */
 };
 
 glibtop_open_files_entry *
@@ -107,12 +105,12 @@ glibtop_open_files_entry *
 glibtop_get_proc_open_files_l (glibtop *server, glibtop_proc_open_files *buf, pid_t pid);
 
 #if GLIBTOP_SUID_PROC_FILE
-void glibtop_init_proc_open_files_p (glibtop *server);
+void _glibtop_init_proc_open_files_p (glibtop *server);
 
 glibtop_open_files_entry *
 glibtop_get_proc_open_files_p (glibtop *server, glibtop_proc_open_files *buf, pid_t pid);
 #else
-void glibtop_init_proc_open_files_s (glibtop *server);
+void _glibtop_init_proc_open_files_s (glibtop *server);
 
 glibtop_open_files_entry *
 glibtop_get_proc_open_files_s (glibtop *server, glibtop_proc_open_files *buf, pid_t pid);

include/glibtop/procsegment.h

@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* Copyright (C) 1998-99 Martin Baulig
    This file is part of LibGTop 1.0.
 
@@ -46,16 +44,16 @@ typedef struct _glibtop_proc_segment	glibtop_proc_segment;
 
 struct _glibtop_proc_segment
 {
-	guint64	flags,
-		text_rss,	/* text resident set size */
-		shlib_rss,	/* shared-lib resident set size */
-		data_rss,	/* data resident set size */
-		stack_rss,	/* stack resident set size */
-		dirty_size,	/* size of dirty pages */
-		start_code,
+	guint64	flags;
+	guint64 text_rss;	/* text resident set size */
+	guint64 shlib_rss;	/* shared-lib resident set size */
+	guint64 data_rss;	/* data resident set size */
+	guint64 stack_rss;	/* stack resident set size */
+	guint64 dirty_size;	/* size of dirty pages */
+	guint64 start_code;
 				/* address of beginning of code segment */
-		end_code,	/* address of end of code segment */
-		start_stack;	/* address of the bottom of stack segment */
+	guint64 end_code;	/* address of end of code segment */
+	guint64 start_stack;	/* address of the bottom of stack segment */
 };
 
 void glibtop_get_proc_segment(glibtop_proc_segment *buf, pid_t pid);
@@ -69,10 +67,10 @@ void glibtop_get_proc_segment(glibtop_proc_segment *buf, pid_t pid);
 void glibtop_get_proc_segment_l (glibtop *server, glibtop_proc_segment *buf, pid_t pid);
 
 #if GLIBTOP_SUID_PROC_SEGMENT
-void glibtop_init_proc_segment_p (glibtop *server);
+void _glibtop_init_proc_segment_p (glibtop *server);
 void glibtop_get_proc_segment_p (glibtop *server, glibtop_proc_segment *buf, pid_t pid);
 #else
-void glibtop_init_proc_segment_s (glibtop *server);
+void _glibtop_init_proc_segment_s (glibtop *server);
 void glibtop_get_proc_segment_s (glibtop *server, glibtop_proc_segment *buf, pid_t pid);
 #endif
 

include/glibtop/procsignal.h

@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* Copyright (C) 1998-99 Martin Baulig
    This file is part of LibGTop 1.0.
 
@@ -42,11 +40,11 @@ typedef struct _glibtop_proc_signal	glibtop_proc_signal;
 
 struct _glibtop_proc_signal
 {
-	guint64	flags,
-		signal [2],		/* mask of pending signals */
-		blocked [2],		/* mask of blocked signals */
-		sigignore [2],		/* mask of ignored signals */
-		sigcatch [2];		/* mask of caught  signals */
+	guint64	flags;
+	guint64 signal [2];		/* mask of pending signals */
+	guint64 blocked [2];		/* mask of blocked signals */
+	guint64 sigignore [2];		/* mask of ignored signals */
+	guint64 sigcatch [2];		/* mask of caught  signals */
 };
 
 void glibtop_get_proc_signal(glibtop_proc_signal *buf, pid_t pid);
@@ -60,10 +58,10 @@ void glibtop_get_proc_signal(glibtop_proc_signal *buf, pid_t pid);
 void glibtop_get_proc_signal_l (glibtop *server, glibtop_proc_signal *buf, pid_t pid);
 
 #if GLIBTOP_SUID_PROC_SIGNAL
-void glibtop_init_proc_signal_p (glibtop *server);
+void _glibtop_init_proc_signal_p (glibtop *server);
 void glibtop_get_proc_signal_p (glibtop *server, glibtop_proc_signal *buf, pid_t pid);
 #else
-void glibtop_init_proc_signal_s (glibtop *server);
+void _glibtop_init_proc_signal_s (glibtop *server);
 void glibtop_get_proc_signal_s (glibtop *server, glibtop_proc_signal *buf, pid_t pid);
 #endif
 

include/glibtop/procstate.h

@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* Copyright (C) 1998-99 Martin Baulig
    This file is part of LibGTop 1.0.
 
@@ -58,20 +56,19 @@ struct _glibtop_proc_state
 	guint64 flags;
 	char cmd[40];		/* basename of executable file in
 				 * call to exec(2) */
-	unsigned state;		/* single-char code for process state
-				 * (S=sleeping) */
+	unsigned state;
 	/* NOTE: when porting the library, TRY HARD to implement the
 	 *       following two fields. */
 	/* IMPORTANT NOTICE: For security reasons, it is extremely important
 	 *                   only to set the flags value for those two
 	 *                   fields if their values are corrent ! */
-	int uid,		/* UID of process */
-		gid,		/* GID of process */
-        ruid,
-        rgid;
-    int has_cpu,
-        processor,
-        last_processor;
+	int uid;		/* UID of process */
+	int gid;		/* GID of process */
+    int ruid;
+    int rgid;
+    int has_cpu;
+    int processor;
+    int last_processor;
 };
 
 void glibtop_get_proc_state(glibtop_proc_state *buf, pid_t pid);
@@ -85,10 +82,10 @@ void glibtop_get_proc_state(glibtop_proc_state *buf, pid_t pid);
 void glibtop_get_proc_state_l (glibtop *server, glibtop_proc_state *buf, pid_t pid);
 
 #if GLIBTOP_SUID_PROC_STATE
-void glibtop_init_proc_state_p (glibtop *server);
+void _glibtop_init_proc_state_p (glibtop *server);
 void glibtop_get_proc_state_p (glibtop *server, glibtop_proc_state *buf, pid_t pid);
 #else
-void glibtop_init_proc_state_s (glibtop *server);
+void _glibtop_init_proc_state_s (glibtop *server);
 void glibtop_get_proc_state_s (glibtop *server, glibtop_proc_state *buf, pid_t pid);
 #endif
 

include/glibtop/proctime.h

@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* Copyright (C) 1998-99 Martin Baulig
    This file is part of LibGTop 1.0.
 
@@ -50,24 +48,24 @@ typedef struct _glibtop_proc_time	glibtop_proc_time;
 
 struct _glibtop_proc_time
 {
-	guint64	flags,
-		start_time,	/* start time of process --
+	guint64	flags;
+	guint64 start_time;	/* start time of process --
 				 * seconds since 1-1-70 */
-		rtime,		/* real time accumulated by process */
-		utime,		/* user-mode CPU time accumulated by process */
-		stime,		/* kernel-mode CPU time accumulated by process */
-		cutime,		/* cumulative utime of process and
+	guint64 rtime;		/* real time accumulated by process */
+	guint64 utime;		/* user-mode CPU time accumulated by process */
+	guint64 stime;		/* kernel-mode CPU time accumulated by process */
+	guint64 cutime;		/* cumulative utime of process and
 				 * reaped children */
-		cstime,		/* cumulative stime of process and
+	guint64 cstime;		/* cumulative stime of process and
 				 * reaped children */
-		timeout,	/* The time (in jiffies) of the process's
+	guint64 timeout;	/* The time (in jiffies) of the process's
 				 * next timeout */
-		it_real_value,	/* The time (in jiffies) before the
+	guint64 it_real_value;	/* The time (in jiffies) before the
 				 * next SIGALRM is sent to the process
 				 * due to an interval timer. */
-		frequency,	/* Tick frequency. */
-		xcpu_utime [GLIBTOP_NCPU],	/* utime and stime for all CPUs on */
-		xcpu_stime [GLIBTOP_NCPU];	/* SMP machines. */
+	guint64 frequency;	/* Tick frequency. */
+	guint64 xcpu_utime [GLIBTOP_NCPU];	/* utime and stime for all CPUs on */
+	guint64 xcpu_stime [GLIBTOP_NCPU];	/* SMP machines. */
 };
 
 
@@ -82,10 +80,10 @@ void glibtop_get_proc_time(glibtop_proc_time *buf, pid_t pid);
 void glibtop_get_proc_time_l (glibtop *server, glibtop_proc_time *buf, pid_t pid);
 
 #if GLIBTOP_SUID_PROC_TIME
-void glibtop_init_proc_time_p (glibtop *server);
+void _glibtop_init_proc_time_p (glibtop *server);
 void glibtop_get_proc_time_p (glibtop *server, glibtop_proc_time *buf, pid_t pid);
 #else
-void glibtop_init_proc_time_s (glibtop *server);
+void _glibtop_init_proc_time_s (glibtop *server);
 void glibtop_get_proc_time_s (glibtop *server, glibtop_proc_time *buf, pid_t pid);
 #endif
 

include/glibtop/procuid.h

@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* Copyright (C) 1998-99 Martin Baulig
    This file is part of LibGTop 1.0.
 
@@ -59,24 +57,24 @@ typedef struct _glibtop_proc_uid	glibtop_proc_uid;
 struct _glibtop_proc_uid
 {
 	guint64 flags;
-	gint32 uid,		/* user id */
-		euid,		/* effective user id */
-		gid,		/* group id */
-		egid,		/* effective group id */
-        suid,       /* set user id */
-        sgid,       /* set group id */
-        fsuid,      /* ??? user id */
-        fsgid,      /* ??? group id */
-		pid,		/* process id */
-		ppid,		/* pid of parent process */
-		pgrp,		/* process group id */
-		session,	/* session id */
-		tty,		/* full device number of controlling terminal */
-		tpgid,		/* terminal process group id */
-		priority,	/* kernel scheduling priority */
-		nice,		/* standard unix nice level of process */
-		ngroups,
-        groups [GLIBTOP_MAX_GROUPS];
+	gint32 uid;		/* user id */
+	gint32 euid;		/* effective user id */
+	gint32 gid;		/* group id */
+	gint32 egid;		/* effective group id */
+	gint32 suid;       /* set user id */
+	gint32 sgid;       /* set group id */
+	gint32 fsuid;      /* ??? user id */
+	gint32 fsgid;      /* ??? group id */
+	gint32 pid;		/* process id */
+	gint32 ppid;		/* pid of parent process */
+	gint32 pgrp;		/* process group id */
+	gint32 session;	/* session id */
+	gint32 tty;		/* full device number of controlling terminal */
+	gint32 tpgid;		/* terminal process group id */
+	gint32 priority;	/* kernel scheduling priority */
+	gint32 nice;		/* standard unix nice level of process */
+	gint32 ngroups;
+	gint32 groups [GLIBTOP_MAX_GROUPS];
 
 };
 
@@ -91,10 +89,10 @@ void glibtop_get_proc_uid(glibtop_proc_uid *buf, pid_t pid);
 void glibtop_get_proc_uid_l (glibtop *server, glibtop_proc_uid *buf, pid_t pid);
 
 #if GLIBTOP_SUID_PROC_UID
-void glibtop_init_proc_uid_p (glibtop *server);
+void _glibtop_init_proc_uid_p (glibtop *server);
 void glibtop_get_proc_uid_p (glibtop *server, glibtop_proc_uid *buf, pid_t pid);
 #else
-void glibtop_init_proc_uid_s (glibtop *server);
+void _glibtop_init_proc_uid_s (glibtop *server);
 void glibtop_get_proc_uid_s (glibtop *server, glibtop_proc_uid *buf, pid_t pid);
 #endif
 

include/glibtop/procwd.h

@@ -0,0 +1,69 @@
+/* Copyright (C) 2007 Benoît Dejean
+   This file is part of LibGTop 2.
+
+   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_PROCWD_H__
+#define __GLIBTOP_PROCWD_H__
+
+#include <glibtop.h>
+#include <glibtop/global.h>
+
+G_BEGIN_DECLS
+
+typedef struct _glibtop_proc_wd	glibtop_proc_wd;
+
+#define GLIBTOP_PROC_WD_NUMBER	0
+#define GLIBTOP_PROC_WD_ROOT	1
+#define GLIBTOP_PROC_WD_EXE	2
+#define GLIBTOP_PROC_WD_MAX	3
+
+#define GLIBTOP_PROC_WD_ROOT_LEN 215
+#define GLIBTOP_PROC_WD_EXE_LEN 215
+
+struct _glibtop_proc_wd
+{
+	guint64	flags;
+	guint32 number;
+	char root[GLIBTOP_PROC_WD_ROOT_LEN+1];
+	char exe[GLIBTOP_PROC_WD_EXE_LEN+1];
+};
+
+
+char ** glibtop_get_proc_wd(glibtop_proc_wd *buf, pid_t pid);
+char ** glibtop_get_proc_wd_l(glibtop *server, glibtop_proc_wd *buf, pid_t pid);
+
+
+#if GLIBTOP_SUID_PROC_WD
+
+#define glibtop_get_proc_wd_r glibtop_get_proc_wd_p
+void _glibtop_init_proc_wd_p(glibtop *server);
+char ** glibtop_get_proc_wd_p(glibtop *server, glibtop_proc_wd *buf, pid_t pid);
+
+#else
+
+#define glibtop_get_proc_wd_r glibtop_get_proc_wd_s
+void _glibtop_init_proc_wd_s(glibtop *server);
+char ** glibtop_get_proc_wd_s(glibtop *server, glibtop_proc_wd *buf, pid_t pid);
+
+#endif
+
+
+
+G_END_DECLS
+
+#endif

include/glibtop/read.h

@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* Copyright (C) 1998-99 Martin Baulig
    This file is part of LibGTop 1.0.
 

include/glibtop/read_data.h

@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* Copyright (C) 1998-99 Martin Baulig
    This file is part of LibGTop 1.0.
 

include/glibtop/sem_limits.h

@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* Copyright (C) 1998-99 Martin Baulig
    This file is part of LibGTop 1.0.
 
@@ -46,17 +44,17 @@ typedef struct _glibtop_sem_limits	glibtop_sem_limits;
 
 struct _glibtop_sem_limits
 {
-	guint64	flags,
-		semmap,		/* GLIBTOP_IPC_SEMMAP	*/
-		semmni,		/* GLIBTOP_IPC_SEMMNI	*/
-		semmns,		/* GLIBTOP_IPC_SEMMNS	*/
-		semmnu,		/* GLIBTOP_IPC_SEMMNU	*/
-		semmsl,		/* GLIBTOP_IPC_SEMMSL	*/
-		semopm,		/* GLIBTOP_IPC_SEMOPM	*/
-		semume,		/* GLIBTOP_IPC_SEMUME	*/
-		semusz,		/* GLIBTOP_IPC_SEMUSZ	*/
-		semvmx,		/* GLIBTOP_IPC_SEMVMX	*/
-		semaem;		/* GLIBTOP_IPC_SEMAEM	*/
+	guint64	flags;
+	guint64 semmap;		/* GLIBTOP_IPC_SEMMAP	*/
+	guint64 semmni;		/* GLIBTOP_IPC_SEMMNI	*/
+	guint64 semmns;		/* GLIBTOP_IPC_SEMMNS	*/
+	guint64 semmnu;		/* GLIBTOP_IPC_SEMMNU	*/
+	guint64 semmsl;		/* GLIBTOP_IPC_SEMMSL	*/
+	guint64 semopm;		/* GLIBTOP_IPC_SEMOPM	*/
+	guint64 semume;		/* GLIBTOP_IPC_SEMUME	*/
+	guint64 semusz;		/* GLIBTOP_IPC_SEMUSZ	*/
+	guint64 semvmx;		/* GLIBTOP_IPC_SEMVMX	*/
+	guint64 semaem;		/* GLIBTOP_IPC_SEMAEM	*/
 };
 
 void glibtop_get_sem_limits(glibtop_sem_limits *buf);
@@ -70,10 +68,10 @@ void glibtop_get_sem_limits(glibtop_sem_limits *buf);
 void glibtop_get_sem_limits_l (glibtop *server, glibtop_sem_limits *buf);
 
 #if GLIBTOP_SUID_SEM_LIMITS
-void glibtop_init_sem_limits_p (glibtop *server);
+void _glibtop_init_sem_limits_p (glibtop *server);
 void glibtop_get_sem_limits_p (glibtop *server, glibtop_sem_limits *buf);
 #else
-void glibtop_init_sem_limits_s (glibtop *server);
+void _glibtop_init_sem_limits_s (glibtop *server);
 void glibtop_get_sem_limits_s (glibtop *server, glibtop_sem_limits *buf);
 #endif
 

include/glibtop/shm_limits.h

@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* Copyright (C) 1998-99 Martin Baulig
    This file is part of LibGTop 1.0.
 
@@ -41,12 +39,12 @@ typedef struct _glibtop_shm_limits	glibtop_shm_limits;
 
 struct _glibtop_shm_limits
 {
-	guint64	flags,
-		shmmax,		/* GLIBTOP_IPC_SHMMAX	*/
-		shmmin,		/* GLIBTOP_IPC_SHMMIN	*/
-		shmmni,		/* GLIBTOP_IPC_SHMMNI	*/
-		shmseg,		/* GLIBTOP_IPC_SHMSEG	*/
-		shmall;		/* GLIBTOP_IPC_SHMALL	*/
+	guint64	flags;
+	guint64 shmmax;		/* GLIBTOP_IPC_SHMMAX	*/
+	guint64 shmmin;		/* GLIBTOP_IPC_SHMMIN	*/
+	guint64 shmmni;		/* GLIBTOP_IPC_SHMMNI	*/
+	guint64 shmseg;		/* GLIBTOP_IPC_SHMSEG	*/
+	guint64 shmall;		/* GLIBTOP_IPC_SHMALL	*/
 };
 
 void glibtop_get_shm_limits(glibtop_shm_limits *buf);
@@ -60,10 +58,10 @@ void glibtop_get_shm_limits(glibtop_shm_limits *buf);
 void glibtop_get_shm_limits_l (glibtop *server, glibtop_shm_limits *buf);
 
 #if GLIBTOP_SUID_SHM_LIMITS
-void glibtop_init_shm_limits_p (glibtop *server);
+void _glibtop_init_shm_limits_p (glibtop *server);
 void glibtop_get_shm_limits_p (glibtop *, glibtop_shm_limits *buf);
 #else
-void glibtop_init_shm_limits_s (glibtop *server);
+void _glibtop_init_shm_limits_s (glibtop *server);
 void glibtop_get_shm_limits_s (glibtop *server, glibtop_shm_limits *buf);
 #endif
 

include/glibtop/signal.h

@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* Copyright (C) 1998-99 Martin Baulig
    This file is part of LibGTop 1.0.
 

include/glibtop/swap.h

@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* Copyright (C) 1998-99 Martin Baulig
    This file is part of LibGTop 1.0.
 
@@ -41,12 +39,12 @@ typedef struct _glibtop_swap	glibtop_swap;
 
 struct _glibtop_swap
 {
-	guint64	flags,
-		total,		/* GLIBTOP_SWAP_TOTAL	*/
-		used,		/* GLIBTOP_SWAP_USED	*/
-		free,		/* GLIBTOP_SWAP_FREE	*/
-		pagein,		/* GLIBTOP_SWAP_PAGEIN	*/
-		pageout;	/* GLIBTOP_SWAP_PAGEOUT	*/
+	guint64	flags;
+	guint64 total;		/* GLIBTOP_SWAP_TOTAL	*/
+	guint64 used;		/* GLIBTOP_SWAP_USED	*/
+	guint64 free;		/* GLIBTOP_SWAP_FREE	*/
+	guint64 pagein;		/* GLIBTOP_SWAP_PAGEIN	*/
+	guint64 pageout;	/* GLIBTOP_SWAP_PAGEOUT	*/
 };
 
 void
@@ -61,10 +59,10 @@ glibtop_get_swap(glibtop_swap *buf);
 void glibtop_get_swap_l (glibtop *server, glibtop_swap *buf);
 
 #if GLIBTOP_SUID_SWAP
-void glibtop_init_swap_p (glibtop *server);
+void _glibtop_init_swap_p (glibtop *server);
 void glibtop_get_swap_p (glibtop *server, glibtop_swap *buf);
 #else
-void glibtop_init_swap_s (glibtop *server);
+void _glibtop_init_swap_s (glibtop *server);
 void glibtop_get_swap_s (glibtop *server, glibtop_swap *buf);
 #endif
 

include/glibtop/sysdeps.h

@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* Copyright (C) 1998-99 Martin Baulig
    This file is part of LibGTop 1.0.
 
@@ -53,8 +51,9 @@ G_BEGIN_DECLS
 #define GLIBTOP_SYSDEPS_PPP		22
 #define GLIBTOP_SYSDEPS_NETLIST		23
 #define GLIBTOP_SYSDEPS_PROC_OPEN_FILES	24
+#define GLIBTOP_SYSDEPS_PROC_WD		25
 
-#define GLIBTOP_MAX_SYSDEPS		25
+#define GLIBTOP_MAX_SYSDEPS		26
 
 #define GLIBTOP_SYSDEPS_ALL		((1 << GLIBTOP_MAX_SYSDEPS) - 1)
 
@@ -62,32 +61,33 @@ typedef struct _glibtop_sysdeps	glibtop_sysdeps;
 
 struct _glibtop_sysdeps
 {
-	guint64 flags,
-		features,		/* server features	*/
-		cpu,			/* glibtop_cpu		*/
-		mem,			/* glibtop_mem		*/
-		swap,			/* glibtop_swap		*/
-		uptime,			/* glibtop_uptime	*/
-		loadavg,		/* glibtop_loadavg	*/
-		shm_limits,		/* glibtop_shm_limits	*/
-		msg_limits,		/* glibtop_msg_limits	*/
-		sem_limits,		/* glibtop_sem_limits	*/
-		proclist,		/* glibtop_proclist	*/
-		proc_state,		/* glibtop_proc_state	*/
-		proc_uid,		/* glibtop_proc_uid	*/
-		proc_mem,		/* glibtop_proc_mem	*/
-		proc_time,		/* glibtop_proc_time	*/
-		proc_signal,		/* glibtop_proc_signal	*/
-		proc_kernel,		/* glibtop_proc_kernel	*/
-		proc_segment,		/* glibtop_proc_segment	*/
-		proc_args,		/* glibtop_proc_args	*/
-		proc_map,		/* glibtop_proc_map	*/
-		proc_open_files,	/* glibtop_proc_open_files */
-		mountlist,		/* glibtop_mountlist	*/
-		fsusage,		/* glibtop_fsusage	*/
-		netlist,		/* glibtop_netlist	*/
-		netload,		/* glibtop_netload	*/
-		ppp;			/* glibtop_ppp		*/
+	guint64 flags;
+	guint64 features;		/* server features	*/
+	guint64 cpu;			/* glibtop_cpu		*/
+	guint64 mem;			/* glibtop_mem		*/
+	guint64 swap;			/* glibtop_swap		*/
+	guint64 uptime;			/* glibtop_uptime	*/
+	guint64 loadavg;		/* glibtop_loadavg	*/
+	guint64 shm_limits;		/* glibtop_shm_limits	*/
+	guint64 msg_limits;		/* glibtop_msg_limits	*/
+	guint64 sem_limits;		/* glibtop_sem_limits	*/
+	guint64 proclist;		/* glibtop_proclist	*/
+	guint64 proc_state;		/* glibtop_proc_state	*/
+	guint64 proc_uid;		/* glibtop_proc_uid	*/
+	guint64 proc_mem;		/* glibtop_proc_mem	*/
+	guint64 proc_time;		/* glibtop_proc_time	*/
+	guint64 proc_signal;		/* glibtop_proc_signal	*/
+	guint64 proc_kernel;		/* glibtop_proc_kernel	*/
+	guint64 proc_segment;		/* glibtop_proc_segment	*/
+	guint64 proc_args;		/* glibtop_proc_args	*/
+	guint64 proc_map;		/* glibtop_proc_map	*/
+	guint64 proc_open_files;	/* glibtop_proc_open_files */
+	guint64 mountlist;		/* glibtop_mountlist	*/
+	guint64 fsusage;		/* glibtop_fsusage	*/
+	guint64 netlist;		/* glibtop_netlist	*/
+	guint64 netload;		/* glibtop_netload	*/
+	guint64 ppp;			/* glibtop_ppp		*/
+	guint64	proc_wd;		/* glibtop_proc_wd	*/
 };
 
 void glibtop_get_sysdeps (glibtop_sysdeps *buf);

include/glibtop/sysinfo.h

@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* Copyright (C) 1998-99 Martin Baulig
    This file is part of LibGTop 1.0.
 
@@ -50,7 +48,8 @@ struct _glibtop_entry
 
 struct _glibtop_sysinfo
 {
-	guint64	flags, ncpu;
+	guint64	flags;
+	guint64 ncpu;
 	glibtop_entry cpuinfo [GLIBTOP_NCPU];
 };
 

include/glibtop/union.h

@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* Copyright (C) 1998-99 Martin Baulig
    This file is part of LibGTop 1.0.
 
@@ -44,6 +42,7 @@
 #include <glibtop/procargs.h>
 #include <glibtop/procmap.h>
 #include <glibtop/procopenfiles.h>
+#include <glibtop/procwd.h>
 
 #include <glibtop/mountlist.h>
 #include <glibtop/fsusage.h>
@@ -82,6 +81,7 @@ union _glibtop_union
 	glibtop_netload		netload;
 	glibtop_ppp		ppp;
 	glibtop_proc_open_files proc_open_files;
+	glibtop_proc_wd		proc_wd;
 };
 
 G_END_DECLS

include/glibtop/uptime.h

@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* Copyright (C) 1998-99 Martin Baulig
    This file is part of LibGTop 1.0.
 
@@ -40,8 +38,8 @@ typedef struct _glibtop_uptime	glibtop_uptime;
 struct _glibtop_uptime
 {
 	guint64 flags;
-	double uptime,		/* GLIBTOP_UPTIME_UPTIME	*/
-		idletime;	/* GLIBTOP_UPTIME_IDLETIME	*/
+	double uptime;		/* GLIBTOP_UPTIME_UPTIME	*/
+	double idletime;	/* GLIBTOP_UPTIME_IDLETIME	*/
 	guint64 boot_time;
 };
 
@@ -56,10 +54,10 @@ void glibtop_get_uptime (glibtop_uptime *buf);
 void glibtop_get_uptime_l (glibtop *server, glibtop_uptime *buf);
 
 #if GLIBTOP_SUID_UPTIME
-void glibtop_init_uptime_p (glibtop *server);
+void _glibtop_init_uptime_p (glibtop *server);
 void glibtop_get_uptime_p (glibtop *server, glibtop_uptime *buf);
 #else
-void glibtop_init_uptime_s (glibtop *server);
+void _glibtop_init_uptime_s (glibtop *server);
 void glibtop_get_uptime_s (glibtop *server, glibtop_uptime *buf);
 #endif
 

include/glibtop/write.h

@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* Copyright (C) 1998-99 Martin Baulig
    This file is part of LibGTop 1.0.
 

lib/.cvsignore

@@ -1,8 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-libgtop.la
-*.lo
-lib.c
-error.loT

lib/Makefile.am

@@ -7,7 +7,7 @@ libgtop_2_0_la_SOURCES		= init.c open.c close.c command.c read.c \
 				  read_data.c write.c lib.c parameter.c \
 				  sysdeps.c
 
-libgtop_2_0_la_LDFLAGS		= $(LT_VERSION_INFO) -export-symbols-regex "^[^_].*"
+libgtop_2_0_la_LDFLAGS		= $(LT_VERSION_INFO) -export-symbols $(srcdir)/libgtop.sym
 libgtop_2_0_la_LIBADD		= $(GLIB_LIBS) $(top_builddir)/sysdeps/common/libgtop_common-2.0.la $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la $(sysdeps_suid_lib)
 
 BUILT_SOURCES			= lib.c
@@ -16,7 +16,7 @@ lib.c: lib.pl $(top_builddir)/config.h $(top_srcdir)/features.def
 	$(PERL) $(srcdir)/lib.pl < $(top_srcdir)/features.def > lib-t
 	mv lib-t lib.c
 
-EXTRA_DIST			= lib.pl
+EXTRA_DIST			= lib.pl libgtop.sym
 
 CLEANFILES			= lib.c
 

lib/close.c

@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* Copyright (C) 1998-99 Martin Baulig
    This file is part of LibGTop 1.0.
 

lib/command.c

@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* Copyright (C) 1998-99 Martin Baulig
    This file is part of LibGTop 1.0.
 

lib/error.c

@@ -1,7 +1,5 @@
 /* -*- 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.
 

lib/glibtop-server-private.h

@@ -1,7 +1,5 @@
 /* -*- 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.
 

lib/glibtop-server.c

@@ -1,7 +1,5 @@
 /* -*- 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 2.0.
 

lib/init.c

@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* Copyright (C) 1998-99 Martin Baulig
    This file is part of LibGTop 1.0.
 
@@ -221,7 +219,7 @@ glibtop *
 glibtop_init_s (glibtop **server_ptr, unsigned long features, unsigned flags)
 {
 	glibtop *server;
-	const glibtop_init_func_t *init_fkt;
+	const _glibtop_init_func_t *init_fkt;
 
 	if (server_ptr == NULL)
 		return NULL;

lib/inodedb.c

@@ -1,117 +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 <config.h>
-#include <glibtop.h>
-#include <glibtop/error.h>
-#include <glibtop/inodedb.h>
-
-#include <pwd.h>
-#include <gdbm.h>
-
-#ifndef SYSTEM_INODEDB
-#define SYSTEM_INODEDB "/usr/var/libgtop/inodedb.db"
-#endif
-
-glibtop_inodedb *
-glibtop_inodedb_open_s (glibtop *server, unsigned databases,
-			unsigned long cachesize)
-{
-	glibtop_inodedb *inodedb;
-	char filename [BUFSIZ];
-	struct passwd *pwd;
-	struct stat statb;
-
-	if (!databases)
-		databases = GLIBTOP_INODEDB_ALL;
-
-	inodedb = g_malloc (sizeof (glibtop_inodedb));
-
-	if (stat (SYSTEM_INODEDB, &statb))
-		databases &= ~GLIBTOP_INODEDB_SYSTEM;
-
-	if (databases & GLIBTOP_INODEDB_SYSTEM) {
-		inodedb->system_dbf = gdbm_open
-			(SYSTEM_INODEDB, 0, GDBM_READER, 0, 0);
-		if (!inodedb->system_dbf)
-			glibtop_error_io_r
-				(server, "gdbm_open (%s)", SYSTEM_INODEDB);
-	}
-
-	pwd = getpwuid (getuid ());
-	if (!pwd) glibtop_error_io_r (server, "getpwuid");
-
-	sprintf (filename, "%s/var/libgtop/inodedb.db", pwd->pw_dir);
-
-	if (stat (filename, &statb))
-		databases &= ~GLIBTOP_INODEDB_USER;
-
-	if (databases & GLIBTOP_INODEDB_USER) {
-		inodedb->user_dbf = gdbm_open
-			(filename, 0, GDBM_READER, 0, 0);
-		if (!inodedb->user_dbf)
-			glibtop_error_io_r
-				(server, "gdbm_open (%s)", filename);
-	}
-
-	return inodedb;
-}
-
-const char *
-glibtop_inodedb_lookup_s (glibtop *server,
-			  glibtop_inodedb *inodedb,
-			  guint64 device, guint64 inode)
-{
-	glibtop_inodedb_key key;
-	datum d_key, d_content;
-
-	d_key.dptr = (void *) &key;
-	d_key.dsize = sizeof (key);
-
-	key.device = device;
-	key.inode = inode;
-
-	if (inodedb->system_dbf) {
-		d_content = gdbm_fetch (inodedb->system_dbf, d_key);
-		if (d_content.dptr) return d_content.dptr;
-	}
-
-	if (inodedb->user_dbf) {
-		d_content = gdbm_fetch (inodedb->user_dbf, d_key);
-		if (d_content.dptr) return d_content.dptr;
-	}
-
-	return NULL;
-}
-
-void
-glibtop_inodedb_close_s (glibtop *server, glibtop_inodedb *inodedb)
-{
-	if (inodedb->system_dbf)
-		gdbm_close (inodedb->system_dbf);
-
-	if (inodedb->user_dbf)
-		gdbm_close (inodedb->user_dbf);
-
-	g_free (inodedb);
-}

lib/libgtop.sym

@@ -0,0 +1,130 @@
+glibtop_call_l
+glibtop_call_p
+glibtop_close
+glibtop_close_p
+glibtop_close_r
+glibtop_close_s
+glibtop_get_cpu
+glibtop_get_cpu_l
+glibtop_get_cpu_p
+glibtop_get_cpu_s
+glibtop_get_fsusage
+glibtop_get_fsusage_l
+glibtop_get_fsusage_p
+glibtop_get_fsusage_s
+glibtop_get_loadavg
+glibtop_get_loadavg_l
+glibtop_get_loadavg_p
+glibtop_get_loadavg_s
+glibtop_get_mem
+glibtop_get_mem_l
+glibtop_get_mem_p
+glibtop_get_mem_s
+glibtop_get_mountlist
+glibtop_get_mountlist_l
+glibtop_get_mountlist_p
+glibtop_get_mountlist_s
+glibtop_get_msg_limits
+glibtop_get_msg_limits_l
+glibtop_get_msg_limits_p
+glibtop_get_msg_limits_s
+glibtop_get_netlist
+glibtop_get_netlist_l
+glibtop_get_netlist_p
+glibtop_get_netlist_s
+glibtop_get_netload
+glibtop_get_netload_l
+glibtop_get_netload_p
+glibtop_get_netload_s
+glibtop_get_parameter_l
+glibtop_get_parameter_p
+glibtop_get_ppp
+glibtop_get_ppp_l
+glibtop_get_ppp_p
+glibtop_get_ppp_s
+glibtop_get_proc_args
+glibtop_get_proc_args_l
+glibtop_get_proc_args_p
+glibtop_get_proc_args_s
+glibtop_get_proc_argv
+glibtop_get_proc_argv_l
+glibtop_get_proc_argv_p
+glibtop_get_proc_kernel
+glibtop_get_proc_kernel_l
+glibtop_get_proc_kernel_p
+glibtop_get_proc_kernel_s
+glibtop_get_proclist
+glibtop_get_proclist_l
+glibtop_get_proclist_p
+glibtop_get_proclist_s
+glibtop_get_proc_map
+glibtop_get_proc_map_l
+glibtop_get_proc_map_p
+glibtop_get_proc_map_s
+glibtop_get_proc_mem
+glibtop_get_proc_mem_l
+glibtop_get_proc_mem_p
+glibtop_get_proc_mem_s
+glibtop_get_proc_open_files
+glibtop_get_proc_open_files_l
+glibtop_get_proc_open_files_p
+glibtop_get_proc_open_files_s
+glibtop_get_proc_segment
+glibtop_get_proc_segment_l
+glibtop_get_proc_segment_p
+glibtop_get_proc_segment_s
+glibtop_get_proc_signal
+glibtop_get_proc_signal_l
+glibtop_get_proc_signal_p
+glibtop_get_proc_signal_s
+glibtop_get_proc_state
+glibtop_get_proc_state_l
+glibtop_get_proc_state_p
+glibtop_get_proc_state_s
+glibtop_get_proc_time
+glibtop_get_proc_time_l
+glibtop_get_proc_time_p
+glibtop_get_proc_time_s
+glibtop_get_proc_uid
+glibtop_get_proc_uid_l
+glibtop_get_proc_uid_p
+glibtop_get_proc_uid_s
+glibtop_get_proc_wd
+glibtop_get_proc_wd_l
+glibtop_get_proc_wd_p
+glibtop_get_proc_wd_s
+glibtop_get_sem_limits
+glibtop_get_sem_limits_l
+glibtop_get_sem_limits_p
+glibtop_get_sem_limits_s
+glibtop_get_shm_limits
+glibtop_get_shm_limits_l
+glibtop_get_shm_limits_p
+glibtop_get_shm_limits_s
+glibtop_get_swap
+glibtop_get_swap_l
+glibtop_get_swap_p
+glibtop_get_swap_s
+glibtop_get_sysdeps
+glibtop_get_sysdeps_r
+glibtop_get_sysinfo
+glibtop_get_sysinfo_p
+glibtop_get_sysinfo_s
+glibtop_get_uptime
+glibtop_get_uptime_l
+glibtop_get_uptime_p
+glibtop_get_uptime_s
+glibtop_global_server
+glibtop_init
+glibtop_init_p
+glibtop_init_r
+glibtop_init_s
+glibtop_internet_addr
+glibtop_make_connection
+glibtop_open_l
+glibtop_open_p
+glibtop_open_s
+glibtop_server_features
+glibtop_set_parameter_l
+glibtop_set_parameter_p
+glibtop_sys_siglist

lib/open.c

@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* Copyright (C) 1998-99 Martin Baulig
    This file is part of LibGTop 1.0.
 

lib/parameter.c

@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* Copyright (C) 1998-99 Martin Baulig
    This file is part of LibGTop 1.0.
 

lib/read.c

@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* Copyright (C) 1998-99 Martin Baulig
    This file is part of LibGTop 1.0.
 
@@ -22,48 +20,39 @@
 */
 
 #include <config.h>
+#include <errno.h>
 #include <glibtop/read.h>
 #include <glibtop/error.h>
 #include <glib/gi18n-lib.h>
 
 
-/* Reads some data from server. */
-
-static void
-do_read (int s, void *ptr, size_t total_size)
-{
-	ssize_t nread;
-
-	if(!total_size) return;
-
-	while (total_size && (nread = recv (s, ptr, total_size, 0)) > 0) {
-		total_size -= nread;
-		ptr = (char*)ptr + nread;
-	}
-
-	if(nread == 0)
-		close (s);
-	else if (nread < 0)
-		glibtop_error_io ("recv");
-}
 
 void
 glibtop_read_l (glibtop *server, size_t size, void *buf)
 {
+	int fd;
 	glibtop_init_r (&server, 0, 0);
 
 #ifdef DEBUG
 	fprintf (stderr, "LIBRARY: really reading %d bytes.\n", (int)size);
 #endif
 
-	if (server->socket) {
-		do_read (server->socket, buf, size);
-	} else {
-		if(read (server->input [0], buf, size) < 0)
-			glibtop_error_io_r (
+	fd = server->socket ? server->socket : server->input[0];
+
+	while (size) {
+		ssize_t nread = read(fd, buf, size);
+
+		if (nread < 0 && errno == EINTR)
+			continue;
+
+		if (nread <= 0)
+			glibtop_error_io_r(
 				server,
 				ngettext ("read %d byte",
 					  "read %d bytes", size),
 				(int)size);
+
+		size -= nread;
+		buf = (char *)buf + nread;
 	}
 }

lib/read_data.c

@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* Copyright (C) 1998-99 Martin Baulig
    This file is part of LibGTop 1.0.
 

lib/sysdeps.c

@@ -46,138 +46,145 @@ GLIBTOP_SUID_PROC_ARGS +
 GLIBTOP_SUID_PROC_MAP +
 GLIBTOP_SUID_NETLOAD +
 GLIBTOP_SUID_NETLIST +
+GLIBTOP_SUID_PROC_WD +
 GLIBTOP_SUID_PPP;
 
-const glibtop_init_func_t _glibtop_init_hook_s [] = {
+const _glibtop_init_func_t _glibtop_init_hook_s [] = {
 #if !GLIBTOP_SUID_CPU
-	glibtop_init_cpu_s,
+	_glibtop_init_cpu_s,
 #endif
 #if !GLIBTOP_SUID_MEM
-	glibtop_init_mem_s,
+	_glibtop_init_mem_s,
 #endif
 #if !GLIBTOP_SUID_SWAP
-	glibtop_init_swap_s,
+	_glibtop_init_swap_s,
 #endif
 #if !GLIBTOP_SUID_UPTIME
-	glibtop_init_uptime_s,
+	_glibtop_init_uptime_s,
 #endif
 #if !GLIBTOP_SUID_LOADAVG
-	glibtop_init_loadavg_s,
+	_glibtop_init_loadavg_s,
 #endif
 #if !GLIBTOP_SUID_SHM_LIMITS
-	glibtop_init_shm_limits_s,
+	_glibtop_init_shm_limits_s,
 #endif
 #if !GLIBTOP_SUID_MSG_LIMITS
-	glibtop_init_msg_limits_s,
+	_glibtop_init_msg_limits_s,
 #endif
 #if !GLIBTOP_SUID_SEM_LIMITS
-	glibtop_init_sem_limits_s,
+	_glibtop_init_sem_limits_s,
 #endif
 #if !GLIBTOP_SUID_PROCLIST
-	glibtop_init_proclist_s,
+	_glibtop_init_proclist_s,
 #endif
 #if !GLIBTOP_SUID_PROC_STATE
-	glibtop_init_proc_state_s,
+	_glibtop_init_proc_state_s,
 #endif
 #if !GLIBTOP_SUID_PROC_UID
-	glibtop_init_proc_uid_s,
+	_glibtop_init_proc_uid_s,
 #endif
 #if !GLIBTOP_SUID_PROC_MEM
-	glibtop_init_proc_mem_s,
+	_glibtop_init_proc_mem_s,
 #endif
 #if !GLIBTOP_SUID_PROC_TIME
-	glibtop_init_proc_time_s,
+	_glibtop_init_proc_time_s,
 #endif
 #if !GLIBTOP_SUID_PROC_SIGNAL
-	glibtop_init_proc_signal_s,
+	_glibtop_init_proc_signal_s,
 #endif
 #if !GLIBTOP_SUID_PROC_KERNEL
-	glibtop_init_proc_kernel_s,
+	_glibtop_init_proc_kernel_s,
 #endif
 #if !GLIBTOP_SUID_PROC_SEGMENT
-	glibtop_init_proc_segment_s,
+	_glibtop_init_proc_segment_s,
 #endif
 #if !GLIBTOP_SUID_PROC_ARGS
-	glibtop_init_proc_args_s,
+	_glibtop_init_proc_args_s,
 #endif
 #if !GLIBTOP_SUID_PROC_MAP
-	glibtop_init_proc_map_s,
+	_glibtop_init_proc_map_s,
 #endif
 #if !GLIBTOP_SUID_NETLOAD
-	glibtop_init_netload_s,
+	_glibtop_init_netload_s,
 #endif
 #if !GLIBTOP_SUID_NETLIST
-	glibtop_init_netlist_s,
+	_glibtop_init_netlist_s,
+#endif
+#if !GLIBTOP_SUID_PROC_WD
+	_glibtop_init_proc_wd_s,
 #endif
 #if !GLIBTOP_SUID_PPP
-	glibtop_init_ppp_s,
+	_glibtop_init_ppp_s,
 #endif
 	NULL
 };
 
-const glibtop_init_func_t _glibtop_init_hook_p [] = {
+const _glibtop_init_func_t _glibtop_init_hook_p [] = {
 #if GLIBTOP_SUID_CPU
-	glibtop_init_cpu_p,
+	_glibtop_init_cpu_p,
 #endif
 #if GLIBTOP_SUID_MEM
-	glibtop_init_mem_p,
+	_glibtop_init_mem_p,
 #endif
 #if GLIBTOP_SUID_SWAP
-	glibtop_init_swap_p,
+	_glibtop_init_swap_p,
 #endif
 #if GLIBTOP_SUID_UPTIME
-	glibtop_init_uptime_p,
+	_glibtop_init_uptime_p,
 #endif
 #if GLIBTOP_SUID_LOADAVG
-	glibtop_init_loadavg_p,
+	_glibtop_init_loadavg_p,
 #endif
 #if GLIBTOP_SUID_SHM_LIMITS
-	glibtop_init_shm_limits_p,
+	_glibtop_init_shm_limits_p,
 #endif
 #if GLIBTOP_SUID_MSG_LIMITS
-	glibtop_init_msg_limits_p,
+	_glibtop_init_msg_limits_p,
 #endif
 #if GLIBTOP_SUID_SEM_LIMITS
-	glibtop_init_sem_limits_p,
+	_glibtop_init_sem_limits_p,
 #endif
 #if GLIBTOP_SUID_PROCLIST
-	glibtop_init_proclist_p,
+	_glibtop_init_proclist_p,
 #endif
 #if GLIBTOP_SUID_PROC_STATE
-	glibtop_init_proc_state_p,
+	_glibtop_init_proc_state_p,
 #endif
 #if GLIBTOP_SUID_PROC_UID
-	glibtop_init_proc_uid_p,
+	_glibtop_init_proc_uid_p,
 #endif
 #if GLIBTOP_SUID_PROC_MEM
-	glibtop_init_proc_mem_p,
+	_glibtop_init_proc_mem_p,
 #endif
 #if GLIBTOP_SUID_PROC_TIME
-	glibtop_init_proc_time_p,
+	_glibtop_init_proc_time_p,
 #endif
 #if GLIBTOP_SUID_PROC_SIGNAL
-	glibtop_init_proc_signal_p,
+	_glibtop_init_proc_signal_p,
 #endif
 #if GLIBTOP_SUID_PROC_KERNEL
-	glibtop_init_proc_kernel_p,
+	_glibtop_init_proc_kernel_p,
 #endif
 #if GLIBTOP_SUID_PROC_SEGMENT
-	glibtop_init_proc_segment_p,
+	_glibtop_init_proc_segment_p,
 #endif
 #if GLIBTOP_SUID_PROC_ARGS
-	glibtop_init_proc_args_p,
+	_glibtop_init_proc_args_p,
 #endif
 #if GLIBTOP_SUID_PROC_MAP
-	glibtop_init_proc_map_p,
+	_glibtop_init_proc_map_p,
 #endif
 #if GLIBTOP_SUID_NETLOAD
-	glibtop_init_netload_p,
+	_glibtop_init_netload_p,
 #endif
 #if GLIBTOP_SUID_NETLIST
-	glibtop_init_netlist_p,
+	_glibtop_init_netlist_p,
+#endif
+#if GLIBTOP_SUID_PROC_WD
+	_glibtop_init_proc_wd_p,
 #endif
 #if GLIBTOP_SUID_PPP
-	glibtop_init_ppp_p,
+	_glibtop_init_ppp_p,
 #endif
 	NULL
 };

lib/write.c

@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* Copyright (C) 1998-99 Martin Baulig
    This file is part of LibGTop 1.0.
 
@@ -22,7 +20,7 @@
 */
 
 #include <config.h>
-
+#include <errno.h>
 #include <glibtop/write.h>
 #include <glibtop/error.h>
 #include <glib/gi18n-lib.h>
@@ -33,6 +31,7 @@ void
 glibtop_write_l (glibtop *server, size_t size, void *buf)
 {
 	int ret;
+	int fd;
 
 	glibtop_init_r (&server, 0, 0);
 
@@ -42,11 +41,10 @@ glibtop_write_l (glibtop *server, size_t size, void *buf)
 	fprintf (stderr, "LIBRARY: really writing %d bytes.\n", (int)size);
 #endif
 
-	if (server->socket) {
-		ret = send (server->socket, buf, size, 0);
-	} else {
-		ret = write (server->output [1], buf, size);
-	}
+	fd = server->socket ? server->socket : server->output[1];
+
+	while ((ret = write(fd, buf, size)) < 0 && errno == EINTR)
+		;
 
 	if (ret < 0)
 		glibtop_error_io_r (server,

libgtop-sysdeps.m4

@@ -18,23 +18,22 @@ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[
 	AC_SUBST(libgtop_need_server)
 
 	AC_ARG_WITH(libgtop-examples,
-	[  --with-libgtop-examples Build the libgtop examples (default=no)],[
-	build_examples="$withval"], [build_examples=no])
+	AS_HELP_STRING([--with-examples],
+	[Build the libgtop examples @<:@default=yes@:>@]),[
+	build_examples="$withval"], [build_examples=yes])
 
 	AM_CONDITIONAL(EXAMPLES, test x"$build_examples" = xyes)
 
 	AC_ARG_ENABLE(hacker-mode,
-	[  --enable-hacker-mode    Enable building of unstable sysdeps],
+	AS_HELP_STRING([--enable-hacker-mode],
+	[Enable building of unstable sysdeps]),
 	[hacker_mode="$enableval"], [hacker_mode=no])
 
 	AM_CONDITIONAL(HACKER_MODE, test x"$hacker_mode" = xyes)
 
-	if test x$hacker_mode = xyes ; then
-	  LIBGTOP_HACKER_TESTS
-	fi
-
 	AC_ARG_WITH(libgtop-smp,
-	[  --with-libgtop-smp      Enable SMP support (default-auto)],[
+	AS_HELP_STRING([--with-libgtop-smp],
+	[Enable SMP support @<:@default-auto@:>@]),[
 	libgtop_smp="$withval"],[libgtop_smp=auto])
 
 	if test $libgtop_smp = auto ; then
@@ -68,11 +67,17 @@ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[
 	  libgtop_have_sysinfo=yes
 	  libgtop_need_server=no
 	  ;;
-	freebsd*|netbsd*|openbsd*|bsdi*)
+	netbsd*|openbsd*|bsdi*)
+	  libgtop_sysdeps_dir=bsd
+	  libgtop_use_machine_h=yes
+	  libgtop_need_server=yes
+	  libgtop_postinstall='chgrp kmem $(bindir)/libgtop_server2 && chmod 2755 $(bindir)/libgtop_server2'
+	  ;;
+	freebsd*|kfreebsd*)
 	  libgtop_sysdeps_dir=freebsd
 	  libgtop_use_machine_h=yes
 	  libgtop_need_server=yes
-	  libgtop_postinstall='chgrp kmem $(bindir)/libgtop_server && chmod 2755 $(bindir)/libgtop_server'
+	  libgtop_postinstall='chgrp kmem $(bindir)/libgtop_server2 && chmod 2755 $(bindir)/libgtop_server2'
 	  ;;
 	solaris*)
 	  libgtop_sysdeps_dir=solaris
@@ -126,9 +131,29 @@ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[
 
 	case "$host_os" in
 	*bsd*)
-	  AC_CHECK_LIB(kvm, kvm_open, KVM_LIBS=-lkvm, KVM_LIBS=)
+		case "$host_os" in
+		*kfreebsd*)
+		AC_CHECK_LIB(kvm, kvm_open, KVM_LIBS="-lkvm -lfreebsd -lbsd", KVM_LIBS=, -lfreebsd -lbsd);;
+		*) 
+	  	AC_CHECK_LIB(kvm, kvm_open, KVM_LIBS=-lkvm, KVM_LIBS=);;
+	  	esac
+	  
 	  AC_SUBST(KVM_LIBS)
 
+	  case "$host_os" in
+	  kfreebsd*)
+	  	EXTRA_SYSDEPS_LIBS="-lgeom -ldevstat"
+		;;
+	  freebsd*)
+	  	osreldate=`sysctl -n kern.osreldate 2>/dev/null`
+		if test -n "${osreldate}" && test ${osreldate} -ge 600000 ; then
+		    EXTRA_SYSDEPS_LIBS="-lgeom -ldevstat"
+		fi
+		;;
+          esac
+
+	  AC_SUBST(EXTRA_SYSDEPS_LIBS)
+
 	  AC_CHECK_HEADERS(net/if_var.h)
 	  AC_MSG_CHECKING([for I4B])
 	  AC_TRY_COMPILE([
@@ -145,7 +170,7 @@ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[
 #include <net/netisr.h>
 #include <net/route.h>
 
-#if defined(__FreeBSD__) || defined(__NetBSD__)
+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__FreeBSD_kernel__)
 #include <net/if_sppp.h>
 #else
 #include <i4b/sppp/if_sppp.h>
@@ -171,7 +196,7 @@ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[
 #include <net/netisr.h>
 #include <net/route.h>
 
-#if defined(__FreeBSD__) || defined(__NetBSD__)
+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__FreeBSD_kernel__)
 #include <net/if_sppp.h>
 #else
 #include <i4b/sppp/if_sppp.h>
@@ -198,6 +223,7 @@ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[
 	    msginfo_needs=
 	    for def in nothing KERNEL _KERNEL; do
 	      AC_COMPILE_IFELSE([#define $def
+#include <sys/types.h>
 #include <sys/ipc.h>
 #include <sys/msg.h>
 #include <stdio.h>
@@ -255,16 +281,16 @@ main (void)
 	  AC_MSG_RESULT($os_version_code)
 	  ;;
 	solaris*)
-	  os_major_version=`uname -r | sed 's/\([[0-9]]*\).\([[0-9]]\)\.*\([[0-9]]*\)/\1/'`
-	  os_minor_version=`uname -r | sed 's/\([[0-9]]*\).\([[0-9]]\)\.*\([[0-9]]*\)/\2/'`
-	  os_micro_version=`uname -r | sed 's/\([[0-9]]*\).\([[0-9]]\)\.*\([[0-9]]*\)/\3/'`
+	  os_major_version=`uname -r | sed 's/\([[0-9]]*\).\([[0-9]]*\)\.*\([[0-9]]*\)/\1/'`
+	  os_minor_version=`uname -r | sed 's/\([[0-9]]*\).\([[0-9]]*\)\.*\([[0-9]]*\)/\2/'`
+	  os_micro_version=`uname -r | sed 's/\([[0-9]]*\).\([[0-9]]*\)\.*\([[0-9]]*\)/\3/'`
 	  test -z "$os_micro_version" && os_micro_version=0
-	  os_version_expr="$os_major_version 100 * $os_minor_version 10 * + $os_micro_version + p q"
+	  os_version_expr="$os_major_version 10000 * $os_minor_version 100 * + $os_micro_version + p q"
 	  os_version_code=`echo "$os_version_expr" | dc`
 
 	  AC_MSG_CHECKING(for Solaris release code)
 	  AC_DEFINE_UNQUOTED(GLIBTOP_SOLARIS_RELEASE, $os_version_code,
-              [Solaris release code (eg. 251 for Solaris 2.5.1).])
+              [Solaris release code (eg. 20501 for Solaris 2.5.1).])
 	  AC_MSG_RESULT($os_version_code)
 	  ;;
 	esac

libgtop.spec.in

@@ -59,12 +59,12 @@ Examples for LibGTop.
 %build
 # Needed for snapshot releases.
 if [ ! -f configure ]; then
-  CFLAGS="$RPM_OPT_FLAGS" ./autogen.sh --prefix=%prefix --without-linux-table --with-libgtop-inodedb --with-libgtop-examples --with-libgtop-smp
+  CFLAGS="$RPM_OPT_FLAGS" ./autogen.sh --prefix=%prefix --without-linux-table --with-libgtop-examples --with-libgtop-smp
 else
 %ifarch alpha
   CFLAGS="$RPM_OPT_FLAGS" ./configure --host=alpha-redhat-linux --prefix=%prefix --without-linux-table --with-libgtop-inodedb --with-libgtop-examples --with-libgtop-smp
 %else
-  CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%prefix --without-linux-table --with-libgtop-inodedb --with-libgtop-examples --with-libgtop-smp
+  CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%prefix --without-linux-table --with-libgtop-examples --with-libgtop-smp
 %endif
 fi
 

misc/.cvsignore

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

po/.cvsignore

@@ -1,14 +0,0 @@
-*.gmo
-*.mo
-*.pot
-Makefile
-Makefile.in
-Makefile.in.in
-POTFILES
-cat-id-tbl.c
-messages
-missing
-notexist
-po2tbl.sed
-po2tbl.sed.in
-stamp-cat-id

po/ChangeLog

@@ -1,3 +1,220 @@
+2007-09-16  Gintautas Miliauskas  <gintas@akl.lt>
+
+	* lt.po: Updated Lithuanian translation.
+
+2007-09-13  Djihed Afifi <djihed@gmail.com> 
+
+	* ar.po: Updated Arabic Translation by Youssef Chahibi.
+
+2007-09-13 Gabor Kelemen  <kelemeng@gnome.hu>
+
+	* hu.po: Translation updated.
+
+2007-09-13  Mugurel Tudor  <mugurelu@gnome.ro>
+
+        * ro.po: Updated Romanian translation
+        by Mişu Moldovan <dumol@gnome.ro>
+
+2007-09-12 Maxim Dziumanenko <dziumanenko@gmail.com>
+
+	* uk.po: Update Ukrainian translation.
+
+2007-09-12  Goran Rakić  <grakic@devbase.net>
+
+	* sr.po, sr@Latn.po: Updated Serbian translation.
+
+2007-09-08  Duarte Loreto <happyguy_pt@hotmail.com>
+
+	* pt.po: Updated Portuguese translation.
+
+2007-09-05  Nickolay V. Shmyrev  <nshmyrev@yandex.ru>
+ 
+	* ru.po: Updated Russian translation.
+
+2007-09-03  Jovan Naumovski  <jovan@lugola.net>
+ 
+	* mk.po: Updated Macedonian translation.
+
+2007-08-24  Stéphane Raimbault  <stephane.raimbault@gmail.com>
+
+	* fr.po: Updated French translation.
+
+2007-08-10  Runa Bhattacharjee <runabh@gmail.com>
+
+	* bn_IN.po: Updated Bengali India Translation.
+
+2007-08-07  Ankit Patel  <ankit644@yahoo.com>
+
+	* gu.po: Updated Gujarati Translation.
+
+2007-08-06  Ilkka Tuohela  <hile@iki.fi>
+
+	* fi.po: Updated Finnish translation.
+
+2007-08-05  Inaki Larranaga Murgoitio  <dooteo@zundan.com>
+
+	* eu.po: Updated Basque translation.
+
+2007-07-21  Leonardo Ferreira Fontenelle  <leonardof@svn.gnome.org>
+
+	* pt_BR.po: Brazilian Portuguese translation updated by Og Maciel
+	<ogmaciel@ubuntu.com>.
+
+2007-07-19  Hendrik Richter  <hendrikr@gnome.org>
+
+	* de.po: Updated German translation.
+
+2007-07-17  Wouter Bolsterlee  <wbolster@svn.gnome.org>
+
+	* nl.po: Dutch translation updated by Wouter Bolsterlee.
+
+2007-07-16  Ilkka Tuohela  <hile@iki.fi>
+
+	* fi.po: Updated Finnish translation.
+
+2007-07-09  I. Felix <ifelix@svn.gnome.org>
+
+	* ta.po:  Tamil Translation updated by Tirumurthi Vasudevan
+
+2007-07-07  Takeshi AIHANA <takeshi.aihana@gmail.com>
+
+	* ja.po: Updated Japanese translation.
+
+2007-06-27  Clytie Siddall <clytie@riverland.net.au>
+
+	* vi.po: Updated Vietnamese translation.
+
+2007-06-23  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* nb.po: Updated Norwegian bokmål translation.
+
+2007-06-13  Pema Geyleg <pema.geyleg@gmail.com>
+
+	* dz.po: Updated dzongkha translation.
+
+2007-05-27  Daniel Nylander <po@danielnylander.se>
+
+	* sv.po: Updated Swedish translation.
+
+2007-05-18  Theppitak Karoonboonyanan  <thep@linux.thai.net>
+
+	* th.po: Updated Thai translation.
+
+2007-05-17  Priit Laes  <plaes@svn.gnome.org>
+
+	* et.po: Updated Estonian translation by Ivar Smolin <okul@linux.ee>.
+
+2007-05-15  David Lodge <dave@cirt.net>
+
+	* en_GB.po: Updated British English translation
+
+2007-05-14  Jorge Gonzalez <jorgegonz@svn.gnome.org>
+
+	* es.po: Updated Spanish translation.
+
+2007-04-27  I Felix  <ifelix25@gmail.com>
+
+	* ta.po: Updated Tamil Translation.
+
+2007-04-25  Benoît Dejean  <benoit@placenet.org>
+
+	* ta.po: Updated Tamil translation.
+	Translated by Senthil Kumar  <senthil0627@gmail.com>.
+
+2007-03-25  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
+
+	* gl.po: Updated Galician Translation.
+
+2007-03-03  Artur Flinta  <aflinta@svn.gnome.org>
+
+	* pl.po: Updated Polish translation by GNOME PL Team.
+
+2007-02-27  Gintautas Miliauskas  <gintas@akl.lt>
+
+	* lt.po: Updated Lithuanian translation.
+
+2006-02-20  Maxim Dziumanenko <dziumanenko@gmail.com>
+
+	* uk.po: Updated Ukrainian translation.
+
+2006-12-1  Djihed Afifi <djihed@gmail.com> 
+
+	* ar.po: Updated Arabic Translation.
+
+2006-11-19  Wouter Bolsterlee  <wbolster@cvs.gnome.org>
+
+	* pl.po: Translation updated by GNOME PL Team.
+
+2006-11-18  Djihed Afifi <djihed@gmail.com> 
+
+	* ar.po: Updated Arabic Translation.
+
+2006-10-30  Djihed Afifi <djihed@gmail.com> 
+
+	* ar.po Updated Arabic Translation.
+
+2006-10-30  Satoru SATOH <ss@gnome.gr.jp>
+
+	* ja.po: Fixed wrong plural form entries.
+
+2006-09-21  Pawan Chitrakar  <pchitrakar@gmail.com>
+
+	* ne.po: Updated Nepali Translation
+
+2006-09-19  Sunil Mohan Adapa  <sunil@atc.tcs.co.in>
+
+	* te.po: Added Telugu "te" translation done by
+	Sree Ganesh <mrthottempudi@yahoo.com>.
+	* LINGUAS: Added "te".
+
+2006-09-01  Runa Bhattacharjee <runabh@gmail.com>
+
+	* bn_IN.po: Fixed some typos.
+
+2006-08-27  Theppitak Karoonboonyanan  <thep@linux.thai.net>
+
+	* th.po: Fixed plural strings.
+
+2006-08-16  Gabor Kelemen  <kelemeng@gnome.hu>
+
+	* hu.po: Translation updated.
+
+2006-08-14  Matic Žgur  <mr.zgur@gmail.com>
+
+	* sl.po: Updated Slovenian translation.
+
+2006-08-07  Runa Bhattacharjee <runabh@gmail.com>
+
+	* bn_IN.po: Updated Bengali India Translation.
+
+2006-08-05  Ani Peter <peter.ani@gmail.com>
+
+	*ml.po Updated Malayalam Translation
+
+2006-07-05  Thierry Randrianiriana <thierryR@cvs.gnome.org>
+
+        * mg.po: Added Malagasy translation
+        * LINGUAS: Added Malagasy code 'mg' to the list
+
+2006-07-03  Runa Bhattacharjee <runabh@gmail.com>
+
+        * bn_IN.po: Added Bengali India Translation
+        * LINGUAS: Added Bengali India (bn_IN) to the list of languages.
+
+2006-07-03  Simos Xenitellis  <simos@gnome.org>
+
+	* ne.po: Fixed ^M, bug #316750.
+
+2006-06-26  Abel Cheung  <abel@oaka.org>
+
+	* zh_HK.po, zh_TW.po: Updated traditional Chinese translation.
+
+2006-06-08  Gora Mohanty  <gmohanty@cvs.gnome.org>
+
+        * LINGUAS: Added 'eo' (Esperanto)
+        * eo.po: Added Esperanto translation by Guillaume Savaton
+          <gsavaton@hotmail.com>
+
 2006-04-07  Ales Nyakhaychyk  <nab@mail.by>
 
 	* be.po: Updated Belarusian translation.
@@ -19,7 +236,7 @@
 2006-03-18  Vladimer Sichinava  <vlsichinava@gmail.com>
 
 	* ka.po: Updated Georgian translation.
-	
+
 2006-03-03  Žygimantas Beručka  <zygis@gnome.org>
 
 	* lt.po: Updated Lithuanian translation.
@@ -27,7 +244,7 @@
 2006-02-28  Clytie Siddall <clytie@riverland.net.au>
 
 	* lv.po: Updated Latvian translation by Raivis Dejus <orvils@gmail.com>.
-	
+
 2005-12-04  Theppitak Karoonboonyanan  <thep@linux.thai.net>
 
 	* th.po: Added Thai translation.
@@ -60,7 +277,7 @@
 2005-08-29  Telsa Gwynne  <hobbit@aloss.ukuu.org.uk>
 
         * cy.po: Updated Welsh translation.
-	
+
 2005-08-22  Mugurel Tudor  <mugurelu@gnome.ro>
 
 	* ro.po: Updated Romanian translation
@@ -193,9 +410,9 @@
 	* ru.po: Updated Russian translation
 
 2005-02-07  David Lodge <dave@cirt.net>
-                                                                                
+
         * en_GB.po: Updated British translation.
-                                                                                
+
 2005-02-06  Ole Laursen  <olau@hardworking.dk>
 
 	* da.po: Updated Danish translation.
@@ -288,7 +505,7 @@
 
 2004-12-29  Benoît Dejean  <tazforever@dlfp.org>
 
-	* POTFILES.in: Removed a bunch of strings. 
+	* POTFILES.in: Removed a bunch of strings.
 
 2004-12-28  Christian Rose  <menthos@menthos.com>
 
@@ -338,9 +555,9 @@
 	* it.po: Updated Italian translation.
 
 2004-09-14  Gora Mohanty  <gmohanty@cvs.gnome.org>
-                                                                                
+
         * or.po: Updated Oriya translation.
-  
+
 2004-09-12  Laszlo Dvornik  <dvornik@gnome.hu>
 
 	* hu.po: Updated Hungarian translation by Gabor Kelemen.
@@ -361,7 +578,7 @@
 2004-09-06  Mugurel Tudor  <mugurelu@go.ro>
 
         * ro.po: Updated Romanian translation
-        by Misu Moldovan <dumol@go.ro> 
+        by Misu Moldovan <dumol@go.ro>
 
 2004-09-06  Kostas Papadimas <pkst@gnome.org>
 
@@ -374,11 +591,11 @@
 2004-09-03  Baris Cicek <baris@teamforce.name.tr>
 
 	* tr.po: Updated Turkish Translation
-	
+
 2004-09-02  Hendrik Richter <hendrik@gnome-de.org>
 
 	* de.po: Updated German translation
-	
+
 2004-08-30  Nikos Charonitakis  <charosn@her.forthnet.gr>
 
 	* el.po: Updated Greek translation.
@@ -538,9 +755,9 @@
 
 	* es.po: Updated Spanih translation.
 
-2004-07-28  David Lodge  <dave@cirt.net>                                                                       
+2004-07-28  David Lodge  <dave@cirt.net>
         * en_GB.po: Updated British translation.
-                                                                                
+
 2004-07-26  Duarte Loreto <happyguy_pt@hotmail.com>
 
 	* pt.po: Updated Portuguese translation.
@@ -643,7 +860,7 @@
 
 	* bg.po: Updated Bulgarian translation by
 	Rostislav Raykov <zbrox@i-space.org>
-		
+
 2004-06-28  Laurent Dhima  <laurenti@alblinux.net>
 
 	* sq.po: Translation updated.
@@ -1544,4 +1761,3 @@ Sun, 31 May 1998 22:38:59 +0200  Vincent Renardias  <vincent@waw.com>
 1998-05-21  Martin Baulig  <martin@home-of-linux.org>
 
 	* ChangeLog: new file - currently empty
-

po/LINGUAS

@@ -0,0 +1,77 @@
+# please keep this list sorted alphabetically
+#
+am
+ar
+az
+be
+bg
+bn
+bn_IN
+bs
+ca
+cs
+cy
+da
+de
+dz
+el
+en_CA
+en_GB
+eo
+es
+et
+eu
+fa
+fi
+fr
+ga
+gl
+gu
+he
+hi
+hr
+hu
+id
+it
+ja
+ka
+ko
+ku
+ky
+lt
+lv
+mg
+mi
+mk
+ml
+mn
+ms
+nb
+ne
+nl
+nn
+oc
+or
+pa
+pl
+pt
+pt_BR
+ro
+ru
+rw
+sk
+sl
+sq
+sr
+sr@Latn
+sv
+ta
+te
+th
+tr
+uk
+vi
+xh
+zh_CN
+zh_HK
+zh_TW

po/Makefile.in.in.in

@@ -1,248 +0,0 @@
-# Makefile for program source directory in GNU NLS utilities package.
-# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
-#
-# This file file be copied and used freely without restrictions.  It can
-# be used in projects which are not available under the GNU Public License
-# but which still want to provide support for the GNU gettext functionality.
-# Please note that the actual code is *not* freely available.
-
-PACKAGE = @LIBGTOP_PACKAGE@
-VERSION = @VERSION@
-
-SHELL = /bin/sh
-@SET_MAKE@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-datadir = $(prefix)/@DATADIRNAME@
-localedir = $(datadir)/locale
-gnulocaledir = $(prefix)/share/locale
-gettextsrcdir = $(prefix)/share/gettext/po
-subdir = po
-
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-MKINSTALLDIRS = $(top_srcdir)/@MKINSTALLDIRS@
-
-CC = @CC@
-GENCAT = @GENCAT@
-GMSGFMT = PATH=../src:$$PATH @GMSGFMT@
-MSGFMT = @MSGFMT@
-XGETTEXT = PATH=../src:$$PATH @XGETTEXT@
-MSGMERGE = PATH=../src:$$PATH msgmerge
-
-DEFS = @DEFS@
-CFLAGS = @CFLAGS@
-CPPFLAGS = @CPPFLAGS@
-
-INCLUDES = -I.. -I$(top_srcdir)/intl
-
-COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
-
-SOURCES = cat-id-tbl.c
-POFILES = @POFILES@
-GMOFILES = @GMOFILES@
-DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(PACKAGE).pot \
-stamp-cat-id $(POFILES) $(GMOFILES) $(SOURCES)
-
-POTFILES = \
-
-CATALOGS = @CATALOGS@
-CATOBJEXT = @CATOBJEXT@
-INSTOBJEXT = @INSTOBJEXT@
-
-.SUFFIXES:
-.SUFFIXES: .c .o .po .pox .gmo .mo .msg .cat
-
-.c.o:
-	$(COMPILE) $<
-
-.po.pox:
-	$(MAKE) $(PACKAGE).pot
-	$(MSGMERGE) $< $(srcdir)/$(PACKAGE).pot -o $*.pox
-
-.po.mo:
-	$(MSGFMT) -o $@ $<
-
-.po.gmo:
-	file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \
-	  && rm -f $$file && $(GMSGFMT) -o $$file $<
-
-.po.cat:
-	sed -f ../intl/po2msg.sed < $< > $*.msg \
-	  && rm -f $@ && $(GENCAT) $@ $*.msg
-
-
-all: all-@USE_NLS@
-
-all-yes: cat-id-tbl.c $(CATALOGS)
-all-no:
-
-$(srcdir)/$(PACKAGE).pot: $(POTFILES)
-	$(XGETTEXT) --default-domain=$(PACKAGE) --directory=$(top_srcdir) \
-	  --add-comments --keyword=_ --keyword=N_ \
-	  --files-from=$(srcdir)/POTFILES.in \
-	&& test ! -f $(PACKAGE).po \
-	   || ( rm -f $(srcdir)/$(PACKAGE).pot \
-		&& mv $(PACKAGE).po $(srcdir)/$(PACKAGE).pot )
-
-$(srcdir)/cat-id-tbl.c: stamp-cat-id; @:
-$(srcdir)/stamp-cat-id: $(PACKAGE).pot
-	rm -f cat-id-tbl.tmp
-	sed -f ../intl/po2tbl.sed $(srcdir)/$(PACKAGE).pot \
-		| sed -e "s/@PACKAGE NAME@/$(PACKAGE)/" > cat-id-tbl.tmp
-	if cmp -s cat-id-tbl.tmp $(srcdir)/cat-id-tbl.c; then \
-	  rm cat-id-tbl.tmp; \
-	else \
-	  echo cat-id-tbl.c changed; \
-	  rm -f $(srcdir)/cat-id-tbl.c; \
-	  mv cat-id-tbl.tmp $(srcdir)/cat-id-tbl.c; \
-	fi
-	cd $(srcdir) && rm -f stamp-cat-id && echo timestamp > stamp-cat-id
-
-
-install: install-exec install-data
-install-exec:
-install-data: install-data-@USE_NLS@
-install-data-no: all
-install-data-yes: all
-	if test -r "$(MKINSTALLDIRS)"; then \
-	  $(MKINSTALLDIRS) $(datadir); \
-	else \
-	  $(SHELL) $(top_srcdir)/mkinstalldirs $(datadir); \
-	fi
-	@catalogs='$(CATALOGS)'; \
-	for cat in $$catalogs; do \
-	  cat=`basename $$cat`; \
-	  case "$$cat" in \
-	    *.gmo) destdir=$(gnulocaledir);; \
-	    *)     destdir=$(localedir);; \
-	  esac; \
-	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
-	  dir=$$destdir/$$lang/LC_MESSAGES; \
-	  if test -r "$(MKINSTALLDIRS)"; then \
-	    $(MKINSTALLDIRS) $$dir; \
-	  else \
-	    $(SHELL) $(top_srcdir)/mkinstalldirs $$dir; \
-	  fi; \
-	  if test -r $$cat; then \
-	    $(INSTALL_DATA) $$cat $$dir/$(PACKAGE)$(INSTOBJEXT); \
-	    echo "installing $$cat as $$dir/$(PACKAGE)$(INSTOBJEXT)"; \
-	  else \
-	    $(INSTALL_DATA) $(srcdir)/$$cat $$dir/$(PACKAGE)$(INSTOBJEXT); \
-	    echo "installing $(srcdir)/$$cat as" \
-		 "$$dir/$(PACKAGE)$(INSTOBJEXT)"; \
-	  fi; \
-	  if test -r $$cat.m; then \
-	    $(INSTALL_DATA) $$cat.m $$dir/$(PACKAGE)$(INSTOBJEXT).m; \
-	    echo "installing $$cat.m as $$dir/$(PACKAGE)$(INSTOBJEXT).m"; \
-	  else \
-	    if test -r $(srcdir)/$$cat.m ; then \
-	      $(INSTALL_DATA) $(srcdir)/$$cat.m \
-		$$dir/$(PACKAGE)$(INSTOBJEXT).m; \
-	      echo "installing $(srcdir)/$$cat as" \
-		   "$$dir/$(PACKAGE)$(INSTOBJEXT).m"; \
-	    else \
-	      true; \
-	    fi; \
-	  fi; \
-	done
-	if test "$(PACKAGE)" = "gettext"; then \
-	  if test -r "$(MKINSTALLDIRS)"; then \
-	    $(MKINSTALLDIRS) $(gettextsrcdir); \
-	  else \
-	    $(SHELL) $(top_srcdir)/mkinstalldirs $(gettextsrcdir); \
-	  fi; \
-	  $(INSTALL_DATA) $(srcdir)/Makefile.in.in \
-			  $(gettextsrcdir)/Makefile.in.in; \
-	else \
-	  : ; \
-	fi
-
-# Define this as empty until I found a useful application.
-installcheck:
-
-uninstall:
-	catalogs='$(CATALOGS)'; \
-	for cat in $$catalogs; do \
-	  cat=`basename $$cat`; \
-	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
-	  rm -f $(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
-	  rm -f $(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
-	  rm -f $(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
-	  rm -f $(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
-	done
-	rm -f $(gettextsrcdir)/po-Makefile.in.in
-
-check: all
-
-cat-id-tbl.o: ../intl/libgettext.h
-
-dvi info tags TAGS ID:
-
-mostlyclean:
-	rm -f core core.* *.pox $(PACKAGE).po *.old.po cat-id-tbl.tmp
-	rm -fr *.o
-
-clean: mostlyclean
-
-distclean: clean
-	rm -f Makefile Makefile.in POTFILES *.mo *.msg *.cat *.cat.m
-
-maintainer-clean: distclean
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-	rm -f $(GMOFILES)
-
-distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
-dist distdir: update-po $(DISTFILES)
-	dists="$(DISTFILES)"; \
-	for file in $$dists; do \
-	  ln $(srcdir)/$$file $(distdir) 2> /dev/null \
-	    || cp -p $(srcdir)/$$file $(distdir); \
-	done
-
-update-po: Makefile
-	$(MAKE) $(PACKAGE).pot
-	PATH=`pwd`/../src:$$PATH; \
-	cd $(srcdir); \
-	catalogs='$(CATALOGS)'; \
-	for cat in $$catalogs; do \
-	  cat=`basename $$cat`; \
-	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
-	  mv $$lang.po $$lang.old.po; \
-	  echo "$$lang:"; \
-	  if $(MSGMERGE) $$lang.old.po $(PACKAGE).pot -o $$lang.po; then \
-	    rm -f $$lang.old.po; \
-	  else \
-	    echo "msgmerge for $$cat failed!"; \
-	    rm -f $$lang.po; \
-	    mv $$lang.old.po $$lang.po; \
-	  fi; \
-	done
-
-POTFILES: POTFILES.in
-	( if test 'x$(srcdir)' != 'x.'; then \
-	    posrcprefix='$(top_srcdir)/'; \
-	  else \
-	    posrcprefix="../"; \
-	  fi; \
-	  rm -f $@-t $@ \
-	    && (sed -e '/^#/d' -e '/^[ 	]*$$/d' \
-		    -e "s@.*@	$$posrcprefix& \\\\@" < $(srcdir)/$@.in \
-		| sed -e '$$s/\\$$//') > $@-t \
-	    && chmod a-w $@-t \
-	    && mv $@-t $@ )
-
-Makefile: Makefile.in.in ../config.status POTFILES
-	cd .. \
-	  && CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \
-	       $(SHELL) ./config.status
-
-# Tell versions [3.59,3.63) of GNU make not to export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

po/POTFILES.in

@@ -15,8 +15,6 @@ src/daemon/main.c
 src/daemon/server.c
 src/daemon/slave.c
 src/daemon/version.c
-src/inodedb/file_by_inode2.c
-src/inodedb/mkinodedb2.c
 sysdeps/linux/siglist.c
 sysdeps/osf1/siglist.c
 sysdeps/sun4/siglist.c

po/ar.po

@@ -1,51 +1,49 @@
-# translation of libgtop.po to Arabic
-# translation of libgtop.libgtop-GNOME-2-0-port.ar.po to Arabic
+# translation of libgtop.HEAD.ar.po to Arabic
 # This file is distributed under the same license as the PACKAGE package.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
+#
 # Arafat Medini <lumina@silverpen.de>, 2002,2003.
 # Isam Bayazidi <bayazidi@arabeyes.org>, 2002.
 # Abdulaziz Al-Arfaj <alarfaj0@yahoo.com>, 2004.
-#
+# Khaled Hosny <khaledhosny@eglug.org>, 2006.
 msgid ""
 msgstr ""
-"Project-Id-Version: libgtop\n"
+"Project-Id-Version: libgtop.HEAD.ar\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-25 18:15+0200\n"
-"PO-Revision-Date: 2004-09-04 17:52+0300\n"
-"Last-Translator: Abdulaziz Al-Arfaj <alarfaj0@yahoo.com>\n"
+"POT-Creation-Date: 2007-08-26 14:20-0700\n"
+"PO-Revision-Date: 2007-09-08 14:32-0000\n"
+"Last-Translator: Youssef Chahibi <chahibi@gmail.com>\n"
 "Language-Team: Arabic <support@arabeyes.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.3\n"
-"Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : n>=3 && n<=10 ? 2 : "
-"3\n"
-"\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms: Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : n>=3 && n<=10 ? 2 : 3\n"
 
-#: lib/read.c:65
+#: ../lib/read.c:51
 #, c-format
 msgid "read %d byte"
 msgid_plural "read %d bytes"
-msgstr[0] "قراءة بايت واحدة"
-msgstr[1] "قراءة بايتين"
-msgstr[2] "قراءة %d بايتات"
-msgstr[3] "قراءة %d بايت"
+msgstr[0] "اقرأ بايت واحدة"
+msgstr[1] "اقرأ بايتين"
+msgstr[2] "اقرأ %d بايتات"
+msgstr[3] "اقرأ %d بايت"
 
-#: lib/read_data.c:53
+#: ../lib/read_data.c:51
 msgid "read data size"
-msgstr "قراءت حجم البيانات"
+msgstr "اقرأ حجم البيانات"
 
-#: lib/read_data.c:72
-#, fuzzy, c-format
+#: ../lib/read_data.c:70
+#, c-format
 msgid "read %lu byte of data"
 msgid_plural "read %lu bytes of data"
-msgstr[0] "قراءة بايت واحدة"
-msgstr[1] "قراءة بايتين"
-msgstr[2] "قراءة %d بايتات"
-msgstr[3] "قراءة %d بايت"
+msgstr[0] "اقرأ بايت واحدة "
+msgstr[1] "اقرأ بايتين"
+msgstr[2] "اقرأ %lu بايتات"
+msgstr[3] "اقرأ %lu بايت"
 
-#: lib/write.c:52
-#, fuzzy, c-format
+#: ../lib/write.c:51
+#, c-format
 msgid "wrote %d byte"
 msgid_plural "wrote %d bytes"
 msgstr[0] "كتابة بايت واحدة"
@@ -53,167 +51,188 @@ msgstr[1] "كتابة بايتين"
 msgstr[2] "كتابة %d بايتات"
 msgstr[3] "كتابة %d بايت"
 
-#: src/daemon/gnuserv.c:460
+#: ../src/daemon/gnuserv.c:458
 msgid "Enable debugging"
-msgstr "تفعيل التنقيح"
+msgstr "فعّل التنقيح"
 
-#: src/daemon/gnuserv.c:460
-msgid "DEBUG"
-msgstr "تنقيح"
-
-#: src/daemon/gnuserv.c:462
+#: ../src/daemon/gnuserv.c:460
 msgid "Enable verbose output"
-msgstr "تمكين اخراج مسهب"
+msgstr "فعّل خرْج مسهِب"
 
-#: src/daemon/gnuserv.c:462
-msgid "VERBOSE"
-msgstr "مضجر"
-
-#: src/daemon/gnuserv.c:464
+#: ../src/daemon/gnuserv.c:462
 msgid "Don't fork into background"
 msgstr "لا تشعّب إلى الخلفية"
 
-#: src/daemon/gnuserv.c:464
-msgid "NO-DAEMON"
-msgstr "لا-جنّي"
-
-#: src/daemon/gnuserv.c:466
+#: ../src/daemon/gnuserv.c:464
 msgid "Invoked from inetd"
 msgstr "استُحضرت من inetd "
 
-#: src/daemon/gnuserv.c:466
-msgid "INETD"
-msgstr "INETD"
-
-#: src/daemon/gnuserv.c:500
+#: ../src/daemon/gnuserv.c:498
 #, c-format
-msgid ""
-"Error on option %s: %s.\n"
-"Run '%s --help' to see a full list of available command line options.\n"
-msgstr ""
-"خطأ عند الخيار %s: %s.\n"
-"فعل '%s --help' لرئية قائمة كاملة لخيارات سطر الأوامر.\n"
+msgid "Run '%s --help' to see a full list of available command line options.\n"
+msgstr "شغّل '%s --help' لرؤية قائمة كاملة لخيارات سطر الأوامر.\n"
 
-#: sysdeps/osf1/siglist.c:28 sysdeps/sun4/siglist.c:28
+#: ../sysdeps/osf1/siglist.c:27
+#: ../sysdeps/sun4/siglist.c:27
 msgid "Hangup"
-msgstr "أغلاق الخط"
+msgstr "علق"
 
-#: sysdeps/osf1/siglist.c:29 sysdeps/sun4/siglist.c:29
+#: ../sysdeps/osf1/siglist.c:28
+#: ../sysdeps/sun4/siglist.c:28
 msgid "Interrupt"
-msgstr "مقاطعة"
+msgstr "قاطِع"
 
-#: sysdeps/osf1/siglist.c:30 sysdeps/sun4/siglist.c:30
+#: ../sysdeps/osf1/siglist.c:29
+#: ../sysdeps/sun4/siglist.c:29
 msgid "Quit"
-msgstr "خروج"
+msgstr "اخرج"
 
-#: sysdeps/osf1/siglist.c:31 sysdeps/sun4/siglist.c:31
+#: ../sysdeps/osf1/siglist.c:30
+#: ../sysdeps/sun4/siglist.c:30
 msgid "Illegal instruction"
 msgstr "توجيه ممنوع"
 
-#: sysdeps/osf1/siglist.c:32 sysdeps/sun4/siglist.c:32
+#: ../sysdeps/osf1/siglist.c:31
+#: ../sysdeps/sun4/siglist.c:31
 msgid "Trace trap"
 msgstr "فخ رسم"
 
-#: sysdeps/osf1/siglist.c:33 sysdeps/sun4/siglist.c:33
+#: ../sysdeps/osf1/siglist.c:32
+#: ../sysdeps/sun4/siglist.c:32
 msgid "Abort"
-msgstr "ايقاف"
+msgstr "اجهض"
 
-#: sysdeps/osf1/siglist.c:34 sysdeps/sun4/siglist.c:34
+#: ../sysdeps/osf1/siglist.c:33
+#: ../sysdeps/sun4/siglist.c:33
 msgid "EMT error"
 msgstr "خطأ EMT"
 
-#: sysdeps/osf1/siglist.c:35 sysdeps/sun4/siglist.c:35
+#: ../sysdeps/osf1/siglist.c:34
+#: ../sysdeps/sun4/siglist.c:34
 msgid "Floating-point exception"
-msgstr "استثناء Floating-point"
+msgstr "استثناء أرقام عشرية"
 
-#: sysdeps/osf1/siglist.c:36 sysdeps/sun4/siglist.c:36
+#: ../sysdeps/osf1/siglist.c:35
+#: ../sysdeps/sun4/siglist.c:35
 msgid "Kill"
-msgstr "قتل"
+msgstr "اقتل"
 
-#: sysdeps/osf1/siglist.c:37 sysdeps/sun4/siglist.c:37
+#: ../sysdeps/osf1/siglist.c:36
+#: ../sysdeps/sun4/siglist.c:36
 msgid "Bus error"
-msgstr "خطأ باص"
+msgstr "خطأ ناقل"
 
-#: sysdeps/osf1/siglist.c:38 sysdeps/sun4/siglist.c:38
+#: ../sysdeps/osf1/siglist.c:37
+#: ../sysdeps/sun4/siglist.c:37
 msgid "Segmentation violation"
 msgstr "انتهاك اﻻنقسام"
 
-#: sysdeps/osf1/siglist.c:39 sysdeps/sun4/siglist.c:39
+#: ../sysdeps/osf1/siglist.c:38
+#: ../sysdeps/sun4/siglist.c:38
 msgid "Bad argument to system call"
-msgstr "متغيّر سيء عند نداء النظام"
+msgstr "متغيّر سيء لنداء النظام"
 
-#: sysdeps/osf1/siglist.c:40 sysdeps/sun4/siglist.c:40
+#: ../sysdeps/osf1/siglist.c:39
+#: ../sysdeps/sun4/siglist.c:39
 msgid "Broken pipe"
-msgstr "انبوب مكسور"
+msgstr "أنبوب مكسور"
 
-#: sysdeps/osf1/siglist.c:41 sysdeps/sun4/siglist.c:41
+#: ../sysdeps/osf1/siglist.c:40
+#: ../sysdeps/sun4/siglist.c:40
 msgid "Alarm clock"
 msgstr "ساعة منبهة"
 
-#: sysdeps/osf1/siglist.c:42 sysdeps/sun4/siglist.c:42
+#: ../sysdeps/osf1/siglist.c:41
+#: ../sysdeps/sun4/siglist.c:41
 msgid "Termination"
 msgstr "إنهاء"
 
-#: sysdeps/osf1/siglist.c:43 sysdeps/sun4/siglist.c:43
+#: ../sysdeps/osf1/siglist.c:42
+#: ../sysdeps/sun4/siglist.c:42
 msgid "Urgent condition on socket"
-msgstr "حالة استعجالية عند نقطة الاتصال"
+msgstr "حالة عاجلة عند المقبس"
 
-#: sysdeps/osf1/siglist.c:44 sysdeps/sun4/siglist.c:44
+#: ../sysdeps/osf1/siglist.c:43
+#: ../sysdeps/sun4/siglist.c:43
 msgid "Stop"
-msgstr "توقّف"
+msgstr "قف"
 
-#: sysdeps/osf1/siglist.c:45 sysdeps/sun4/siglist.c:45
+#: ../sysdeps/osf1/siglist.c:44
+#: ../sysdeps/sun4/siglist.c:44
 msgid "Keyboard stop"
-msgstr "توقيف لوحة المفاتيح"
+msgstr "أوقف لوحة المفاتيح"
 
-#: sysdeps/osf1/siglist.c:46 sysdeps/sun4/siglist.c:46
+#: ../sysdeps/osf1/siglist.c:45
+#: ../sysdeps/sun4/siglist.c:45
 msgid "Continue"
-msgstr "متابعة"
+msgstr "تابع"
 
-#: sysdeps/osf1/siglist.c:47 sysdeps/sun4/siglist.c:47
+#: ../sysdeps/osf1/siglist.c:46
+#: ../sysdeps/sun4/siglist.c:46
 msgid "Child status has changed"
 msgstr "تغيرت حالة الابن"
 
-#: sysdeps/osf1/siglist.c:48 sysdeps/sun4/siglist.c:48
+#: ../sysdeps/osf1/siglist.c:47
+#: ../sysdeps/sun4/siglist.c:47
 msgid "Background read from tty"
-msgstr "قراءة خلفية من tty"
+msgstr "قراءة من tty في الخلفية"
 
-#: sysdeps/osf1/siglist.c:49 sysdeps/sun4/siglist.c:49
+#: ../sysdeps/osf1/siglist.c:48
+#: ../sysdeps/sun4/siglist.c:48
 msgid "Background write to tty"
-msgstr "كتابة خلفية لـ tty"
+msgstr "كتابة لـ tty في الخلفية"
 
-#: sysdeps/osf1/siglist.c:50 sysdeps/sun4/siglist.c:50
+#: ../sysdeps/osf1/siglist.c:49
+#: ../sysdeps/sun4/siglist.c:49
 msgid "I/O now possible"
-msgstr "ادخال/اخراج ممكن الآن"
+msgstr "دخْل/خرْج ممكن الآن"
 
-#: sysdeps/osf1/siglist.c:51 sysdeps/sun4/siglist.c:51
+#: ../sysdeps/osf1/siglist.c:50
+#: ../sysdeps/sun4/siglist.c:50
 msgid "CPU limit exceeded"
 msgstr "تجاوز حد الـمعالج"
 
-#: sysdeps/osf1/siglist.c:52 sysdeps/sun4/siglist.c:52
+#: ../sysdeps/osf1/siglist.c:51
+#: ../sysdeps/sun4/siglist.c:51
 msgid "File size limit exceeded"
 msgstr "تجاوز حد حجم الملف"
 
-#: sysdeps/osf1/siglist.c:53 sysdeps/sun4/siglist.c:53
+#: ../sysdeps/osf1/siglist.c:52
+#: ../sysdeps/sun4/siglist.c:52
 msgid "Virtual alarm clock"
 msgstr "ساعة تنبيه تخيّلية"
 
-#: sysdeps/osf1/siglist.c:54 sysdeps/sun4/siglist.c:54
+#: ../sysdeps/osf1/siglist.c:53
+#: ../sysdeps/sun4/siglist.c:53
 msgid "Profiling alarm clock"
 msgstr "كتابة لمحة عن ساعة التنبيه"
 
-#: sysdeps/osf1/siglist.c:55 sysdeps/sun4/siglist.c:55
+#: ../sysdeps/osf1/siglist.c:54
+#: ../sysdeps/sun4/siglist.c:54
 msgid "Window size change"
 msgstr "تغير حجم النافذة"
 
-#: sysdeps/osf1/siglist.c:56 sysdeps/sun4/siglist.c:56
+#: ../sysdeps/osf1/siglist.c:55
+#: ../sysdeps/sun4/siglist.c:55
 msgid "Information request"
 msgstr "طلب معلومات"
 
-#: sysdeps/osf1/siglist.c:57 sysdeps/sun4/siglist.c:57
+#: ../sysdeps/osf1/siglist.c:56
+#: ../sysdeps/sun4/siglist.c:56
 msgid "User defined signal 1"
-msgstr "اشارة معرفة من طرف المستخدم 1"
+msgstr "اشارة 1 معرفة من طرف المستخدم"
 
-#: sysdeps/osf1/siglist.c:58 sysdeps/sun4/siglist.c:58
+#: ../sysdeps/osf1/siglist.c:57
+#: ../sysdeps/sun4/siglist.c:57
 msgid "User defined signal 2"
-msgstr "اشارة معرفة من طرف المستخدم 2"
+msgstr "اشارة 2 معرفة من طرف المستخدم"
+
+#~ msgid "DEBUG"
+#~ msgstr "DEBUG"
+#~ msgid "VERBOSE"
+#~ msgstr "VERBOSE"
+#~ msgid "NO-DAEMON"
+#~ msgstr "NO-DAEMON"
+#~ msgid "INETD"
+#~ msgstr "INETD"
+