Released 2.24.3. Again.

svn path=/branches/gnome-2-24/; revision=2793
Fixed Darwin build. Patch by "paul" <ephraim_owns@hotmail.com>. See
2009-01-12 21:07:01 +00:00 · 2009-01-12 21:05:48 +00:00 · 2009-01-12 20:57:17 +00:00 · 2009-01-12 18:39:44 +00:00 · 2009-01-11 22:59:27 +00:00 · 2009-01-11 22:59:11 +00:00
501 changed files with 15103 additions and 9012 deletions
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,48 +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
-intltool-extract.in
-intltool-extract
-intltool-merge.in
-intltool-merge
-intltool-update.in
-intltool-update
--- a/133
+++ b/133
@@ -1,3 +1,136 @@
+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:
--- a/7
+++ b/7
@@ -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
+
--- a/132
+++ b/132
@@ -1,3 +1,135 @@
+12 January 2009: Overview of changes in 2.24.3
+==============================================
+* linux:
+  - fixed potential memory leak. Vincent Untz.
+  - fixed read(2) usage. Should fix the missing cpus bug in system-monitor.
+* darwin:
+  - fixed build. "paul".
+
+22 Septembre 2008: Overview of changes in 2.24.0
+================================================
+* Translation updates.
+
+18 August 2008: Overview of changes in 2.23.90
+==============================================
+* freebsd:
+  - updated port by Joe Marcus Clarke.
+
+23 June 2008: Overview of changes in 2.23.4
+===========================================
+* linux:
+  - Fixed and improved glibtop_get_fsusage with kernel >= 2.6.25.
+    Closes #539360.
+
+24 May 2008: Overview of changes in 2.23.2
+==========================================
+* glibtop_get_proc_open_files API can also lists IPv6 TCP sockets.
+* glibtop_get_proc_affinity : new API to retrieve process CPU affinity.
+
+(Let's hope one day i'll find the gtk-doc documentation ...)
+
+* linux:
+  - fixed parsing of big /proc/stat for uptime.
+
+04 April 2008: Overview of changes in 2.22.1
+============================================
+* Fixed compilation/dist for !linux.
+  Closes #525953.
+
+10 Mars 2008: Overview of changes in 2.22.0
+===========================================
+* linux:
+  - fixed proc_kernel.
+ 
+25 February 2008: Overview of changes in 2.21.92
+================================================
+* linux:
+  - fixed smaps parsing on >= 2.6.24.x.
+
+14 January 2008: Overview of changes in 2.21.5
+==============================================
+* freebsd:
+  - fixed build on GNU/kfreebsd. Petr Salinger.
+  - fixed procmem units. Kuang-che Wu.
+
+28 October 2007: Overview of changes in 2.21.1
+==============================================
+* don't export _p/_s private symbols anymore. This is not an API/ABI breakage.
+* darwin implementation by Benjamin Reed.
+* linux:
+  - splitted fsusage and mountlist implementations;
+  - smarter mountlist(allfs = False);
+  - fixed some compile warning on 64bit;
+* solaris:
+  - fixed netload build by Henry Zhang.
+
+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>).
--- a/configure.in
+++ b/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], [5])
+m4_define([libgtop_minor_version], [24])
+m4_define([libgtop_micro_version], [3])
 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], [9])

 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], [2])

 # Increase each time you change the client/server protocol.
 m4_define([libgtop_server_version], [5])
@@ -87,39 +87,12 @@ AM_CONDITIONAL(CROSS_COMPILING, test "x$cross_compiling" = xyes)
 GNOME_LIBGTOP_SYSDEPS
 GNOME_LIBGTOP_TYPES

-AC_ARG_WITH(libgtop-inodedb,
-            AS_HELP_STRING([--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])
@@ -300,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
@@ -410,9 +379,10 @@ sysdeps/linux/Makefile
 sysdeps/freebsd/Makefile
 sysdeps/solaris/Makefile
 sysdeps/aix/Makefile
+sysdeps/bsd/Makefile
+sysdeps/darwin/Makefile
 src/Makefile
 src/daemon/Makefile
-src/inodedb/Makefile
 lib/Makefile
 examples/Makefile
 doc/Makefile
--- a/debian/.cvsignore
+++ b/debian/.cvsignore
@@ -1,9 +0,0 @@
-control
-rules
-build
-tmp
-*.postinst
-*.debhelper
-*.files
-files
-substvars
--- a/doc/.cvsignore
+++ b/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
--- a/doc/ChangeLog
+++ b/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.
--- a/doc/reference/Makefile.am
+++ b/doc/reference/Makefile.am
@@ -15,25 +15,25 @@ 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=../../sysdeps/common
+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=../../include/glibtop
+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=../../include/glibtop/*.h
-CFILE_GLOB=../../sysdeps/common/*.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=../../glibtop.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
--- a/doc/reference/libgtop-docs.xml
+++ b/doc/reference/libgtop-docs.xml
@@ -171,7 +171,6 @@ rather than using the server.</para>
    <xi:include href="xml/close.xml"/>
    <xi:include href="xml/command.xml"/>
    <xi:include href="xml/glibtop-server.xml"/>
-    <xi:include href="xml/inodedb.xml"/>
    <xi:include href="xml/netload.xml"/>
    <xi:include href="xml/ppp.xml"/>
    <xi:include href="xml/shm_limits.xml"/>
--- a/doc/reference/libgtop-sections.txt
+++ b/doc/reference/libgtop-sections.txt
@@ -73,24 +73,6 @@ glibtop_server_ref
 glibtop_server_unref
 </SECTION>

-<INCLUDE>glibtop/inodedb.h</INCLUDE>
-<SECTION>
-<FILE>inodedb</FILE>
-<TITLE>Inode DB</TITLE>
-GLIBTOP_INODEDB_SYSTEM
-GLIBTOP_INODEDB_USER
-GLIBTOP_INODEDB_CACHE
-GLIBTOP_INODEDB_ALL
-glibtop_inodedb
-glibtop_inodedb_key
-glibtop_inodedb_open
-glibtop_inodedb_lookup
-glibtop_inodedb_close
-glibtop_inodedb_open_s
-glibtop_inodedb_lookup_s
-glibtop_inodedb_close_s
-</SECTION>
-
 <INCLUDE>glibtop/netload.h</INCLUDE>
 <SECTION>
 <FILE>netload</FILE>
--- a/examples/.cvsignore
+++ b/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
--- a/examples/ChangeLog
+++ b/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):
--- a/examples/Makefile.am
+++ b/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 affinity

 first_SOURCES		= first.c
 first_LDADD		= $(top_builddir)/lib/libgtop-2.0.la
@@ -51,3 +51,12 @@ 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
+
+affinity_SOURCES	= affinity.c
+affinity_LDADD	= $(top_builddir)/lib/libgtop-2.0.la
--- a/examples/affinity.c
+++ b/examples/affinity.c
@@ -0,0 +1,34 @@
+#include <glibtop.h>
+#include <glibtop/procaffinity.h>
+
+#include <glib.h>
+#include <unistd.h>
+
+int main(int argc, char **argv)
+{
+	pid_t pid;
+	glibtop_proc_affinity buf;
+	guint16 *cpus;
+	size_t i;
+
+	if (argc < 2 || !(pid = strtoul(argv[1], NULL, 0)))
+		pid = getpid();
+
+	glibtop_init();
+
+	cpus = glibtop_get_proc_affinity(&buf, pid);
+
+	g_print("Process %u:\n"
+		" - all: %d\n",
+		(unsigned)pid, buf.all);
+
+	for (i = 0; i != buf.number; ++i)
+		g_print(" - CPU#%u is set\n", cpus[i]);
+
+	g_free(cpus);
+
+	glibtop_close();
+
+	return 0;
+}
+
--- a/examples/df.c
+++ b/examples/df.c
@@ -15,35 +15,43 @@ static void print_fsusage(const char *mountpoint)

  glibtop_get_fsusage(&buf, mountpoint);

-  printf("%-20s %-10llu %-10llu %-10llu %.1f\n",
+  printf("%-30s %10llu %10llu %10llu %5.1f %10llu %10llu\n",
 	 mountpoint,
 	 buf.blocks * buf.block_size >> 20,
 	 (buf.blocks - buf.bavail) * buf.block_size >> 20,
 	 buf.bavail * buf.block_size >> 20,
-	 (buf.blocks - buf.bavail) * 100.0 / buf.blocks
+	 (buf.blocks - buf.bavail) * 100.0 / (buf.blocks ? buf.blocks : 1.0),
+	 buf.read,
+	 buf.write
 	 );
 }


-int main()
+int main(int argc, char **argv)
 {
  glibtop_mountlist buf;
-  glibtop_mountentry *entries;
-  size_t i;

  glibtop_init();

-  printf("%-20s %-10s %-10s %-10s %-10s\n",
-	 "Filesystem", "Size", "Used", "Avail", "Use%");
+  printf("%-30s %10s %10s %10s %5s %10s %10s\n",
+	 "Filesystem", "Size", "Used", "Avail", "Use%", "Read", "Write");

-  entries = glibtop_get_mountlist(&buf, FALSE);
+  if (argc > 1) {
+    while (*++argv)
+      print_fsusage(*argv);
+  } else {
+    glibtop_mountentry *entries;
+    size_t i;

-  for(i = 0; i < buf.number; ++i)
-    {
-      print_fsusage(entries[i].mountdir);
-    }
+    entries = glibtop_get_mountlist(&buf, TRUE);

-  g_free(entries);
+    for(i = 0; i < buf.number; ++i)
+      {
+	print_fsusage(entries[i].mountdir);
+      }
+
+    g_free(entries);
+  }

  glibtop_close();

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

@@ -49,9 +47,9 @@ main (int argc, char *argv [])
 {
 	glibtop_union data;
 	glibtop_sysdeps sysdeps;
-	unsigned c, method, count, port, i, *ptr;
+	unsigned c, method, count, port, i;
 	char buffer [BUFSIZ];
-	pid_t pid, ppid;
+	pid_t pid, ppid, *ptr;
 	char *args;

 	count = PROFILE_COUNT;
--- a/examples/mem.c
+++ b/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;
+}
+
--- a/examples/mountlist.c
+++ b/examples/mountlist.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* Copyright (C) 1998-99 Martin Baulig
   This file is part of LibGTop 1.0.

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

--- a/examples/openfiles.c
+++ b/examples/openfiles.c
@@ -37,9 +37,16 @@ static void show_open_files(pid_t pid)
 		  printf("socket %s:%d\n", files[i].info.sock.dest_host, files[i].info.sock.dest_port);
 		  break;

+	  case GLIBTOP_FILE_TYPE_INET6SOCKET:
+		  printf("socket [%s]:%d\n", files[i].info.sock.dest_host, files[i].info.sock.dest_port);
+		  break;
+
 	  case GLIBTOP_FILE_TYPE_LOCALSOCKET:
 		  printf("localsocket %s\n", files[i].info.localsock.name);
 		  break;
+
+	  default:
+		  printf("unknown type\n");
 	  }
  }

--- a/examples/proclist.c
+++ b/examples/proclist.c
@@ -11,7 +11,7 @@

 static void print_pids(guint64 which, guint64 arg)
 {
-	unsigned *pids;
+	pid_t *pids;
 	unsigned i;
 	glibtop_proclist buf;

--- a/examples/procmap.c
+++ b/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' : '-';
@@ -126,10 +108,10 @@ main (int argc, char *argv [])

 			if (sizeof (void*) == 8)
 				format = "%016lx-%016lx %016lx - "
-					 "%02x:%02x %08lu - %4s - %s\n";
+					 "%02x:%02x %08lu - %5.5s - %s\n";
 			else
 				format = "%08lx-%08lx %08lx - "
-					 "%02x:%02x %08lu - %4s - %s\n";
+					 "%02x:%02x %08lu - %5.5s - %s\n";

 			fprintf (stderr, format,
 				 (unsigned long) maps [i].start,
@@ -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,
--- a/examples/second.c
+++ b/examples/second.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* Copyright (C) 1998-99 Martin Baulig
   This file is part of LibGTop 1.0.

@@ -241,7 +239,8 @@ main (int argc, char *argv [])
 {
 	glibtop_proclist proclist;
 	glibtop_sysdeps sysdeps;
-	unsigned *ptr, pid, i;
+	unsigned i;
+	pid_t *ptr, pid;

 	setlocale (LC_ALL, "");
 	bindtextdomain (GETTEXT_PACKAGE, GTOPLOCALEDIR);
--- a/examples/smp.c
+++ b/examples/smp.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* Copyright (C) 1998-99 Martin Baulig
   This file is part of LibGTop 1.0.

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

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

@@ -46,7 +44,7 @@
 #endif

 #ifndef PROFILE_COUNT_EXPENSIVE
-#define PROFILE_COUNT_EXPENSIVE		10000L
+#define PROFILE_COUNT_EXPENSIVE		(PROFILE_COUNT / 10)
 #endif

 #define ELAPSED_UTIME ((unsigned long) elapsed_utime.tv_sec * 1000000 +	(unsigned long) elapsed_utime.tv_usec)
@@ -75,13 +73,13 @@ int
 main (int argc, char *argv [])
 {
 	glibtop_union data;
-	unsigned c, count, *ptr;
+	unsigned c;
 	struct rusage total_start, total_end;
 	struct rusage rusage_start, rusage_end;
 	struct timeval elapsed_utime, elapsed_stime;
 	pid_t pid;

-	count = PROFILE_COUNT;
+	pid = getpid ();

 	setlocale (LC_ALL, "");
 	bindtextdomain (GETTEXT_PACKAGE, GTOPLOCALEDIR);
@@ -186,12 +184,10 @@ main (int argc, char *argv [])
 		(long double) ELAPSED_UTIME / PROFILE_COUNT,
 		(long double) ELAPSED_STIME / PROFILE_COUNT);

-	printf ("\n");
-
 	getrusage (RUSAGE_SELF, &rusage_start);

 	for (c = 0; c < PROFILE_COUNT_EXPENSIVE; c++) {
-		ptr = glibtop_get_proclist (&data.proclist, 0, 0);
+		pid_t* ptr = glibtop_get_proclist (&data.proclist, 0, 0);
 		g_free (ptr);
 	}

@@ -209,9 +205,26 @@ main (int argc, char *argv [])
 		(long double) ELAPSED_UTIME / PROFILE_COUNT_EXPENSIVE,
 		(long double) ELAPSED_STIME / PROFILE_COUNT_EXPENSIVE);

-	pid = getpid ();
+	getrusage (RUSAGE_SELF, &rusage_start);

-	printf ("\n");
+	for (c = 0; c < PROFILE_COUNT_EXPENSIVE; c++) {
+		char** ptr = glibtop_get_netlist (&data.netlist);
+		g_strfreev (ptr);
+	}
+
+	getrusage (RUSAGE_SELF, &rusage_end);
+
+	libgtop_timersub (&rusage_end.ru_utime, &rusage_start.ru_utime,
+			  &elapsed_utime);
+
+	libgtop_timersub (&rusage_end.ru_stime, &rusage_start.ru_stime,
+			  &elapsed_stime);
+
+	printf ("Netlist      (0x%08lx): %7lu - %9.2Lf - %9.2Lf\n",
+		(unsigned long) data.proclist.flags,
+		PROFILE_COUNT_EXPENSIVE,
+		(long double) ELAPSED_UTIME / PROFILE_COUNT_EXPENSIVE,
+		(long double) ELAPSED_STIME / PROFILE_COUNT_EXPENSIVE);

 	getrusage (RUSAGE_SELF, &rusage_start);

@@ -269,6 +282,27 @@ main (int argc, char *argv [])

 	getrusage (RUSAGE_SELF, &rusage_start);

+	for (c = 0; c < PROFILE_COUNT_EXPENSIVE; c++) {
+		glibtop_map_entry* entries;
+		entries = glibtop_get_proc_map (&data.proc_map, pid);
+		g_free (entries);
+	}
+
+	getrusage (RUSAGE_SELF, &rusage_end);
+
+	libgtop_timersub (&rusage_end.ru_utime, &rusage_start.ru_utime,
+			  &elapsed_utime);
+
+	libgtop_timersub (&rusage_end.ru_stime, &rusage_start.ru_stime,
+			  &elapsed_stime);
+
+	printf ("Proc_Map     (0x%08lx): %7lu - %9.2Lf - %9.2Lf\n",
+		(unsigned long) data.proc_map.flags, PROFILE_COUNT_EXPENSIVE,
+		(long double) ELAPSED_UTIME / PROFILE_COUNT_EXPENSIVE,
+		(long double) ELAPSED_STIME / PROFILE_COUNT_EXPENSIVE);
+
+	getrusage (RUSAGE_SELF, &rusage_start);
+
 	for (c = 0; c < PROFILE_COUNT; c++)
 		glibtop_get_proc_segment (&data.proc_segment, pid);

@@ -287,6 +321,27 @@ main (int argc, char *argv [])

 	getrusage (RUSAGE_SELF, &rusage_start);

+	for (c = 0; c < PROFILE_COUNT; c++) {
+		char** argv;
+		argv = glibtop_get_proc_argv (&data.proc_args, pid, 0);
+		g_strfreev(argv);
+	}
+
+	getrusage (RUSAGE_SELF, &rusage_end);
+
+	libgtop_timersub (&rusage_end.ru_utime, &rusage_start.ru_utime,
+			  &elapsed_utime);
+
+	libgtop_timersub (&rusage_end.ru_stime, &rusage_start.ru_stime,
+			  &elapsed_stime);
+
+	printf ("Proc_Args    (0x%08lx): %7lu - %9.2Lf - %9.2Lf\n",
+		(unsigned long) data.proc_args.flags, PROFILE_COUNT,
+		(long double) ELAPSED_UTIME / PROFILE_COUNT,
+		(long double) ELAPSED_STIME / PROFILE_COUNT);
+
+	getrusage (RUSAGE_SELF, &rusage_start);
+
 	for (c = 0; c < PROFILE_COUNT; c++)
 		glibtop_get_proc_time (&data.proc_time, pid);

--- a/examples/wd.c
+++ b/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;
+}
+
--- a/features.def
+++ b/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,6 @@ 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)
+guint16*|proc_affinity|ulong(number),int(all)|pid_t(pid)

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

--- a/gtk-doc.make
+++ b/gtk-doc.make
@@ -1,155 +0,0 @@
-# -*- mode: makefile -*-
-
-####################################
-# Everything below here is generic #
-####################################
-
-if GTK_DOC_USE_LIBTOOL
-GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
-GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)
-else
-GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
-GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)
-endif
-
-# We set GPATH here; this gives us semantics for GNU make
-# which are more like other make's VPATH, when it comes to
-# whether a source that is a target of one rule is then
-# searched for in VPATH/GPATH.
-#
-GPATH = $(srcdir)
-
-TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
-
-EXTRA_DIST = 				\
-	$(content_files)		\
-	$(HTML_IMAGES)			\
-	$(DOC_MAIN_SGML_FILE)		\
-	$(DOC_MODULE)-sections.txt	\
-	$(DOC_MODULE)-overrides.txt
-
-DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
-	   $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp
-
-SCANOBJ_FILES = 		 \
-	$(DOC_MODULE).args 	 \
-	$(DOC_MODULE).hierarchy  \
-	$(DOC_MODULE).interfaces \
-	$(DOC_MODULE).prerequisites \
-	$(DOC_MODULE).signals
-
-CLEANFILES = $(SCANOBJ_FILES) $(DOC_MODULE)-unused.txt $(DOC_STAMPS)
-
-if ENABLE_GTK_DOC
-all-local: html-build.stamp
-else
-all-local:
-endif
-
-docs: html-build.stamp
-
-#### scan ####
-
-scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
-	@echo 'gtk-doc: Scanning header files'
-	@-chmod -R u+w $(srcdir)
-	if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \
-	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
-	else \
-	    cd $(srcdir) ; \
-	    for i in $(SCANOBJ_FILES) ; do \
-               test -f $$i || touch $$i ; \
-	    done \
-	fi
-	cd $(srcdir) && \
-	  gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES)
-	touch scan-build.stamp
-
-$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES): scan-build.stamp
-	@true
-
-#### templates ####
-
-tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
-	@echo 'gtk-doc: Rebuilding template files'
-	@-chmod -R u+w $(srcdir)
-	cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
-	touch tmpl-build.stamp
-
-tmpl.stamp: tmpl-build.stamp
-	@true
-
-#### xml ####
-
-sgml-build.stamp: tmpl.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
-	@echo 'gtk-doc: Building XML'
-	@-chmod -R u+w $(srcdir)
-	cd $(srcdir) && \
-	gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS)
-	touch sgml-build.stamp
-
-sgml.stamp: sgml-build.stamp
-	@true
-
-#### html ####
-
-html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
-	@echo 'gtk-doc: Building HTML'
-	@-chmod -R u+w $(srcdir)
-	rm -rf $(srcdir)/html 
-	mkdir $(srcdir)/html
-	cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
-	test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
-	@echo 'gtk-doc: Fixing cross-references' 
-	cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
-	touch html-build.stamp
-
-##############
-
-clean-local:
-	rm -f *~ *.bak
-	rm -rf .libs
-
-maintainer-clean-local: clean
-	cd $(srcdir) && rm -rf xml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
-
-install-data-local:
-	installfiles=`echo $(srcdir)/html/*`; \
-	if test "$$installfiles" = '$(srcdir)/html/*'; \
-	then echo '-- Nothing to install' ; \
-	else \
-	  $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR); \
-	  for i in $$installfiles; do \
-	    echo '-- Installing '$$i ; \
-	    $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
-	  done; \
-	  echo '-- Installing $(srcdir)/html/index.sgml' ; \
-	  $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \
-	fi
-
-uninstall-local:
-	rm -f $(DESTDIR)$(TARGET_DIR)/*
-
-#
-# Require gtk-doc when making dist
-#
-if ENABLE_GTK_DOC
-dist-check-gtkdoc:
-else
-dist-check-gtkdoc:
-	@echo "*** gtk-doc must be installed and enabled in order to make dist"
-	@false
-endif
-
-dist-hook: dist-check-gtkdoc dist-hook-local
-	mkdir $(distdir)/tmpl
-	mkdir $(distdir)/xml
-	mkdir $(distdir)/html
-	-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
-	-cp $(srcdir)/xml/*.xml $(distdir)/xml
-	-cp $(srcdir)/html/* $(distdir)/html
-	if test -f $(srcdir)/$(DOC_MODULE).types; then \
-	  cp $(srcdir)/$(DOC_MODULE).types $(distdir)/$(DOC_MODULE).types; \
-	fi
-
-.PHONY : dist-hook-local docs
--- a/include/.cvsignore
+++ b/include/.cvsignore
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
--- a/include/glibtop/.cvsignore
+++ b/include/glibtop/.cvsignore
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
--- a/include/glibtop/Makefile.am
+++ b/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 procaffinity.h \
 			  netlist.h procopenfiles.h open.h

 noinst_HEADERS		= error.h write.h read_data.h read.h init_hooks.h
--- a/include/glibtop/call-vector.h.in
+++ b/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
--- a/include/glibtop/close.h
+++ b/include/glibtop/close.h
@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* Copyright (C) 1998-99 Martin Baulig
   This file is part of LibGTop 1.0.

--- a/include/glibtop/command.h
+++ b/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,10 @@ 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_CMND_PROC_AFFINITY	27

-#define GLIBTOP_MAX_CMND		26
+#define GLIBTOP_MAX_CMND		28

 #define _GLIBTOP_PARAM_SIZE		16

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

@@ -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

--- a/include/glibtop/error.h
+++ b/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

--- a/include/glibtop/fsusage.h
+++ b/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.
--- a/include/glibtop/glibtop-server.h
+++ b/include/glibtop/glibtop-server.h
@@ -1,70 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
-/* $Id$ */
-
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 2.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __GLIBTOP_SERVER_H__
-#define __GLIBTOP_SERVER_H__
-
-#include <glibtop/global.h>
-#include <glibtop/sysdeps.h>
-
-G_BEGIN_DECLS
-
-typedef struct _glibtop_server		glibtop_server;
-typedef struct _glibtop_server_info	glibtop_server_info;
-
-typedef struct _glibtop_closure		glibtop_closure;
-
-struct _glibtop_server_info
-{
-    int ncpu;			/* Number of CPUs, zero if single-processor */
-    unsigned long features;	/* Server is required for this features */
-    glibtop_sysdeps sysdeps;	/* Detailed feature list */
-    glibtop_sysdeps required;	/* Required feature list */
-    glibtop_sysdeps wanted;	/* We only want this features */
-};
-
-struct	_glibtop_server
-{
-    glibtop_server_info *info;
-
-    int refcount;
-    unsigned flags;
-    const char *name;
-
-    void *_priv;
-};
-
-glibtop_server *
-glibtop_server_new (void);
-
-void
-glibtop_server_ref (glibtop_server *server);
-
-void
-glibtop_server_unref (glibtop_server *server);
-
-G_END_DECLS
-
-#endif
--- a/include/glibtop/global.h
+++ b/include/glibtop/global.h
@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* Copyright (C) 1998-99 Martin Baulig
   This file is part of LibGTop 1.0.

--- a/include/glibtop/init_hooks.h
+++ b/include/glibtop/init_hooks.h
@@ -5,10 +5,10 @@

 G_BEGIN_DECLS

-typedef void (*glibtop_init_func_t)(glibtop *);
+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[];
+extern const _glibtop_init_func_t _glibtop_init_hook_s[];
+extern const _glibtop_init_func_t _glibtop_init_hook_p[];

 G_END_DECLS

--- a/include/glibtop/inodedb.h
+++ b/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
--- a/include/glibtop/loadavg.h
+++ b/include/glibtop/loadavg.h
@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* Copyright (C) 1998-99 Martin Baulig
   This file is part of LibGTop 1.0.

@@ -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

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

@@ -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

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

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

@@ -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

--- a/include/glibtop/netlist.h
+++ b/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

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

@@ -119,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

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

@@ -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

--- a/include/glibtop/procaffinity.h
+++ b/include/glibtop/procaffinity.h
@@ -0,0 +1,61 @@
+/* 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_PROCAFFINITY_H__
+#define __GLIBTOP_PROCAFFINITY_H__
+
+#include <glibtop.h>
+#include <glibtop/global.h>
+
+G_BEGIN_DECLS
+
+typedef struct _glibtop_proc_affinity	glibtop_proc_affinity;
+
+#define GLIBTOP_PROC_AFFINITY_NUMBER	0
+#define GLIBTOP_PROC_AFFINITY_ALL	1
+
+struct _glibtop_proc_affinity
+{
+	guint64	flags;
+	guint32 number;
+	gboolean all;
+};
+
+
+guint16 * glibtop_get_proc_affinity(glibtop_proc_affinity *buf, pid_t pid);
+guint16 * glibtop_get_proc_affinity_l(glibtop *server, glibtop_proc_affinity *buf, pid_t pid);
+
+
+#if GLIBTOP_SUID_PROC_AFFINITY
+
+#define glibtop_get_proc_affinity_r glibtop_get_proc_affinity_p
+void _glibtop_init_proc_affinity_p(glibtop *server);
+guint16 * glibtop_get_proc_affinity_p(glibtop *server, glibtop_proc_affinity *buf, pid_t pid);
+
+#else
+
+#define glibtop_get_proc_affinity_r glibtop_get_proc_affinity_s
+void _glibtop_init_proc_affinity_s(glibtop *server);
+guint16 * glibtop_get_proc_affinity_s(glibtop *server, glibtop_proc_affinity *buf, pid_t pid);
+
+#endif
+
+G_END_DECLS
+
+#endif
--- a/include/glibtop/procargs.h
+++ b/include/glibtop/procargs.h
@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* Copyright (C) 1998-99 Martin Baulig
   This file is part of LibGTop 1.0.

@@ -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,
--- a/include/glibtop/prockernel.h
+++ b/include/glibtop/prockernel.h
@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* Copyright (C) 1998-99 Martin Baulig
   This file is part of LibGTop 1.0.

@@ -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

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

@@ -62,7 +60,7 @@ struct _glibtop_proclist
 	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
--- a/include/glibtop/procmap.h
+++ b/include/glibtop/procmap.h
@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* Copyright (C) 1998-99 Martin Baulig
   This file is part of LibGTop 1.0.

@@ -104,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);
--- a/include/glibtop/procmem.h
+++ b/include/glibtop/procmem.h
@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* Copyright (C) 1998-99 Martin Baulig
   This file is part of LibGTop 1.0.

@@ -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

--- a/include/glibtop/procopenfiles.h
+++ b/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.
@@ -55,7 +53,8 @@ enum glibtop_file_type {
 	GLIBTOP_FILE_TYPE_FILE		= 1,
 	GLIBTOP_FILE_TYPE_PIPE		= 2,
 	GLIBTOP_FILE_TYPE_INETSOCKET	= 4,
-	GLIBTOP_FILE_TYPE_LOCALSOCKET	= 8
+	GLIBTOP_FILE_TYPE_LOCALSOCKET	= 8,
+	GLIBTOP_FILE_TYPE_INET6SOCKET	= 16
 };

 typedef struct _glibtop_open_files_entry glibtop_open_files_entry;
@@ -67,7 +66,8 @@ struct _glibtop_open_files_entry
 	int fd;
 	guint16 type; /* An "enum glibtop_file_type" value. */
 	union {
-		/* When type == GLIBTOP_FILE_TYPE_INETSOCKET */
+		/* When type == GLIBTOP_FILE_TYPE_INETSOCKET or
+		 * when type == GLIBTOP_FILE_TYPE_INET6SOCKET */
 		struct {
 			char dest_host[GLIBTOP_OPEN_DEST_HOST_LEN+1];
 			int dest_port;
@@ -107,12 +107,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);
--- a/include/glibtop/procsegment.h
+++ b/include/glibtop/procsegment.h
@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* Copyright (C) 1998-99 Martin Baulig
   This file is part of LibGTop 1.0.

@@ -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

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

@@ -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

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

@@ -84,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

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

@@ -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

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

@@ -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

--- a/include/glibtop/procwd.h
+++ b/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
--- a/include/glibtop/read.h
+++ b/include/glibtop/read.h
@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* Copyright (C) 1998-99 Martin Baulig
   This file is part of LibGTop 1.0.

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

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

@@ -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

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

@@ -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

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

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

@@ -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

--- a/include/glibtop/sysdeps.h
+++ b/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,10 @@ 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_SYSDEPS_PROC_AFFINITY	26

-#define GLIBTOP_MAX_SYSDEPS		25
+#define GLIBTOP_MAX_SYSDEPS		27

 #define GLIBTOP_SYSDEPS_ALL		((1 << GLIBTOP_MAX_SYSDEPS) - 1)

@@ -88,6 +88,8 @@ struct _glibtop_sysdeps
 	guint64 netlist;		/* glibtop_netlist	*/
 	guint64 netload;		/* glibtop_netload	*/
 	guint64 ppp;			/* glibtop_ppp		*/
+	guint64	proc_wd;		/* glibtop_proc_wd	*/
+	guint64	proc_affinity;		/* glibtop_proc_affinity */
 };

 void glibtop_get_sysdeps (glibtop_sysdeps *buf);
--- a/include/glibtop/sysinfo.h
+++ b/include/glibtop/sysinfo.h
@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* Copyright (C) 1998-99 Martin Baulig
   This file is part of LibGTop 1.0.

--- a/include/glibtop/union.h
+++ b/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,8 @@
 #include <glibtop/procargs.h>
 #include <glibtop/procmap.h>
 #include <glibtop/procopenfiles.h>
+#include <glibtop/procwd.h>
+#include <glibtop/procaffinity.h>

 #include <glibtop/mountlist.h>
 #include <glibtop/fsusage.h>
@@ -82,6 +82,8 @@ union _glibtop_union
 	glibtop_netload		netload;
 	glibtop_ppp		ppp;
 	glibtop_proc_open_files proc_open_files;
+	glibtop_proc_wd		proc_wd;
+	glibtop_proc_affinity	proc_affinity;
 };

 G_END_DECLS
--- a/include/glibtop/uptime.h
+++ b/include/glibtop/uptime.h
@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* Copyright (C) 1998-99 Martin Baulig
   This file is part of LibGTop 1.0.

@@ -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

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

--- a/lib/.cvsignore
+++ b/lib/.cvsignore
@@ -1,8 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-libgtop.la
-*.lo
-lib.c
-error.loT
--- a/lib/Makefile.am
+++ b/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

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

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

--- a/lib/error.c
+++ b/lib/error.c
@@ -1,175 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
-/* $Id$ */
-
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#include <config.h>
-
-#include <glibtop/error.h>
-
-#include <glib/gstrfuncs.h>
-#include <errno.h>
-
-#define DEFAULT_NAME	"LibGTop-Server"
-
-/* Prints error message and exits. */
-
-static void
-print_server_name (glibtop_server *server)
-{
-    fprintf (stderr, "%s: ", server ?
-	     (server->name ? server->name : DEFAULT_NAME)
-	     : DEFAULT_NAME);
-}
-
-void
-glibtop_error_vr (glibtop_server *server, char *format, va_list args)
-{
-    print_server_name (server);
-    vfprintf (stderr, format, args);
-    fprintf (stderr, "\n");
-
-#ifdef LIBGTOP_ENABLE_DEBUG
-    abort ();
-#else
-    exit (1);
-#endif
-}
-
-void
-glibtop_error_io_vr (glibtop_server *server, char *format, int error, va_list args)
-{
-    print_server_name (server);
-    vfprintf (stderr, format, args);
-    fprintf (stderr, ": %s\n", g_strerror (error));
-
-#ifdef LIBGTOP_ENABLE_DEBUG
-    abort ();
-#else
-    exit (1);
-#endif
-}
-
-void
-glibtop_warn_vr (glibtop_server *server, char *format, va_list args)
-{
-    print_server_name (server);
-    vfprintf (stderr, format, args);
-    fprintf (stderr, "\n");
-
-#ifdef LIBGTOP_FATAL_WARNINGS
-    abort ();
-#endif
-}
-
-void
-glibtop_warn_io_vr (glibtop_server *server, char *format, int error, va_list args)
-{
-    print_server_name (server);
-    vfprintf (stderr, format, args);
-    fprintf (stderr, ": %s\n", g_strerror (error));
-
-#ifdef LIBGTOP_FATAL_WARNINGS
-    abort ();
-#endif
-}
-
-void
-glibtop_error_r (glibtop_server *server, char *format, ...)
-{
-    va_list args;
-
-    va_start (args, format);
-    glibtop_error_vr (server, format, args);
-    va_end (args);
-}
-
-void
-glibtop_warn_r (glibtop_server *server, char *format, ...)
-{
-    va_list args;
-
-    va_start (args, format);
-    glibtop_warn_vr (server, format, args);
-    va_end (args);
-}
-
-void
-glibtop_error_io_r (glibtop_server *server, char *format, ...)
-{
-    va_list args;
-
-    va_start (args, format);
-    glibtop_error_io_vr (server, format, errno, args);
-    va_end (args);
-}
-
-void
-glibtop_warn_io_r (glibtop_server *server, char *format, ...)
-{
-    va_list args;
-
-    va_start (args, format);
-    glibtop_warn_io_vr (server, format, errno, args);
-    va_end (args);
-}
-
-#ifndef  __GNUC__
-
-static void
-glibtop_error (char *format, ...)
-{
-    va_list args;
-    va_start (args, format);
-    glibtop_error_vr (glibtop_global_server, format, args);
-    va_end (args);
-}
-
-static void
-glibtop_warn (char *format, ...)
-{
-    va_list args;
-    va_start (args, format);
-    glibtop_warn_vr (glibtop_global_server, format, args);
-    va_end (args);
-}
-
-static void
-glibtop_error_io (char *format, ...)
-{
-    va_list args;
-    va_start (args, format);
-    glibtop_error_io_vr (glibtop_global_server, format, errno, args);
-    va_end (args);
-}
-
-static void
-glibtop_warn_io (char *format, ...)
-{
-    va_list args;
-    va_start (args, format);
-    glibtop_warn_io_vr (glibtop_global_server, format, errno, args);
-    va_end (args);
-}
-
-#endif /* no __GNUC__ */
--- a/lib/init.c
+++ b/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;
--- a/lib/inodedb.c
+++ b/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);
-}
--- a/lib/libgtop.sym
+++ b/lib/libgtop.sym
@@ -0,0 +1,70 @@
+glibtop_call_l
+glibtop_close
+glibtop_close_r
+glibtop_get_cpu
+glibtop_get_cpu_l
+glibtop_get_fsusage
+glibtop_get_fsusage_l
+glibtop_get_loadavg
+glibtop_get_loadavg_l
+glibtop_get_mem
+glibtop_get_mem_l
+glibtop_get_mountlist
+glibtop_get_mountlist_l
+glibtop_get_msg_limits
+glibtop_get_msg_limits_l
+glibtop_get_netlist
+glibtop_get_netlist_l
+glibtop_get_netload
+glibtop_get_netload_l
+glibtop_get_parameter_l
+glibtop_get_ppp
+glibtop_get_ppp_l
+glibtop_get_proc_args
+glibtop_get_proc_args_l
+glibtop_get_proc_argv
+glibtop_get_proc_argv_l
+glibtop_get_proc_kernel
+glibtop_get_proc_kernel_l
+glibtop_get_proclist
+glibtop_get_proclist_l
+glibtop_get_proc_map
+glibtop_get_proc_map_l
+glibtop_get_proc_mem
+glibtop_get_proc_mem_l
+glibtop_get_proc_open_files
+glibtop_get_proc_open_files_l
+glibtop_get_proc_segment
+glibtop_get_proc_segment_l
+glibtop_get_proc_signal
+glibtop_get_proc_signal_l
+glibtop_get_proc_state
+glibtop_get_proc_state_l
+glibtop_get_proc_time
+glibtop_get_proc_time_l
+glibtop_get_proc_uid
+glibtop_get_proc_uid_l
+glibtop_get_proc_wd
+glibtop_get_proc_wd_l
+glibtop_get_sem_limits
+glibtop_get_sem_limits_l
+glibtop_get_shm_limits
+glibtop_get_shm_limits_l
+glibtop_get_proc_affinity
+glibtop_get_proc_affinity_l
+glibtop_get_swap
+glibtop_get_swap_l
+glibtop_get_sysdeps
+glibtop_get_sysdeps_r
+glibtop_get_sysinfo
+glibtop_get_uptime
+glibtop_get_uptime_l
+glibtop_global_server
+glibtop_init
+glibtop_init_r
+glibtop_internet_addr
+glibtop_make_connection
+glibtop_open_l
+glibtop_server_features
+glibtop_set_parameter_l
+glibtop_sys_siglist
--- a/lib/open.c
+++ b/lib/open.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* Copyright (C) 1998-99 Martin Baulig
   This file is part of LibGTop 1.0.

@@ -150,7 +148,7 @@ glibtop_open_l (glibtop *server, const char *program_name,
 		if (nbytes != size)
 			glibtop_error_r (server,
 					 "Requested %u bytes but got %u.",
-					 size, nbytes);
+					 (unsigned)size, (unsigned)nbytes);

 		glibtop_read_l (server, nbytes, buffer);

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

--- a/lib/read.c
+++ b/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;
 	}
 }
--- a/lib/read_data.c
+++ b/lib/read_data.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* Copyright (C) 1998-99 Martin Baulig
   This file is part of LibGTop 1.0.

--- a/lib/sysdeps.c
+++ b/lib/sysdeps.c
@@ -46,138 +46,152 @@ GLIBTOP_SUID_PROC_ARGS +
 GLIBTOP_SUID_PROC_MAP +
 GLIBTOP_SUID_NETLOAD +
 GLIBTOP_SUID_NETLIST +
+GLIBTOP_SUID_PROC_WD +
+GLIBTOP_SUID_PROC_AFFINITY +
 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_PROC_AFFINITY
+	_glibtop_init_proc_affinity_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_PROC_AFFINITY
+	_glibtop_init_proc_affinity_p,
 #endif
 #if GLIBTOP_SUID_PPP
-	glibtop_init_ppp_p,
+	_glibtop_init_ppp_p,
 #endif
 	NULL
 };
--- a/lib/write.c
+++ b/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,
--- a/libgtop-sysdeps.m4
+++ b/libgtop-sysdeps.m4
@@ -18,9 +18,9 @@ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[
 	AC_SUBST(libgtop_need_server)

 	AC_ARG_WITH(libgtop-examples,
-	AS_HELP_STRING([--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)

@@ -66,12 +66,22 @@ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[
 	  libgtop_use_machine_h=no
 	  libgtop_have_sysinfo=yes
 	  libgtop_need_server=no
+	  libgtop_sysdeps_private_mountlist=yes
+	  libgtop_sysdeps_private_fsusage=yes
 	  ;;
-	freebsd*|netbsd*|openbsd*|bsdi*|kfreebsd*)
+	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_sysdeps_private_mountlist=yes
+	  libgtop_sysdeps_private_fsusage=yes
+	  libgtop_postinstall='chgrp kmem $(bindir)/libgtop_server2 && chmod 2755 $(bindir)/libgtop_server2'
 	  ;;
 	solaris*)
 	  libgtop_sysdeps_dir=solaris
@@ -86,6 +96,13 @@ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[
 	  libgtop_have_sysinfo=yes
 	  libgtop_postinstall='chgrp system $(bindir)/libgtop_server && chmod g+s $(bindir)/libgtop_server2'
 	  ;;
+	darwin*)
+	  libgtop_sysdeps_dir=darwin
+	  libgtop_use_machine_h=yes
+	  libgtop_need_server=yes
+	  libgtop_have_sysinfo=yes
+	  libgtop_postinstall='chgrp kmem $(bindir)/libgtop_server2 && chmod g+s $(bindir)/libgtop_server2'
+	  ;;
 	*)
 	  if test x$hacker_mode = xyes ; then
 	    case "$host_os" in
@@ -134,6 +151,20 @@ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[
 	  
 	  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([
@@ -203,6 +234,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>
@@ -290,5 +322,7 @@ main (void)
 	fi

 	AM_CONDITIONAL(NEED_LIBGTOP, test x$libgtop_need_server = xyes)
+	AM_CONDITIONAL(LIBGTOP_SYSDEPS_PRIVATE_MOUNTLIST, test x$libgtop_sysdeps_private_mountlist = xyes)
+	AM_CONDITIONAL(LIBGTOP_SYSDEPS_PRIVATE_FSUSAGE, test x$libgtop_sysdeps_private_fsusage = xyes)
 ])

--- a/libgtop.spec.in
+++ b/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

--- a/misc/.cvsignore
+++ b/misc/.cvsignore
@@ -1,2 +0,0 @@
-Makefile.in
-Makefile
--- a/po/.cvsignore
+++ b/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
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,302 @@
+2008-10-19  Djihed Afifi <djihed@gmail.com> 
+
+	* ar.po: Updated Arabic Translation by Khaled Hosny.
+
+2008-09-20  Laurent Dhima  <laurenti@alblinux.net>
+
+	* sq.po: Updated Albanian Translation.
+
+2008-09-19  Mugurel Tudor  <mugurelu@gnome.ro>
+
+	* ro.po: Updated Romanian translation by
+	Mişu Moldovan <dumol@gnome.ro>
+
+2008-09-18  Baris Cicek  <baris@teamforce.name.tr>
+
+	* tr.po: Fixed wrong plural forms
+
+2008-09-18  Djihed Afifi <djihed@gmail.com> 
+
+	* ar.po: Updated Arabic Translation by Khaled Hosny.
+
+2008-09-15  Djihed Afifi <djihed@gmail.com> 
+
+	* ar.po: Updated Arabic Translation by Khaled Hosny.
+
+2008-09-14  Baris Cicek  <baris@teamforce.name.tr>
+
+	* tr.po: Updated Turkish Translation.
+
+2008-09-09  Robert Sedak  <robert.sedak@sk.t-com.hr>
+
+	* hr.po: Updated Croatian translation.
+
+2008-08-25  Goran Rakic  <grakic@devbase.net>
+
+        * LINGUAS, sr@latin.po, sr@Latn.po: Conversion from sr@Latn to sr@latin.
+
+2008-08-6  Djihed Afifi <djihed@gmail.com> 
+
+	* ar.po: Updated Arabic Translation by Khaled Hosny.
+
+2008-07-29  Djihed Afifi <djihed@gmail.com> 
+
+	* ar.po: Updated Arabic Translation by Khaled Hosny.
+
+2008-07-25  Leonardo Ferreira Fontenelle  <leonardof@gnome.org>
+
+	* pt_BR.po: Terminology improvement by Vladimir Melo.
+
+2008-06-11  Djihed Afifi <djihed@gmail.com> 
+
+	* ar.po: Updated Arabic Translation by Khaled Hosny.
+
+2008-05-22  Djihed Afifi <djihed@gmail.com> 
+
+	* ar.po: Updated Arabic Translation by Khaled Hosny.
+
+2008-05-19  Djihed Afifi <djihed@gmail.com> 
+
+	* ar.po: Updated Arabic Translation by Khaled Hosny.
+
+2008-04-04  Eskild Hustvedt  <eskildh@gnome.org>
+
+	* nn.po: Updated Norwegian Nynorsk translation
+
+2008-03-16  Simos Xenitellis  <simos@gnome.org>
+
+	* el.po: Updated Greek translation.
+
+2008-03-09  Gabor Kelemen  <kelemeng@gnome.hu>
+
+	* hu.po: Translation updated
+
+2008-03-06  Marcel Telka  <marcel@telka.sk>
+
+	* sk.po: Updated Slovak translation.
+
+2008-02-26  Changwoo Ryu  <cwryu@debian.org>
+
+	* ko.po: Updated Korean translation.
+
+2008-02-14  Chao-Hsiung Liao  <j_h_liau@yahoo.com.tw>
+
+        * zh_HK.po: Updated Traditional Chinese translation(Hong Kong).
+        * zh_TW.po: Updated Traditional Chinese translation(Taiwan).
+
+2008-02-14  Pawan Chitrakar <chautari@gmail.com>
+
+	* ne.po: Updated Nepali Translation.
+
+2008-02-11  Petr Kovar  <pknbe@volny.cz>
+
+	* cs.po: Updated Czech translation by Lucas Lommer.
+
+2008-01-31  Djihed Afifi <djihed@gmail.com> 
+
+	* ar.po: Updated Arabic Translation by Khaled Hosny.
+
+2008-01-12  Djihed Afifi <djihed@gmail.com> 
+
+	* ar.po: Updated Arabic Translation by Khaled Hosny.
+
+2008-01-11  Inaki Larranaga Murgoitio  <dooteo@euskalgnu.org>
+
+	* eu.po: Updated Basque translation.
+
+2007-12-31  Yannig Marchegay <yannig@marchegay.org>
+
+	* oc.po: Updated Occitan translation.
+
+2007-12-28  Rahul Bhalerao <b.rahul.pm@gmail.com>
+
+	* mr.po: Added Marathi translations from Sandeep Shedmake.
+	* LINGUAS: Added an entry for Marathi(mr).
+
+2007-11-28  Ignacio Casal Quinteiro   <nacho.resa@gmail.com>
+
+	* gl.po: Updated Galician Translation.
+
+2007-11-01  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* nb.po: Updated Norwegian bokmål translation.
+
+2007-10-23  Djihed Afifi <djihed@gmail.com> 
+
+	* ar.po: Updated Arabic Translation by Youssef Chahibi.
+
+2007-10-21  Djihed Afifi <djihed@gmail.com> 
+
+	* ar.po: Updated Arabic Translation by Youssef Chahibi.
+
+2007-10-18  Matej Urbančič  <mateju@svn.gnome.org>
+
+	* sl.po: Updated Slovenian Translation.
+
+2007-10-15  Yair Hershkovitz  <yairhr@gmail.com>
+
+	* he.po: Updated Hebrew translation.
+
+2007-10-02  Alessio Frusciante  <algol@firenze.linux.it>
+
+	* it.po: Updated Italian translation.
+
+2007-09-18  Alexander Shopov  <ash@contact.bg>
+
+	* bg.po: Updated Bulgarian translation by
+	Alexander Shopov <ash@contact.bg>
+
+2007-09-17  Artur Flinta  <aflinta@svn.gnome.org>
+
+	* pl.po: Updated Polish translation by GNOME PL Team.
+
+2007-09-16  Kenneth Nielsen  <k.nielsen81@gmail.com>
+
+	* da.po: Updated Danish translation
+
+2007-09-16  Gil Forcada  <gforcada@svn.gnome.org>
+
+	* ca.po: Updated Catalan translation.
+
+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.
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -45,11 +45,13 @@ mi
 mk
 ml
 mn
+mr
 ms
 nb
 ne
 nl
 nn
+oc
 or
 pa
 pl
@@ -62,7 +64,7 @@ sk
 sl
 sq
 sr
-sr@Latn
+sr@latin
 sv
 ta
 te
--- a/po/POTFILES.in
+++ b/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
--- a/po/ar.po
+++ b/po/ar.po
@@ -1,249 +1,204 @@
-# translation of libgtop.HEAD.ar.po to Arabic
+# translation of libgtop.HEAD.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.
+# Khaled Hosny <khaledhosny@eglug.org>, 2006, 2008.
 msgid ""
 msgstr ""
-"Project-Id-Version: libgtop.HEAD.ar\n"
+"Project-Id-Version: libgtop.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-07-23 08:51+0200\n"
-"PO-Revision-Date: 2006-11-25 15:36+0200\n"
+"POT-Creation-Date: 2008-01-12 01:07+0000\n"
+"PO-Revision-Date: 2008-07-28 19:26+0300\n"
 "Last-Translator: Khaled Hosny <khaledhosny@eglug.org>\n"
-"Language-Team: Arabic <support@arabeyes.org>\n"
+"Language-Team: Arabic <doc@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.11.4\n"
-"Plural-Forms: Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : n>=3 && n<=10 ? 2 : 3\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\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] "قرأ بايتين"
+msgstr[3] "قرأ %Id بايتات"
+msgstr[4] "قرأ %Id بايت"
+msgstr[5] "قرأ %Id بايت"

-#: ../lib/read_data.c:53
+#: ../lib/read_data.c:51
 msgid "read data size"
-msgstr "اقرأ حجم البيانات"
+msgstr "حجم البيانات المقروءة"

-#: ../lib/read_data.c:72
+#: ../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] "اقرأ %lu بايتات"
-msgstr[3] "اقرأ %lu بايت"
+msgstr[0] "قرأ صفر بايت من البيانات"
+msgstr[1] "قرأ بايت واحدة من البيانات"
+msgstr[2] "قرأ بايتين من البيانات"
+msgstr[3] "قرأ %lu بايتات من البيانات"
+msgstr[4] "قرأ %lu بايت من البيانات"
+msgstr[5] "قرأ %lu بايت من البيانات"

-#: ../lib/write.c:53
+#: ../lib/write.c:51
 #, c-format
 msgid "wrote %d byte"
 msgid_plural "wrote %d bytes"
-msgstr[0] "كتابة بايت واحدة"
-msgstr[1] "كتابة بايتين"
-msgstr[2] "كتابة %d بايتات"
-msgstr[3] "كتابة %d بايت"
+msgstr[0] "كتب صفر بايت"
+msgstr[1] "كتب بايت واحدة"
+msgstr[2] "كتب بايتين"
+msgstr[3] "كتب %Id بايتات"
+msgstr[4] "كتب %Id بايت"
+msgstr[5] "كتب %Id بايت"

-#: ../src/daemon/gnuserv.c:460
+#: ../src/daemon/gnuserv.c:458
 msgid "Enable debugging"
 msgstr "فعّل التنقيح"

 #: ../src/daemon/gnuserv.c:460
-msgid "DEBUG"
-msgstr "DEBUG"
-
-#: ../src/daemon/gnuserv.c:462
 msgid "Enable verbose output"
-msgstr "فعّل خرْج مسهِب"
+msgstr "فعّل الخرْج المسهِب"

 #: ../src/daemon/gnuserv.c:462
-msgid "VERBOSE"
-msgstr "VERBOSE"
-
-#: ../src/daemon/gnuserv.c:464
 msgid "Don't fork into background"
 msgstr "لا تشعّب إلى الخلفية"

 #: ../src/daemon/gnuserv.c:464
-msgid "NO-DAEMON"
-msgstr "NO-DAEMON"
-
-#: ../src/daemon/gnuserv.c:466
 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:29
-#: ../sysdeps/sun4/siglist.c:29
+#: ../sysdeps/osf1/siglist.c:27 ../sysdeps/sun4/siglist.c:27
 msgid "Hangup"
-msgstr "علق"
+msgstr "علّق"

-#: ../sysdeps/osf1/siglist.c:30
-#: ../sysdeps/sun4/siglist.c:30
+#: ../sysdeps/osf1/siglist.c:28 ../sysdeps/sun4/siglist.c:28
 msgid "Interrupt"
 msgstr "قاطِع"

-#: ../sysdeps/osf1/siglist.c:31
-#: ../sysdeps/sun4/siglist.c:31
+#: ../sysdeps/osf1/siglist.c:29 ../sysdeps/sun4/siglist.c:29
 msgid "Quit"
 msgstr "اخرج"

-#: ../sysdeps/osf1/siglist.c:32
-#: ../sysdeps/sun4/siglist.c:32
+#: ../sysdeps/osf1/siglist.c:30 ../sysdeps/sun4/siglist.c:30
 msgid "Illegal instruction"
 msgstr "توجيه ممنوع"

-#: ../sysdeps/osf1/siglist.c:33
-#: ../sysdeps/sun4/siglist.c:33
+#: ../sysdeps/osf1/siglist.c:31 ../sysdeps/sun4/siglist.c:31
 msgid "Trace trap"
-msgstr "فخ رسم"
+msgstr "تتبع الأثر"

-#: ../sysdeps/osf1/siglist.c:34
-#: ../sysdeps/sun4/siglist.c:34
+#: ../sysdeps/osf1/siglist.c:32 ../sysdeps/sun4/siglist.c:32
 msgid "Abort"
 msgstr "اجهض"

-#: ../sysdeps/osf1/siglist.c:35
-#: ../sysdeps/sun4/siglist.c:35
+#: ../sysdeps/osf1/siglist.c:33 ../sysdeps/sun4/siglist.c:33
 msgid "EMT error"
 msgstr "خطأ EMT"

-#: ../sysdeps/osf1/siglist.c:36
-#: ../sysdeps/sun4/siglist.c:36
+#: ../sysdeps/osf1/siglist.c:34 ../sysdeps/sun4/siglist.c:34
 msgid "Floating-point exception"
 msgstr "استثناء أرقام عشرية"

-#: ../sysdeps/osf1/siglist.c:37
-#: ../sysdeps/sun4/siglist.c:37
+#: ../sysdeps/osf1/siglist.c:35 ../sysdeps/sun4/siglist.c:35
 msgid "Kill"
 msgstr "اقتل"

-#: ../sysdeps/osf1/siglist.c:38
-#: ../sysdeps/sun4/siglist.c:38
+#: ../sysdeps/osf1/siglist.c:36 ../sysdeps/sun4/siglist.c:36
 msgid "Bus error"
-msgstr "خطأ ناقل"
+msgstr "خطأ في ناقل"

-#: ../sysdeps/osf1/siglist.c:39
-#: ../sysdeps/sun4/siglist.c:39
+#: ../sysdeps/osf1/siglist.c:37 ../sysdeps/sun4/siglist.c:37
 msgid "Segmentation violation"
 msgstr "انتهاك اﻻنقسام"

-#: ../sysdeps/osf1/siglist.c:40
-#: ../sysdeps/sun4/siglist.c:40
+#: ../sysdeps/osf1/siglist.c:38 ../sysdeps/sun4/siglist.c:38
 msgid "Bad argument to system call"
-msgstr "متغيّر سيء لنداء النظام"
+msgstr "معطى سيء لنداء النظام"

-#: ../sysdeps/osf1/siglist.c:41
-#: ../sysdeps/sun4/siglist.c:41
+#: ../sysdeps/osf1/siglist.c:39 ../sysdeps/sun4/siglist.c:39
 msgid "Broken pipe"
 msgstr "أنبوب مكسور"

-#: ../sysdeps/osf1/siglist.c:42
-#: ../sysdeps/sun4/siglist.c:42
+#: ../sysdeps/osf1/siglist.c:40 ../sysdeps/sun4/siglist.c:40
 msgid "Alarm clock"
 msgstr "ساعة منبهة"

-#: ../sysdeps/osf1/siglist.c:43
-#: ../sysdeps/sun4/siglist.c:43
+#: ../sysdeps/osf1/siglist.c:41 ../sysdeps/sun4/siglist.c:41
 msgid "Termination"
 msgstr "إنهاء"

-#: ../sysdeps/osf1/siglist.c:44
-#: ../sysdeps/sun4/siglist.c:44
+#: ../sysdeps/osf1/siglist.c:42 ../sysdeps/sun4/siglist.c:42
 msgid "Urgent condition on socket"
 msgstr "حالة عاجلة عند المقبس"

-#: ../sysdeps/osf1/siglist.c:45
-#: ../sysdeps/sun4/siglist.c:45
+#: ../sysdeps/osf1/siglist.c:43 ../sysdeps/sun4/siglist.c:43
 msgid "Stop"
 msgstr "قف"

-#: ../sysdeps/osf1/siglist.c:46
-#: ../sysdeps/sun4/siglist.c:46
+#: ../sysdeps/osf1/siglist.c:44 ../sysdeps/sun4/siglist.c:44
 msgid "Keyboard stop"
-msgstr "أوقف لوحة المفاتيح"
+msgstr "إيقاف من لوحة المفاتيح"

-#: ../sysdeps/osf1/siglist.c:47
-#: ../sysdeps/sun4/siglist.c:47
+#: ../sysdeps/osf1/siglist.c:45 ../sysdeps/sun4/siglist.c:45
 msgid "Continue"
 msgstr "تابع"

-#: ../sysdeps/osf1/siglist.c:48
-#: ../sysdeps/sun4/siglist.c:48
+#: ../sysdeps/osf1/siglist.c:46 ../sysdeps/sun4/siglist.c:46
 msgid "Child status has changed"
 msgstr "تغيرت حالة الابن"

-#: ../sysdeps/osf1/siglist.c:49
-#: ../sysdeps/sun4/siglist.c:49
+#: ../sysdeps/osf1/siglist.c:47 ../sysdeps/sun4/siglist.c:47
 msgid "Background read from tty"
 msgstr "قراءة من tty في الخلفية"

-#: ../sysdeps/osf1/siglist.c:50
-#: ../sysdeps/sun4/siglist.c:50
+#: ../sysdeps/osf1/siglist.c:48 ../sysdeps/sun4/siglist.c:48
 msgid "Background write to tty"
 msgstr "كتابة لـ tty في الخلفية"

-#: ../sysdeps/osf1/siglist.c:51
-#: ../sysdeps/sun4/siglist.c:51
+#: ../sysdeps/osf1/siglist.c:49 ../sysdeps/sun4/siglist.c:49
 msgid "I/O now possible"
-msgstr "دخْل/خرْج ممكن الآن"
+msgstr "الدخْل/الخرْج ممكن الآن"

-#: ../sysdeps/osf1/siglist.c:52
-#: ../sysdeps/sun4/siglist.c:52
+#: ../sysdeps/osf1/siglist.c:50 ../sysdeps/sun4/siglist.c:50
 msgid "CPU limit exceeded"
 msgstr "تجاوز حد الـمعالج"

-#: ../sysdeps/osf1/siglist.c:53
-#: ../sysdeps/sun4/siglist.c:53
+#: ../sysdeps/osf1/siglist.c:51 ../sysdeps/sun4/siglist.c:51
 msgid "File size limit exceeded"
 msgstr "تجاوز حد حجم الملف"

-#: ../sysdeps/osf1/siglist.c:54
-#: ../sysdeps/sun4/siglist.c:54
+#: ../sysdeps/osf1/siglist.c:52 ../sysdeps/sun4/siglist.c:52
 msgid "Virtual alarm clock"
 msgstr "ساعة تنبيه تخيّلية"

-#: ../sysdeps/osf1/siglist.c:55
-#: ../sysdeps/sun4/siglist.c:55
+#: ../sysdeps/osf1/siglist.c:53 ../sysdeps/sun4/siglist.c:53
 msgid "Profiling alarm clock"
-msgstr "كتابة لمحة عن ساعة التنبيه"
+msgstr "تشخيص ساعة التنبيه"

-#: ../sysdeps/osf1/siglist.c:56
-#: ../sysdeps/sun4/siglist.c:56
+#: ../sysdeps/osf1/siglist.c:54 ../sysdeps/sun4/siglist.c:54
 msgid "Window size change"
 msgstr "تغير حجم النافذة"

-#: ../sysdeps/osf1/siglist.c:57
-#: ../sysdeps/sun4/siglist.c:57
+#: ../sysdeps/osf1/siglist.c:55 ../sysdeps/sun4/siglist.c:55
 msgid "Information request"
 msgstr "طلب معلومات"

-#: ../sysdeps/osf1/siglist.c:58
-#: ../sysdeps/sun4/siglist.c:58
+#: ../sysdeps/osf1/siglist.c:56 ../sysdeps/sun4/siglist.c:56
 msgid "User defined signal 1"
-msgstr "اشارة 1 معرفة من طرف المستخدم"
+msgstr "إشارة 1 معرفة من طرف المستخدم"

-#: ../sysdeps/osf1/siglist.c:59
-#: ../sysdeps/sun4/siglist.c:59
+#: ../sysdeps/osf1/siglist.c:57 ../sysdeps/sun4/siglist.c:57
 msgid "User defined signal 2"
-msgstr "اشارة 2 معرفة من طرف المستخدم"
+msgstr "إشارة 2 معرفة من طرف المستخدم"

--- a/po/bg.po
+++ b/po/bg.po
@@ -1,210 +1,190 @@
-# Bulgarian translation for libgtop
-# Copyright (C) 2002, 2004 Free Software Foundation, Inc.
+# Bulgarian translation for libgtop po-file
+# Copyright (C) 2002, 2004, 2005, 2007 Free Software Foundation, Inc.
 # Borislav Aleksandrov <B.Aleksandrov@cnsys.bg>, 2002.
 # Yanko Kaneti <yaneti@declera.com>, 2002.
 # Rostislav Raykov <zbrox@i-space.org>, 2004.
 # Vladimir Petkov <vpetkov@i-space.org>, 2005.
+# Alexander Shopov <ash@contact.bg>, 2007.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: libgtop\n"
+"Project-Id-Version: libgtop trunk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-25 18:15+0200\n"
-"PO-Revision-Date: 2005-07-28 14:04+0300\n"
-"Last-Translator: Rostislav Raykov <zbrox@i-space.org>\n"
-"Language-Team: Bulgarian <dict@linux.zonebg.com>\n"
+"POT-Creation-Date: 2007-09-18 10:43+0300\n"
+"PO-Revision-Date: 2007-09-18 10:43+0300\n"
+"Last-Translator: Alexander Shopov <ash@contact.bg>\n"
+"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"

-#: lib/read.c:65
+#: ../lib/read.c:51
 #, c-format
 msgid "read %d byte"
 msgid_plural "read %d bytes"
 msgstr[0] "прочетен %d байт"
 msgstr[1] "прочетени %d байта"

-#: lib/read_data.c:53
+#: ../lib/read_data.c:51
 msgid "read data size"
-msgstr "размер прочетени данни"
+msgstr "прочетен е размерът на данните"

-#: lib/read_data.c:72
+#: ../lib/read_data.c:70
 #, c-format
 msgid "read %lu byte of data"
 msgid_plural "read %lu bytes of data"
 msgstr[0] "прочетен %lu байт данни"
 msgstr[1] "прочетени %lu байта данни"

-#: lib/write.c:52
+#: ../lib/write.c:51
 #, c-format
 msgid "wrote %d byte"
 msgid_plural "wrote %d bytes"
 msgstr[0] "записан %d байт"
 msgstr[1] "записани %d байта"

-#: src/daemon/gnuserv.c:460
+#: ../src/daemon/gnuserv.c:458
 msgid "Enable debugging"
-msgstr "Включване на дебъгване"
+msgstr "Включване на изчистване на грешките"

-#: src/daemon/gnuserv.c:460
-msgid "DEBUG"
-msgstr "DEBUG"
-
-#: 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 "Прекъсване"

-#: sysdeps/osf1/siglist.c:30 sysdeps/sun4/siglist.c:30
+#: ../sysdeps/osf1/siglist.c:29 ../sysdeps/sun4/siglist.c:29
 msgid "Quit"
 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 "Прекъсване"

-#: 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 грешка"
+msgstr "Грешка на емулацията"

-#: 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 "Изключение с плаваща запетая"

-#: sysdeps/osf1/siglist.c:36 sysdeps/sun4/siglist.c:36
+#: ../sysdeps/osf1/siglist.c:35 ../sysdeps/sun4/siglist.c:35
 msgid "Kill"
 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 "Грешка в шината"

-#: sysdeps/osf1/siglist.c:38 sysdeps/sun4/siglist.c:38
+#: ../sysdeps/osf1/siglist.c:37 ../sysdeps/sun4/siglist.c:37
 msgid "Segmentation violation"
-msgstr "Сегментация"
+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 "Грешен аргумент на системно извикване"

-#: sysdeps/osf1/siglist.c:40 sysdeps/sun4/siglist.c:40
+#: ../sysdeps/osf1/siglist.c:39 ../sysdeps/sun4/siglist.c:39
 msgid "Broken pipe"
 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 "Неотложно състояние на socket"

-#: sysdeps/osf1/siglist.c:44 sysdeps/sun4/siglist.c:44
+#: ../sysdeps/osf1/siglist.c:43 ../sysdeps/sun4/siglist.c:43
 msgid "Stop"
 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 "Стоп от клавиатурата"

-#: sysdeps/osf1/siglist.c:46 sysdeps/sun4/siglist.c:46
+#: ../sysdeps/osf1/siglist.c:45 ../sysdeps/sun4/siglist.c:45
 msgid "Continue"
 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 "Фоново четене от терминал"

-#: 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 "Фонов запис в терминал"

-#: 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 "I/O сега е възможно"
+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 "Превишено ограничение за CPU"
+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 "Профилиран алармен часовник"
+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"

-#: 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"
--- a/po/bn_IN.po
+++ b/po/bn_IN.po
@@ -1,26 +1,27 @@
 # Bengali India  translation of libgtop.
-# Copyright (C) 2003, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2006, 2007 Free Software Foundation, Inc.
 # This file is distributed under the same license as the libgtop package.
+#
 # Vat <vatzcar@yahoo.co.in>, 2003.
 # Mahay Alam Khan <makl10n@yahoo.com>, 2005.
 # Samia Niamatullah <mailsamia2001@yahoo.com>, 2005.
-#
+# Runa Bhattacharjee <runabh@gmail.com>, 2007.
 msgid ""
 msgstr ""
-"Project-Id-Version: libgtop\n"
+"Project-Id-Version: bn_IN\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-01 01:20+0200\n"
-"PO-Revision-Date: 2006-08-07 12:47+0530\n"
+"POT-Creation-Date: 2007-05-14 03:41+0100\n"
+"PO-Revision-Date: 2007-08-10 14:47+0530\n"
 "Last-Translator: Runa Bhattacharjee <runabh@gmail.com>\n"
-"Language-Team: Bengali India\n"
+"Language-Team: Bengali INDIA\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "\n"
-"X-Generator: KBabel 1.9.1\n"
+"X-Generator: KBabel 1.11.4\n"

-#: ../lib/read.c:65
+#: ../lib/read.c:51
 #, c-format
 msgid "read %d byte"
 msgid_plural "read %d bytes"
@@ -31,11 +32,11 @@ msgstr[1] "%d বাইট পড়া হয়েছে"
 # #########################################
 # দয়া করে "গেছে" এর পরিবর্তে "গিয়েছে" লিখেন
 # #########################################
-#: ../lib/read_data.c:53
+#: ../lib/read_data.c:51
 msgid "read data size"
 msgstr "তথ্যের মাপ পড়া হবে"

-#: ../lib/read_data.c:72
+#: ../lib/read_data.c:70
 #, c-format
 msgid "read %lu byte of data"
 msgid_plural "read %lu bytes of data"
@@ -44,7 +45,7 @@ msgstr[1] "%lu বাইট তথ্য পড়া হয়েছে"

 # msgstr "%d বাইট তথ্য পড়া গেছে"
 # msgstr "%d বাইট তথ্য পড়া হোক"
-#: ../lib/write.c:53
+#: ../lib/write.c:51
 #, c-format
 msgid "wrote %d byte"
 msgid_plural "wrote %d bytes"
@@ -52,192 +53,169 @@ msgstr[0] "%d বাইট লেখা হয়েছে"
 msgstr[1] "%d বাইট লেখা হয়েছে"

 # msgstr "%d বাইট লেখা হয়েছে"
-#: ../src/daemon/gnuserv.c:460
+#: ../src/daemon/gnuserv.c:458
 msgid "Enable debugging"
 msgstr "ডিবাগ ব্যবস্থা সক্রিয় করুন"

-# msgstr "ডিবাগ প্রক্রিয়া সক্রিয় করা হোক"
-# ২ এটা কি বিবেচনা করা যায় না? অন্যান্য জায়গায় "ডিবাগ" লেখা হইছে, তাই এখানে অন্য রকম হয়ে যায়।
-# আপনার আপত্তি থাকলে অবশ্য কোন কথা নাই।
-#: ../src/daemon/gnuserv.c:460
-msgid "DEBUG"
-msgstr "DEBUG"
-
 # msgstr "ডিবাগ"
-#: ../src/daemon/gnuserv.c:462
+#: ../src/daemon/gnuserv.c:460
 msgid "Enable verbose output"
 msgstr "বিস্তারিত (ভার্বোস) আউটপুট সক্রিয় করা হবে"

-# msgstr "ভার্বোস (Verbose) ফলাফল চালু করুন"
-# msgstr "বর্ণনাযুক্ত ফলাফল দেখানো হোক"
 #: ../src/daemon/gnuserv.c:462
-msgid "VERBOSE"
-msgstr "VERBOSE"
-
-#: ../src/daemon/gnuserv.c:464
 msgid "Don't fork into background"
 msgstr "পটভূমিতে fork করা হবে না"

 #: ../src/daemon/gnuserv.c:464
-msgid "NO-DAEMON"
-msgstr "NO-DAEMON"
-
-#: ../src/daemon/gnuserv.c:466
 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"
+msgid "Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
-"%s বিকল্পে সমস্যা: %s.\n"
-"কমান্ত-লাইন থেকে ব্যবহারযোগ্য সমস্ত বিকল্পের সম্পূর্ণ তালিকা দেখতে '%s --help' প্রয়োগ "
+"কমান্ড-লাইন থেকে ব্যবহারযোগ্য সমস্ত বিকল্পের সম্পূর্ণ তালিকা দেখতে '%s --help' প্রয়োগ "
 "করুন।\n"

 # msgstr "সিস্টেম বুট হবার পর থেকে নিষ্ক্রিয় কাজে অতিবাহিত সময় (সেকেন্ডে)"
-#: ../sysdeps/osf1/siglist.c:29 ../sysdeps/sun4/siglist.c:29
+#: ../sysdeps/osf1/siglist.c:27 ../sysdeps/sun4/siglist.c:27
 msgid "Hangup"
 msgstr "বন্ধ করুন"

-#: ../sysdeps/osf1/siglist.c:30 ../sysdeps/sun4/siglist.c:30
+#: ../sysdeps/osf1/siglist.c:28 ../sysdeps/sun4/siglist.c:28
 msgid "Interrupt"
-msgstr "ইন্টারাপ্ট উৎপন্ন করুন"
+msgstr "ইন্টারাপ্ট উৎপন্ন করা হবে"

-#: ../sysdeps/osf1/siglist.c:31 ../sysdeps/sun4/siglist.c:31
+#: ../sysdeps/osf1/siglist.c:29 ../sysdeps/sun4/siglist.c:29
 msgid "Quit"
 msgstr "প্রস্থান"

 # msgstr "প্রস্থান"
-#: ../sysdeps/osf1/siglist.c:32 ../sysdeps/sun4/siglist.c:32
+#: ../sysdeps/osf1/siglist.c:30 ../sysdeps/sun4/siglist.c:30
 msgid "Illegal instruction"
 msgstr "অবৈধ নির্দেশ"

 # msgstr "অবৈধ ইনস্ট্রাকশন"
 # Instruction এখানে Technical term।
-#: ../sysdeps/osf1/siglist.c:33 ../sysdeps/sun4/siglist.c:33
+#: ../sysdeps/osf1/siglist.c:31 ../sysdeps/sun4/siglist.c:31
 msgid "Trace trap"
 msgstr "ট্রেস ট্র্যাপ"

 # ২ এটা আসলে ঠিক বোঝা যাচ্ছে না। তাই মনে হয় বাদ রাখাই ভাল
-#: ../sysdeps/osf1/siglist.c:34 ../sysdeps/sun4/siglist.c:34
+#: ../sysdeps/osf1/siglist.c:32 ../sysdeps/sun4/siglist.c:32
 msgid "Abort"
 msgstr "অস্বাভাবিক প্রস্থান"

 # msgstr "বন্ধ করা"
-#: ../sysdeps/osf1/siglist.c:35 ../sysdeps/sun4/siglist.c:35
+#: ../sysdeps/osf1/siglist.c:33 ../sysdeps/sun4/siglist.c:33
 msgid "EMT error"
 msgstr "EMT সংক্রান্ত সমস্যা"

-#: ../sysdeps/osf1/siglist.c:36 ../sysdeps/sun4/siglist.c:36
+#: ../sysdeps/osf1/siglist.c:34 ../sysdeps/sun4/siglist.c:34
 msgid "Floating-point exception"
 msgstr "ফ্লোটিং-পয়েন্ট এক্সেপশন"

 # msgstr "ভগ্নাংশ সংক্রান্ত ব্যতীক্রম" <-- বানান ভুল
-#: ../sysdeps/osf1/siglist.c:37 ../sysdeps/sun4/siglist.c:37
+#: ../sysdeps/osf1/siglist.c:35 ../sysdeps/sun4/siglist.c:35
 msgid "Kill"
 msgstr "Kill করুন"

 # msgstr "শেষ করা (Kill)"
-#: ../sysdeps/osf1/siglist.c:38 ../sysdeps/sun4/siglist.c:38
+#: ../sysdeps/osf1/siglist.c:36 ../sysdeps/sun4/siglist.c:36
 msgid "Bus error"
 msgstr "বাস সংক্রান্ত সমস্যা"

 # msgstr "বাস (Bus) সংক্রান্ত সমস্যা"
-#: ../sysdeps/osf1/siglist.c:39 ../sysdeps/sun4/siglist.c:39
+#: ../sysdeps/osf1/siglist.c:37 ../sysdeps/sun4/siglist.c:37
 msgid "Segmentation violation"
 msgstr "সেগমেন্টেশন সংক্রান্ত সমস্যা"

-#: ../sysdeps/osf1/siglist.c:40 ../sysdeps/sun4/siglist.c:40
+#: ../sysdeps/osf1/siglist.c:38 ../sysdeps/sun4/siglist.c:38
 msgid "Bad argument to system call"
 msgstr "সিস্টেম-কল'এ ভুল আর্গুমেন্ট প্রেরিত হয়েছে"

 # msgstr "সিস্টেম call এ ভুল মান প্রেরিত হয়েছে"
-#: ../sysdeps/osf1/siglist.c:41 ../sysdeps/sun4/siglist.c:41
+#: ../sysdeps/osf1/siglist.c:39 ../sysdeps/sun4/siglist.c:39
 msgid "Broken pipe"
 msgstr "ক্ষতিগ্রস্ত পাইপ"

 # msgstr "অচল পাইপ"
-#: ../sysdeps/osf1/siglist.c:42 ../sysdeps/sun4/siglist.c:42
+#: ../sysdeps/osf1/siglist.c:40 ../sysdeps/sun4/siglist.c:40
 msgid "Alarm clock"
 msgstr "অ্যালার্ম ঘড়ি"

-#: ../sysdeps/osf1/siglist.c:43 ../sysdeps/sun4/siglist.c:43
+#: ../sysdeps/osf1/siglist.c:41 ../sysdeps/sun4/siglist.c:41
 msgid "Termination"
 msgstr "সমাপ্তি"

-#: ../sysdeps/osf1/siglist.c:44 ../sysdeps/sun4/siglist.c:44
+#: ../sysdeps/osf1/siglist.c:42 ../sysdeps/sun4/siglist.c:42
 msgid "Urgent condition on socket"
 msgstr "সকেটে গুরুতর অবস্থা"

-#: ../sysdeps/osf1/siglist.c:45 ../sysdeps/sun4/siglist.c:45
+#: ../sysdeps/osf1/siglist.c:43 ../sysdeps/sun4/siglist.c:43
 msgid "Stop"
 msgstr "বন্ধ করুন"

-#: ../sysdeps/osf1/siglist.c:46 ../sysdeps/sun4/siglist.c:46
+#: ../sysdeps/osf1/siglist.c:44 ../sysdeps/sun4/siglist.c:44
 msgid "Keyboard stop"
 msgstr "কি-বোর্ড বন্ধ করুন"

 # ২ কীবোর্ড
-#: ../sysdeps/osf1/siglist.c:47 ../sysdeps/sun4/siglist.c:47
+#: ../sysdeps/osf1/siglist.c:45 ../sysdeps/sun4/siglist.c:45
 msgid "Continue"
 msgstr "এগিয়ে চলুন"

-#: ../sysdeps/osf1/siglist.c:48 ../sysdeps/sun4/siglist.c:48
+#: ../sysdeps/osf1/siglist.c:46 ../sysdeps/sun4/siglist.c:46
 msgid "Child status has changed"
 msgstr "চাইল্ডের অবস্থা পরিবর্তিত হয়েছে"

-#: ../sysdeps/osf1/siglist.c:49 ../sysdeps/sun4/siglist.c:49
+#: ../sysdeps/osf1/siglist.c:47 ../sysdeps/sun4/siglist.c:47
 msgid "Background read from tty"
 msgstr "পটভূমিতে tty'থেকে পড়া হচ্ছে"

 # ভাল হইলো না
-#: ../sysdeps/osf1/siglist.c:50 ../sysdeps/sun4/siglist.c:50
+#: ../sysdeps/osf1/siglist.c:48 ../sysdeps/sun4/siglist.c:48
 msgid "Background write to tty"
 msgstr "পটভূমিতে tty'এ লেখা হচ্ছে"

-#: ../sysdeps/osf1/siglist.c:51 ../sysdeps/sun4/siglist.c:51
+#: ../sysdeps/osf1/siglist.c:49 ../sysdeps/sun4/siglist.c:49
 msgid "I/O now possible"
 msgstr "I/O বর্তমানে করা সম্ভব"

-#: ../sysdeps/osf1/siglist.c:52 ../sysdeps/sun4/siglist.c:52
+#: ../sysdeps/osf1/siglist.c:50 ../sysdeps/sun4/siglist.c:50
 msgid "CPU limit exceeded"
 msgstr "CPU'র সীমা অতিক্রান্ত"

-#: ../sysdeps/osf1/siglist.c:53 ../sysdeps/sun4/siglist.c:53
+#: ../sysdeps/osf1/siglist.c:51 ../sysdeps/sun4/siglist.c:51
 msgid "File size limit exceeded"
 msgstr "ফাইলের মাপের সীমা অতিক্রান্ত"

 # msgstr "ফাইলের আয়তন সীমা ছাড়িয়ে গেছে"
-#: ../sysdeps/osf1/siglist.c:54 ../sysdeps/sun4/siglist.c:54
+#: ../sysdeps/osf1/siglist.c:52 ../sysdeps/sun4/siglist.c:52
 msgid "Virtual alarm clock"
 msgstr "ভার্চুয়াল অ্যালার্ম ঘড়ি"

 # msgstr "কাল্পনিক এলার্ম ঘড়ি"
-#: ../sysdeps/osf1/siglist.c:55 ../sysdeps/sun4/siglist.c:55
+#: ../sysdeps/osf1/siglist.c:53 ../sysdeps/sun4/siglist.c:53
 msgid "Profiling alarm clock"
 msgstr "অ্যালার্ম ঘড়ি প্রোফাইল করা হবে"

-#: ../sysdeps/osf1/siglist.c:56 ../sysdeps/sun4/siglist.c:56
+#: ../sysdeps/osf1/siglist.c:54 ../sysdeps/sun4/siglist.c:54
 msgid "Window size change"
 msgstr "উইন্ডোর মাপে পরিবর্তন"

 # msgstr "উইন্ডো'র আয়তন পরিবর্তন"
 # Window এর বাংলা করার দরকার নাই
-#: ../sysdeps/osf1/siglist.c:57 ../sysdeps/sun4/siglist.c:57
+#: ../sysdeps/osf1/siglist.c:55 ../sysdeps/sun4/siglist.c:55
 msgid "Information request"
 msgstr "তথ্যের অনুরোধ"

 # msgstr "তথ্যের আবেদন"
-#: ../sysdeps/osf1/siglist.c:58 ../sysdeps/sun4/siglist.c:58
+#: ../sysdeps/osf1/siglist.c:56 ../sysdeps/sun4/siglist.c:56
 msgid "User defined signal 1"
 msgstr "ব্যবহারকারী নির্ধারিত সিগনাল ১"

-#: ../sysdeps/osf1/siglist.c:59 ../sysdeps/sun4/siglist.c:59
+#: ../sysdeps/osf1/siglist.c:57 ../sysdeps/sun4/siglist.c:57
 msgid "User defined signal 2"
 msgstr "ব্যবহারকারী নির্ধারিত সিগনাল ২"
+
--- a/po/ca.po
+++ b/po/ca.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libgtop 2.9.91\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-25 18:15+0200\n"
+"POT-Creation-Date: 2007-09-16 22:33+0200\n"
 "PO-Revision-Date: 2005-09-04 01:16+0200\n"
 "Last-Translator: Jordi Mallach <jordi@sindominio.net>\n"
 "Language-Team: Catalan <tradgnome@softcatala.org>\n"
@@ -16,193 +16,186 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n!=1;\n"

-#: lib/read.c:65
+#: ../lib/read.c:51
 #, c-format
 msgid "read %d byte"
 msgid_plural "read %d bytes"
 msgstr[0] "s'ha llegit %d octet"
 msgstr[1] "s'ha llegit %d octets"

-#: lib/read_data.c:53
+#: ../lib/read_data.c:51
 msgid "read data size"
 msgstr "llegeix la mida de les dades"

-#: lib/read_data.c:72
+#: ../lib/read_data.c:70
 #, c-format
 msgid "read %lu byte of data"
 msgid_plural "read %lu bytes of data"
 msgstr[0] "s'ha llegit %lu octet de dades"
 msgstr[1] "s'ha llegit %lu octets de dades"

-#: lib/write.c:52
+#: ../lib/write.c:51
 #, c-format
 msgid "wrote %d byte"
 msgid_plural "wrote %d bytes"
 msgstr[0] "s'ha escrit %d octet"
 msgstr[1] "s'ha escrit %d octets"

-#: src/daemon/gnuserv.c:460
+#: ../src/daemon/gnuserv.c:458
 msgid "Enable debugging"
 msgstr "Activa la depuració"

-#: src/daemon/gnuserv.c:460
-msgid "DEBUG"
-msgstr "DEPURACIÓ"
-
-#: src/daemon/gnuserv.c:462
+#: ../src/daemon/gnuserv.c:460
 msgid "Enable verbose output"
 msgstr "Activa la sortida detallada"

-#: src/daemon/gnuserv.c:462
-msgid "VERBOSE"
-msgstr "DETALLA"
-
-#: src/daemon/gnuserv.c:464
+#: ../src/daemon/gnuserv.c:462
 msgid "Don't fork into background"
 msgstr "No bifurquis al segon pla"

-#: src/daemon/gnuserv.c:464
-msgid "NO-DAEMON"
-msgstr "SENSE DIMONI"
-
-#: src/daemon/gnuserv.c:466
+#: ../src/daemon/gnuserv.c:464
 msgid "Invoked from inetd"
 msgstr "Ha estat cridat des d'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"
+msgid "Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
-"S'ha produït un error en l'opció %s: %s.\n"
-"Executeu '%s --ajuda' per a veure una llista completa de les opcions de "
-"línies d'ordre disponibles.\n"
+"Executeu «%s --help»  per a veure una llista completa de les opcions "
+"disponibles de la línia d'ordres.\n"

-#: sysdeps/osf1/siglist.c:28 sysdeps/sun4/siglist.c:28
+#: ../sysdeps/osf1/siglist.c:27 ../sysdeps/sun4/siglist.c:27
 msgid "Hangup"
 msgstr "Termina"

-#: sysdeps/osf1/siglist.c:29 sysdeps/sun4/siglist.c:29
+#: ../sysdeps/osf1/siglist.c:28 ../sysdeps/sun4/siglist.c:28
 msgid "Interrupt"
 msgstr "Interromp"

-#: sysdeps/osf1/siglist.c:30 sysdeps/sun4/siglist.c:30
+#: ../sysdeps/osf1/siglist.c:29 ../sysdeps/sun4/siglist.c:29
 msgid "Quit"
 msgstr "Surt"

-#: sysdeps/osf1/siglist.c:31 sysdeps/sun4/siglist.c:31
+#: ../sysdeps/osf1/siglist.c:30 ../sysdeps/sun4/siglist.c:30
 msgid "Illegal instruction"
 msgstr "Instrucció il·legal"

-#: sysdeps/osf1/siglist.c:32 sysdeps/sun4/siglist.c:32
+#: ../sysdeps/osf1/siglist.c:31 ../sysdeps/sun4/siglist.c:31
 msgid "Trace trap"
 msgstr "Captura traça"

-#: sysdeps/osf1/siglist.c:33 sysdeps/sun4/siglist.c:33
+#: ../sysdeps/osf1/siglist.c:32 ../sysdeps/sun4/siglist.c:32
 msgid "Abort"
 msgstr "Avorta"

-#: sysdeps/osf1/siglist.c:34 sysdeps/sun4/siglist.c:34
+#: ../sysdeps/osf1/siglist.c:33 ../sysdeps/sun4/siglist.c:33
 msgid "EMT error"
 msgstr "Error 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 "Excepció de coma flotant"

-#: sysdeps/osf1/siglist.c:36 sysdeps/sun4/siglist.c:36
+#: ../sysdeps/osf1/siglist.c:35 ../sysdeps/sun4/siglist.c:35
 msgid "Kill"
 msgstr "Mata"

-#: sysdeps/osf1/siglist.c:37 sysdeps/sun4/siglist.c:37
+#: ../sysdeps/osf1/siglist.c:36 ../sysdeps/sun4/siglist.c:36
 msgid "Bus error"
 msgstr "Error de bus"

-#: sysdeps/osf1/siglist.c:38 sysdeps/sun4/siglist.c:38
+#: ../sysdeps/osf1/siglist.c:37 ../sysdeps/sun4/siglist.c:37
 msgid "Segmentation violation"
 msgstr "Violació de segment"

-#: 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 "Argument erroni a una crida al sistema"

-#: sysdeps/osf1/siglist.c:40 sysdeps/sun4/siglist.c:40
+#: ../sysdeps/osf1/siglist.c:39 ../sysdeps/sun4/siglist.c:39
 msgid "Broken pipe"
 msgstr "Conducte trencat"

-#: sysdeps/osf1/siglist.c:41 sysdeps/sun4/siglist.c:41
+#: ../sysdeps/osf1/siglist.c:40 ../sysdeps/sun4/siglist.c:40
 msgid "Alarm clock"
 msgstr "Alarma del rellotge"

-#: sysdeps/osf1/siglist.c:42 sysdeps/sun4/siglist.c:42
+#: ../sysdeps/osf1/siglist.c:41 ../sysdeps/sun4/siglist.c:41
 msgid "Termination"
 msgstr "Terminació"

-#: 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 "Condició urgent en socket"

-#: sysdeps/osf1/siglist.c:44 sysdeps/sun4/siglist.c:44
+#: ../sysdeps/osf1/siglist.c:43 ../sysdeps/sun4/siglist.c:43
 msgid "Stop"
 msgstr "Parada"

-#: sysdeps/osf1/siglist.c:45 sysdeps/sun4/siglist.c:45
+#: ../sysdeps/osf1/siglist.c:44 ../sysdeps/sun4/siglist.c:44
 msgid "Keyboard stop"
 msgstr "Parada de teclat"

-#: sysdeps/osf1/siglist.c:46 sysdeps/sun4/siglist.c:46
+#: ../sysdeps/osf1/siglist.c:45 ../sysdeps/sun4/siglist.c:45
 msgid "Continue"
 msgstr "Continua"

-#: 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 "L'estat del fill ha canviat"

-#: 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 "Lectura de tty en segon pla"

-#: 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 "Escriptura a tty en segon pla"

-#: 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 "E/S ara és possible"

-#: 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 "Límit de CPU excedit"

-#: 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 "Límit de mida de fitxer excedit"

-#: 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 "Alarma del rellotge virtual"

-#: 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 "Alarma del rellotge perfilada"

-#: 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 "Canvi de la mida de la finestra"

-#: sysdeps/osf1/siglist.c:56 sysdeps/sun4/siglist.c:56
+#: ../sysdeps/osf1/siglist.c:55 ../sysdeps/sun4/siglist.c:55
 msgid "Information request"
 msgstr "Petició d'informació"

-#: 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 "Senyal 1 definit per l'usuari"

-#: 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 "Senyal 2 definit per l'usuari"
+
+#~ msgid "DEBUG"
+#~ msgstr "DEPURACIÓ"
+
+#~ msgid "VERBOSE"
+#~ msgstr "DETALLA"
+
+#~ msgid "NO-DAEMON"
+#~ msgstr "SENSE DIMONI"
+
+#~ msgid "INETD"
+#~ msgstr "INETD"
--- a/Show More
+++ b/Show More