released 2.9.0

* NEWS: * configure.in: released 2.9.0
Glibified. g_array_free which returns a char* ! If you want to change
2004-11-30 12:06:46 +00:00 · 2004-11-29 23:55:03 +00:00 · 2004-11-28 01:32:55 +00:00 · 2004-11-23 12:36:48 +00:00 · 2004-11-22 11:13:24 +00:00 · 2004-11-19 08:32:16 +00:00
176 changed files with 3595 additions and 8472 deletions
--- a/.cvsignore
+++ b/.cvsignore
@@ -39,3 +39,4 @@ INSTALL
 install-sh
 missing
 mkinstalldirs
+libgtopconfig.h
--- a/2
+++ b/2
@@ -1,3 +1,3 @@
 Martin Baulig (martin@home-of-linux.org)
 Drazen Kacar (dave@srce.hr)
-Benoît Dejean (tazforever@dlfp.org)
+Benoît Dejean (tazforever@dlfp.org)
--- a/170
+++ b/170
@@ -1,3 +1,173 @@
+2004-11-30  Benoît Dejean  <tazforever@dlfp.org>
+
+	* NEWS:
+	* configure.in: released 2.9.0
+
+2004-11-22  Benoît Dejean  <tazforever@dlfp.org>
+
+	* AUTHORS:
+	* MAINTAINERS: UTF-8-ified.
+	
+	* acconfig.h:
+	* acinclude.m4:
+	* configure.in:
+	* kernel/ChangeLog:
+	* kernel/sysctl/.cvsignore:
+	* kernel/sysctl/Makefile:
+	* kernel/sysctl/libgtop.c:
+	* kernel/sysctl/libgtop.h:
+	* kernel/sysctl/libgtop_syms.c:
+	* kernel/sysctl/main.c:
+	* kernel/sysctl/patch-2.2.1:
+	* kernel/sysctl/patch-2.2.x:
+	* kernel/table.h:
+	* kernel/table20/Makefile:
+	* kernel/table20/README:
+	* kernel/table20/entry-i386.S:
+	* kernel/table20/kernel.patch:
+	* kernel/table20/main.c:
+	* kernel/table20/unistd-i386.h:
+	* kernel/table20/version.h:
+	* kernel/table21/.cvsignore:
+	* kernel/table21/Makefile:
+	* kernel/table21/README:
+	* kernel/table21/entry-i386.S:
+	* kernel/table21/main.c:
+	* kernel/table21/module.c:
+	* kernel/table21/unistd-i386.h:
+	* kernel/table21/version.h:
+	* kernel/version.h:
+	* libgtop-sysdeps.m4:
+	* sysdeps/Makefile.am:
+	* sysdeps/kernel/.cvsignore:
+	* sysdeps/kernel/ChangeLog:
+	* sysdeps/kernel/Makefile.am:
+	* sysdeps/kernel/close.c:
+	* sysdeps/kernel/cpu.c:
+	* sysdeps/kernel/glibtop_private.h:
+	* sysdeps/kernel/glibtop_server.h:
+	* sysdeps/kernel/kernel.h:
+	* sysdeps/kernel/kernel.s:
+	* sysdeps/kernel/loadavg.c:
+	* sysdeps/kernel/mem.c:
+	* sysdeps/kernel/msg_limits.c:
+	* sysdeps/kernel/netload.c:
+	* sysdeps/kernel/open.c:
+	* sysdeps/kernel/ppp.c:
+	* sysdeps/kernel/procargs.c:
+	* sysdeps/kernel/procdata.c:
+	* sysdeps/kernel/prockernel.c:
+	* sysdeps/kernel/proclist.c:
+	* sysdeps/kernel/procmap.c:
+	* sysdeps/kernel/procmem.c:
+	* sysdeps/kernel/procsegment.c:
+	* sysdeps/kernel/procsignal.c:
+	* sysdeps/kernel/procstate.c:
+	* sysdeps/kernel/proctime.c:
+	* sysdeps/kernel/procuid.c:
+	* sysdeps/kernel/sem_limits.c:
+	* sysdeps/kernel/shm_limits.c:
+	* sysdeps/kernel/siglist.c:
+	* sysdeps/kernel/swap.c:
+	* sysdeps/kernel/sysinfo.c:
+	* sysdeps/kernel/uptime.c: Removed kernel patch and implementation.
+
+2004-11-18  Benoît Dejean  <tazforever@dlfp.org>
+
+	* Makefile.am: Forgot to ship libgtopconfig.h.
+
+2004-11-18  Benoît Dejean  <tazforever@dlfp.org>
+	
+	* LIBGTOP-VERSION:
+	* libgtop-mirror.sh: Removed unused files.
+
+	* libgtopconfig.h.in: Added.
+	* Makefile.am:
+	* configure.in:
+	* glibtop.h: Added libgtopconfig.h and LIBGTOP_VERSION_CHECK(X, Y, Z).
+	This can be used in build tests.
+
+2004-11-15  Benoît Dejean  <tazforever@dlfp.org>
+
+	* copyright.txt: Added myself.
+
+2004-11-13  Benoît Dejean  <tazforever@dlfp.org>
+
+	* include/glibtop/procargs.h:
+	* sysdeps/common/procargs.c: (glibtop_get_proc_argv_l): Removed SUID 
+	wrappers because glibtop_proc_argv_l is a client-side function that wraps
+	glibtop_get_proc_args.
+
+2004-11-13  Benoît Dejean  <tazforever@dlfp.org>
+
+	* structures.def: Removed old functions. OMG, everything is really broken
+	here :/
+
+2004-11-13  Benoît Dejean  <tazforever@dlfp.org>
+
+	* configure.in: Bumped to 2.9.0
+	
+	* configure.in:
+	* examples/.cvsignore:
+	* examples/Makefile.am:
+	* examples/netlist.c: (main):
+	* features.def:
+	* include/glibtop/Makefile.am:
+	* include/glibtop/command.h:
+	* include/glibtop/netlist.h:
+	* include/glibtop/sysdeps.h:
+	* include/glibtop/union.h:
+	* include/glibtop/version.h:
+	* src/daemon/version.c:
+	* sysdeps/linux/Makefile.am:
+	* sysdeps/linux/netlist.c: (glibtop_init_netlist_s),
+	(glibtop_get_netlist_s):
+	* sysdeps/names/Makefile.am:
+	* sysdeps/names/netlist.c:
+	* sysdeps/solaris/Makefile.am:
+	* sysdeps/solaris/netlist.c: (glibtop_init_netlist_s),
+	(glibtop_get_netlist_s): Added new function glibtop_get_netlist().
+	Implemented for linux and solaris. Doc needed.
+
+2004-10-11  Benoît Dejean  <tazforever@dlfp.org>
+
+	* NEWS: Released 2.8.1.
+
+2004-10-10  Benoît Dejean  <tazforever@dlfp.org>
+
+	* lib/init.c: Replaced C99 initializer.
+	
+	* lib/read.c: (do_read): 1-line cleanup.
+
+2004-10-09  Benoît Dejean  <tazforever@dlfp.org>
+
+	* configure.in: Depends on glib 2.4.0
+
+2004-09-25  Benoît Dejean  <tazforever@dlfp.org>
+
+	* glibtop.h: Added missing include <glibtop/close.h>.
+
+2004-09-22  Benoît Dejean  <tazforever@dlfp.org>
+
+	* configure.in: CFLAGS: Removed -W, added -Winline.
+
+2004-09-14  Gora Mohanty  <gmohanty@cvs.gnome.org>
+                                                                                
+        * configure.in: Added 'or' to ALL_LINGUAS.
+ 
+2004-09-13  Benoît Dejean  <tazforever@dlfp.org>
+
+	* configure.in: bumped to 2.8.1.
+	
+	* sysdeps/common/fsusage.c:
+	* sysdeps/common/gnuslib.c: (glibtop_make_connection),
+	(connect_to_unix_server), (glibtop_internet_addr):
+	* sysdeps/linux/glibtop_server.c: (get_pageshift):
+	* sysdeps/linux/glibtop_server.h:
+	* sysdeps/linux/open.c: (glibtop_open_s):
+	* sysdeps/linux/ppp.c: (is_ISDN_on): Cleanups. Thanks to Kjartan Maraas.
+	Closes #151557.
+
 2004-09-13  Benoît Dejean  <tazforever@dlfp.org>

 	* NEWS:
--- a/28
+++ b/28
@@ -1,28 +0,0 @@
-# Making releases:
-#   LIBGTOP_MICRO_VERSION += 1;
-#   LIBGTOP_INTERFACE_AGE += 1;
-#   LIBGTOP_BINARY_AGE += 1;
-# if any functions have been added, set LIBGTOP_INTERFACE_AGE to 0.
-# if backwards compatibility has been broken,
-# set LIBGTOP_BINARY_AGE and LIBGTOP_INTERFACE_AGE to 0.
-#
-LIBGTOP_MAJOR_VERSION=1
-LIBGTOP_MINOR_VERSION=90
-LIBGTOP_MICRO_VERSION=0
-
-LIBGTOP_INTERFACE_AGE=0
-LIBGTOP_BINARY_AGE=0
-# you can set this to `-snap' for instance to create
-# a `libgtop-1.x.y-snap.tar.gz' tarball.
-LIBGTOP_VERSION_SUFFIX=
-
-# Increase each time you change the client/server protocol.
-LIBGTOP_SERVER_VERSION=5
-
-# Don't change this
-LIBGTOP_VERSION=$LIBGTOP_MAJOR_VERSION.$LIBGTOP_MINOR_VERSION.$LIBGTOP_MICRO_VERSION
-LIBGTOP_VERSION_CODE=`echo "$LIBGTOP_MAJOR_VERSION 1000000 * $LIBGTOP_MINOR_VERSION 1000 * + $LIBGTOP_MICRO_VERSION + p q" | dc`
-
-# For automake.
-VERSION=$LIBGTOP_VERSION$LIBGTOP_VERSION_SUFFIX
-PACKAGE=libgtop
--- a/2
+++ b/2
@@ -1,3 +1,3 @@
 Email: martin@home-of-linux.org
 Email: dave@srce.hr
-Benoît Dejean (tazforever@dlfp.org)
+Benoît Dejean (tazforever@dlfp.org)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,13 +1,13 @@

 SUBDIRS = po misc include sysdeps lib src examples doc

-libgtopinclude_HEADERS = glibtop.h
+libgtopinclude_HEADERS = glibtop.h libgtopconfig.h
 libgtopincludedir = $(includedir)/libgtop-2.0

 EXTRA_DIST = autogen.sh libgtop.spec.in copyright.txt \
-	LIBGTOP-VERSION features.def \
+	 features.def libgtopconfig.h.in \
 	libgtop-sysdeps.m4 README \
-	libgtop-mirror.sh libgtop-2.0.pc.in acinclude.m4
+	 libgtop-2.0.pc.in acinclude.m4

 dist-hook:
 	cp libgtop.spec $(distdir)
--- a/13
+++ b/13
@@ -1,3 +1,16 @@
+December 30, 2004: Overview of Changes from 2.8.1 to 2.9.0
+=========================================================
+* glibtop_get_netload : Fixed segfault on linux with ppp devices.
+* NEW glibtop_get_netlist : retrieves the list of all available interfaces.
+* NEW LIBGTOP_CHECK_VERSION(major, minor, micro)
+* Removed dead kernel patch and implementation.
+* Cleanups on Linux and Solaris.
+
+October 11, 2004: Overview of Changes from 2.8.0 to 2.8.1
+=========================================================
+* Improved Solaris and AIX support.
+
+
 August 13, 2004: Overview of Changes from 2.7.92 to 2.8.0
 =========================================================
 * No changes
--- a/acconfig.h
+++ b/acconfig.h
@@ -139,7 +139,6 @@

 #undef NEED_LIBGTOP

-#undef HAVE_LINUX_TABLE
 #undef HAVE_LIBGTOP_SMP

 #undef HAVE_XAUTH
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -586,53 +586,6 @@ dnl                              define 'HAVE_GLIBTOP_MACHINE_H'.
 dnl * 'libgtop_need_server'    - is the server really needed? Defines 'NEED_LIBGTOP'
 dnl                              if true; defines conditional 'NEED_LIBGTOP'.

-AC_DEFUN([LIBGTOP_HACKER_TESTS],[
-	AC_REQUIRE([AC_CANONICAL_HOST])
-
-	AC_ARG_WITH(linux-table,
-      [  --with-linux-table      Use the table () function from Martin Baulig],
-	[linux_table="$withval"],[linux_table=auto])
-	case "$host_os" in
-	linux*)
-	  if test $linux_table = yes ; then
-	    AC_CHECK_HEADER(linux/table.h, linux_table=yes, linux_table=no)
-	  elif test $linux_table = auto ; then
-	    AC_MSG_CHECKING(for table function in Linux Kernel)
-	    AC_TRY_RUN([
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <unistd.h>
-#include <linux/unistd.h>
-#include <linux/table.h>
-
-#include <syscall.h>
-
-static inline _syscall3 (int, table, int, type, union table *, tbl, const void *, param);
-
-int
-main (void)
-{
-	union table tbl;
-	int ret;
-
-	ret = table (TABLE_VERSION, NULL, NULL);
-
-	if (ret == -1)
-		exit (-errno);
-
-	exit (ret < 1 ? ret : 0);
-}
-], linux_table=yes, linux_table=no, linux_table=no)
-	    AC_MSG_RESULT($linux_table)
-	  fi
-	  if test $linux_table = yes ; then
-	    AC_DEFINE(HAVE_LINUX_TABLE)
-	  fi
-	  ;;
-	esac
-])
-
 AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[
 	AC_REQUIRE([AC_CANONICAL_HOST])

@@ -652,11 +605,9 @@ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[

 	AM_CONDITIONAL(HACKER_MODE, test x"$hacker_mode" = xyes)

-	linux_table=auto
 	if test x$hacker_mode = xyes ; then
 	  LIBGTOP_HACKER_TESTS
 	fi
-	AM_CONDITIONAL(LINUX_TABLE, test $linux_table = yes)

 	AC_ARG_WITH(libgtop-smp,
 	[  --with-libgtop-smp      Enable SMP support (default-auto)],[
@@ -688,14 +639,9 @@ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[

 	case "$host_os" in
 	linux*)
-	  if test x$linux_table = xyes ; then
-	    libgtop_sysdeps_dir=kernel
-	    libgtop_use_machine_h=no
-	  else
-	    libgtop_sysdeps_dir=linux
-	    libgtop_use_machine_h=no
-	    libgtop_have_sysinfo=yes
-	  fi
+	  libgtop_sysdeps_dir=linux
+	  libgtop_use_machine_h=no
+	  libgtop_have_sysinfo=yes
 	  libgtop_need_server=no
 	  ;;
 	freebsd*|netbsd*|openbsd*|bsdi*)
--- a/configure.in
+++ b/configure.in
@@ -7,13 +7,13 @@ AM_CONFIG_HEADER(config.h)
 AC_CANONICAL_SYSTEM

 LIBGTOP_MAJOR_VERSION=2
-LIBGTOP_MINOR_VERSION=8
+LIBGTOP_MINOR_VERSION=9
 LIBGTOP_MICRO_VERSION=0
 LIBGTOP_VERSION=$LIBGTOP_MAJOR_VERSION.$LIBGTOP_MINOR_VERSION.$LIBGTOP_MICRO_VERSION
 AM_INIT_AUTOMAKE(libgtop, $LIBGTOP_VERSION)

 dnl  increment if the interface has additions, changes, removals.
-LIBGTOP_CURRENT=4
+LIBGTOP_CURRENT=5

 dnl  increment any time the source changes; set to
 dnl  0 if you increment CURRENT
@@ -123,7 +123,7 @@ else
 fi

 if test "x$enable_static" != xno; then
-  static_targets="first_static second_static mountlist_static procmap_static netload_static sysdeps_static timings_static $smp_static_examples"
+  static_targets="first_static second_static mountlist_static procmap_static netload_static sysdeps_static timings_static $smp_static_examples pprint_static procargs_static df_static netlist netlist_static"
 else
  static_targets=""
 fi
@@ -134,7 +134,7 @@ AM_CONDITIONAL(ENABLE_SHARED, test x$enable_static = xyes)
 AC_SUBST(static_targets)
 AC_SUBST(smp_examples)

-GLIB_REQUIRED=2.0.0
+GLIB_REQUIRED=2.4.0

 PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED)
 AC_SUBST(GLIB_CFLAGS)
@@ -255,7 +255,7 @@ AC_TYPE_SIGNAL
 AC_FUNC_STRFTIME
 AC_CHECK_FUNCS(getcwd gettimeofday getwd putenv strdup strtoul uname)

-ALL_LINGUAS="am ar az be bg bn bs ca cs cy da de el en_CA en_GB es et eu fa fi fr ga gl gu he hi hr hu id it ja ko lt lv mi mk ml mn ms nb nl nn no pa pl pt pt_BR ro ru sk sl sq sr sr@Latn sv ta tr uk vi zh_CN zh_TW"
+ALL_LINGUAS="am ar az be bg bn bs ca cs cy da de el en_CA en_GB es et eu fa fi fr ga gl gu he hi hr hu id it ja ko lt lv mi mk ml mn ms nb nl nn no or pa pl pt pt_BR ro ru sk sl sq sr sr@Latn sv ta tr uk vi zh_CN zh_TW"

 GETTEXT_PACKAGE=libgtop-2.0
 AC_SUBST(GETTEXT_PACKAGE)
@@ -351,7 +351,7 @@ AC_SUBST(machine_incs)

 if test "$GCC" = "yes" ; then
        CFLAGS="\
-	-W \
+	-Winline \
 	-Wall \
 	-std=gnu89 \
 	-Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes \
@@ -399,7 +399,6 @@ sysdeps/stub_suid/Makefile
 sysdeps/sun4/Makefile
 sysdeps/osf1/Makefile
 sysdeps/linux/Makefile
-sysdeps/kernel/Makefile
 sysdeps/freebsd/Makefile
 sysdeps/solaris/Makefile
 sysdeps/aix/Makefile
@@ -410,4 +409,5 @@ lib/Makefile
 examples/Makefile
 doc/Makefile
 libgtop-2.0.pc
+libgtopconfig.h
 ])
--- a/copyright.txt
+++ b/copyright.txt
@@ -1,10 +1,9 @@
-/* $Id$ */
-
 /* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
+   This file is part of LibGTop 2.0.

   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
+   Contributed by Benoît Dejean <TazForEver@dlfp.org>, 2004.
+   
   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,
--- a/examples/.cvsignore
+++ b/examples/.cvsignore
@@ -14,3 +14,12 @@ second_linux
 smp_static sysdeps_static netload_static procmap_static mountlist_static
 smp sysdeps netload procmap mountlist
 timings timings_static
+pprint
+pprint_static
+procargs
+procargs_static
+df
+df_static
+netlist
+netlist_static
+
--- a/examples/ChangeLog
+++ b/examples/ChangeLog
@@ -1,3 +1,67 @@
+2004-11-15  Benoît Dejean  <tazforever@dlfp.org>
+
+	* netload.c: (hwaddress_format_for_display), (main): Updated.
+
+2004-11-13  Benoît Dejean  <tazforever@dlfp.org>
+
+	* pprint.c: (pprint_get_fsusage), (pprint_get_mountlist),
+	(pprint_get_netload), (pprint_get_netlist), (main): Updated.
+
+2004-09-25  Benoît Dejean  <tazforever@dlfp.org>
+
+	* pprint.c: (main): Re-added pprint_get_msg_limits()
+
+i2004-09-25  Benoît Dejean  <tazforever@dlfp.org>
+
+	* df.c: (main):
+	* pprint.c: (main):
+	* procargs.c: (main): Added missing call to glibgtop_init() / glibtop_close()
+
+2004-09-24  Benoît Dejean  <tazforever@dlfp.org>
+
+	* .cvsignore:
+	* Makefile.am:
+	* ../configure.in
+	* df.c: (print_fsusage), (main): Added new example, just like 'df'.
+
+2004-09-22  Benoît Dejean  <tazforever@dlfp.org>
+
+	* pprint.c: (main): Disable pprint_get_msg_limits() because it can fail.
+
+2004-09-21  Benoît Dejean  <tazforever@dlfp.org>
+
+	* pprint.c: (pprint_get_swap), (main): Updated.
+
+2004-09-21  Benoît Dejean  <tazforever@dlfp.org>
+
+	* procargs.c: (show_args), (main): Updated.
+
+2004-09-21  Benoît Dejean  <tazforever@dlfp.org>
+
+	* pprint.c: (pprint_get_mountlist), (pprint_get_netload),
+	(pprint_get_uptime), (main): Updated.
+
+2004-09-21  Benoît Dejean  <tazforever@dlfp.org>
+
+	* pprint.c: (pprint_get_mountlist): Updated.
+
+2004-09-21  Benoît Dejean  <tazforever@dlfp.org>
+
+	* procargs.c: (show_args), (main): Updated.
+
+2004-09-20  Benoît Dejean  <tazforever@dlfp.org>
+
+	* .cvsignore:
+	* Makefile.am:
+	* pprint.c: (pprint_get_cpu), (pprint_get_fsusage),
+	(pprint_get_loadavg), (pprint_get_mem), (pprint_get_mountlist),
+	(pprint_get_msg_limits), (main): Added new example : pretty prints
+	the result of glibtop_*. Work in progress.
+	
+	Now builds procargs.
+	
+	* ../configure.in: Added to static list.
+
 2004-07-07  Benoît Dejean  <tazforever@dlfp.org>

 	* procargs.c: Added glibtop_get_proc_argv demo.
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -6,7 +6,7 @@ INCLUDES		= @INCLUDES@

 DEFS			= @DEFS@

-noinst_PROGRAMS	= 	first second\
+noinst_PROGRAMS	= 	first second pprint procargs df netlist \
 			  mountlist procmap netload sysdeps timings \
 			  @static_targets@ @smp_examples@

@@ -14,7 +14,8 @@ EXTRA_PROGRAMS		= first_static second_static \
 			  mountlist_static procmap_static \
 			  third third_static smp smp_static \
 			  netload_static sysdeps_static \
-			  timings_static
+			  timings_static pprint_static procargs_static \
+			  df_static netlist_static

 first_SOURCES		= first.c
 first_LDADD		= $(top_builddir)/lib/libgtop-2.0.la
@@ -84,3 +85,36 @@ timings_static_SOURCES	= $(timings_SOURCES)
 timings_static_LDADD	= $(timings_LDADD)
 timings_static_LDFLAGS	= -static

+
+pprint_SOURCES	        = pprint.c
+pprint_LDADD		= $(top_builddir)/lib/libgtop-2.0.la
+
+pprint_static_SOURCES   = $(pprint_SOURCES)
+pprint_static_LDADD	= $(pprint_LDADD)
+pprint_static_LDFLAGS   = -static
+
+
+procargs_SOURCES	  = procargs.c
+procargs_LDADD		  = $(top_builddir)/lib/libgtop-2.0.la
+
+procargs_static_SOURCES   = $(procargs_SOURCES)
+procargs_static_LDADD	  = $(procargs_LDADD)
+procargs_static_LDFLAGS   = -static
+
+
+df_SOURCES	  = df.c
+df_LDADD		  = $(top_builddir)/lib/libgtop-2.0.la
+
+df_static_SOURCES   = $(df_SOURCES)
+df_static_LDADD	  = $(df_LDADD)
+df_static_LDFLAGS   = -static
+
+
+netlist_SOURCES		= netlist.c
+netlist_LDADD		= $(top_builddir)/lib/libgtop-2.0.la
+
+netlist_static_SOURCES	= $(netlist_SOURCES)
+netlist_static_LDADD	= $(netlist_LDADD)
+netlist_static_LDFLAGS	= -static
+
+
--- a/examples/df.c
+++ b/examples/df.c
@@ -0,0 +1,48 @@
+#include <glibtop.h>
+
+#include <glibtop/fsusage.h>
+#include <glibtop/mountlist.h>
+
+#include <stdio.h>
+
+
+static void print_fsusage(const char *mountpoint)
+{
+  glibtop_fsusage buf;
+
+  glibtop_get_fsusage(&buf, mountpoint);
+
+  printf("%-20s %-10llu %-10llu %-10llu %.1f\n",
+	 mountpoint,
+	 buf.blocks * buf.block_size >> 20,
+	 (buf.blocks - buf.bavail) * buf.block_size >> 20,
+	 buf.bavail * buf.block_size >> 20,
+	 (buf.blocks - buf.bavail) * 100.0 / buf.blocks
+	 );
+}
+
+
+int main()
+{
+  glibtop_mountlist buf;
+  glibtop_mountentry *entries;
+  size_t i;
+
+  glibtop_init();
+
+  printf("%-20s %-10s %-10s %-10s %-10s\n",
+	 "Filesystem", "Size", "Used", "Avail", "Use%");
+
+  entries = glibtop_get_mountlist(&buf, FALSE);
+
+  for(i = 0; i < buf.number; ++i)
+    {
+      print_fsusage(entries[i].mountdir);
+    }
+
+  g_free(entries);
+
+  glibtop_close();
+
+  return 0;
+}
--- a/sysdeps/kernel/kernel.h
+++ b/sysdeps/kernel/kernel.h
@@ -1,9 +1,6 @@
-/* $Id$ */
+/* Copyright (C) 2004 Benoît Dejean
+   This file is part of LibGTop 2.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
@@ -21,20 +18,29 @@
   Boston, MA 02111-1307, USA.
 */

-#ifndef __GLIBTOP_KERNEL_KERNEL_H__
-#define __GLIBTOP_KERNEL_KERNEL_H__
+#include <stdio.h>

-#include <linux/unistd.h>
-#include <linux/table.h>
+#include <glibtop.h>
+#include <glibtop/netlist.h>

-#include <sys/param.h>

-#include <syscall.h>
+int main(int argc, char *argv [])
+{
+	glibtop_netlist buf;
+	char **devices;
+	guint32 i;

-G_BEGIN_DECLS
+	glibtop_init();

-extern int table (int, union table *, const void *);
+	devices = glibtop_get_netlist(&buf);

-G_END_DECLS
+	for(i = 0; i < buf.number; ++i)
+	{
+		printf("net device '%s'\n", devices[i]);
+	}

-#endif
+	g_strfreev(devices);
+
+	glibtop_close();
+	return 0;
+}
--- a/examples/netload.c
+++ b/examples/netload.c
@@ -40,6 +40,24 @@
 #define PROFILE_COUNT	1
 #endif

+
+static char* hwaddress_format_for_display(glibtop_netload *buf)
+{
+	unsigned i;
+	GString *repr = g_string_new("");
+	char *str;
+
+	for(i = 0; i < sizeof buf->hwaddress; ++i)
+		g_string_append_printf(repr, "%02X:",
+				       (unsigned) ((char*)buf->hwaddress)[i]);
+
+	repr->str [ repr->len - 1] = ' ';
+	str = g_string_free(repr, FALSE);
+	g_strstrip(str);
+	return str;
+}
+
+
 int
 main (int argc, char *argv [])
 {
@@ -47,6 +65,8 @@ main (int argc, char *argv [])
 	unsigned method, count, port;
 	struct in_addr addr, subnet;
 	char *address_string, *subnet_string;
+	char address6_string[INET6_ADDRSTRLEN], prefix6_string[INET6_ADDRSTRLEN];
+	char *hwaddress_string;
 	char buffer [BUFSIZ];

 	count = PROFILE_COUNT;
@@ -86,36 +106,50 @@ main (int argc, char *argv [])
 	address_string = g_strdup (inet_ntoa (addr));
 	subnet_string  = g_strdup (inet_ntoa (subnet));

-	printf ("Network Load (0x%08lx):\n\n"
-		"\tInterface Flags:\t0x%08lx\n"
-		"\tAddress:\t\t0x%08lx - %s\n"
-		"\tSubnet:\t\t\t0x%08lx - %s\n\n"
-		"\tMTU:\t\t\t%ld\n"
-		"\tCollisions:\t\t%ld\n\n"
-		"\tPackets In:\t\t%ld\n"
-		"\tPackets Out:\t\t%ld\n"
-		"\tPackets Total:\t\t%ld\n\n"
-		"\tBytes In:\t\t%ld\n"
-		"\tBytes Out:\t\t%ld\n"
-		"\tBytes Total:\t\t%ld\n\n"
-		"\tErrors In:\t\t%ld\n"
-		"\tErrors Out:\t\t%ld\n"
-		"\tErrors Total:\t\t%ld\n\n",
-		(unsigned long) netload.flags,
-		(unsigned long) netload.if_flags,
-		(unsigned long) netload.address, address_string,
-		(unsigned long) netload.subnet,  subnet_string,
-		(unsigned long) netload.mtu,
-		(unsigned long) netload.collisions,
-		(unsigned long) netload.packets_in,
-		(unsigned long) netload.packets_out,
-		(unsigned long) netload.packets_total,
-		(unsigned long) netload.bytes_in,
-		(unsigned long) netload.bytes_out,
-		(unsigned long) netload.bytes_total,
-		(unsigned long) netload.errors_in,
-		(unsigned long) netload.errors_out,
-		(unsigned long) netload.errors_total);
+	inet_ntop (AF_INET6, netload.address6, address6_string, INET6_ADDRSTRLEN);
+	inet_ntop (AF_INET6, netload.prefix6,  prefix6_string,  INET6_ADDRSTRLEN);
+
+	hwaddress_string = hwaddress_format_for_display(&netload);
+
+	printf ("Network Load (0x%016llx):\n\n"
+		"\tInterface Flags:\t0x%016llx\n"
+		"\tAddress:\t\t0x%08x - %s\n"
+		"\tSubnet:\t\t\t0x%08x - %s\n\n"
+		"\tMTU:\t\t\t%d\n"
+		"\tCollisions:\t\t%llu\n\n"
+		"\tPackets In:\t\t%llu\n"
+		"\tPackets Out:\t\t%llu\n"
+		"\tPackets Total:\t\t%llu\n\n"
+		"\tBytes In:\t\t%llu\n"
+		"\tBytes Out:\t\t%llu\n"
+		"\tBytes Total:\t\t%llu\n\n"
+		"\tErrors In:\t\t%llu\n"
+		"\tErrors Out:\t\t%llu\n"
+		"\tErrors Total:\t\t%llu\n\n"
+		"\tAddress6:\t\t%s\n"
+		"\tPrefix6:\t\t%s\n"
+		"\tScope6:\t\t\t%#03x\n\n"
+		"\tHarware Address:\t%s\n\n",
+		netload.flags,
+		netload.if_flags,
+		(guint32) netload.address, address_string,
+		(guint32) netload.subnet,  subnet_string,
+		netload.mtu,
+		netload.collisions,
+		netload.packets_in,
+		netload.packets_out,
+		netload.packets_total,
+		netload.bytes_in,
+		netload.bytes_out,
+		netload.bytes_total,
+		netload.errors_in,
+		netload.errors_out,
+		netload.errors_total,
+		address6_string,
+		prefix6_string,
+		(int) netload.scope6,
+		hwaddress_string);
+

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

 #include <stdlib.h>

 #include <unistd.h>

-int main(int argc, char **argv)
+static void show_args(pid_t pid, unsigned max_len)
 {
-  while(*++argv)
+  glibtop_proc_args buf;
+  char ** const pargv = glibtop_get_proc_argv(&buf, pid, max_len);
+
+  char **parg = pargv;
+
+  printf("<%ld>\t", (long)pid);
+
+  while(*parg)
    {
-      glibtop_proc_args buf;
-      pid_t pid = strtol(*argv, NULL, 10);
-      char ** const pargv = glibtop_get_proc_argv(&buf, pid, 20);
-
-      char **parg = pargv;
-
-      printf("<%ld>\t", (long)pid);
-
-      while(*parg)
-	{
-	  printf("\"%s\"\t", *parg);
-	  parg++;
-	}
-
-      putchar('\n');
-
-      g_strfreev(pargv);
+      printf("\"%s\" ", *parg);
+      parg++;
    }
+
+  putchar('\n');
+
+  g_strfreev(pargv);
+}
+
+
+int main(int argc, char **argv)
+{
+  glibtop_init();
+
+  show_args(getpid(), 0);
+  show_args(getpid(), 15);
+
+  while(*++argv)
+    {
+      pid_t pid = strtol(*argv, NULL, 10);
+      show_args(pid, 0);
+      show_args(pid, 15);
+    }
+
+  glibtop_close();
+
+  return 0;
 }

--- a/features.def
+++ b/features.def
@@ -20,3 +20,5 @@ glibtop_mountentry *|@mountlist|ulong(number,size,total)|int(all_fs)
 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)
+
--- a/glibtop.h
+++ b/glibtop.h
@@ -26,6 +26,27 @@

 typedef struct _glibtop		glibtop;

+/**
+ *  LIBGTOP_CHECK_VERSION
+ *  @major: Major version number
+ *  @minor: Minor version number
+ *  @micro: Micro version number
+ *
+ *  Checks if the version given is compatable with this version of the
+ *  library.  For example, LIBGTOP_CHECK_VERSION(1.2.3) would return TRUE
+ *  if the version is 1.2.5, and FALSE if 1.1.0.  This can be used in
+ *  build tests.
+ *
+ **/
+
+#include <libgtopconfig.h>
+
+#define LIBGTOP_CHECK_VERSION(major, minor, micro)    \
+(LIBGTOP_MAJOR_VERSION > (major) || \
+(LIBGTOP_MAJOR_VERSION == (major) && LIBGTOP_MINOR_VERSION > (minor)) || \
+(LIBGTOP_MAJOR_VERSION == (major) && LIBGTOP_MINOR_VERSION == (minor) && \
+LIBGTOP_MICRO_VERSION >= (micro)))
+

 #include <glibtop/global.h>

@@ -43,6 +64,7 @@ typedef struct _glibtop		glibtop;

 #include <glibtop/sysdeps.h>

+#include <glibtop/close.h>

 struct _glibtop
 {
--- a/include/glibtop/Makefile.am
+++ b/include/glibtop/Makefile.am
@@ -7,4 +7,4 @@ glibtop_HEADERS		= close.h loadavg.h prockernel.h procstate.h \
 			  procsegment.h read.h sysdeps.h global.h \
 			  procsignal.h read_data.h union.h types.h gnuserv.h \
 			  parameter.h mountlist.h fsusage.h procmap.h signal.h \
-			  inodedb.h sysinfo.h ppp.h procargs.h netload.h
+			  inodedb.h sysinfo.h ppp.h procargs.h netload.h netlist.h
--- a/include/glibtop/command.h
+++ b/include/glibtop/command.h
@@ -57,8 +57,9 @@ G_BEGIN_DECLS
 #define GLIBTOP_CMND_FSUSAGE		21
 #define GLIBTOP_CMND_NETLOAD		22
 #define GLIBTOP_CMND_PPP		23
+#define GLIBTOP_CMND_NETLIST		24

-#define GLIBTOP_MAX_CMND		24
+#define GLIBTOP_MAX_CMND		25

 #define _GLIBTOP_PARAM_SIZE		16

--- a/include/glibtop/netlist.h
+++ b/include/glibtop/netlist.h
@@ -0,0 +1,71 @@
+/* Copyright (C) 2004 Benoît Dejean
+   This file is part of LibGTop 2.0.
+
+   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_NETLIST_H__
+#define __GLIBTOP_NETLIST_H__
+
+#include <glibtop.h>
+#include <glibtop/global.h>
+
+G_BEGIN_DECLS
+
+#define GLIBTOP_NETLIST_NUMBER		0
+
+#define GLIBTOP_MAX_NETLIST		1
+
+typedef struct _glibtop_netlist	glibtop_netlist;
+
+struct _glibtop_netlist
+{
+	guint64 flags;
+	guint32 number;
+};
+
+#define glibtop_get_netlist(netlist)	glibtop_get_netlist_l(glibtop_global_server, netlist)
+
+#if GLIBTOP_SUID_NETLIST
+#define glibtop_get_netlist_r		glibtop_get_netlist_p
+#else
+#define glibtop_get_netlist_r		glibtop_get_netlist_s
+#endif
+
+char** glibtop_get_netlist_l (glibtop *server, glibtop_netlist *buf);
+
+#if GLIBTOP_SUID_NETLIST
+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);
+char** glibtop_get_netlist_s (glibtop *server, glibtop_netlist *buf);
+#endif
+
+#ifdef GLIBTOP_NAMES
+
+/* You need to link with -lgtop_names to get this stuff here. */
+
+extern const char *glibtop_names_netlist [];
+extern const unsigned glibtop_types_netlist [];
+extern const char *glibtop_labels_netlist [];
+extern const char *glibtop_descriptions_netlist [];
+
+#endif
+
+G_END_DECLS
+
+#endif
--- a/include/glibtop/procargs.h
+++ b/include/glibtop/procargs.h
@@ -85,28 +85,6 @@ glibtop_get_proc_argv_l (glibtop *server, glibtop_proc_args *buf,
 #define glibtop_get_proc_argv(proc_args,pid,max_len) glibtop_get_proc_argv_l(glibtop_global_server, proc_args, pid, max_len)


-#if GLIBTOP_SUID_PROC_ARGS
-
-# define glibtop_get_proc_argv_r		glibtop_get_proc_args_p
-# define glibtop_init_proc_argv_p		glibtop_init_proc_args_p
-
-  char **
-  glibtop_get_proc_argv_p (glibtop *server, glibtop_proc_args *buf,
-			   pid_t pid, unsigned max_len);
-
-
-#else /* !GLIBTOP_SUID_PROC_ARGS */
-
-# define glibtop_get_proc_argv_r		glibtop_get_proc_args_s
-# define glibtop_init_proc_argv_s		glibtop_init_proc_args_s
-
-  char **
-  glibtop_get_proc_argv_s (glibtop *server, glibtop_proc_args *buf,
-			   pid_t pid, unsigned max_len);
-#endif /* GLIBTOP_SUID_PROC_ARGS */
-
-
-
 #ifdef GLIBTOP_NAMES

 /* You need to link with -lgtop_names to get this stuff here. */
--- a/include/glibtop/sysdeps.h
+++ b/include/glibtop/sysdeps.h
@@ -51,8 +51,9 @@ G_BEGIN_DECLS
 #define GLIBTOP_SYSDEPS_FSUSAGE		20
 #define GLIBTOP_SYSDEPS_NETLOAD		21
 #define GLIBTOP_SYSDEPS_PPP		22
+#define GLIBTOP_SYSDEPS_NETLIST		23

-#define GLIBTOP_MAX_SYSDEPS		23
+#define GLIBTOP_MAX_SYSDEPS		24

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

@@ -86,6 +87,7 @@ struct _glibtop_sysdeps
 		proc_map,		/* glibtop_proc_map	*/
 		mountlist,		/* glibtop_mountlist	*/
 		fsusage,		/* glibtop_fsusage	*/
+		netlist,		/* glibtop_netlist	*/
 		netload,		/* glibtop_netload	*/
 		ppp;			/* glibtop_ppp		*/
 };
--- a/include/glibtop/union.h
+++ b/include/glibtop/union.h
@@ -48,6 +48,7 @@
 #include <glibtop/fsusage.h>

 #include <glibtop/netload.h>
+#include <glibtop/netlist.h>
 #include <glibtop/ppp.h>

 G_BEGIN_DECLS
@@ -76,6 +77,7 @@ union _glibtop_union
 	glibtop_proc_map	proc_map;
 	glibtop_mountlist	mountlist;
 	glibtop_fsusage		fsusage;
+	glibtop_netlist		netlist;
 	glibtop_netload		netload;
 	glibtop_ppp		ppp;
 };
--- a/include/glibtop/version.h
+++ b/include/glibtop/version.h
@@ -23,9 +23,6 @@
 #define __GLIBTOP_VERSION_H__

 #include <glibtop.h>
-#include <glibtop/union.h>
-#include <glibtop/sysdeps.h>
-#include <glibtop/command.h>

 #define LIBGTOP_VERSION_STRING "Libgtop %s server version %s (%u,%u,%u,%u)."

--- a/kernel/ChangeLog
+++ b/kernel/ChangeLog
@@ -1,14 +0,0 @@
-1998-07-21  Martin Baulig  <martin@home-of-linux.org>
-
-	* table20: New directory for 2.0.xx kernels.
-
-	* table21: New directory for 2.1.xx kernels.
-
-	* *: Moved into `table20' and `table21'.
-
-1998-06-14  Martin Baulig  <baulig@taurus.uni-trier.de>
-
-	* README: Added README.
-
-	* kernel.patch: Patch for the Linux kernel to add the
-	new system call.
--- a/kernel/sysctl/.cvsignore
+++ b/kernel/sysctl/.cvsignore
@@ -1 +0,0 @@
-*.flags
--- a/kernel/sysctl/Makefile
+++ b/kernel/sysctl/Makefile
@@ -1,22 +0,0 @@
-#
-# Makefile for the LibGTop linux sysctl interface.
-#
-# Note! Dependencies are done automagically by 'make dep', which also
-# removes any old dependencies. DON'T put your own dependencies here
-# unless it's something special (ie not a .c file).
-#
-# Note 2! The CFLAGS definition is now in the main makefile...
-
-O_TARGET := kernel.o
-ifeq ($(CONFIG_LIBGTOP),y)
-O_OJBS   := main.o libgtop.o
-else
-O_OBJS   := main.o
-endif
-OX_OBJS  := libgtop_syms.o
-
-ifeq ($(CONFIG_LIBGTOP),m)
-M_OBJS   := libgtop.o
-endif
-
-include $(TOPDIR)/Rules.make
--- a/kernel/sysctl/libgtop.c
+++ b/kernel/sysctl/libgtop.c
--- a/kernel/sysctl/libgtop.h
+++ b/kernel/sysctl/libgtop.h
@@ -1,242 +0,0 @@
-#ifndef _LINUX_LIBGTOP_H
-#define _LINUX_LIBGTOP_H 1
-
-#include <linux/tasks.h>
-
-enum {
-    LIBGTOP_VERSION = 1,
-    LIBGTOP_UPDATE_EXPENSIVE,
-    LIBGTOP_STAT = 101,
-    LIBGTOP_MEM,
-    LIBGTOP_SWAP,
-    LIBGTOP_PROCLIST = 201,
-    LIBGTOP_PROC_STATE = 211,
-    LIBGTOP_PROC_KERNEL,
-    LIBGTOP_PROC_SEGMENT,
-    LIBGTOP_PROC_MEM,
-    LIBGTOP_PROC_SIGNAL,
-    LIBGTOP_PROC_ARGS = 251,
-    LIBGTOP_PROC_MAPS,
-    LIBGTOP_NETLOAD = 301
-};
-
-enum {
-    LIBGTOP_PROCLIST_ALL = 0,
-    LIBGTOP_PROCLIST_PID,
-    LIBGTOP_PROCLIST_PGRP,
-    LIBGTOP_PROCLIST_SESSION,
-    LIBGTOP_PROCLIST_TTY,
-    LIBGTOP_PROCLIST_UID,
-    LIBGTOP_PROCLIST_RUID
-};
-
-#define LIBGTOP_NSIG			4
-
-#define LIBGTOP_PROCLIST_MASK		15
-#define LIBGTOP_MAX_GROUPS		32
-
-#define LIBGTOP_EXCLUDE_IDLE		0x1000
-#define LIBGTOP_EXCLUDE_SYSTEM		0x2000
-#define LIBGTOP_EXCLUDE_NOTTY		0x4000
-
-#define LIBGTOP_TASK_RUNNING		1
-#define LIBGTOP_TASK_INTERRUPTIBLE	2
-#define LIBGTOP_TASK_UNINTERRUPTIBLE	4
-#define LIBGTOP_TASK_ZOMBIE		8
-#define LIBGTOP_TASK_STOPPED		16
-#define LIBGTOP_TASK_SWAPPING		32
-
-#define LIBGTOP_VM_READ		0x0001	/* currently active flags */
-#define LIBGTOP_VM_WRITE	0x0002
-#define LIBGTOP_VM_EXEC		0x0004
-#define LIBGTOP_VM_SHARED	0x0008
-
-#define LIBGTOP_VM_MAYREAD	0x0010	/* limits for mprotect() etc */
-#define LIBGTOP_VM_MAYWRITE	0x0020
-#define LIBGTOP_VM_MAYEXEC	0x0040
-#define LIBGTOP_VM_MAYSHARE	0x0080
-
-#define LIBGTOP_VM_GROWSDOWN	0x0100	/* general info on the segment */
-#define LIBGTOP_VM_GROWSUP	0x0200
-#define LIBGTOP_VM_SHM		0x0400	/* shared memory area, don't swap out */
-#define LIBGTOP_VM_DENYWRITE	0x0800	/* ETXTBSY on write attempts.. */
-
-#define LIBGTOP_VM_EXECUTABLE	0x1000
-#define LIBGTOP_VM_LOCKED	0x2000
-#define LIBGTOP_VM_IO		0x4000  /* Memory mapped I/O or similar */
-
-#define LIBGTOP_MAP_PATH_LEN	(PAGE_SIZE - sizeof (libgtop_proc_maps_header_t))
-
-#ifndef min
-#define min(a,b) ((a < b) ? a : b)
-#endif
-
-typedef struct libgtop_stat libgtop_stat_t;
-
-typedef struct libgtop_cpu libgtop_cpu_t;
-typedef struct libgtop_mem libgtop_mem_t;
-typedef struct libgtop_swap libgtop_swap_t;
-typedef struct libgtop_proclist libgtop_proclist_t;
-
-typedef struct libgtop_proc_state libgtop_proc_state_t;
-typedef struct libgtop_proc_kernel libgtop_proc_kernel_t;
-typedef struct libgtop_proc_segment libgtop_proc_segment_t;
-typedef struct libgtop_proc_mem libgtop_proc_mem_t;
-typedef struct libgtop_proc_signal libgtop_proc_signal_t;
-
-typedef struct libgtop_proc_maps_header libgtop_proc_maps_header_t;
-typedef struct libgtop_proc_maps libgtop_proc_maps_t;
-
-typedef struct libgtop_netload libgtop_netload_t;
-
-struct libgtop_cpu
-{
-    unsigned long total;		/* Total CPU Time		*/
-    unsigned long user;			/* CPU Time in User Mode	*/
-    unsigned long nice;			/* CPU Time in User Mode (nice)	*/
-    unsigned long sys;			/* CPU Time in System Mode	*/
-    unsigned long idle;			/* CPU Time in the Idle Task	*/
-};
-
-struct libgtop_mem
-{
-    unsigned long totalram;		/* Total usable main memory size */
-    unsigned long freeram;		/* Available memory size */
-    unsigned long sharedram;		/* Amount of shared memory */
-    unsigned long bufferram;		/* Memory used by buffers */
-    unsigned long cachedram;
-};
-
-struct libgtop_swap
-{
-    unsigned long totalswap;		/* Total swap space size */
-    unsigned long freeswap;		/* swap space still available */
-};
-
-struct libgtop_proclist
-{
-    int count;
-    int nr_running, nr_tasks, last_pid;
-    unsigned pids [NR_TASKS];
-};
-
-struct libgtop_stat
-{
-    int ncpu;				/* Number of CPUs		*/
-    unsigned long frequency;		/* Tick frequency (HZ)		*/
-    libgtop_cpu_t cpu;			/* CPU statistics		*/
-    libgtop_cpu_t xcpu [NR_CPUS];	/* SMP per-CPU statistics	*/
-    double loadavg [3];			/* Load average			*/
-    unsigned long total_forks;		/* Total # of forks		*/
-    unsigned int context_swtch;		/* Total # of context switches	*/
-    unsigned long boot_time;		/* Boot time (seconds s. epoch)	*/
-    unsigned int pgpgin, pgpgout;	/* # of pages paged in/out	*/
-    unsigned int pswpin, pswpout;	/* # of swap pgs brought in/out	*/
-};
-
-struct libgtop_proc_state
-{
-    long state;
-    unsigned long flags;
-    char comm [16];
-    int uid, euid, suid, fsuid;
-    int gid, egid, sgid, fsgid;
-    int pid, pgrp, ppid;
-    int session;
-    unsigned int tty;
-    int tpgid;
-    long priority, counter, def_priority;
-    long utime, stime, cutime, cstime, start_time;
-    long per_cpu_utime [NR_CPUS], per_cpu_stime [NR_CPUS];
-    int has_cpu, processor, last_processor;
-
-    unsigned long context;
-    unsigned long start_code, end_code, start_data, end_data;
-    unsigned long start_brk, brk, start_stack, start_mmap;
-    unsigned long arg_start, arg_end, env_start, env_end;
-    unsigned long rss, rlim, total_vm, locked_vm;
-
-    unsigned long policy, rt_priority;
-    unsigned long it_real_value, it_prof_value, it_virt_value;
-    unsigned long it_real_incr, it_prof_incr, it_virt_incr;
-
-    unsigned long keip, kesp;
-    unsigned long min_flt, maj_flt, cmin_flt, cmaj_flt;
-    unsigned long nswap, cnswap;
-
-    int ngroups, groups [LIBGTOP_MAX_GROUPS];
-};
-
-struct libgtop_proc_kernel
-{
-    unsigned long wchan;
-};
-
-struct libgtop_proc_segment
-{
-    unsigned long vsize, data, exec, stack, lib;
-};
-
-struct libgtop_proc_mem
-{
-    libgtop_proc_segment_t segment;
-    int size, resident, share, trs, lrs, drs, dt;
-    unsigned long rss, rlim;
-};
-
-struct libgtop_proc_signal
-{
-    unsigned long signal [LIBGTOP_NSIG];
-    unsigned long blocked [LIBGTOP_NSIG];
-    unsigned long ignore [LIBGTOP_NSIG];
-    unsigned long catch [LIBGTOP_NSIG];
-};
-
-struct libgtop_proc_maps_header
-{
-    unsigned long start, end, offset, perm;
-    off_t filename_offset;
-    ino_t inode;
-    dev_t device;
-} __attribute__ ((aligned (64)));
-
-struct libgtop_proc_maps
-{
-    libgtop_proc_maps_header_t header;
-    char filename [LIBGTOP_MAP_PATH_LEN];
-};
-
-struct libgtop_netload
-{
-    unsigned long rx_packets;		/* total packets received	*/
-    unsigned long tx_packets;		/* total packets transmitted	*/
-    unsigned long rx_bytes;		/* total bytes received 	*/
-    unsigned long tx_bytes;		/* total bytes transmitted	*/
-    unsigned long rx_errors;		/* bad packets received		*/
-    unsigned long tx_errors;		/* packet transmit problems	*/
-    unsigned long rx_dropped;		/* no space in linux buffers	*/
-    unsigned long tx_dropped;		/* no space available in linux	*/
-    unsigned long multicast;		/* multicast packets received	*/
-    unsigned long collisions;
-
-    /* detailed rx_errors: */
-    unsigned long rx_length_errors;
-    unsigned long rx_over_errors;	/* receiver ring buff overflow	*/
-    unsigned long rx_crc_errors;	/* recved pkt with crc error	*/
-    unsigned long rx_frame_errors;	/* recv'd frame alignment error */
-    unsigned long rx_fifo_errors;	/* recv'r fifo overrun		*/
-    unsigned long rx_missed_errors;	/* receiver missed packet	*/
-
-    /* detailed tx_errors */
-    unsigned long tx_aborted_errors;
-    unsigned long tx_carrier_errors;
-    unsigned long tx_fifo_errors;
-    unsigned long tx_heartbeat_errors;
-    unsigned long tx_window_errors;
-
-    /* for cslip etc */
-    unsigned long rx_compressed;
-    unsigned long tx_compressed;
-};
-
-#endif
--- a/kernel/sysctl/libgtop_syms.c
+++ b/kernel/sysctl/libgtop_syms.c
@@ -1,30 +0,0 @@
-/*
- * linux/libgtop/libgtop_syms.c
- * Copyright (C) 1999 Martin Baulig
- */
-
-#include <linux/config.h>
-#include <linux/module.h>
-
-#include <linux/sched.h>
-
-#include <linux/mm.h>
-#include <linux/pagemap.h>
-#include <linux/swap.h>
-
-extern unsigned long total_forks;
-
-EXPORT_SYMBOL(task);
-EXPORT_SYMBOL(init_mm);
-EXPORT_SYMBOL(pidhash);
-EXPORT_SYMBOL(avenrun);
-EXPORT_SYMBOL(nr_running);
-EXPORT_SYMBOL(nr_tasks);
-EXPORT_SYMBOL(last_pid);
-EXPORT_SYMBOL(total_forks);
-EXPORT_SYMBOL(si_swapinfo);
-
-extern void scheduling_functions_start_here(void);
-extern void scheduling_functions_end_here(void);
-EXPORT_SYMBOL(scheduling_functions_start_here);
-EXPORT_SYMBOL(scheduling_functions_end_here);
--- a/kernel/sysctl/main.c
+++ b/kernel/sysctl/main.c
@@ -1,4 +0,0 @@
-/*
- * linux/libgtop/main.c
- * Copyright (C) 1999 Martin Baulig
- */
--- a/kernel/sysctl/patch-2.2.1
+++ b/kernel/sysctl/patch-2.2.1
@@ -1,81 +0,0 @@
-diff -ru linux-2.2.1/Makefile hacker/Makefile
--- linux-2.2.1/Makefile	Sun Jan 31 22:45:42 1999
-+++ hacker/Makefile	Sun Mar 21 16:10:41 1999
-@@ -109,6 +109,7 @@
- DRIVERS		=drivers/block/block.a \
- 		 drivers/char/char.a \
- 	         drivers/misc/misc.a
-+EXTRAS		=
- LIBS		=$(TOPDIR)/lib/lib.a
- SUBDIRS		=kernel drivers mm fs net ipc lib
- 
-@@ -186,6 +187,11 @@
- DRIVERS := $(DRIVERS) drivers/net/irda/irda_drivers.a
- endif
- 
-+ifdef CONFIG_LIBGTOP
-+SUBDIRS := $(SUBDIRS) libgtop
-+EXTRAS  := $(EXTRAS) libgtop/kernel.o
-+endif
-+
- include arch/$(ARCH)/Makefile
- 
- .S.s:
-@@ -206,6 +212,7 @@
- 		$(FILESYSTEMS) \
- 		$(NETWORKS) \
- 		$(DRIVERS) \
-+		$(EXTRAS) \
- 		$(LIBS) \
- 		--end-group \
- 		-o vmlinux
-diff -ru linux-2.2.1/arch/i386/config.in hacker/arch/i386/config.in
--- linux-2.2.1/arch/i386/config.in	Sun Jan 31 22:25:25 1999
-+++ hacker/arch/i386/config.in	Sat Mar 20 18:26:18 1999
-@@ -84,6 +84,9 @@
- bool 'System V IPC' CONFIG_SYSVIPC
- bool 'BSD Process Accounting' CONFIG_BSD_PROCESS_ACCT
- bool 'Sysctl support' CONFIG_SYSCTL
-+if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
-+  tristate 'LibGTop support' CONFIG_LIBGTOP
-+fi
- tristate 'Kernel support for a.out binaries' CONFIG_BINFMT_AOUT
- tristate 'Kernel support for ELF binaries' CONFIG_BINFMT_ELF
- tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC
-diff -ru linux-2.2.1/include/linux/sysctl.h hacker/include/linux/sysctl.h
--- linux-2.2.1/include/linux/sysctl.h	Sun Jan 31 22:24:14 1999
-+++ hacker/include/linux/sysctl.h	Sat Mar 20 19:12:54 1999
-@@ -56,7 +56,8 @@
- 	CTL_PROC=4,		/* Process info */
- 	CTL_FS=5,		/* Filesystems */
- 	CTL_DEBUG=6,		/* Debugging */
-	CTL_DEV=7		/* Devices */
-+	CTL_DEV=7,		/* Devices */
-+	CTL_LIBGTOP=408		/* LibGTop */
- };
- 
- 
-diff -ru linux-2.2.1/kernel/sysctl.c hacker/kernel/sysctl.c
--- linux-2.2.1/kernel/sysctl.c	Sun Jan 31 22:24:43 1999
-+++ hacker/kernel/sysctl.c	Sat Mar 20 19:24:34 1999
-@@ -82,7 +82,9 @@
- static ctl_table fs_table[];
- static ctl_table debug_table[];
- static ctl_table dev_table[];
-
-+#ifdef CONFIG_LIBGTOP
-+extern ctl_table libgtop_table[];
-+#endif
- 
- /* /proc declarations: */
- 
-@@ -148,6 +150,9 @@
- 	{CTL_FS, "fs", NULL, 0, 0555, fs_table},
- 	{CTL_DEBUG, "debug", NULL, 0, 0555, debug_table},
-         {CTL_DEV, "dev", NULL, 0, 0555, dev_table},
-+#ifdef CONFIG_LIBGTOP
-+	{CTL_LIBGTOP, "libgtop", NULL, 0, 0555, libgtop_table},
-+#endif
- 	{0}
- };
- 
--- a/kernel/sysctl/patch-2.2.x
+++ b/kernel/sysctl/patch-2.2.x
@@ -1,93 +0,0 @@
-diff -ru kernel-source-2.2.12/Makefile hacker-2.2.12/Makefile
--- kernel-source-2.2.12/Makefile	Thu Aug 26 02:29:45 1999
-+++ hacker-2.2.12/Makefile	Sat Dec 18 17:33:04 1999
-@@ -113,6 +113,7 @@
- DRIVERS		=drivers/block/block.a \
- 		 drivers/char/char.a \
- 	         drivers/misc/misc.a
-+EXTRAS		=
- LIBS		=$(TOPDIR)/lib/lib.a
- SUBDIRS		=kernel drivers mm fs net ipc lib
- 
-@@ -202,6 +203,11 @@
- DRIVERS := $(DRIVERS) drivers/net/irda/irda_drivers.a
- endif
- 
-+ifdef CONFIG_LIBGTOP
-+SUBDIRS := $(SUBDIRS) libgtop
-+EXTRAS  := $(EXTRAS) libgtop/kernel.o
-+endif
-+
- include arch/$(ARCH)/Makefile
- 
- .S.s:
-@@ -222,6 +228,7 @@
- 		$(FILESYSTEMS) \
- 		$(NETWORKS) \
- 		$(DRIVERS) \
-+		$(EXTRAS) \
- 		$(LIBS) \
- 		--end-group \
- 		-o vmlinux
-diff -ru kernel-source-2.2.12/arch/i386/config.in hacker-2.2.12/arch/i386/config.in
--- kernel-source-2.2.12/arch/i386/config.in	Thu Oct 14 00:57:46 1999
-+++ hacker-2.2.12/arch/i386/config.in	Sat Dec 18 17:33:04 1999
-@@ -88,6 +88,9 @@
- bool 'System V IPC' CONFIG_SYSVIPC
- bool 'BSD Process Accounting' CONFIG_BSD_PROCESS_ACCT
- bool 'Sysctl support' CONFIG_SYSCTL
-+if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
-+  tristate 'LibGTop support' CONFIG_LIBGTOP
-+fi
- tristate 'Kernel support for a.out binaries' CONFIG_BINFMT_AOUT
- tristate 'Kernel support for ELF binaries' CONFIG_BINFMT_ELF
- tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC
-diff -ru kernel-source-2.2.12/include/linux/autoconf.h hacker-2.2.12/include/linux/autoconf.h
--- kernel-source-2.2.12/include/linux/autoconf.h	Sat Dec  4 01:20:30 1999
-+++ hacker-2.2.12/include/linux/autoconf.h	Sat Dec 18 17:41:44 1999
-@@ -53,6 +53,8 @@
- #define CONFIG_SYSVIPC 1
- #define CONFIG_BSD_PROCESS_ACCT 1
- #define CONFIG_SYSCTL 1
-+#undef  CONFIG_LIBGTOP
-+#define CONFIG_LIBGTOP_MODULE 1
- #undef  CONFIG_BINFMT_AOUT
- #define CONFIG_BINFMT_AOUT_MODULE 1
- #define CONFIG_BINFMT_ELF 1
-diff -ru kernel-source-2.2.12/include/linux/sysctl.h hacker-2.2.12/include/linux/sysctl.h
--- kernel-source-2.2.12/include/linux/sysctl.h	Mon Aug  9 21:05:13 1999
-+++ hacker-2.2.12/include/linux/sysctl.h	Sat Dec 18 17:34:38 1999
-@@ -57,7 +57,8 @@
- 	CTL_FS=5,		/* Filesystems */
- 	CTL_DEBUG=6,		/* Debugging */
- 	CTL_DEV=7,		/* Devices */
-	CTL_BUS=8		/* Buses */
-+	CTL_BUS=8,		/* Buses */
-+	CTL_LIBGTOP=408		/* LibGTop */
- };
- 
- /* CTL_BUS names: */
-diff -ru kernel-source-2.2.12/kernel/sysctl.c hacker-2.2.12/kernel/sysctl.c
--- kernel-source-2.2.12/kernel/sysctl.c	Mon Aug  9 21:05:13 1999
-+++ hacker-2.2.12/kernel/sysctl.c	Sat Dec 18 17:33:04 1999
-@@ -83,7 +83,9 @@
- static ctl_table fs_table[];
- static ctl_table debug_table[];
- static ctl_table dev_table[];
-
-+#ifdef CONFIG_LIBGTOP
-+extern ctl_table libgtop_table[];
-+#endif
- 
- /* /proc declarations: */
- 
-@@ -149,6 +151,9 @@
- 	{CTL_FS, "fs", NULL, 0, 0555, fs_table},
- 	{CTL_DEBUG, "debug", NULL, 0, 0555, debug_table},
-         {CTL_DEV, "dev", NULL, 0, 0555, dev_table},
-+#ifdef CONFIG_LIBGTOP
-+	{CTL_LIBGTOP, "libgtop", NULL, 0, 0555, libgtop_table},
-+#endif
- 	{0}
- };
- 
--- a/kernel/table.h
+++ b/kernel/table.h
@@ -1,188 +0,0 @@
-#ifndef _LINUX_TABLE_H
-#define _LINUX_TABLE_H
-
-#ifdef _KERNEL
-#include <linux/types.h>
-#else
-#define NR_TASKS		512
-#endif
-
-#define TABLE_KERN_PROC_ALL		0	/* all processes */
-#define TABLE_KERN_PROC_PID		1
-#define TABLE_KERN_PROC_PGRP		2
-#define TABLE_KERN_PROC_SESSION		3
-#define TABLE_KERN_PROC_TTY		4
-#define TABLE_KERN_PROC_UID		5
-#define TABLE_KERN_PROC_RUID		6
-
-#define TABLE_KERN_PROC_MASK		15
-
-#define TABLE_EXCLUDE_IDLE		0x1000
-#define TABLE_EXCLUDE_SYSTEM		0x2000
-#define TABLE_EXCLUDE_NOTTY		0x4000
-
-#define TABLE_VERSION		0
-#define TABLE_CPU		1
-#define TABLE_MEM		2
-#define TABLE_SWAP		3
-#define TABLE_LOADAVG		4
-#define TABLE_UPTIME		5
-#define TABLE_PROCLIST		6
-#define TABLE_PROC_UID		7
-#define TABLE_PROC_MEM		8
-#define TABLE_PROC_SEGMENT	9
-#define TABLE_PROC_TIME		10
-#define TABLE_PROC_STATE	11
-#define TABLE_PROC_SIGNAL	12
-#define TABLE_PROC_KERNEL	13
-
-/* CPU Usage (in jiffies = 1/100th seconds) */
-
-struct table_cpu
-{
-	unsigned long total;		/* Total CPU Time		*/
-	unsigned long user;		/* CPU Time in User Mode	*/
-	unsigned long nice;		/* CPU Time in User Mode (nice)	*/
-	unsigned long sys;		/* CPU Time in System Mode	*/
-	unsigned long idle;		/* CPU Time in the Idle Task	*/
-	unsigned long frequency;	/* Tick frequency		*/
-};
-
-/* Memory Usage (in bytes) */
-
-struct table_mem
-{
-	unsigned long total;		/* Total physical memory	*/
-	unsigned long used;		/* Used memory size		*/
-	unsigned long free;		/* Free memory size		*/
-	unsigned long shared;		/* Shared memory size		*/
-	unsigned long buffer;		/* Size of buffers		*/
-	unsigned long cached;		/* Size of cached memory       	*/
-};
-
-/* Swap Space (in bytes) */
-
-struct table_swap
-{
-	unsigned long total;		/* Total swap space		*/
-	unsigned long used;		/* Used swap space		*/
-	unsigned long free;		/* Free swap space		*/
-	unsigned long pagein;		/* Total # of pages swapped in	*/
-	unsigned long pageout;		/* Total # of pages swapped out	*/
-};
-
-/* Load average */
-
-struct table_loadavg
-{
-	double loadavg [3];
-	unsigned nr_running;
-	unsigned nr_tasks;
-	unsigned last_pid;
-};
-
-/* Uptime */
-
-struct table_uptime
-{
-	unsigned long uptime;
-	unsigned long idle;
-};
-
-/* Process list. */
-
-struct proclist_args
-{
-	int which, arg;
-};
-
-struct table_proclist
-{
-	int nr_running, nr_tasks, last_pid;
-	unsigned pids [NR_TASKS];
-};
-
-/* Information about processes. */
-
-struct table_proc_state
-{
-	long state;
-	unsigned long flags;
-	char comm[16];
-	int uid, gid;
-};
-
-struct table_proc_uid
-{
-	int uid, euid, suid, fsuid;
-	int gid, egid, sgid, fsgid;
-	int pid, pgrp, ppid;
-	int session;
-	unsigned int tty;
-	int tpgid;
-	long priority;
-	long counter;
-	long def_priority;
-};
-
-struct table_proc_mem
-{
-	unsigned long context;
-	unsigned long start_code, end_code, start_data, end_data;
-	unsigned long start_brk, brk, start_stack, start_mmap;
-	unsigned long arg_start, arg_end, env_start, env_end;
-	unsigned long rss, rlim, total_vm, locked_vm;
-};
-
-struct table_proc_segment
-{
-	unsigned long vsize;
-	unsigned long size, resident, shared;
-	unsigned long trs, lrs, drs, srs, dt;
-};
-
-struct table_proc_time
-{
-	long utime, stime, cutime, cstime, start_time;
-	unsigned long timeout, policy, rt_priority;
-	unsigned long it_real_value, it_prof_value, it_virt_value;
-	unsigned long it_real_incr, it_prof_incr, it_virt_incr;
-};
-
-struct table_proc_signal
-{
-	unsigned long long signal,
-		blocked,	/* bitmap of masked signals */
-		ignored,	/* mask of ignored signals */
-		caught;		/* mask of caught signals */
-};
-
-struct table_proc_kernel
-{
-	unsigned long keip, kesp, wchan;
-	unsigned long min_flt, maj_flt, cmin_flt, cmaj_flt;
-	unsigned long nswap, cnswap;
-};
-
-/* Union */
-
-union table
-{
-	struct table_cpu cpu;
-	struct table_mem mem;
-	struct table_swap swap;
-	struct table_loadavg loadavg;
-	struct table_uptime uptime;
-	struct table_proclist proclist;
-	struct table_proc_uid proc_uid;
-	struct table_proc_mem proc_mem;
-	struct table_proc_segment proc_segment;
-	struct table_proc_time proc_time;
-	struct table_proc_state proc_state;
-	struct table_proc_signal proc_signal;
-	struct table_proc_kernel proc_kernel;
-};
-
-#endif /* _LINUX_IPC_H */
-
-
--- a/kernel/table20/Makefile
+++ b/kernel/table20/Makefile
@@ -1,13 +0,0 @@
-#
-# Makefile for the linux system information tables.
-#
-# Note! Dependencies are done automagically by 'make dep', which also
-# removes any old dependencies. DON'T put your own dependencies here
-# unless it's something special (ie not a .c file).
-#
-# Note 2! The CFLAGS definition is now in the main makefile...
-
-O_TARGET := table.o
-O_OBJS   := main.o
-
-include $(TOPDIR)/Rules.make
--- a/kernel/table20/README
+++ b/kernel/table20/README
@@ -1,21 +0,0 @@
-This is a new system call `table ()' for the Linux table. It is faster
-than reading from /proc and can be used to fetch all information required
-for libgtop until whe have some other function (extended sysctl, ...) in
-standard kernels.
-
-I didn't want to change sysctl or some other function myself cause this may
-cause other applications relying upon those function to fail. This is
-something for the ``real'' kernel gurus ...
-
-To use this new system call for libgtop, do the following:
-
-* Copy this directory to /usr/src/linux/table
-* Make /usr/src/linux/include/linux/table.h symlink to /usr/src/linux/table/table.h
-* Apply the patch `kernel.patch' to the kernel, compile, install and reboot
-* Recompile libgtop (remove `config.cache' and run the `autogen.sh' again).
-
-If you want to change and/or add something - feel free to do so !
-
-Have fun,
-
-Martin
--- a/kernel/table20/entry-i386.S
+++ b/kernel/table20/entry-i386.S
@@ -1,706 +0,0 @@
-/*
- *  linux/arch/i386/entry.S
- *
- *  Copyright (C) 1991, 1992  Linus Torvalds
- */
-
-/*
- * entry.S contains the system-call and fault low-level handling routines.
- * This also contains the timer-interrupt handler, as well as all interrupts
- * and faults that can result in a task-switch.
- *
- * NOTE: This code handles signal-recognition, which happens every time
- * after a timer-interrupt and after each system call.
- *
- * I changed all the .align's to 4 (16 byte alignment), as that's faster
- * on a 486.
- *
- * Stack layout in 'ret_from_system_call':
- * 	ptrace needs to have all regs on the stack.
- *	if the order here is changed, it needs to be 
- *	updated in fork.c:copy_process, signal.c:do_signal,
- *	ptrace.c and ptrace.h
- *
- *	 0(%esp) - %ebx
- *	 4(%esp) - %ecx
- *	 8(%esp) - %edx
- *       C(%esp) - %esi
- *	10(%esp) - %edi
- *	14(%esp) - %ebp
- *	18(%esp) - %eax
- *	1C(%esp) - %ds
- *	20(%esp) - %es
- *      24(%esp) - %fs
- *	28(%esp) - %gs
- *	2C(%esp) - orig_eax
- *	30(%esp) - %eip
- *	34(%esp) - %cs
- *	38(%esp) - %eflags
- *	3C(%esp) - %oldesp
- *	40(%esp) - %oldss
- */
-
-#include <linux/sys.h>
-#include <linux/linkage.h>
-#include <asm/segment.h>
-#define ASSEMBLY
-#include <asm/smp.h>
-
-EBX		= 0x00
-ECX		= 0x04
-EDX		= 0x08
-ESI		= 0x0C
-EDI		= 0x10
-EBP		= 0x14
-EAX		= 0x18
-DS		= 0x1C
-ES		= 0x20
-FS		= 0x24
-GS		= 0x28
-ORIG_EAX	= 0x2C
-EIP		= 0x30
-CS		= 0x34
-EFLAGS		= 0x38
-OLDESP		= 0x3C
-OLDSS		= 0x40
-
-CF_MASK		= 0x00000001
-IF_MASK		= 0x00000200
-NT_MASK		= 0x00004000
-VM_MASK		= 0x00020000
-
-/*
- * these are offsets into the task-struct.
- */
-state		=  0
-counter		=  4
-priority	=  8
-signal		= 12
-blocked		= 16
-flags		= 20
-dbgreg6		= 52
-dbgreg7		= 56
-exec_domain	= 60
-
-ENOSYS = 38
-
-#define SAVE_ALL \
-	cld; \
-	push %gs; \
-	push %fs; \
-	push %es; \
-	push %ds; \
-	pushl %eax; \
-	pushl %ebp; \
-	pushl %edi; \
-	pushl %esi; \
-	pushl %edx; \
-	pushl %ecx; \
-	pushl %ebx; \
-	movl $(KERNEL_DS),%edx; \
-	mov %dx,%ds; \
-	mov %dx,%es; \
-	movl $(USER_DS),%edx; \
-	mov %dx,%fs;
-
-#ifdef	__SMP__
-
-#define GET_PROCESSOR_ID \
-	movl SYMBOL_NAME(apic_reg), %edx; \
-	movl 32(%edx), %eax;\
-	movl %eax,SYMBOL_NAME(apic_retval); \
-	shrl $24,%eax; \
-	andb $0x0F,%al;
-
-/*
- *	Get the processor ID multiplied by 4
- */
-
-#define GET_PROCESSOR_OFFSET(x) \
-	movl SYMBOL_NAME(apic_reg), x ; \
-	movl 32( x ), x ; \
-	shrl $22, x ; \
-	andl $0x3C, x ;
-
-/* macro LEAVE_KERNEL decrements kernel_counter and resets kernel_flag and
-   saves processor variables if zero */
-#define	LEAVE_KERNEL \
-	pushfl; \
-	cli; \
-	GET_PROCESSOR_ID \
-	btrl $ SMP_FROM_SYSCALL,SYMBOL_NAME(smp_proc_in_lock)(,%eax,4); \
-	decl SYMBOL_NAME(syscall_count); \
-	decl SYMBOL_NAME(kernel_counter); \
-	jnz 1f;	\
-	movb SYMBOL_NAME(saved_active_kernel_processor), %al; \
-	movb %al, SYMBOL_NAME(active_kernel_processor); \
-	cmpb $(NO_PROC_ID), %al; \
-	jnz 1f; \
-	lock; \
-	btrl $0, SYMBOL_NAME(kernel_flag); \
-1:	popfl;
-
-/* macro ENTER_KERNEL waits for entering the kernel, increments
-   kernel_counter, and reloads the processor variables if necessary
-   uses : %eax, %edx (pushed and popped) 
-
-   Note: We go to great pains to minimise the number of locked operations.
-   We want to spin without locking, and lock when we attempt an update.
-   The pentium has a MESI cache so the spin without lock will exit when
-   another CPU write invalidates our cache, and the lock is avoided when
-   possible so we don't play ping-pong games with the cache line.
-
-*/
-
-#ifndef __SMP_PROF__
-
-#define SMP_PROF_A
-#define SMP_PROF_B 
-
-#else
-
-#define SMP_PROF_A movl $0,SYMBOL_NAME(smp_spins_syscall_cur)(,%eax,4);
-#define SMP_PROF_B incl SYMBOL_NAME(smp_spins_syscall)(,%eax,4); \
-        incl SYMBOL_NAME(smp_spins_syscall_cur)(,%eax,4);
-#endif
-
-#define	ENTER_KERNEL \
-	pushl %eax; \
-	pushl %ebx; \
-	pushl %ecx; \
-	pushl %edx; \
-	pushfl; \
-	cli; \
-	movl $6000, %ebx; \
-	movl SYMBOL_NAME(smp_loops_per_tick), %ecx; \
-	GET_PROCESSOR_ID \
-	btsl $ SMP_FROM_SYSCALL,SYMBOL_NAME(smp_proc_in_lock)(,%eax,4); \
-	SMP_PROF_A \
-1:	lock; \
-	btsl $0, SYMBOL_NAME(kernel_flag); \
-	jnc 3f; \
-	cmpb SYMBOL_NAME(active_kernel_processor), %al; \
-	je 4f; \
-2:	SMP_PROF_B \
-	btl %eax, SYMBOL_NAME(smp_invalidate_needed); \
-	jnc 5f; \
-	lock; \
-	btrl %eax, SYMBOL_NAME(smp_invalidate_needed); \
-	jnc 5f; \
-	movl %cr3,%edx; \
-	movl %edx,%cr3; \
-5:	sti; \
-	decl %ecx; \
-	cli; \
-	jne 7f; \
-	decl %ebx; \
-	jne 6f; \
-	call SYMBOL_NAME(non_irq_deadlock_detected); \
-6:	movl SYMBOL_NAME(smp_loops_per_tick), %ecx; \
-	cmpb SYMBOL_NAME(boot_cpu_id), %al; \
-	jne 7f; \
-	incl SYMBOL_NAME(jiffies);  \
-7:	btl $0, SYMBOL_NAME(kernel_flag); \
-	jc 2b; \
-	jmp 1b; \
-3:	movb %al, SYMBOL_NAME(active_kernel_processor); \
-4:	incl SYMBOL_NAME(kernel_counter); \
-	incl SYMBOL_NAME(syscall_count); \
-	popfl; \
-	popl %edx; \
-	popl %ecx; \
-	popl %ebx; \
-	popl %eax;
-
-
-#define RESTORE_ALL \
-	cmpw $(KERNEL_CS),CS(%esp); \
-	je 1f;   \
-	GET_PROCESSOR_OFFSET(%edx) \
-	movl SYMBOL_NAME(current_set)(,%edx), %eax ; ; \
-	movl dbgreg7(%eax),%ebx; \
-	movl %ebx,%db7;	\
-1:	LEAVE_KERNEL \
-	popl %ebx; \
-	popl %ecx; \
-	popl %edx; \
-	popl %esi; \
-	popl %edi; \
-	popl %ebp; \
-	popl %eax; \
-	pop %ds; \
-	pop %es; \
-	pop %fs; \
-	pop %gs; \
-	addl $4,%esp; \
-	iret
-
-#else
-
-#define RESTORE_ALL \
-	cmpw $(KERNEL_CS),CS(%esp); \
-	je 1f;   \
-	movl SYMBOL_NAME(current_set),%eax; \
-	movl dbgreg7(%eax),%ebx; \
-	movl %ebx,%db7;	\
-1:	\
-	popl %ebx; \
-	popl %ecx; \
-	popl %edx; \
-	popl %esi; \
-	popl %edi; \
-	popl %ebp; \
-	popl %eax; \
-	pop %ds; \
-	pop %es; \
-	pop %fs; \
-	pop %gs; \
-	addl $4,%esp; \
-	iret
-#endif
-
-ENTRY(lcall7)
-	pushfl			# We get a different stack layout with call gates,
-	pushl %eax		# which has to be cleaned up later..
-	SAVE_ALL
-#ifdef __SMP__
-	ENTER_KERNEL
-#endif
-	movl EIP(%esp),%eax	# due to call gates, this is eflags, not eip..
-	movl CS(%esp),%edx	# this is eip..
-	movl EFLAGS(%esp),%ecx	# and this is cs..
-	movl %eax,EFLAGS(%esp)	#
-	movl %edx,EIP(%esp)	# Now we move them to their "normal" places
-	movl %ecx,CS(%esp)	#
-	movl %esp,%eax
-#ifdef __SMP__
-	GET_PROCESSOR_OFFSET(%edx)	# Processor offset into edx
-	movl SYMBOL_NAME(current_set)(,%edx),%edx
-#else
-	movl SYMBOL_NAME(current_set),%edx
-#endif
-	pushl %eax
-	movl exec_domain(%edx),%edx	# Get the execution domain
-	movl 4(%edx),%edx	# Get the lcall7 handler for the domain
-	call *%edx
-	popl %eax
-	jmp ret_from_sys_call
-
-	ALIGN
-handle_bottom_half:
-	incl SYMBOL_NAME(intr_count)
-	call SYMBOL_NAME(do_bottom_half)
-	decl SYMBOL_NAME(intr_count)
-	jmp 9f
-	ALIGN
-reschedule:
-	pushl $ret_from_sys_call
-	jmp SYMBOL_NAME(schedule)    # test
-
-ENTRY(system_call)
-	pushl %eax			# save orig_eax
-	SAVE_ALL
-#ifdef __SMP__
-	ENTER_KERNEL
-#endif
-	movl $-ENOSYS,EAX(%esp)
-	cmpl $(NR_syscalls),%eax
-	jae ret_from_sys_call
-	movl SYMBOL_NAME(sys_call_table)(,%eax,4),%eax
-	testl %eax,%eax
-	je ret_from_sys_call
-#ifdef __SMP__
-	GET_PROCESSOR_OFFSET(%edx)
-	movl SYMBOL_NAME(current_set)(,%edx),%ebx
-#else
-	movl SYMBOL_NAME(current_set),%ebx
-#endif
-	andl $~CF_MASK,EFLAGS(%esp)	# clear carry - assume no errors
-	movl %db6,%edx
-	movl %edx,dbgreg6(%ebx)  # save current hardware debugging status
-	testb $0x20,flags(%ebx)		# PF_TRACESYS
-	jne 1f
-	call *%eax
-	movl %eax,EAX(%esp)		# save the return value
-	jmp ret_from_sys_call
-	ALIGN
-1:	call SYMBOL_NAME(syscall_trace)
-	movl ORIG_EAX(%esp),%eax
-	call SYMBOL_NAME(sys_call_table)(,%eax,4)
-	movl %eax,EAX(%esp)		# save the return value
-#ifdef __SMP__
-	GET_PROCESSOR_OFFSET(%eax)
-	movl SYMBOL_NAME(current_set)(,%eax),%eax
-#else
-	movl SYMBOL_NAME(current_set),%eax
-#endif
-	call SYMBOL_NAME(syscall_trace)
-
-	ALIGN
-	.globl ret_from_sys_call
-ret_from_sys_call:
-	cmpl $0,SYMBOL_NAME(intr_count)
-	jne 2f
-9:	movl SYMBOL_NAME(bh_mask),%eax
-	andl SYMBOL_NAME(bh_active),%eax
-	jne handle_bottom_half
-#ifdef __SMP__
-	cmpb $(NO_PROC_ID), SYMBOL_NAME(saved_active_kernel_processor)
-	jne 2f
-#endif
-	movl EFLAGS(%esp),%eax		# check VM86 flag: CS/SS are
-	testl $(VM_MASK),%eax		# different then
-	jne 1f
-	cmpw $(KERNEL_CS),CS(%esp)	# was old code segment supervisor ?
-	je 2f
-1:	sti
-	orl $(IF_MASK),%eax		# these just try to make sure
-	andl $~NT_MASK,%eax		# the program doesn't do anything
-	movl %eax,EFLAGS(%esp)		# stupid
-	cmpl $0,SYMBOL_NAME(need_resched)
-	jne reschedule
-#ifdef __SMP__
-	GET_PROCESSOR_OFFSET(%eax)
-	movl SYMBOL_NAME(current_set)(,%eax), %eax
-#else
-	movl SYMBOL_NAME(current_set),%eax
-#endif
-	cmpl SYMBOL_NAME(task),%eax	# task[0] cannot have signals
-	je 2f
-	movl blocked(%eax),%ecx
-	movl %ecx,%ebx			# save blocked in %ebx for signal handling
-	notl %ecx
-	andl signal(%eax),%ecx
-	jne signal_return
-2:	RESTORE_ALL
-	ALIGN
-signal_return:
-	movl %esp,%ecx
-	pushl %ecx
-	testl $(VM_MASK),EFLAGS(%ecx)
-	jne v86_signal_return
-	pushl %ebx
-	call SYMBOL_NAME(do_signal)
-	popl %ebx
-	popl %ebx
-	RESTORE_ALL
-	ALIGN
-v86_signal_return:
-	call SYMBOL_NAME(save_v86_state)
-	movl %eax,%esp
-	pushl %eax
-	pushl %ebx
-	call SYMBOL_NAME(do_signal)
-	popl %ebx
-	popl %ebx
-	RESTORE_ALL
-
-ENTRY(divide_error)
-	pushl $0		# no error code
-	pushl $ SYMBOL_NAME(do_divide_error)
-	ALIGN
-error_code:
-	push %fs
-	push %es
-	push %ds
-	pushl %eax
-	xorl %eax,%eax
-	pushl %ebp
-	pushl %edi
-	pushl %esi
-	pushl %edx
-	decl %eax			# eax = -1
-	pushl %ecx
-	pushl %ebx
-	cld
-	xorl %ebx,%ebx			# zero ebx
-	xchgl %eax, ORIG_EAX(%esp)	# orig_eax (get the error code. )
-	mov %gs,%bx			# get the lower order bits of gs
-	movl %esp,%edx
-	xchgl %ebx, GS(%esp)		# get the address and save gs.
-	pushl %eax			# push the error code
-	pushl %edx
-	movl $(KERNEL_DS),%edx
-	mov %dx,%ds
-	mov %dx,%es
-	movl $(USER_DS),%edx
-	mov %dx,%fs
-#ifdef __SMP__
-	ENTER_KERNEL
-	GET_PROCESSOR_OFFSET(%eax)
-	movl SYMBOL_NAME(current_set)(,%eax), %eax
-#else
-	movl SYMBOL_NAME(current_set),%eax
-#endif
-	movl %db6,%edx
-	movl %edx,dbgreg6(%eax)  # save current hardware debugging status
-	call *%ebx
-	addl $8,%esp
-	jmp ret_from_sys_call
-
-ENTRY(coprocessor_error)
-	pushl $0
-	pushl $ SYMBOL_NAME(do_coprocessor_error)
-	jmp error_code
-
-ENTRY(device_not_available)
-	pushl $-1		# mark this as an int
-	SAVE_ALL
-#ifdef __SMP__
-	ENTER_KERNEL
-#endif
-	pushl $ret_from_sys_call
-	movl %cr0,%eax
-	testl $0x4,%eax			# EM (math emulation bit)
-	je SYMBOL_NAME(math_state_restore)
-	pushl $0		# temporary storage for ORIG_EIP
-	call  SYMBOL_NAME(math_emulate)
-	addl $4,%esp
-	ret
-
-ENTRY(debug)
-	pushl $0
-	pushl $ SYMBOL_NAME(do_debug)
-	jmp error_code
-
-ENTRY(nmi)
-	pushl $0
-	pushl $ SYMBOL_NAME(do_nmi)
-	jmp error_code
-
-ENTRY(int3)
-	pushl $0
-	pushl $ SYMBOL_NAME(do_int3)
-	jmp error_code
-
-ENTRY(overflow)
-	pushl $0
-	pushl $ SYMBOL_NAME(do_overflow)
-	jmp error_code
-
-ENTRY(bounds)
-	pushl $0
-	pushl $ SYMBOL_NAME(do_bounds)
-	jmp error_code
-
-ENTRY(invalid_op)
-	pushl $0
-	pushl $ SYMBOL_NAME(do_invalid_op)
-	jmp error_code
-
-ENTRY(coprocessor_segment_overrun)
-	pushl $0
-	pushl $ SYMBOL_NAME(do_coprocessor_segment_overrun)
-	jmp error_code
-
-ENTRY(reserved)
-	pushl $0
-	pushl $ SYMBOL_NAME(do_reserved)
-	jmp error_code
-
-ENTRY(double_fault)
-	pushl $ SYMBOL_NAME(do_double_fault)
-	jmp error_code
-
-ENTRY(invalid_TSS)
-	pushl $ SYMBOL_NAME(do_invalid_TSS)
-	jmp error_code
-
-ENTRY(segment_not_present)
-	pushl $ SYMBOL_NAME(do_segment_not_present)
-	jmp error_code
-
-ENTRY(stack_segment)
-	pushl $ SYMBOL_NAME(do_stack_segment)
-	jmp error_code
-
-ENTRY(general_protection)
-	pushl $ SYMBOL_NAME(do_general_protection)
-	jmp error_code
-
-ENTRY(alignment_check)
-	pushl $ SYMBOL_NAME(do_alignment_check)
-	jmp error_code
-
-ENTRY(page_fault)
-	pushl $ SYMBOL_NAME(do_page_fault)
-	jmp error_code
-
-ENTRY(spurious_interrupt_bug)
-	pushl $0
-	pushl $ SYMBOL_NAME(do_spurious_interrupt_bug)
-	jmp error_code
-
-.data
-ENTRY(sys_call_table)
-	.long SYMBOL_NAME(sys_setup)		/* 0 */
-	.long SYMBOL_NAME(sys_exit)
-	.long SYMBOL_NAME(sys_fork)
-	.long SYMBOL_NAME(sys_read)
-	.long SYMBOL_NAME(sys_write)
-	.long SYMBOL_NAME(sys_open)		/* 5 */
-	.long SYMBOL_NAME(sys_close)
-	.long SYMBOL_NAME(sys_waitpid)
-	.long SYMBOL_NAME(sys_creat)
-	.long SYMBOL_NAME(sys_link)
-	.long SYMBOL_NAME(sys_unlink)		/* 10 */
-	.long SYMBOL_NAME(sys_execve)
-	.long SYMBOL_NAME(sys_chdir)
-	.long SYMBOL_NAME(sys_time)
-	.long SYMBOL_NAME(sys_mknod)
-	.long SYMBOL_NAME(sys_chmod)		/* 15 */
-	.long SYMBOL_NAME(sys_chown)
-	.long SYMBOL_NAME(sys_break)
-	.long SYMBOL_NAME(sys_stat)
-	.long SYMBOL_NAME(sys_lseek)
-	.long SYMBOL_NAME(sys_getpid)		/* 20 */
-	.long SYMBOL_NAME(sys_mount)
-	.long SYMBOL_NAME(sys_umount)
-	.long SYMBOL_NAME(sys_setuid)
-	.long SYMBOL_NAME(sys_getuid)
-	.long SYMBOL_NAME(sys_stime)		/* 25 */
-	.long SYMBOL_NAME(sys_ptrace)
-	.long SYMBOL_NAME(sys_alarm)
-	.long SYMBOL_NAME(sys_fstat)
-	.long SYMBOL_NAME(sys_pause)
-	.long SYMBOL_NAME(sys_utime)		/* 30 */
-	.long SYMBOL_NAME(sys_stty)
-	.long SYMBOL_NAME(sys_gtty)
-	.long SYMBOL_NAME(sys_access)
-	.long SYMBOL_NAME(sys_nice)
-	.long SYMBOL_NAME(sys_ftime)		/* 35 */
-	.long SYMBOL_NAME(sys_sync)
-	.long SYMBOL_NAME(sys_kill)
-	.long SYMBOL_NAME(sys_rename)
-	.long SYMBOL_NAME(sys_mkdir)
-	.long SYMBOL_NAME(sys_rmdir)		/* 40 */
-	.long SYMBOL_NAME(sys_dup)
-	.long SYMBOL_NAME(sys_pipe)
-	.long SYMBOL_NAME(sys_times)
-	.long SYMBOL_NAME(sys_prof)
-	.long SYMBOL_NAME(sys_brk)		/* 45 */
-	.long SYMBOL_NAME(sys_setgid)
-	.long SYMBOL_NAME(sys_getgid)
-	.long SYMBOL_NAME(sys_signal)
-	.long SYMBOL_NAME(sys_geteuid)
-	.long SYMBOL_NAME(sys_getegid)		/* 50 */
-	.long SYMBOL_NAME(sys_acct)
-	.long SYMBOL_NAME(sys_phys)
-	.long SYMBOL_NAME(sys_lock)
-	.long SYMBOL_NAME(sys_ioctl)
-	.long SYMBOL_NAME(sys_fcntl)		/* 55 */
-	.long SYMBOL_NAME(sys_mpx)
-	.long SYMBOL_NAME(sys_setpgid)
-	.long SYMBOL_NAME(sys_ulimit)
-	.long SYMBOL_NAME(sys_olduname)
-	.long SYMBOL_NAME(sys_umask)		/* 60 */
-	.long SYMBOL_NAME(sys_chroot)
-	.long SYMBOL_NAME(sys_ustat)
-	.long SYMBOL_NAME(sys_dup2)
-	.long SYMBOL_NAME(sys_getppid)
-	.long SYMBOL_NAME(sys_getpgrp)		/* 65 */
-	.long SYMBOL_NAME(sys_setsid)
-	.long SYMBOL_NAME(sys_sigaction)
-	.long SYMBOL_NAME(sys_sgetmask)
-	.long SYMBOL_NAME(sys_ssetmask)
-	.long SYMBOL_NAME(sys_setreuid)		/* 70 */
-	.long SYMBOL_NAME(sys_setregid)
-	.long SYMBOL_NAME(sys_sigsuspend)
-	.long SYMBOL_NAME(sys_sigpending)
-	.long SYMBOL_NAME(sys_sethostname)
-	.long SYMBOL_NAME(sys_setrlimit)	/* 75 */
-	.long SYMBOL_NAME(sys_getrlimit)
-	.long SYMBOL_NAME(sys_getrusage)
-	.long SYMBOL_NAME(sys_gettimeofday)
-	.long SYMBOL_NAME(sys_settimeofday)
-	.long SYMBOL_NAME(sys_getgroups)	/* 80 */
-	.long SYMBOL_NAME(sys_setgroups)
-	.long SYMBOL_NAME(old_select)
-	.long SYMBOL_NAME(sys_symlink)
-	.long SYMBOL_NAME(sys_lstat)
-	.long SYMBOL_NAME(sys_readlink)		/* 85 */
-	.long SYMBOL_NAME(sys_uselib)
-	.long SYMBOL_NAME(sys_swapon)
-	.long SYMBOL_NAME(sys_reboot)
-	.long SYMBOL_NAME(old_readdir)
-	.long SYMBOL_NAME(old_mmap)		/* 90 */
-	.long SYMBOL_NAME(sys_munmap)
-	.long SYMBOL_NAME(sys_truncate)
-	.long SYMBOL_NAME(sys_ftruncate)
-	.long SYMBOL_NAME(sys_fchmod)
-	.long SYMBOL_NAME(sys_fchown)		/* 95 */
-	.long SYMBOL_NAME(sys_getpriority)
-	.long SYMBOL_NAME(sys_setpriority)
-	.long SYMBOL_NAME(sys_profil)
-	.long SYMBOL_NAME(sys_statfs)
-	.long SYMBOL_NAME(sys_fstatfs)		/* 100 */
-	.long SYMBOL_NAME(sys_ioperm)
-	.long SYMBOL_NAME(sys_socketcall)
-	.long SYMBOL_NAME(sys_syslog)
-	.long SYMBOL_NAME(sys_setitimer)
-	.long SYMBOL_NAME(sys_getitimer)	/* 105 */
-	.long SYMBOL_NAME(sys_newstat)
-	.long SYMBOL_NAME(sys_newlstat)
-	.long SYMBOL_NAME(sys_newfstat)
-	.long SYMBOL_NAME(sys_uname)
-	.long SYMBOL_NAME(sys_iopl)		/* 110 */
-	.long SYMBOL_NAME(sys_vhangup)
-	.long SYMBOL_NAME(sys_idle)
-	.long SYMBOL_NAME(sys_vm86old)
-	.long SYMBOL_NAME(sys_wait4)
-	.long SYMBOL_NAME(sys_swapoff)		/* 115 */
-	.long SYMBOL_NAME(sys_sysinfo)
-	.long SYMBOL_NAME(sys_ipc)
-	.long SYMBOL_NAME(sys_fsync)
-	.long SYMBOL_NAME(sys_sigreturn)
-	.long SYMBOL_NAME(sys_clone)		/* 120 */
-	.long SYMBOL_NAME(sys_setdomainname)
-	.long SYMBOL_NAME(sys_newuname)
-	.long SYMBOL_NAME(sys_modify_ldt)
-	.long SYMBOL_NAME(sys_adjtimex)
-	.long SYMBOL_NAME(sys_mprotect)		/* 125 */
-	.long SYMBOL_NAME(sys_sigprocmask)
-	.long SYMBOL_NAME(sys_create_module)
-	.long SYMBOL_NAME(sys_init_module)
-	.long SYMBOL_NAME(sys_delete_module)
-	.long SYMBOL_NAME(sys_get_kernel_syms)	/* 130 */
-	.long SYMBOL_NAME(sys_quotactl)
-	.long SYMBOL_NAME(sys_getpgid)
-	.long SYMBOL_NAME(sys_fchdir)
-	.long SYMBOL_NAME(sys_bdflush)
-	.long SYMBOL_NAME(sys_sysfs)		/* 135 */
-	.long SYMBOL_NAME(sys_personality)
-	.long 0					/* for afs_syscall */
-	.long SYMBOL_NAME(sys_setfsuid)
-	.long SYMBOL_NAME(sys_setfsgid)
-	.long SYMBOL_NAME(sys_llseek)		/* 140 */
-	.long SYMBOL_NAME(sys_getdents)
-	.long SYMBOL_NAME(sys_select)
-	.long SYMBOL_NAME(sys_flock)
-	.long SYMBOL_NAME(sys_msync)
-	.long SYMBOL_NAME(sys_readv)		/* 145 */
-	.long SYMBOL_NAME(sys_writev)
-	.long SYMBOL_NAME(sys_getsid)
-	.long SYMBOL_NAME(sys_fdatasync)
-	.long SYMBOL_NAME(sys_sysctl)
-	.long SYMBOL_NAME(sys_mlock)		/* 150 */
-	.long SYMBOL_NAME(sys_munlock)
-	.long SYMBOL_NAME(sys_mlockall)
-	.long SYMBOL_NAME(sys_munlockall)
-	.long SYMBOL_NAME(sys_sched_setparam)
-	.long SYMBOL_NAME(sys_sched_getparam)   /* 155 */
-	.long SYMBOL_NAME(sys_sched_setscheduler)
-	.long SYMBOL_NAME(sys_sched_getscheduler)
-	.long SYMBOL_NAME(sys_sched_yield)
-	.long SYMBOL_NAME(sys_sched_get_priority_max)
-	.long SYMBOL_NAME(sys_sched_get_priority_min)  /* 160 */
-	.long SYMBOL_NAME(sys_sched_rr_get_interval)
-	.long SYMBOL_NAME(sys_nanosleep)
-	.long SYMBOL_NAME(sys_mremap)
-	.long 0,0
-	.long SYMBOL_NAME(sys_vm86)
-	.long 0,0,0,0					/* 170 */
-	.long 0,0,0,0,0,0,0,0,0,0			/* 180 */
-	.long 0,0,0,0,0,0,0
-	.long SYMBOL_NAME(sys_table)
-	.space (NR_syscalls-188)*4
--- a/kernel/table20/kernel.patch
+++ b/kernel/table20/kernel.patch
@@ -1,51 +0,0 @@
-diff -ur linux-2.0.32/Makefile linux-hacked/Makefile
--- linux-2.0.32/Makefile	Fri Nov  7 19:51:05 1997
-+++ linux-hacked/Makefile	Thu Jun 11 20:41:12 1998
-@@ -87,7 +87,7 @@
- # standard CFLAGS
- #
- 
-CFLAGS = -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer -fno-strength-reduce
-+CFLAGS = -Wall -Wstrict-prototypes -g -O2 -fomit-frame-pointer -fno-strength-reduce
- 
- ifdef CONFIG_CPP
- CFLAGS := $(CFLAGS) -x c++
-@@ -113,12 +113,12 @@
- # Include the make variables (CC, etc...)
- #
- 
-ARCHIVES	=kernel/kernel.o mm/mm.o fs/fs.o ipc/ipc.o net/network.a
-+ARCHIVES	=kernel/kernel.o mm/mm.o fs/fs.o ipc/ipc.o net/network.a table/table.o
- FILESYSTEMS	=fs/filesystems.a
- DRIVERS		=drivers/block/block.a \
- 		 drivers/char/char.a
- LIBS		=$(TOPDIR)/lib/lib.a
-SUBDIRS		=kernel drivers mm fs net ipc lib
-+SUBDIRS		=kernel drivers mm fs net ipc lib table
- 
- ifeq ($(CONFIG_ISDN),y)
- DRIVERS := $(DRIVERS) drivers/isdn/isdn.a
-diff -ur linux-2.0.32/arch/i386/kernel/entry.S linux-hacked/arch/i386/kernel/entry.S
--- linux-2.0.32/arch/i386/kernel/entry.S	Tue Sep 16 23:42:45 1997
-+++ linux-hacked/arch/i386/kernel/entry.S	Thu Jun 11 21:37:20 1998
-@@ -699,4 +699,8 @@
- 	.long SYMBOL_NAME(sys_mremap)
- 	.long 0,0
- 	.long SYMBOL_NAME(sys_vm86)
-	.space (NR_syscalls-166)*4
-+	.long 0,0,0,0					/* 170 */
-+	.long 0,0,0,0,0,0,0,0,0,0			/* 180 */
-+	.long 0,0,0,0,0,0,0
-+	.long SYMBOL_NAME(sys_table)
-+	.space (NR_syscalls-188)*4
-diff -ur linux-2.0.32/include/asm-i386/unistd.h linux-hacked/include/asm-i386/unistd.h
--- linux-2.0.32/include/asm-i386/unistd.h	Fri Mar 22 07:34:02 1996
-+++ linux-hacked/include/asm-i386/unistd.h	Thu Jun 11 21:37:03 1998
-@@ -169,6 +169,7 @@
- #define __NR_sched_rr_get_interval	161
- #define __NR_nanosleep		162
- #define __NR_mremap		163
-+#define __NR_table		188
- 
- /* XXX - _foo needs to be __foo, while __NR_bar could be _NR_bar. */
- #define _syscall0(type,name) \
--- a/kernel/table20/main.c
+++ b/kernel/table20/main.c
@@ -1,468 +0,0 @@
-/*
- * linux/table/table_impl.c
- * Copyright (C) 1998 Martin Baulig
- */
-
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <linux/sched.h>
-#include <linux/kernel.h>
-#include <linux/kernel_stat.h>
-#include <linux/tty.h>
-#include <linux/user.h>
-#include <linux/a.out.h>
-#include <linux/string.h>
-#include <linux/mman.h>
-#include <linux/proc_fs.h>
-#include <linux/ioport.h>
-#include <linux/config.h>
-#include <linux/mm.h>
-#include <linux/pagemap.h>
-#include <linux/swap.h>
-
-#include <asm/segment.h>
-#include <asm/pgtable.h>
-#include <asm/io.h>
-
-#include <linux/table.h>
-
-#include "version.h"
-
-#if defined(__i386__)
-# define KSTK_EIP(tsk)	(((unsigned long *)tsk->kernel_stack_page)[1019])
-# define KSTK_ESP(tsk)	(((unsigned long *)tsk->kernel_stack_page)[1022])
-#elif defined(__alpha__)
-  /*
-   * See arch/alpha/kernel/ptrace.c for details.
-   */
-# define PT_REG(reg)		(PAGE_SIZE - sizeof(struct pt_regs)	\
-				 + (long)&((struct pt_regs *)0)->reg)
-# define KSTK_EIP(tsk)	(*(unsigned long *)(tsk->kernel_stack_page + PT_REG(pc)))
-# define KSTK_ESP(tsk)	((tsk) == current ? rdusp() : (tsk)->tss.usp)
-#elif defined(__sparc__)
-# define PT_REG(reg)            (PAGE_SIZE - sizeof(struct pt_regs)     \
-                                 + (long)&((struct pt_regs *)0)->reg)
-# define KSTK_EIP(tsk)  (*(unsigned long *)(tsk->kernel_stack_page + PT_REG(pc)))
-# define KSTK_ESP(tsk)  (*(unsigned long *)(tsk->kernel_stack_page + PT_REG(u_regs[UREG_FP])))
-#endif
-
-static struct task_struct *
-get_task (pid_t pid)
-{
-	struct task_struct ** p;
-
-	p = task;
-	while (++p < task+NR_TASKS) {
-		if (*p && (*p)->pid == pid)
-			return *p;
-	}
-
-	return NULL;
-}
-
-static inline void statm_pte_range(pmd_t * pmd, unsigned long address, unsigned long size,
-	int * pages, int * shared, int * dirty, int * total)
-{
-	pte_t * pte;
-	unsigned long end;
-
-	if (pmd_none(*pmd))
-		return;
-	if (pmd_bad(*pmd)) {
-		printk("statm_pte_range: bad pmd (%08lx)\n", pmd_val(*pmd));
-		pmd_clear(pmd);
-		return;
-	}
-	pte = pte_offset(pmd, address);
-	address &= ~PMD_MASK;
-	end = address + size;
-	if (end > PMD_SIZE)
-		end = PMD_SIZE;
-	do {
-		pte_t page = *pte;
-
-		address += PAGE_SIZE;
-		pte++;
-		if (pte_none(page))
-			continue;
-		++*total;
-		if (!pte_present(page))
-			continue;
-		++*pages;
-		if (pte_dirty(page))
-			++*dirty;
-		if (pte_page(page) >= high_memory)
-			continue;
-		if (mem_map[MAP_NR(pte_page(page))].count > 1)
-			++*shared;
-	} while (address < end);
-}
-
-static inline void statm_pmd_range(pgd_t * pgd, unsigned long address, unsigned long size,
-	int * pages, int * shared, int * dirty, int * total)
-{
-	pmd_t * pmd;
-	unsigned long end;
-
-	if (pgd_none(*pgd))
-		return;
-	if (pgd_bad(*pgd)) {
-		printk("statm_pmd_range: bad pgd (%08lx)\n", pgd_val(*pgd));
-		pgd_clear(pgd);
-		return;
-	}
-	pmd = pmd_offset(pgd, address);
-	address &= ~PGDIR_MASK;
-	end = address + size;
-	if (end > PGDIR_SIZE)
-		end = PGDIR_SIZE;
-	do {
-		statm_pte_range(pmd, address, end - address, pages, shared, dirty, total);
-		address = (address + PMD_SIZE) & PMD_MASK;
-		pmd++;
-	} while (address < end);
-}
-
-static void statm_pgd_range(pgd_t * pgd, unsigned long address, unsigned long end,
-	int * pages, int * shared, int * dirty, int * total)
-{
-	while (address < end) {
-		statm_pmd_range(pgd, address, end - address, pages, shared, dirty, total);
-		address = (address + PGDIR_SIZE) & PGDIR_MASK;
-		pgd++;
-	}
-}
-
-static unsigned long
-get_wchan (struct task_struct *p)
-{
-	if (!p || p == current || p->state == TASK_RUNNING)
-		return 0;
-#if defined(__i386__)
-	{
-		unsigned long ebp, eip;
-		unsigned long stack_page;
-		int count = 0;
-
-		stack_page = p->kernel_stack_page;
-		if (!stack_page)
-			return 0;
-		ebp = p->tss.ebp;
-		do {
-			if (ebp < stack_page || ebp >= 4092+stack_page)
-				return 0;
-			eip = *(unsigned long *) (ebp+4);
-			if (eip < (unsigned long) interruptible_sleep_on
-			    || eip >= (unsigned long) add_timer)
-				return eip;
-			ebp = *(unsigned long *) ebp;
-		} while (count++ < 16);
-	}
-#elif defined(__alpha__)
-	/*
-	 * This one depends on the frame size of schedule().  Do a
-	 * "disass schedule" in gdb to find the frame size.  Also, the
-	 * code assumes that sleep_on() follows immediately after
-	 * interruptible_sleep_on() and that add_timer() follows
-	 * immediately after interruptible_sleep().  Ugly, isn't it?
-	 * Maybe adding a wchan field to task_struct would be better,
-	 * after all...
-	 */
-	{
-		unsigned long schedule_frame;
-		unsigned long pc;
-
-		pc = thread_saved_pc(&p->tss);
-		if (pc >= (unsigned long) interruptible_sleep_on && pc < (unsigned long) add_timer) {
-			schedule_frame = ((unsigned long *)p->tss.ksp)[6];
-			return ((unsigned long *)schedule_frame)[12];
-		}
-		return pc;
-	}
-#endif
-	return 0;
-}
-
-asmlinkage int
-sys_table (int type, union table *buf, const void *param)
-{
-	union table tbl;
-	struct sysinfo i;
-	struct task_struct *tsk = NULL;
-	struct ip_chain *chain;
-	struct ip_fwkernel *rule;
-	char devname [9];
-	int index, err;
-	pid_t pid;
-
-	if (type == TABLE_VERSION)
-		return _TABLE_VERSION;
-
-	if (!buf)
-		return -EFAULT;
-
-	memset (&tbl, 0, sizeof (union table));
-
-	/* For TABLE_PROC_*, read pid and get task_struct */
-
-	switch (type) {
-	case TABLE_PROC_UID:
-	case TABLE_PROC_MEM:
-	case TABLE_PROC_SEGMENT:
-	case TABLE_PROC_TIME:
-	case TABLE_PROC_STATE:
-	case TABLE_PROC_SIGNAL:
-	case TABLE_PROC_KERNEL:
-	  err = verify_area (VERIFY_READ, param, sizeof (pid_t));
-		if (err)
-			return err;
-		memcpy_fromfs (&pid, param, sizeof (pid_t));
-
-		tsk = get_task (pid);
-		if (tsk == NULL)
-			return -ESRCH;
-		break;
-	case TABLE_NETACCT:
-		err = verify_area (VERIFY_READ, param, 5);
-		if (err)
-			return err;
-		copy_from_user (devname, param, 5);
-		devname [5] = 0;
-
-		break;
-	}
-
-	/* Main function dispatcher */
-
-	switch (type) {
-	case TABLE_PROCLIST:
-		tsk = task [0];
-		for (index = 0; index < nr_tasks; index++) {
-			tbl.proclist.pids [index] = tsk->pid;
-			tsk = tsk->next_task;
-		}
-		tbl.proclist.nr_running = nr_running;
-		tbl.proclist.nr_tasks = nr_tasks;
-		tbl.proclist.last_pid = last_pid;
-		break;
-	case TABLE_CPU:
-		tbl.cpu.total = jiffies;
-		tbl.cpu.user  = kstat.cpu_user;
-		tbl.cpu.nice  = kstat.cpu_nice;
-		tbl.cpu.sys   = kstat.cpu_system;
-		tbl.cpu.idle  = tbl.cpu.total -
-			(tbl.cpu.user + tbl.cpu.nice + tbl.cpu.sys);
-		tbl.cpu.frequency = HZ;
-		break;
-	case TABLE_MEM:
-		si_meminfo (&i);
-		tbl.mem.total  = i.totalram;
-		tbl.mem.used   = i.totalram - i.freeram;
-		tbl.mem.free   = i.freeram;
-		tbl.mem.shared = i.sharedram;
-		tbl.mem.buffer = i.bufferram;
-		tbl.mem.cached = page_cache_size << PAGE_SHIFT;
-		break;
-	case TABLE_SWAP:
-		si_swapinfo (&i);
-		tbl.swap.total = i.totalswap;
-		tbl.swap.used  = i.totalswap - i.freeswap;
-		tbl.swap.free  = i.freeswap;
-		tbl.swap.pagein = kstat.pswpin;
-		tbl.swap.pageout = kstat.pswpout;
-		break;
-	case TABLE_LOADAVG:
-		tbl.loadavg.loadavg [0] = (double) avenrun [0] / (1 << FSHIFT);
-		tbl.loadavg.loadavg [1] = (double) avenrun [1] / (1 << FSHIFT);
-		tbl.loadavg.loadavg [2] = (double) avenrun [2] / (1 << FSHIFT);
-		tbl.loadavg.nr_running = nr_running;
-		tbl.loadavg.nr_tasks = nr_tasks;
-		tbl.loadavg.last_pid = last_pid;
-		break;
-	case TABLE_UPTIME:
-		tbl.uptime.uptime = jiffies;
-		tbl.uptime.idle   = task[0]->utime + task[0]->stime;
-		break;
-	case TABLE_PROC_STATE:
-		tbl.proc_state.state = tsk->state;
-		tbl.proc_state.flags = tsk->flags;
-		memcpy (tbl.proc_state.comm, tsk->comm,
-			sizeof (tbl.proc_state.comm));
-		break;
-	case TABLE_PROC_UID:
-		tbl.proc_uid.uid = tsk->uid;
-		tbl.proc_uid.euid = tsk->euid;
-		tbl.proc_uid.suid = tsk->suid;
-		tbl.proc_uid.fsuid = tsk->fsuid;
-
-		tbl.proc_uid.gid = tsk->gid;
-		tbl.proc_uid.egid = tsk->egid;
-		tbl.proc_uid.sgid = tsk->sgid;
-		tbl.proc_uid.fsgid = tsk->fsgid;
-
-		tbl.proc_uid.pid = tsk->pid;
-		tbl.proc_uid.pgrp = tsk->pgrp;
-		tbl.proc_uid.ppid = tsk->p_pptr->pid;
-
-		tbl.proc_uid.session = tsk->session;
-	        tbl.proc_uid.tty = tsk->tty ?
-			kdev_t_to_nr (tsk->tty->device) : 0;
-		tbl.proc_uid.tpgid = tsk->tty ? tsk->tty->pgrp : -1;
-
-		tbl.proc_uid.priority = tsk->priority;
-		tbl.proc_uid.counter = tsk->counter;
-		tbl.proc_uid.def_priority = DEF_PRIORITY;
-		break;
-	case TABLE_PROC_SIGNAL:
-		tbl.proc_signal.signal = tsk->signal;
-		tbl.proc_signal.blocked = tsk->blocked;
-
-		if (tsk->sig) {
-			struct sigaction * action = tsk->sig->action;
-			unsigned long sig_ign = 0, sig_caught = 0;
-			unsigned long bit = 1;
-			int i;
-
-			for (i = 0; i < 32; i++) {
-				switch((unsigned long) action->sa_handler) {
-				case 0:
-					break;
-				case 1:
-					sig_ign |= bit;
-					break;
-				default:
-					sig_caught |= bit;
-				}
-				bit <<= 1;
-				action++;
-			}
-
-			tbl.proc_signal.ignored = sig_ign;
-			tbl.proc_signal.caught  = sig_caught;
-		} else {
-			tbl.proc_signal.ignored = 0;
-			tbl.proc_signal.caught  = 0;
-		}
-		break;
-	case TABLE_PROC_MEM:
-		if (tsk->mm && tsk->mm != &init_mm) {
-			tbl.proc_mem.context = tsk->mm->context;
-			tbl.proc_mem.start_code = tsk->mm->start_code;
-			tbl.proc_mem.end_code = tsk->mm->end_code;
-			tbl.proc_mem.start_data = tsk->mm-> start_data;
-			tbl.proc_mem.end_data = tsk->mm->end_data;
-			tbl.proc_mem.start_brk = tsk->mm->start_brk;
-			tbl.proc_mem.brk = tsk->mm->brk;
-			tbl.proc_mem.start_stack = tsk->mm->start_stack;
-			tbl.proc_mem.start_mmap = tsk->mm->start_mmap;
-			tbl.proc_mem.arg_start = tsk->mm->arg_start;
-			tbl.proc_mem.arg_end = tsk->mm->arg_end;
-			tbl.proc_mem.env_start = tsk->mm->env_start;
-			tbl.proc_mem.env_end = tsk->mm->env_end;
-			tbl.proc_mem.rss = tsk->mm->rss;
-			tbl.proc_mem.total_vm = tsk->mm->total_vm;
-			tbl.proc_mem.locked_vm = tsk->mm->locked_vm;
-		}
-		tbl.proc_mem.rlim = tsk->rlim ?
-			tsk->rlim[RLIMIT_RSS].rlim_cur : 0;
-		break;
-	case TABLE_PROC_SEGMENT:
-		if (tsk->mm && tsk->mm != &init_mm) {
-			unsigned long vsize = 0;
-			int size = 0, resident = 0, share = 0;
-			int trs = 0, lrs = 0, drs = 0, dt = 0;
-			struct vm_area_struct * vma = tsk->mm->mmap;
-
-			while (vma) {
-				pgd_t *pgd = pgd_offset(tsk->mm, vma->vm_start);
-				int pages = 0, shared = 0, dirty = 0, total = 0;
-
-				vsize += vma->vm_end - vma->vm_start;
-
-				statm_pgd_range (pgd, vma->vm_start, vma->vm_end,
-						 &pages, &shared, &dirty, &total);
-				resident += pages;
-				share += shared;
-				dt += dirty;
-				size += total;
-				if (vma->vm_flags & VM_EXECUTABLE)
-					trs += pages;	/* text */
-				else if (vma->vm_flags & VM_GROWSDOWN)
-					drs += pages;	/* stack */
-				else if (vma->vm_end > 0x60000000)
-					lrs += pages;	/* library */
-				else
-					drs += pages;
-				vma = vma->vm_next;
-			}
-
-			tbl.proc_segment.vsize = vsize;
-			tbl.proc_segment.size = size;
-			tbl.proc_segment.resident = resident;
-			tbl.proc_segment.shared = share;
-			tbl.proc_segment.trs = trs;
-			tbl.proc_segment.lrs = lrs;
-			tbl.proc_segment.dt = dt;
-		}
-		break;
-	case TABLE_PROC_TIME:
-		tbl.proc_time.utime = tsk->utime;
-		tbl.proc_time.stime = tsk->stime;
-		tbl.proc_time.cutime = tsk->cutime;
-		tbl.proc_time.cstime = tsk->cstime;
-
-		tbl.proc_time.start_time = tsk->start_time;
-		tbl.proc_time.timeout = tsk->timeout;
-		tbl.proc_time.policy = tsk->policy;
-		tbl.proc_time.rt_priority = tsk->rt_priority;
-
-		tbl.proc_time.it_real_value = tsk->it_real_value;
-		tbl.proc_time.it_prof_value = tsk->it_prof_value;
-		tbl.proc_time.it_virt_value = tsk->it_virt_value;
-		tbl.proc_time.it_real_incr = tsk->it_real_incr;
-		tbl.proc_time.it_prof_incr = tsk->it_prof_incr;
-		tbl.proc_time.it_virt_incr = tsk->it_virt_incr;
-		break;
-	case TABLE_PROC_KERNEL:
-		tbl.proc_kernel.min_flt = tsk->min_flt;
-		tbl.proc_kernel.cmin_flt = tsk->cmin_flt;
-		tbl.proc_kernel.maj_flt = tsk->maj_flt;
-		tbl.proc_kernel.cmaj_flt = tsk->cmaj_flt;
-
-		tbl.proc_kernel.kesp = tsk->kernel_stack_page ? KSTK_EIP(tsk) : 0;
-		tbl.proc_kernel.keip = tsk->kernel_stack_page ? KSTK_ESP(tsk) : 0;
-
-		tbl.proc_kernel.nswap = tsk->nswap;
-		tbl.proc_kernel.cnswap = tsk->cnswap;
-
-		tbl.proc_kernel.wchan = get_wchan (tsk);
-		break;
-	case TABLE_NETACCT:
-		for (chain = ip_fw_chains; chain; chain = chain->next) {
-			for (rule = chain->chain; rule; rule = rule->next) {
-				const char *name = rule->ipfw.fw_vianame;
-				int k;
-
-				if (name [0] && !strncmp (param, name, 5))
-					continue;
-
-				for (k = 0; k < NUM_SLOTS; k++) {
-					tbl.netacct.packets +=
-						rule->counters[k].pcnt;
-					tbl.netacct.bytes +=
-						rule->counters[k].bcnt;
-				}
-			}
-		}
-		break;
-	default:
-		return -EINVAL;
-	}
-
-	err = verify_area (VERIFY_WRITE, buf, sizeof (struct table));
-	if (err)
-		return err;
-
-	memcpy_tofs (buf, &tbl, sizeof (union table));
-	return 0;
-}
--- a/kernel/table20/unistd-i386.h
+++ b/kernel/table20/unistd-i386.h
@@ -1,324 +0,0 @@
-#ifndef _ASM_I386_UNISTD_H_
-#define _ASM_I386_UNISTD_H_
-
-/*
- * This file contains the system call numbers.
- */
-
-#define __NR_setup		  0	/* used only by init, to get system going */
-#define __NR_exit		  1
-#define __NR_fork		  2
-#define __NR_read		  3
-#define __NR_write		  4
-#define __NR_open		  5
-#define __NR_close		  6
-#define __NR_waitpid		  7
-#define __NR_creat		  8
-#define __NR_link		  9
-#define __NR_unlink		 10
-#define __NR_execve		 11
-#define __NR_chdir		 12
-#define __NR_time		 13
-#define __NR_mknod		 14
-#define __NR_chmod		 15
-#define __NR_chown		 16
-#define __NR_break		 17
-#define __NR_oldstat		 18
-#define __NR_lseek		 19
-#define __NR_getpid		 20
-#define __NR_mount		 21
-#define __NR_umount		 22
-#define __NR_setuid		 23
-#define __NR_getuid		 24
-#define __NR_stime		 25
-#define __NR_ptrace		 26
-#define __NR_alarm		 27
-#define __NR_oldfstat		 28
-#define __NR_pause		 29
-#define __NR_utime		 30
-#define __NR_stty		 31
-#define __NR_gtty		 32
-#define __NR_access		 33
-#define __NR_nice		 34
-#define __NR_ftime		 35
-#define __NR_sync		 36
-#define __NR_kill		 37
-#define __NR_rename		 38
-#define __NR_mkdir		 39
-#define __NR_rmdir		 40
-#define __NR_dup		 41
-#define __NR_pipe		 42
-#define __NR_times		 43
-#define __NR_prof		 44
-#define __NR_brk		 45
-#define __NR_setgid		 46
-#define __NR_getgid		 47
-#define __NR_signal		 48
-#define __NR_geteuid		 49
-#define __NR_getegid		 50
-#define __NR_acct		 51
-#define __NR_phys		 52
-#define __NR_lock		 53
-#define __NR_ioctl		 54
-#define __NR_fcntl		 55
-#define __NR_mpx		 56
-#define __NR_setpgid		 57
-#define __NR_ulimit		 58
-#define __NR_oldolduname	 59
-#define __NR_umask		 60
-#define __NR_chroot		 61
-#define __NR_ustat		 62
-#define __NR_dup2		 63
-#define __NR_getppid		 64
-#define __NR_getpgrp		 65
-#define __NR_setsid		 66
-#define __NR_sigaction		 67
-#define __NR_sgetmask		 68
-#define __NR_ssetmask		 69
-#define __NR_setreuid		 70
-#define __NR_setregid		 71
-#define __NR_sigsuspend		 72
-#define __NR_sigpending		 73
-#define __NR_sethostname	 74
-#define __NR_setrlimit		 75
-#define __NR_getrlimit		 76
-#define __NR_getrusage		 77
-#define __NR_gettimeofday	 78
-#define __NR_settimeofday	 79
-#define __NR_getgroups		 80
-#define __NR_setgroups		 81
-#define __NR_select		 82
-#define __NR_symlink		 83
-#define __NR_oldlstat		 84
-#define __NR_readlink		 85
-#define __NR_uselib		 86
-#define __NR_swapon		 87
-#define __NR_reboot		 88
-#define __NR_readdir		 89
-#define __NR_mmap		 90
-#define __NR_munmap		 91
-#define __NR_truncate		 92
-#define __NR_ftruncate		 93
-#define __NR_fchmod		 94
-#define __NR_fchown		 95
-#define __NR_getpriority	 96
-#define __NR_setpriority	 97
-#define __NR_profil		 98
-#define __NR_statfs		 99
-#define __NR_fstatfs		100
-#define __NR_ioperm		101
-#define __NR_socketcall		102
-#define __NR_syslog		103
-#define __NR_setitimer		104
-#define __NR_getitimer		105
-#define __NR_stat		106
-#define __NR_lstat		107
-#define __NR_fstat		108
-#define __NR_olduname		109
-#define __NR_iopl		110
-#define __NR_vhangup		111
-#define __NR_idle		112
-#define __NR_vm86		113
-#define __NR_wait4		114
-#define __NR_swapoff		115
-#define __NR_sysinfo		116
-#define __NR_ipc		117
-#define __NR_fsync		118
-#define __NR_sigreturn		119
-#define __NR_clone		120
-#define __NR_setdomainname	121
-#define __NR_uname		122
-#define __NR_modify_ldt		123
-#define __NR_adjtimex		124
-#define __NR_mprotect		125
-#define __NR_sigprocmask	126
-#define __NR_create_module	127
-#define __NR_init_module	128
-#define __NR_delete_module	129
-#define __NR_get_kernel_syms	130
-#define __NR_quotactl		131
-#define __NR_getpgid		132
-#define __NR_fchdir		133
-#define __NR_bdflush		134
-#define __NR_sysfs		135
-#define __NR_personality	136
-#define __NR_afs_syscall	137 /* Syscall for Andrew File System */
-#define __NR_setfsuid		138
-#define __NR_setfsgid		139
-#define __NR__llseek		140
-#define __NR_getdents		141
-#define __NR__newselect		142
-#define __NR_flock		143
-#define __NR_msync		144
-#define __NR_readv		145
-#define __NR_writev		146
-#define __NR_getsid		147
-#define __NR_fdatasync		148
-#define __NR__sysctl		149
-#define __NR_mlock		150
-#define __NR_munlock		151
-#define __NR_mlockall		152
-#define __NR_munlockall		153
-#define __NR_sched_setparam		154
-#define __NR_sched_getparam		155
-#define __NR_sched_setscheduler		156
-#define __NR_sched_getscheduler		157
-#define __NR_sched_yield		158
-#define __NR_sched_get_priority_max	159
-#define __NR_sched_get_priority_min	160
-#define __NR_sched_rr_get_interval	161
-#define __NR_nanosleep		162
-#define __NR_mremap		163
-#define __NR_table		188
-
-/* XXX - _foo needs to be __foo, while __NR_bar could be _NR_bar. */
-#define _syscall0(type,name) \
-type name(void) \
-{ \
-long __res; \
-__asm__ volatile ("int $0x80" \
-	: "=a" (__res) \
-	: "0" (__NR_##name)); \
-if (__res >= 0) \
-	return (type) __res; \
-errno = -__res; \
-return -1; \
-}
-
-#define _syscall1(type,name,type1,arg1) \
-type name(type1 arg1) \
-{ \
-long __res; \
-__asm__ volatile ("int $0x80" \
-	: "=a" (__res) \
-	: "0" (__NR_##name),"b" ((long)(arg1))); \
-if (__res >= 0) \
-	return (type) __res; \
-errno = -__res; \
-return -1; \
-}
-
-#define _syscall2(type,name,type1,arg1,type2,arg2) \
-type name(type1 arg1,type2 arg2) \
-{ \
-long __res; \
-__asm__ volatile ("int $0x80" \
-	: "=a" (__res) \
-	: "0" (__NR_##name),"b" ((long)(arg1)),"c" ((long)(arg2))); \
-if (__res >= 0) \
-	return (type) __res; \
-errno = -__res; \
-return -1; \
-}
-
-#define _syscall3(type,name,type1,arg1,type2,arg2,type3,arg3) \
-type name(type1 arg1,type2 arg2,type3 arg3) \
-{ \
-long __res; \
-__asm__ volatile ("int $0x80" \
-	: "=a" (__res) \
-	: "0" (__NR_##name),"b" ((long)(arg1)),"c" ((long)(arg2)), \
-		  "d" ((long)(arg3))); \
-if (__res>=0) \
-	return (type) __res; \
-errno=-__res; \
-return -1; \
-}
-
-#define _syscall4(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4) \
-type name (type1 arg1, type2 arg2, type3 arg3, type4 arg4) \
-{ \
-long __res; \
-__asm__ volatile ("int $0x80" \
-	: "=a" (__res) \
-	: "0" (__NR_##name),"b" ((long)(arg1)),"c" ((long)(arg2)), \
-	  "d" ((long)(arg3)),"S" ((long)(arg4))); \
-if (__res>=0) \
-	return (type) __res; \
-errno=-__res; \
-return -1; \
-}
-
-#define _syscall5(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4, \
-	  type5,arg5) \
-type name (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5) \
-{ \
-long __res; \
-__asm__ volatile ("int $0x80" \
-	: "=a" (__res) \
-	: "0" (__NR_##name),"b" ((long)(arg1)),"c" ((long)(arg2)), \
-	  "d" ((long)(arg3)),"S" ((long)(arg4)),"D" ((long)(arg5))); \
-if (__res>=0) \
-	return (type) __res; \
-errno=-__res; \
-return -1; \
-}
-
-#ifdef __KERNEL_SYSCALLS__
-
-/*
- * we need this inline - forking from kernel space will result
- * in NO COPY ON WRITE (!!!), until an execve is executed. This
- * is no problem, but for the stack. This is handled by not letting
- * main() use the stack at all after fork(). Thus, no function
- * calls - which means inline code for fork too, as otherwise we
- * would use the stack upon exit from 'fork()'.
- *
- * Actually only pause and fork are needed inline, so that there
- * won't be any messing with the stack from main(), but we define
- * some others too.
- */
-#define __NR__exit __NR_exit
-static inline _syscall0(int,idle)
-static inline _syscall0(int,fork)
-static inline _syscall2(int,clone,unsigned long,flags,char *,esp)
-static inline _syscall0(int,pause)
-static inline _syscall0(int,setup)
-static inline _syscall0(int,sync)
-static inline _syscall0(pid_t,setsid)
-static inline _syscall3(int,write,int,fd,const char *,buf,off_t,count)
-static inline _syscall1(int,dup,int,fd)
-static inline _syscall3(int,execve,const char *,file,char **,argv,char **,envp)
-static inline _syscall3(int,open,const char *,file,int,flag,int,mode)
-static inline _syscall1(int,close,int,fd)
-static inline _syscall1(int,_exit,int,exitcode)
-static inline _syscall3(pid_t,waitpid,pid_t,pid,int *,wait_stat,int,options)
-
-static inline pid_t wait(int * wait_stat)
-{
-	return waitpid(-1,wait_stat,0);
-}
-
-/*
- * This is the mechanism for creating a new kernel thread.
- *
- * NOTE! Only a kernel-only process(ie the swapper or direct descendants
- * who haven't done an "execve()") should use this: it will work within
- * a system call from a "real" process, but the process memory space will
- * not be free'd until both the parent and the child have exited.
- */
-static inline pid_t kernel_thread(int (*fn)(void *), void * arg, unsigned long flags)
-{
-	long retval;
-
-	__asm__ __volatile__(
-		"movl %%esp,%%esi\n\t"
-		"int $0x80\n\t"		/* Linux/i386 system call */
-		"cmpl %%esp,%%esi\n\t"	/* child or parent? */
-		"je 1f\n\t"		/* parent - jump */
-		"pushl %3\n\t"		/* push argument */
-		"call *%4\n\t"		/* call fn */
-		"movl %2,%0\n\t"	/* exit */
-		"int $0x80\n"
-		"1:\t"
-		:"=a" (retval)
-		:"0" (__NR_clone), "i" (__NR_exit),
-		 "r" (arg), "r" (fn),
-		 "b" (flags | CLONE_VM)
-		:"si");
-	return retval;
-}
-
-#endif
-
-#endif /* _ASM_I386_UNISTD_H_ */
--- a/kernel/table20/version.h
+++ b/kernel/table20/version.h
@@ -1 +0,0 @@
-#define _TABLE_VERSION	1
--- a/kernel/table21/.cvsignore
+++ b/kernel/table21/.cvsignore
@@ -1,4 +0,0 @@
-kernel.patch
-.main.o.flags
-.table.o.flags
-.module.o.flags
--- a/kernel/table21/Makefile
+++ b/kernel/table21/Makefile
@@ -1,16 +0,0 @@
-#
-# Makefile for the linux system information tables.
-#
-# Note! Dependencies are done automagically by 'make dep', which also
-# removes any old dependencies. DON'T put your own dependencies here
-# unless it's something special (ie not a .c file).
-#
-# Note 2! The CFLAGS definition is now in the main makefile...
-
-O_TARGET := table.o
-OX_OBJS  := main.o
-
-M_TARGET := table_mod.o
-MX_OBJS  := module.o
-
-include $(TOPDIR)/Rules.make
--- a/kernel/table21/README
+++ b/kernel/table21/README
@@ -1,21 +0,0 @@
-This is a new system call `table ()' for the Linux table. It is faster
-than reading from /proc and can be used to fetch all information required
-for libgtop until whe have some other function (extended sysctl, ...) in
-standard kernels.
-
-I didn't want to change sysctl or some other function myself cause this may
-cause other applications relying upon those function to fail. This is
-something for the ``real'' kernel gurus ...
-
-To use this new system call for libgtop, do the following:
-
-* Copy this directory to /usr/src/linux/table
-* Make /usr/src/linux/include/linux/table.h symlink to /usr/src/linux/table/table.h
-* Apply the patch `kernel.patch' to the kernel, compile, install and reboot
-* Recompile libgtop (remove `config.cache' and run the `autogen.sh' again).
-
-If you want to change and/or add something - feel free to do so !
-
-Have fun,
-
-Martin
--- a/kernel/table21/entry-i386.S
+++ b/kernel/table21/entry-i386.S
@@ -1,571 +0,0 @@
-/*
- *  linux/arch/i386/entry.S
- *
- *  Copyright (C) 1991, 1992  Linus Torvalds
- */
-
-/*
- * entry.S contains the system-call and fault low-level handling routines.
- * This also contains the timer-interrupt handler, as well as all interrupts
- * and faults that can result in a task-switch.
- *
- * NOTE: This code handles signal-recognition, which happens every time
- * after a timer-interrupt and after each system call.
- *
- * I changed all the .align's to 4 (16 byte alignment), as that's faster
- * on a 486.
- *
- * Stack layout in 'ret_from_system_call':
- * 	ptrace needs to have all regs on the stack.
- *	if the order here is changed, it needs to be
- *	updated in fork.c:copy_process, signal.c:do_signal,
- *	ptrace.c and ptrace.h
- *
- *	 0(%esp) - %ebx
- *	 4(%esp) - %ecx
- *	 8(%esp) - %edx
- *       C(%esp) - %esi
- *	10(%esp) - %edi
- *	14(%esp) - %ebp
- *	18(%esp) - %eax
- *	1C(%esp) - %ds
- *	20(%esp) - %es
- *	24(%esp) - orig_eax
- *	28(%esp) - %eip
- *	2C(%esp) - %cs
- *	30(%esp) - %eflags
- *	34(%esp) - %oldesp
- *	38(%esp) - %oldss
- *
- * "current" is in register %ebx during any slow entries.
- */
-
-#include <linux/sys.h>
-#include <linux/linkage.h>
-#include <asm/segment.h>
-#define ASSEMBLY
-#include <asm/smp.h>
-
-EBX		= 0x00
-ECX		= 0x04
-EDX		= 0x08
-ESI		= 0x0C
-EDI		= 0x10
-EBP		= 0x14
-EAX		= 0x18
-DS		= 0x1C
-ES		= 0x20
-ORIG_EAX	= 0x24
-EIP		= 0x28
-CS		= 0x2C
-EFLAGS		= 0x30
-OLDESP		= 0x34
-OLDSS		= 0x38
-
-CF_MASK		= 0x00000001
-IF_MASK		= 0x00000200
-NT_MASK		= 0x00004000
-VM_MASK		= 0x00020000
-
-/*
- * these are offsets into the task-struct.
- */
-state		=  0
-flags		=  4
-sigpending	=  8
-addr_limit	= 12
-exec_domain	= 16
-need_resched	= 20
-
-ENOSYS = 38
-
-
-#define SAVE_ALL \
-	cld; \
-	pushl %es; \
-	pushl %ds; \
-	pushl %eax; \
-	pushl %ebp; \
-	pushl %edi; \
-	pushl %esi; \
-	pushl %edx; \
-	pushl %ecx; \
-	pushl %ebx; \
-	movl $(__KERNEL_DS),%edx; \
-	movl %dx,%ds; \
-	movl %dx,%es;
-
-#define RESTORE_ALL	\
-	popl %ebx;	\
-	popl %ecx;	\
-	popl %edx;	\
-	popl %esi;	\
-	popl %edi;	\
-	popl %ebp;	\
-	popl %eax;	\
-1:	popl %ds;	\
-2:	popl %es;	\
-3:	addl $4,%esp;	\
-	iret;		\
-.section fixup,"ax";	\
-4:	pushl $0;	\
-	popl %ds;	\
-	jmp 2b;		\
-5:	pushl $0;	\
-	popl %es;	\
-	jmp 3b;		\
-.previous;		\
-.section __ex_table,"a";\
-	.align 4;	\
-	.long 1b,4b;	\
-	.long 2b,5b;	\
-.previous
-
-#define GET_CURRENT(reg) \
-	movl %esp, reg; \
-	andl $-8192, reg;
-
-ENTRY(lcall7)
-	pushfl			# We get a different stack layout with call gates,
-	pushl %eax		# which has to be cleaned up later..
-	SAVE_ALL
-	movl EIP(%esp),%eax	# due to call gates, this is eflags, not eip..
-	movl CS(%esp),%edx	# this is eip..
-	movl EFLAGS(%esp),%ecx	# and this is cs..
-	movl %eax,EFLAGS(%esp)	#
-	movl %edx,EIP(%esp)	# Now we move them to their "normal" places
-	movl %ecx,CS(%esp)	#
-	movl %esp,%ebx
-	pushl %ebx
-	andl $-8192,%ebx	# GET_CURRENT
-	movl exec_domain(%ebx),%edx	# Get the execution domain
-	movl 4(%edx),%edx	# Get the lcall7 handler for the domain
-	call *%edx
-	popl %eax
-	jmp ret_from_sys_call
-
-
-#ifdef __SMP__
-	ALIGN
-	.globl	ret_from_smpfork
-ret_from_smpfork:
-	GET_CURRENT(%ebx)
-	btrl	$0, SYMBOL_NAME(scheduler_lock)
-	jmp	ret_from_sys_call
-#endif /* __SMP__ */
-
-/*
- * Return to user mode is not as complex as all this looks,
- * but we want the default path for a system call return to
- * go as quickly as possible which is why some of this is
- * less clear than it otherwise should be.
- */
-
-ENTRY(system_call)
-	pushl %eax			# save orig_eax
-	SAVE_ALL
-	GET_CURRENT(%ebx)
-	cmpl $(NR_syscalls),%eax
-	jae badsys
-	testb $0x20,flags(%ebx)		# PF_TRACESYS
-	jne tracesys
-	call *SYMBOL_NAME(sys_call_table)(,%eax,4)
-	movl %eax,EAX(%esp)		# save the return value
-	ALIGN
-	.globl ret_from_sys_call
-	.globl ret_from_intr
-ret_from_sys_call:
-	movl SYMBOL_NAME(bh_mask),%eax
-	andl SYMBOL_NAME(bh_active),%eax
-	jne handle_bottom_half
-ret_with_reschedule:
-	cmpl $0,need_resched(%ebx)
-	jne reschedule
-	cmpl $0,sigpending(%ebx)
-	jne signal_return
-	RESTORE_ALL
-	ALIGN
-signal_return:
-	testl $(VM_MASK),EFLAGS(%esp)
-	pushl %esp
-	jne v86_signal_return
-	pushl $0
-	call SYMBOL_NAME(do_signal)
-	addl $8,%esp
-	RESTORE_ALL
-	ALIGN
-v86_signal_return:
-	call SYMBOL_NAME(save_v86_state)
-	movl %eax,%esp
-	pushl %eax
-	pushl $0
-	call SYMBOL_NAME(do_signal)
-	addl $8,%esp
-	RESTORE_ALL
-	ALIGN
-tracesys:
-	movl $-ENOSYS,EAX(%esp)
-	call SYMBOL_NAME(syscall_trace)
-	movl ORIG_EAX(%esp),%eax
-	call *SYMBOL_NAME(sys_call_table)(,%eax,4)
-	movl %eax,EAX(%esp)		# save the return value
-	call SYMBOL_NAME(syscall_trace)
-	jmp ret_from_sys_call
-badsys:
-	movl $-ENOSYS,EAX(%esp)
-	jmp ret_from_sys_call
-
-	ALIGN
-ret_from_exception:
-	movl SYMBOL_NAME(bh_mask),%eax
-	andl SYMBOL_NAME(bh_active),%eax
-	jne handle_bottom_half
-	ALIGN
-ret_from_intr:
-	GET_CURRENT(%ebx)
-	movl EFLAGS(%esp),%eax		# mix EFLAGS and CS
-	movb CS(%esp),%al
-	testl $(VM_MASK | 3),%eax	# return to VM86 mode or non-supervisor?
-	jne ret_with_reschedule
-	RESTORE_ALL
-
-	ALIGN
-handle_bottom_half:
-	pushl $ret_from_intr
-	jmp SYMBOL_NAME(do_bottom_half)
-
-	ALIGN
-reschedule:
-	pushl $ret_from_sys_call
-	jmp SYMBOL_NAME(schedule)    # test
-
-
-ENTRY(divide_error)
-	pushl $0		# no error code
-	pushl $ SYMBOL_NAME(do_divide_error)
-	ALIGN
-error_code:
-	pushl %ds
-	pushl %eax
-	xorl %eax,%eax
-	pushl %ebp
-	pushl %edi
-	pushl %esi
-	pushl %edx
-	decl %eax			# eax = -1
-	pushl %ecx
-	pushl %ebx
-#if 1
-	xorl %ecx,%ecx			# zero ecx
-	cld
-	mov %es,%cx			# get the lower order bits of es
-#else
-	cld
-# Some older processors leave the top 16 bits of the 32 bit destination
-# register undefined, rather than zeroed in the following instruction.
-# This won't matter when restoring or loading a segment register from the
-# stack.  It may be a problem if any code reads the full 32 bit value.
-# dosemu? kernel?  Would somebody like to verify that this way is really OK?
-	movl %es,%cx
-#endif
-	xchgl %eax, ORIG_EAX(%esp)	# orig_eax (get the error code. )
-	movl %esp,%edx
-	xchgl %ecx, ES(%esp)		# get the address and save es.
-	pushl %eax			# push the error code
-	pushl %edx
-	movl $(__KERNEL_DS),%edx
-	movl %dx,%ds
-	movl %dx,%es
-	GET_CURRENT(%ebx)
-	call *%ecx
-	addl $8,%esp
-	jmp ret_from_exception
-
-ENTRY(coprocessor_error)
-	pushl $0
-	pushl $ SYMBOL_NAME(do_coprocessor_error)
-	jmp error_code
-
-ENTRY(device_not_available)
-	pushl $-1		# mark this as an int
-	SAVE_ALL
-	GET_CURRENT(%ebx)
-	pushl $ret_from_exception
-	movl %cr0,%eax
-	testl $0x4,%eax			# EM (math emulation bit)
-	je SYMBOL_NAME(math_state_restore)
-	pushl $0		# temporary storage for ORIG_EIP
-	call  SYMBOL_NAME(math_emulate)
-	addl $4,%esp
-	ret
-
-ENTRY(debug)
-	pushl $0
-	pushl $ SYMBOL_NAME(do_debug)
-	jmp error_code
-
-ENTRY(nmi)
-	pushl $0
-	pushl $ SYMBOL_NAME(do_nmi)
-	jmp error_code
-
-ENTRY(int3)
-	pushl $0
-	pushl $ SYMBOL_NAME(do_int3)
-	jmp error_code
-
-ENTRY(overflow)
-	pushl $0
-	pushl $ SYMBOL_NAME(do_overflow)
-	jmp error_code
-
-ENTRY(bounds)
-	pushl $0
-	pushl $ SYMBOL_NAME(do_bounds)
-	jmp error_code
-
-ENTRY(invalid_op)
-	pushl $0
-	pushl $ SYMBOL_NAME(do_invalid_op)
-	jmp error_code
-
-ENTRY(coprocessor_segment_overrun)
-	pushl $0
-	pushl $ SYMBOL_NAME(do_coprocessor_segment_overrun)
-	jmp error_code
-
-ENTRY(reserved)
-	pushl $0
-	pushl $ SYMBOL_NAME(do_reserved)
-	jmp error_code
-
-ENTRY(double_fault)
-	pushl $ SYMBOL_NAME(do_double_fault)
-	jmp error_code
-
-ENTRY(invalid_TSS)
-	pushl $ SYMBOL_NAME(do_invalid_TSS)
-	jmp error_code
-
-ENTRY(segment_not_present)
-	pushl $ SYMBOL_NAME(do_segment_not_present)
-	jmp error_code
-
-ENTRY(stack_segment)
-	pushl $ SYMBOL_NAME(do_stack_segment)
-	jmp error_code
-
-ENTRY(general_protection)
-	pushl $ SYMBOL_NAME(do_general_protection)
-	jmp error_code
-
-ENTRY(alignment_check)
-	pushl $ SYMBOL_NAME(do_alignment_check)
-	jmp error_code
-
-ENTRY(page_fault)
-	pushl $ SYMBOL_NAME(do_page_fault)
-	jmp error_code
-
-ENTRY(spurious_interrupt_bug)
-	pushl $0
-	pushl $ SYMBOL_NAME(do_spurious_interrupt_bug)
-	jmp error_code
-
-.data
-ENTRY(sys_call_table)
-	.long SYMBOL_NAME(sys_setup)		/* 0 */
-	.long SYMBOL_NAME(sys_exit)
-	.long SYMBOL_NAME(sys_fork)
-	.long SYMBOL_NAME(sys_read)
-	.long SYMBOL_NAME(sys_write)
-	.long SYMBOL_NAME(sys_open)		/* 5 */
-	.long SYMBOL_NAME(sys_close)
-	.long SYMBOL_NAME(sys_waitpid)
-	.long SYMBOL_NAME(sys_creat)
-	.long SYMBOL_NAME(sys_link)
-	.long SYMBOL_NAME(sys_unlink)		/* 10 */
-	.long SYMBOL_NAME(sys_execve)
-	.long SYMBOL_NAME(sys_chdir)
-	.long SYMBOL_NAME(sys_time)
-	.long SYMBOL_NAME(sys_mknod)
-	.long SYMBOL_NAME(sys_chmod)		/* 15 */
-	.long SYMBOL_NAME(sys_lchown)
-	.long SYMBOL_NAME(sys_ni_syscall)				/* old break syscall holder */
-	.long SYMBOL_NAME(sys_stat)
-	.long SYMBOL_NAME(sys_lseek)
-	.long SYMBOL_NAME(sys_getpid)		/* 20 */
-	.long SYMBOL_NAME(sys_mount)
-	.long SYMBOL_NAME(sys_umount)
-	.long SYMBOL_NAME(sys_setuid)
-	.long SYMBOL_NAME(sys_getuid)
-	.long SYMBOL_NAME(sys_stime)		/* 25 */
-	.long SYMBOL_NAME(sys_ptrace)
-	.long SYMBOL_NAME(sys_alarm)
-	.long SYMBOL_NAME(sys_fstat)
-	.long SYMBOL_NAME(sys_pause)
-	.long SYMBOL_NAME(sys_utime)		/* 30 */
-	.long SYMBOL_NAME(sys_ni_syscall)				/* old stty syscall holder */
-	.long SYMBOL_NAME(sys_ni_syscall)				/* old gtty syscall holder */
-	.long SYMBOL_NAME(sys_access)
-	.long SYMBOL_NAME(sys_nice)
-	.long SYMBOL_NAME(sys_ni_syscall)	/* 35 */		/* old ftime syscall holder */
-	.long SYMBOL_NAME(sys_sync)
-	.long SYMBOL_NAME(sys_kill)
-	.long SYMBOL_NAME(sys_rename)
-	.long SYMBOL_NAME(sys_mkdir)
-	.long SYMBOL_NAME(sys_rmdir)		/* 40 */
-	.long SYMBOL_NAME(sys_dup)
-	.long SYMBOL_NAME(sys_pipe)
-	.long SYMBOL_NAME(sys_times)
-	.long SYMBOL_NAME(sys_ni_syscall)				/* old prof syscall holder */
-	.long SYMBOL_NAME(sys_brk)		/* 45 */
-	.long SYMBOL_NAME(sys_setgid)
-	.long SYMBOL_NAME(sys_getgid)
-	.long SYMBOL_NAME(sys_signal)
-	.long SYMBOL_NAME(sys_geteuid)
-	.long SYMBOL_NAME(sys_getegid)		/* 50 */
-	.long SYMBOL_NAME(sys_acct)
-	.long SYMBOL_NAME(sys_ni_syscall)				/* old phys syscall holder */
-	.long SYMBOL_NAME(sys_ni_syscall)				/* old lock syscall holder */
-	.long SYMBOL_NAME(sys_ioctl)
-	.long SYMBOL_NAME(sys_fcntl)		/* 55 */
-	.long SYMBOL_NAME(sys_ni_syscall)				/* old mpx syscall holder */
-	.long SYMBOL_NAME(sys_setpgid)
-	.long SYMBOL_NAME(sys_ni_syscall)				/* old ulimit syscall holder */
-	.long SYMBOL_NAME(sys_olduname)
-	.long SYMBOL_NAME(sys_umask)		/* 60 */
-	.long SYMBOL_NAME(sys_chroot)
-	.long SYMBOL_NAME(sys_ustat)
-	.long SYMBOL_NAME(sys_dup2)
-	.long SYMBOL_NAME(sys_getppid)
-	.long SYMBOL_NAME(sys_getpgrp)		/* 65 */
-	.long SYMBOL_NAME(sys_setsid)
-	.long SYMBOL_NAME(sys_sigaction)
-	.long SYMBOL_NAME(sys_sgetmask)
-	.long SYMBOL_NAME(sys_ssetmask)
-	.long SYMBOL_NAME(sys_setreuid)		/* 70 */
-	.long SYMBOL_NAME(sys_setregid)
-	.long SYMBOL_NAME(sys_sigsuspend)
-	.long SYMBOL_NAME(sys_sigpending)
-	.long SYMBOL_NAME(sys_sethostname)
-	.long SYMBOL_NAME(sys_setrlimit)	/* 75 */
-	.long SYMBOL_NAME(sys_getrlimit)
-	.long SYMBOL_NAME(sys_getrusage)
-	.long SYMBOL_NAME(sys_gettimeofday)
-	.long SYMBOL_NAME(sys_settimeofday)
-	.long SYMBOL_NAME(sys_getgroups)	/* 80 */
-	.long SYMBOL_NAME(sys_setgroups)
-	.long SYMBOL_NAME(old_select)
-	.long SYMBOL_NAME(sys_symlink)
-	.long SYMBOL_NAME(sys_lstat)
-	.long SYMBOL_NAME(sys_readlink)		/* 85 */
-	.long SYMBOL_NAME(sys_uselib)
-	.long SYMBOL_NAME(sys_swapon)
-	.long SYMBOL_NAME(sys_reboot)
-	.long SYMBOL_NAME(old_readdir)
-	.long SYMBOL_NAME(old_mmap)		/* 90 */
-	.long SYMBOL_NAME(sys_munmap)
-	.long SYMBOL_NAME(sys_truncate)
-	.long SYMBOL_NAME(sys_ftruncate)
-	.long SYMBOL_NAME(sys_fchmod)
-	.long SYMBOL_NAME(sys_fchown)		/* 95 */
-	.long SYMBOL_NAME(sys_getpriority)
-	.long SYMBOL_NAME(sys_setpriority)
-	.long SYMBOL_NAME(sys_ni_syscall)				/* old profil syscall holder */
-	.long SYMBOL_NAME(sys_statfs)
-	.long SYMBOL_NAME(sys_fstatfs)		/* 100 */
-	.long SYMBOL_NAME(sys_ioperm)
-	.long SYMBOL_NAME(sys_socketcall)
-	.long SYMBOL_NAME(sys_syslog)
-	.long SYMBOL_NAME(sys_setitimer)
-	.long SYMBOL_NAME(sys_getitimer)	/* 105 */
-	.long SYMBOL_NAME(sys_newstat)
-	.long SYMBOL_NAME(sys_newlstat)
-	.long SYMBOL_NAME(sys_newfstat)
-	.long SYMBOL_NAME(sys_uname)
-	.long SYMBOL_NAME(sys_iopl)		/* 110 */
-	.long SYMBOL_NAME(sys_vhangup)
-	.long SYMBOL_NAME(sys_idle)
-	.long SYMBOL_NAME(sys_vm86old)
-	.long SYMBOL_NAME(sys_wait4)
-	.long SYMBOL_NAME(sys_swapoff)		/* 115 */
-	.long SYMBOL_NAME(sys_sysinfo)
-	.long SYMBOL_NAME(sys_ipc)
-	.long SYMBOL_NAME(sys_fsync)
-	.long SYMBOL_NAME(sys_sigreturn)
-	.long SYMBOL_NAME(sys_clone)		/* 120 */
-	.long SYMBOL_NAME(sys_setdomainname)
-	.long SYMBOL_NAME(sys_newuname)
-	.long SYMBOL_NAME(sys_modify_ldt)
-	.long SYMBOL_NAME(sys_adjtimex)
-	.long SYMBOL_NAME(sys_mprotect)		/* 125 */
-	.long SYMBOL_NAME(sys_sigprocmask)
-	.long SYMBOL_NAME(sys_create_module)
-	.long SYMBOL_NAME(sys_init_module)
-	.long SYMBOL_NAME(sys_delete_module)
-	.long SYMBOL_NAME(sys_get_kernel_syms)	/* 130 */
-	.long SYMBOL_NAME(sys_quotactl)
-	.long SYMBOL_NAME(sys_getpgid)
-	.long SYMBOL_NAME(sys_fchdir)
-	.long SYMBOL_NAME(sys_bdflush)
-	.long SYMBOL_NAME(sys_sysfs)		/* 135 */
-	.long SYMBOL_NAME(sys_personality)
-	.long SYMBOL_NAME(sys_ni_syscall)	/* for afs_syscall */
-	.long SYMBOL_NAME(sys_setfsuid)
-	.long SYMBOL_NAME(sys_setfsgid)
-	.long SYMBOL_NAME(sys_llseek)		/* 140 */
-	.long SYMBOL_NAME(sys_getdents)
-	.long SYMBOL_NAME(sys_select)
-	.long SYMBOL_NAME(sys_flock)
-	.long SYMBOL_NAME(sys_msync)
-	.long SYMBOL_NAME(sys_readv)		/* 145 */
-	.long SYMBOL_NAME(sys_writev)
-	.long SYMBOL_NAME(sys_getsid)
-	.long SYMBOL_NAME(sys_fdatasync)
-	.long SYMBOL_NAME(sys_sysctl)
-	.long SYMBOL_NAME(sys_mlock)		/* 150 */
-	.long SYMBOL_NAME(sys_munlock)
-	.long SYMBOL_NAME(sys_mlockall)
-	.long SYMBOL_NAME(sys_munlockall)
-	.long SYMBOL_NAME(sys_sched_setparam)
-	.long SYMBOL_NAME(sys_sched_getparam)   /* 155 */
-	.long SYMBOL_NAME(sys_sched_setscheduler)
-	.long SYMBOL_NAME(sys_sched_getscheduler)
-	.long SYMBOL_NAME(sys_sched_yield)
-	.long SYMBOL_NAME(sys_sched_get_priority_max)
-	.long SYMBOL_NAME(sys_sched_get_priority_min)  /* 160 */
-	.long SYMBOL_NAME(sys_sched_rr_get_interval)
-	.long SYMBOL_NAME(sys_nanosleep)
-	.long SYMBOL_NAME(sys_mremap)
-	.long SYMBOL_NAME(sys_setresuid)
-	.long SYMBOL_NAME(sys_getresuid)	/* 165 */
-	.long SYMBOL_NAME(sys_vm86)
-	.long SYMBOL_NAME(sys_query_module)
-	.long SYMBOL_NAME(sys_poll)
-	.long SYMBOL_NAME(sys_nfsservctl)
-	.long SYMBOL_NAME(sys_setresgid)	/* 170 */
-	.long SYMBOL_NAME(sys_getresgid)
-	.long SYMBOL_NAME(sys_prctl)
-	.long SYMBOL_NAME(sys_rt_sigreturn)
-	.long SYMBOL_NAME(sys_rt_sigaction)
-	.long SYMBOL_NAME(sys_rt_sigprocmask)	/* 175 */
-	.long SYMBOL_NAME(sys_rt_sigpending)
-	.long SYMBOL_NAME(sys_rt_sigtimedwait)
-	.long SYMBOL_NAME(sys_rt_sigqueueinfo)
-	.long SYMBOL_NAME(sys_rt_sigsuspend)
-	.long SYMBOL_NAME(sys_pread)		/* 180 */
-	.long SYMBOL_NAME(sys_pwrite)
-	.long SYMBOL_NAME(sys_chown)
-	.long SYMBOL_NAME(sys_getcwd)
-	.long SYMBOL_NAME(sys_capget)
-	.long SYMBOL_NAME(sys_capset)           /* 185 */
-	.long SYMBOL_NAME(sys_sigaltstack)
-	.long SYMBOL_NAME(sys_sendfile)
-	.long SYMBOL_NAME(sys_ni_syscall)		/* streams1 */
-	.long SYMBOL_NAME(sys_ni_syscall)		/* streams2 */
-	.long SYMBOL_NAME(sys_table)		/* 190 */
-	
-	.rept NR_syscalls-190
-		.long SYMBOL_NAME(sys_ni_syscall)
-	.endr
--- a/kernel/table21/main.c
+++ b/kernel/table21/main.c
@@ -1,61 +0,0 @@
-/*
- * linux/table/table_impl.c
- * Copyright (C) 1998 Martin Baulig
- */
-
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <linux/sched.h>
-#include <linux/kernel.h>
-#include <linux/kernel_stat.h>
-#include <linux/tty.h>
-#include <linux/user.h>
-#include <linux/a.out.h>
-#include <linux/string.h>
-#include <linux/mman.h>
-#include <linux/proc_fs.h>
-#include <linux/ioport.h>
-#include <linux/config.h>
-#include <linux/mm.h>
-#include <linux/pagemap.h>
-#include <linux/swap.h>
-#include <linux/slab.h>
-#include <linux/smp.h>
-#include <linux/signal.h>
-
-#include <asm/uaccess.h>
-#include <asm/pgtable.h>
-#include <asm/io.h>
-
-#include <linux/module.h>
-#include <linux/table.h>
-
-#include "version.h"
-
-extern void scheduling_functions_start_here(void);
-extern void scheduling_functions_end_here(void);
-
-int (*table_function_ptr) (int, union table *, const void *) = 0;
-
-EXPORT_SYMBOL(table_function_ptr);
-
-EXPORT_SYMBOL(nr_running);
-EXPORT_SYMBOL(pidhash);
-EXPORT_SYMBOL(task);
-EXPORT_SYMBOL(si_swapinfo);
-EXPORT_SYMBOL(scheduling_functions_start_here);
-EXPORT_SYMBOL(scheduling_functions_end_here);
-EXPORT_SYMBOL(avenrun);
-EXPORT_SYMBOL(nr_tasks);
-EXPORT_SYMBOL(last_pid);
-EXPORT_SYMBOL(page_cache_size);
-EXPORT_SYMBOL(init_mm);
-
-asmlinkage int
-sys_table (int type, union table *buf, const void *param)
-{
-	if (table_function_ptr == 0)
-		return -ENOSYS;
-
-	return (*table_function_ptr) (type, buf, param);
-}
--- a/kernel/table21/module.c
+++ b/kernel/table21/module.c
@@ -1,607 +0,0 @@
-/*
- * linux/table/table_impl.c
- * Copyright (C) 1998 Martin Baulig
- */
-
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <linux/sched.h>
-#include <linux/kernel.h>
-#include <linux/kernel_stat.h>
-#include <linux/tty.h>
-#include <linux/user.h>
-#include <linux/a.out.h>
-#include <linux/string.h>
-#include <linux/mman.h>
-#include <linux/proc_fs.h>
-#include <linux/ioport.h>
-#include <linux/config.h>
-#include <linux/mm.h>
-#include <linux/pagemap.h>
-#include <linux/swap.h>
-#include <linux/slab.h>
-#include <linux/smp.h>
-#include <linux/signal.h>
-
-#include <asm/uaccess.h>
-#include <asm/pgtable.h>
-#include <asm/io.h>
-
-#include <linux/module.h>
-#include <linux/table.h>
-
-#include "version.h"
-
-extern int (*table_function_ptr) (int, union table *, const void *);
-
-int table_fkt (int, union table *, const void *);
-
-EXPORT_NO_SYMBOLS;
-
-int
-init_module(void)
-{
-	printk ("init_module () = %p - %d, %d\n",
-		table_fkt, sizeof (union table), sizeof (sigset_t));
-	table_function_ptr = table_fkt;
-	return 0;
-}
-
-void
-cleanup_module(void)
-{
-	table_function_ptr = 0;
-}
-
-#define LOAD_INT(x) ((x) >> FSHIFT)
-#define LOAD_FRAC(x) LOAD_INT(((x) & (FIXED_1-1)) * 100)
-
-#ifdef CONFIG_DEBUG_MALLOC
-int get_malloc(char * buffer);
-#endif
-
-static void collect_sigign_sigcatch(struct task_struct *p, sigset_t *ign,
-				    sigset_t *catch)
-{
-	struct k_sigaction *k;
-	int i;
-
-	sigemptyset(ign);
-	sigemptyset(catch);
-
-#if 0
-	printk ("collect_sigign_sigcatch: %p - %p\n",
-		p, p->sig);
-#endif
-
-	if (p->sig) {
-		k = p->sig->action;
-		for (i = 1; i <= _NSIG; ++i, ++k) {
-#if 0
-			printk ("signal: %d - %p (%p, %p)\n",
-				i, k->sa.sa_handler, SIG_IGN, SIG_DFL);
-#endif
-			if (k->sa.sa_handler == SIG_IGN)
-				sigaddset(ign, i);
-			else if (k->sa.sa_handler != SIG_DFL)
-				sigaddset(catch, i);
-		}
-	}
-}
-
-/*
- * These bracket the sleeping functions..
- */
-extern void scheduling_functions_start_here(void);
-extern void scheduling_functions_end_here(void);
-#define first_sched	((unsigned long) scheduling_functions_start_here)
-#define last_sched	((unsigned long) scheduling_functions_end_here)
-
-static unsigned long get_wchan(struct task_struct *p)
-{
-	if (!p || p == current || p->state == TASK_RUNNING)
-		return 0;
-#if defined(__i386__)
-	{
-		unsigned long ebp, eip;
-		unsigned long stack_page;
-		int count = 0;
-
-		stack_page = 4096 + (unsigned long)p;
-		if (!stack_page)
-			return 0;
-		ebp = p->tss.ebp;
-		do {
-			if (ebp < stack_page || ebp >= 4092+stack_page)
-				return 0;
-			eip = *(unsigned long *) (ebp+4);
-			if (eip < first_sched || eip >= last_sched)
-				return eip;
-			ebp = *(unsigned long *) ebp;
-		} while (count++ < 16);
-	}
-#elif defined(__alpha__)
-	/*
-	 * This one depends on the frame size of schedule().  Do a
-	 * "disass schedule" in gdb to find the frame size.  Also, the
-	 * code assumes that sleep_on() follows immediately after
-	 * interruptible_sleep_on() and that add_timer() follows
-	 * immediately after interruptible_sleep().  Ugly, isn't it?
-	 * Maybe adding a wchan field to task_struct would be better,
-	 * after all...
-	 */
-	{
-	    unsigned long schedule_frame;
-	    unsigned long pc;
-
-	    pc = thread_saved_pc(&p->tss);
-	    if (pc >= first_sched && pc < last_sched) {
-		schedule_frame = ((unsigned long *)p->tss.ksp)[6];
-		return ((unsigned long *)schedule_frame)[12];
-	    }
-	    return pc;
-	}
-#elif defined(__mc68000__)
-	{
-	    unsigned long fp, pc;
-	    unsigned long stack_page;
-	    int count = 0;
-	    extern int sys_pause (void);
-
-	    stack_page = p->kernel_stack_page;
-	    if (!stack_page)
-		    return 0;
-	    fp = ((struct switch_stack *)p->tss.ksp)->a6;
-	    do {
-		    if (fp < stack_page || fp >= 4088+stack_page)
-			    return 0;
-		    pc = ((unsigned long *)fp)[1];
-		/* FIXME: This depends on the order of these functions. */
-		    if (pc < first_sched || pc >= last_sched)
-		      return pc;
-		    fp = *(unsigned long *) fp;
-	    } while (count++ < 16);
-	}
-#elif defined(__powerpc__)
-	return (p->tss.wchan);
-#elif defined (CONFIG_ARM)
-	{
-		unsigned long fp, lr;
-		unsigned long stack_page;
-		int count = 0;
-
-		stack_page = 4096 + (unsigned long)p;
-		fp = get_css_fp (&p->tss);
-		do {
-			if (fp < stack_page || fp > 4092+stack_page)
-				return 0;
-			lr = pc_pointer (((unsigned long *)fp)[-1]);
-			if (lr < first_sched || lr > last_sched)
-				return lr;
-			fp = *(unsigned long *) (fp - 12);
-		} while (count ++ < 16);
-	}
-#endif
-	return 0;
-}
-
-#if defined(__i386__)
-# define KSTK_EIP(tsk)	(((unsigned long *)(4096+(unsigned long)(tsk)))[1019])
-# define KSTK_ESP(tsk)	(((unsigned long *)(4096+(unsigned long)(tsk)))[1022])
-#elif defined(__alpha__)
-  /*
-   * See arch/alpha/kernel/ptrace.c for details.
-   */
-# define PT_REG(reg)		(PAGE_SIZE - sizeof(struct pt_regs)	\
-				 + (long)&((struct pt_regs *)0)->reg)
-# define KSTK_EIP(tsk) \
-    (*(unsigned long *)(PT_REG(pc) + PAGE_SIZE + (unsigned long)(tsk)))
-# define KSTK_ESP(tsk)	((tsk) == current ? rdusp() : (tsk)->tss.usp)
-#elif defined(CONFIG_ARM)
-# define KSTK_EIP(tsk)	(((unsigned long *)(4096+(unsigned long)(tsk)))[1022])
-# define KSTK_ESP(tsk)	(((unsigned long *)(4096+(unsigned long)(tsk)))[1020])
-#elif defined(__mc68000__)
-#define	KSTK_EIP(tsk)	\
-    ({			\
-	unsigned long eip = 0;	 \
- 	if ((tsk)->tss.esp0 > PAGE_SIZE && \
-	    MAP_NR((tsk)->tss.esp0) < max_mapnr) \
-	      eip = ((struct pt_regs *) (tsk)->tss.esp0)->pc;	 \
-        eip; })
-#define	KSTK_ESP(tsk)	((tsk) == current ? rdusp() : (tsk)->tss.usp)
-#elif defined(__powerpc__)
-#define KSTK_EIP(tsk)	((tsk)->tss.regs->nip)
-#define KSTK_ESP(tsk)	((tsk)->tss.regs->gpr[1])
-#elif defined (__sparc_v9__)
-# define KSTK_EIP(tsk)  ((tsk)->tss.kregs->tpc)
-# define KSTK_ESP(tsk)  ((tsk)->tss.kregs->u_regs[UREG_FP])
-#elif defined(__sparc__)
-# define KSTK_EIP(tsk)  ((tsk)->tss.kregs->pc)
-# define KSTK_ESP(tsk)  ((tsk)->tss.kregs->u_regs[UREG_FP])
-#endif
-
-/* Gcc optimizes away "strlen(x)" for constant x */
-#define ADDBUF(buffer, string) \
-do { memcpy(buffer, string, strlen(string)); \
-     buffer += strlen(string); } while (0)
-
-static inline void statm_pte_range(pmd_t * pmd, unsigned long address, unsigned long size,
-	int * pages, int * shared, int * dirty, int * total)
-{
-	pte_t * pte;
-	unsigned long end;
-
-	if (pmd_none(*pmd))
-		return;
-	if (pmd_bad(*pmd)) {
-		printk("statm_pte_range: bad pmd (%08lx)\n", pmd_val(*pmd));
-		pmd_clear(pmd);
-		return;
-	}
-	pte = pte_offset(pmd, address);
-	address &= ~PMD_MASK;
-	end = address + size;
-	if (end > PMD_SIZE)
-		end = PMD_SIZE;
-	do {
-		pte_t page = *pte;
-
-		address += PAGE_SIZE;
-		pte++;
-		if (pte_none(page))
-			continue;
-		++*total;
-		if (!pte_present(page))
-			continue;
-		++*pages;
-		if (pte_dirty(page))
-			++*dirty;
-		if (MAP_NR(pte_page(page)) >= max_mapnr)
-			continue;
-		if (atomic_read(&mem_map[MAP_NR(pte_page(page))].count) > 1)
-			++*shared;
-	} while (address < end);
-}
-
-static inline void statm_pmd_range(pgd_t * pgd, unsigned long address, unsigned long size,
-	int * pages, int * shared, int * dirty, int * total)
-{
-	pmd_t * pmd;
-	unsigned long end;
-
-	if (pgd_none(*pgd))
-		return;
-	if (pgd_bad(*pgd)) {
-		printk("statm_pmd_range: bad pgd (%08lx)\n", pgd_val(*pgd));
-		pgd_clear(pgd);
-		return;
-	}
-	pmd = pmd_offset(pgd, address);
-	address &= ~PGDIR_MASK;
-	end = address + size;
-	if (end > PGDIR_SIZE)
-		end = PGDIR_SIZE;
-	do {
-		statm_pte_range(pmd, address, end - address, pages, shared, dirty, total);
-		address = (address + PMD_SIZE) & PMD_MASK;
-		pmd++;
-	} while (address < end);
-}
-
-static void statm_pgd_range(pgd_t * pgd, unsigned long address, unsigned long end,
-	int * pages, int * shared, int * dirty, int * total)
-{
-	while (address < end) {
-		statm_pmd_range(pgd, address, end - address, pages, shared, dirty, total);
-		address = (address + PGDIR_SIZE) & PGDIR_MASK;
-		pgd++;
-	}
-}
-
-int
-table_fkt (int type, union table *buf, const void *param)
-{
-	union table tbl;
-	struct sysinfo i;
-	struct task_struct *tsk = NULL;
-	struct proclist_args plistargs;
-	int index, tindex, err, tty;
-	sigset_t sigign, sigcatch;
-	pid_t pid;
-
-	if (type == TABLE_VERSION)
-		return _TABLE_VERSION;
-
-	if (!buf)
-		return -EFAULT;
-
-	memset (&tbl, 0, sizeof (union table));
-
-	/* For TABLE_PROC_*, read pid and get task_struct */
-
-	switch (type) {
-	case TABLE_PROC_UID:
-	case TABLE_PROC_MEM:
-	case TABLE_PROC_SEGMENT:
-	case TABLE_PROC_TIME:
-	case TABLE_PROC_STATE:
-	case TABLE_PROC_SIGNAL:
-	case TABLE_PROC_KERNEL:
-		err = verify_area (VERIFY_READ, param, sizeof (pid_t));
-		if (err)
-			return err;
-		copy_from_user (&pid, param, sizeof (pid_t));
-
-		read_lock (&tasklist_lock);
-		tsk = find_task_by_pid (pid);
-		/* FIXME!! This should be done after the last use */
-		read_unlock(&tasklist_lock);
-
-		if (tsk == NULL)
-			return -ESRCH;
-		break;
-	case TABLE_PROCLIST:
-		err = verify_area (VERIFY_READ, param,
-				   sizeof (struct proclist_args));
-		if (err)
-			return err;
-		copy_from_user (&plistargs, param,
-				sizeof (struct proclist_args));
-		break;
-	}
-
-	/* Main function dispatcher */
-
-	switch (type) {
-	case TABLE_PROCLIST:
-		tsk = task [0];
-		read_lock (&tasklist_lock);
-		for (index = tindex = 0; index < nr_tasks;
-		     index++, tsk = tsk->next_task) {
-			if (tsk->pid == 0) continue;
-			switch (plistargs.which & TABLE_KERN_PROC_MASK) {
-			case TABLE_KERN_PROC_PID:
-				if (tsk->pid != plistargs.arg) continue;
-				break;
-			case TABLE_KERN_PROC_PGRP:
-				if (tsk->pgrp != plistargs.arg) continue;
-				break;
-			case TABLE_KERN_PROC_SESSION:
-				if (tsk->session != plistargs.arg) continue;
-			case TABLE_KERN_PROC_TTY:
-				tty = tsk->tty ?
-					kdev_t_to_nr (tsk->tty->device) : 0;
-				if (tty != plistargs.arg) continue;
-				break;
-			case TABLE_KERN_PROC_UID:
-				if (tsk->uid != plistargs.arg) continue;
-				break;
-			case TABLE_KERN_PROC_RUID:
-				if (tsk->euid != plistargs.arg) continue;
-				break;
-			}
-
-			if ((plistargs.which & TABLE_EXCLUDE_IDLE) &&
-			    (tsk->state != 0))
-				continue;
-
-			if ((plistargs.which & TABLE_EXCLUDE_NOTTY) &&
-			    (tsk->tty == NULL))
-				continue;
-
-			tbl.proclist.pids [tindex++] = tsk->pid;
-		}
-		tbl.proclist.nr_running = nr_running;
-		tbl.proclist.last_pid = last_pid;
-		tbl.proclist.nr_tasks = tindex;
-		read_unlock(&tasklist_lock);
-		break;
-	case TABLE_CPU:
-		tbl.cpu.total = jiffies;
-		tbl.cpu.user  = kstat.cpu_user;
-		tbl.cpu.nice  = kstat.cpu_nice;
-		tbl.cpu.sys   = kstat.cpu_system;
-		tbl.cpu.idle  = tbl.cpu.total -
-			(tbl.cpu.user + tbl.cpu.nice + tbl.cpu.sys);
-		tbl.cpu.frequency = HZ;
-		break;
-	case TABLE_MEM:
-		si_meminfo (&i);
-		tbl.mem.total  = i.totalram;
-		tbl.mem.used   = i.totalram - i.freeram;
-		tbl.mem.free   = i.freeram;
-		tbl.mem.shared = i.sharedram;
-		tbl.mem.buffer = i.bufferram;
-		tbl.mem.cached = page_cache_size << PAGE_SHIFT;
-		break;
-	case TABLE_SWAP:
-		si_swapinfo (&i);
-		tbl.swap.total = i.totalswap;
-		tbl.swap.used  = i.totalswap - i.freeswap;
-		tbl.swap.free  = i.freeswap;
-		break;
-	case TABLE_LOADAVG:
-		tbl.loadavg.loadavg [0] = (double) avenrun [0] / (1 << FSHIFT);
-		tbl.loadavg.loadavg [1] = (double) avenrun [1] / (1 << FSHIFT);
-		tbl.loadavg.loadavg [2] = (double) avenrun [2] / (1 << FSHIFT);
-		tbl.loadavg.nr_running = nr_running;
-		tbl.loadavg.nr_tasks = nr_tasks;
-		tbl.loadavg.last_pid = last_pid;
-		break;
-	case TABLE_UPTIME:
-		tbl.uptime.uptime = jiffies;
-		tbl.uptime.idle   = task[0]->times.tms_utime +
-			task[0]->times.tms_stime;
-		break;
-	case TABLE_PROC_STATE:
-		tbl.proc_state.uid = tsk->uid;
-		tbl.proc_state.gid = tsk->gid;
-		tbl.proc_state.state = tsk->state;
-		tbl.proc_state.flags = tsk->flags;
-		memcpy (tbl.proc_state.comm, tsk->comm,
-			sizeof (tbl.proc_state.comm));
-		break;
-	case TABLE_PROC_UID:
-		tbl.proc_uid.uid = tsk->uid;
-		tbl.proc_uid.euid = tsk->euid;
-		tbl.proc_uid.suid = tsk->suid;
-		tbl.proc_uid.fsuid = tsk->fsuid;
-
-		tbl.proc_uid.gid = tsk->gid;
-		tbl.proc_uid.egid = tsk->egid;
-		tbl.proc_uid.sgid = tsk->sgid;
-		tbl.proc_uid.fsgid = tsk->fsgid;
-
-		tbl.proc_uid.pid = tsk->pid;
-		tbl.proc_uid.pgrp = tsk->pgrp;
-		tbl.proc_uid.ppid = tsk->p_pptr->pid;
-
-		tbl.proc_uid.session = tsk->session;
-	        tbl.proc_uid.tty = tsk->tty ?
-			kdev_t_to_nr (tsk->tty->device) : 0;
-		tbl.proc_uid.tpgid = tsk->tty ? tsk->tty->pgrp : -1;
-
-		tbl.proc_uid.priority = tsk->priority;
-		tbl.proc_uid.counter = tsk->counter;
-		tbl.proc_uid.def_priority = DEF_PRIORITY;
-		break;
-	case TABLE_PROC_SIGNAL:
-		memcpy (&tbl.proc_signal.signal, &tsk->signal,
-			sizeof (tbl.proc_signal.signal));
-
-		memcpy (&tbl.proc_signal.blocked, &tsk->blocked,
-			sizeof (tbl.proc_signal.blocked));
-
-		collect_sigign_sigcatch (tsk, &sigign, &sigcatch);
-
-		memcpy (&tbl.proc_signal.ignored, &sigign,
-			sizeof (tbl.proc_signal.ignored));
-
-		memcpy (&tbl.proc_signal.caught, &sigcatch,
-			sizeof (tbl.proc_signal.caught));
-
-#if 0
-		printk ("PROC_SIGNAL: (%lu, %lu) - (%lu, %lu)\n",
-			tbl.proc_signal.ignored.sig [0],
-			tbl.proc_signal.ignored.sig [1],
-			tbl.proc_signal.caught.sig [0],
-			tbl.proc_signal.caught.sig [1]);
-#endif
-		break;
-	case TABLE_PROC_MEM:
-		if (tsk->mm && tsk->mm != &init_mm) {
-			tbl.proc_mem.context = tsk->mm->context;
-			tbl.proc_mem.start_code = tsk->mm->start_code;
-			tbl.proc_mem.end_code = tsk->mm->end_code;
-			tbl.proc_mem.start_data = tsk->mm-> start_data;
-			tbl.proc_mem.end_data = tsk->mm->end_data;
-			tbl.proc_mem.start_brk = tsk->mm->start_brk;
-			tbl.proc_mem.brk = tsk->mm->brk;
-			tbl.proc_mem.start_stack = tsk->mm->start_stack;
-			tbl.proc_mem.start_mmap = tsk->mm->mmap ?
-				tsk->mm->mmap->vm_start : 0;
-			tbl.proc_mem.arg_start = tsk->mm->arg_start;
-			tbl.proc_mem.arg_end = tsk->mm->arg_end;
-			tbl.proc_mem.env_start = tsk->mm->env_start;
-			tbl.proc_mem.env_end = tsk->mm->env_end;
-			tbl.proc_mem.rss = tsk->mm->rss << PAGE_SHIFT;
-			tbl.proc_mem.total_vm = tsk->mm->total_vm;
-			tbl.proc_mem.locked_vm = tsk->mm->locked_vm;
-		}
-		tbl.proc_mem.rlim = tsk->rlim ? tsk->rlim[RLIMIT_RSS].rlim_cur : 0;
-		break;
-	case TABLE_PROC_SEGMENT:
-		if (tsk->mm && tsk->mm != &init_mm) {
-			unsigned long vsize = 0;
-			int size = 0, resident = 0, share = 0;
-			int trs = 0, lrs = 0, drs = 0, srs = 0, dt = 0;
-			struct vm_area_struct * vma = tsk->mm->mmap;
-
-			while (vma) {
-				pgd_t *pgd = pgd_offset(tsk->mm, vma->vm_start);
-				int pages = 0, shared = 0, dirty = 0, total = 0;
-
-				vsize += vma->vm_end - vma->vm_start;
-
-				statm_pgd_range (pgd, vma->vm_start, vma->vm_end,
-
-						 &pages, &shared, &dirty, &total);
-
-				resident += pages;
-				share += shared;
-				dt += dirty;
-				size += total;
-
-				/* Well, shared library seem to get mapped
-				 * above 0x40000000 and are executable,
-				 * so I use this hack to get their size.
-				 */
-
-				if (vma->vm_flags & VM_GROWSDOWN)
-					srs += pages;	/* stack */
-				else if ((vma->vm_flags & VM_EXEC) &&
-					 (vma->vm_start > 0x40000000))
-					lrs += pages;	/* library */
-				else if (vma->vm_flags & VM_EXECUTABLE)
-					trs += pages;	/* text */
-				else
-					drs += pages;
-
-				vma = vma->vm_next;
-			}
-
-			tbl.proc_segment.vsize = vsize;
-			tbl.proc_segment.size = size << PAGE_SHIFT;
-			tbl.proc_segment.resident = resident << PAGE_SHIFT;
-			tbl.proc_segment.shared = share << PAGE_SHIFT;
-			tbl.proc_segment.trs = trs << PAGE_SHIFT;
-			tbl.proc_segment.lrs = lrs << PAGE_SHIFT;
-			tbl.proc_segment.drs = drs << PAGE_SHIFT;
-			tbl.proc_segment.srs = srs << PAGE_SHIFT;
-			tbl.proc_segment.dt = dt << PAGE_SHIFT;
-		}
-		break;
-	case TABLE_PROC_TIME:
-		tbl.proc_time.utime = tsk->times.tms_utime;
-		tbl.proc_time.stime = tsk->times.tms_stime;
-		tbl.proc_time.cutime = tsk->times.tms_cutime;
-		tbl.proc_time.cstime = tsk->times.tms_cstime;
-
-		tbl.proc_time.start_time = tsk->start_time;
-		tbl.proc_time.timeout = tsk->timeout;
-		tbl.proc_time.policy = tsk->policy;
-		tbl.proc_time.rt_priority = tsk->rt_priority;
-
-		tbl.proc_time.it_real_value = tsk->it_real_value;
-		tbl.proc_time.it_prof_value = tsk->it_prof_value;
-		tbl.proc_time.it_virt_value = tsk->it_virt_value;
-		tbl.proc_time.it_real_incr = tsk->it_real_incr;
-		tbl.proc_time.it_prof_incr = tsk->it_prof_incr;
-		tbl.proc_time.it_virt_incr = tsk->it_virt_incr;
-		break;
-	case TABLE_PROC_KERNEL:
-		tbl.proc_kernel.min_flt = tsk->min_flt;
-		tbl.proc_kernel.cmin_flt = tsk->cmin_flt;
-		tbl.proc_kernel.maj_flt = tsk->maj_flt;
-		tbl.proc_kernel.cmaj_flt = tsk->cmaj_flt;
-
-		tbl.proc_kernel.kesp = KSTK_ESP(tsk);
-		tbl.proc_kernel.keip = KSTK_EIP(tsk);
-
-		tbl.proc_kernel.nswap = tsk->nswap;
-		tbl.proc_kernel.cnswap = tsk->cnswap;
-
-		tbl.proc_kernel.wchan = get_wchan (tsk);
-		break;
-	default:
-		return -EINVAL;
-	}
-
-	err = verify_area (VERIFY_WRITE, buf, sizeof (struct table));
-	if (err)
-		return err;
-
-	copy_to_user (buf, &tbl, sizeof (union table));
-
-	return 0;
-}
--- a/kernel/table21/unistd-i386.h
+++ b/kernel/table21/unistd-i386.h
@@ -1,344 +0,0 @@
-#ifndef _ASM_I386_UNISTD_H_
-#define _ASM_I386_UNISTD_H_
-
-/*
- * This file contains the system call numbers.
- */
-
-#define __NR_setup		  0	/* used only by init, to get system going */
-#define __NR_exit		  1
-#define __NR_fork		  2
-#define __NR_read		  3
-#define __NR_write		  4
-#define __NR_open		  5
-#define __NR_close		  6
-#define __NR_waitpid		  7
-#define __NR_creat		  8
-#define __NR_link		  9
-#define __NR_unlink		 10
-#define __NR_execve		 11
-#define __NR_chdir		 12
-#define __NR_time		 13
-#define __NR_mknod		 14
-#define __NR_chmod		 15
-#define __NR_lchown		 16
-#define __NR_break		 17
-#define __NR_oldstat		 18
-#define __NR_lseek		 19
-#define __NR_getpid		 20
-#define __NR_mount		 21
-#define __NR_umount		 22
-#define __NR_setuid		 23
-#define __NR_getuid		 24
-#define __NR_stime		 25
-#define __NR_ptrace		 26
-#define __NR_alarm		 27
-#define __NR_oldfstat		 28
-#define __NR_pause		 29
-#define __NR_utime		 30
-#define __NR_stty		 31
-#define __NR_gtty		 32
-#define __NR_access		 33
-#define __NR_nice		 34
-#define __NR_ftime		 35
-#define __NR_sync		 36
-#define __NR_kill		 37
-#define __NR_rename		 38
-#define __NR_mkdir		 39
-#define __NR_rmdir		 40
-#define __NR_dup		 41
-#define __NR_pipe		 42
-#define __NR_times		 43
-#define __NR_prof		 44
-#define __NR_brk		 45
-#define __NR_setgid		 46
-#define __NR_getgid		 47
-#define __NR_signal		 48
-#define __NR_geteuid		 49
-#define __NR_getegid		 50
-#define __NR_acct		 51
-#define __NR_phys		 52
-#define __NR_lock		 53
-#define __NR_ioctl		 54
-#define __NR_fcntl		 55
-#define __NR_mpx		 56
-#define __NR_setpgid		 57
-#define __NR_ulimit		 58
-#define __NR_oldolduname	 59
-#define __NR_umask		 60
-#define __NR_chroot		 61
-#define __NR_ustat		 62
-#define __NR_dup2		 63
-#define __NR_getppid		 64
-#define __NR_getpgrp		 65
-#define __NR_setsid		 66
-#define __NR_sigaction		 67
-#define __NR_sgetmask		 68
-#define __NR_ssetmask		 69
-#define __NR_setreuid		 70
-#define __NR_setregid		 71
-#define __NR_sigsuspend		 72
-#define __NR_sigpending		 73
-#define __NR_sethostname	 74
-#define __NR_setrlimit		 75
-#define __NR_getrlimit		 76
-#define __NR_getrusage		 77
-#define __NR_gettimeofday	 78
-#define __NR_settimeofday	 79
-#define __NR_getgroups		 80
-#define __NR_setgroups		 81
-#define __NR_select		 82
-#define __NR_symlink		 83
-#define __NR_oldlstat		 84
-#define __NR_readlink		 85
-#define __NR_uselib		 86
-#define __NR_swapon		 87
-#define __NR_reboot		 88
-#define __NR_readdir		 89
-#define __NR_mmap		 90
-#define __NR_munmap		 91
-#define __NR_truncate		 92
-#define __NR_ftruncate		 93
-#define __NR_fchmod		 94
-#define __NR_fchown		 95
-#define __NR_getpriority	 96
-#define __NR_setpriority	 97
-#define __NR_profil		 98
-#define __NR_statfs		 99
-#define __NR_fstatfs		100
-#define __NR_ioperm		101
-#define __NR_socketcall		102
-#define __NR_syslog		103
-#define __NR_setitimer		104
-#define __NR_getitimer		105
-#define __NR_stat		106
-#define __NR_lstat		107
-#define __NR_fstat		108
-#define __NR_olduname		109
-#define __NR_iopl		110
-#define __NR_vhangup		111
-#define __NR_idle		112
-#define __NR_vm86old		113
-#define __NR_wait4		114
-#define __NR_swapoff		115
-#define __NR_sysinfo		116
-#define __NR_ipc		117
-#define __NR_fsync		118
-#define __NR_sigreturn		119
-#define __NR_clone		120
-#define __NR_setdomainname	121
-#define __NR_uname		122
-#define __NR_modify_ldt		123
-#define __NR_adjtimex		124
-#define __NR_mprotect		125
-#define __NR_sigprocmask	126
-#define __NR_create_module	127
-#define __NR_init_module	128
-#define __NR_delete_module	129
-#define __NR_get_kernel_syms	130
-#define __NR_quotactl		131
-#define __NR_getpgid		132
-#define __NR_fchdir		133
-#define __NR_bdflush		134
-#define __NR_sysfs		135
-#define __NR_personality	136
-#define __NR_afs_syscall	137 /* Syscall for Andrew File System */
-#define __NR_setfsuid		138
-#define __NR_setfsgid		139
-#define __NR__llseek		140
-#define __NR_getdents		141
-#define __NR__newselect		142
-#define __NR_flock		143
-#define __NR_msync		144
-#define __NR_readv		145
-#define __NR_writev		146
-#define __NR_getsid		147
-#define __NR_fdatasync		148
-#define __NR__sysctl		149
-#define __NR_mlock		150
-#define __NR_munlock		151
-#define __NR_mlockall		152
-#define __NR_munlockall		153
-#define __NR_sched_setparam		154
-#define __NR_sched_getparam		155
-#define __NR_sched_setscheduler		156
-#define __NR_sched_getscheduler		157
-#define __NR_sched_yield		158
-#define __NR_sched_get_priority_max	159
-#define __NR_sched_get_priority_min	160
-#define __NR_sched_rr_get_interval	161
-#define __NR_nanosleep		162
-#define __NR_mremap		163
-#define __NR_setresuid		164
-#define __NR_getresuid		165
-#define __NR_vm86		166
-#define __NR_query_module	167
-#define __NR_poll		168
-#define __NR_nfsservctl		169
-#define __NR_setresgid		170
-#define __NR_getresgid		171
-#define __NR_prctl              172
-#define __NR_rt_sigreturn	173
-#define __NR_rt_sigaction	174
-#define __NR_rt_sigprocmask	175
-#define __NR_rt_sigpending	176
-#define __NR_rt_sigtimedwait	177
-#define __NR_rt_sigqueueinfo	178
-#define __NR_rt_sigsuspend	179
-#define __NR_pread		180
-#define __NR_pwrite		181
-#define __NR_chown		182
-#define __NR_getcwd		183
-#define __NR_capget		184
-#define __NR_capset		185
-#define __NR_sigaltstack	186
-#define __NR_sendfile		187
-#define __NR_streams1		188	/* some people actually want it */
-#define __NR_streams2		189	/* some people actually want it */
-#define __NR_table		190
-
-/* user-visible error numbers are in the range -1 - -122: see <asm-i386/errno.h> */
-
-#define __syscall_return(type, res) \
-do { \
-	if ((unsigned long)(res) >= (unsigned long)(-125)) { \
-		errno = -(res); \
-		res = -1; \
-	} \
-	return (type) (res); \
-} while (0)
-
-/* XXX - _foo needs to be __foo, while __NR_bar could be _NR_bar. */
-#define _syscall0(type,name) \
-type name(void) \
-{ \
-long __res; \
-__asm__ volatile ("int $0x80" \
-	: "=a" (__res) \
-	: "0" (__NR_##name)); \
-__syscall_return(type,__res); \
-}
-
-#define _syscall1(type,name,type1,arg1) \
-type name(type1 arg1) \
-{ \
-long __res; \
-__asm__ volatile ("int $0x80" \
-	: "=a" (__res) \
-	: "0" (__NR_##name),"b" ((long)(arg1))); \
-__syscall_return(type,__res); \
-}
-
-#define _syscall2(type,name,type1,arg1,type2,arg2) \
-type name(type1 arg1,type2 arg2) \
-{ \
-long __res; \
-__asm__ volatile ("int $0x80" \
-	: "=a" (__res) \
-	: "0" (__NR_##name),"b" ((long)(arg1)),"c" ((long)(arg2))); \
-__syscall_return(type,__res); \
-}
-
-#define _syscall3(type,name,type1,arg1,type2,arg2,type3,arg3) \
-type name(type1 arg1,type2 arg2,type3 arg3) \
-{ \
-long __res; \
-__asm__ volatile ("int $0x80" \
-	: "=a" (__res) \
-	: "0" (__NR_##name),"b" ((long)(arg1)),"c" ((long)(arg2)), \
-		  "d" ((long)(arg3))); \
-__syscall_return(type,__res); \
-}
-
-#define _syscall4(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4) \
-type name (type1 arg1, type2 arg2, type3 arg3, type4 arg4) \
-{ \
-long __res; \
-__asm__ volatile ("int $0x80" \
-	: "=a" (__res) \
-	: "0" (__NR_##name),"b" ((long)(arg1)),"c" ((long)(arg2)), \
-	  "d" ((long)(arg3)),"S" ((long)(arg4))); \
-__syscall_return(type,__res); \
-}
-
-#define _syscall5(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4, \
-	  type5,arg5) \
-type name (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5) \
-{ \
-long __res; \
-__asm__ volatile ("int $0x80" \
-	: "=a" (__res) \
-	: "0" (__NR_##name),"b" ((long)(arg1)),"c" ((long)(arg2)), \
-	  "d" ((long)(arg3)),"S" ((long)(arg4)),"D" ((long)(arg5))); \
-__syscall_return(type,__res); \
-}
-
-#ifdef __KERNEL_SYSCALLS__
-
-/*
- * we need this inline - forking from kernel space will result
- * in NO COPY ON WRITE (!!!), until an execve is executed. This
- * is no problem, but for the stack. This is handled by not letting
- * main() use the stack at all after fork(). Thus, no function
- * calls - which means inline code for fork too, as otherwise we
- * would use the stack upon exit from 'fork()'.
- *
- * Actually only pause and fork are needed inline, so that there
- * won't be any messing with the stack from main(), but we define
- * some others too.
- */
-#define __NR__exit __NR_exit
-static inline _syscall0(int,idle)
-static inline _syscall0(int,pause)
-static inline _syscall1(int,setup,int,magic)
-static inline _syscall0(int,sync)
-static inline _syscall0(pid_t,setsid)
-static inline _syscall3(int,write,int,fd,const char *,buf,off_t,count)
-static inline _syscall3(int,read,int,fd,char *,buf,off_t,count)
-static inline _syscall3(off_t,lseek,int,fd,off_t,offset,int,count)
-static inline _syscall1(int,dup,int,fd)
-static inline _syscall3(int,execve,const char *,file,char **,argv,char **,envp)
-static inline _syscall3(int,open,const char *,file,int,flag,int,mode)
-static inline _syscall1(int,close,int,fd)
-static inline _syscall1(int,_exit,int,exitcode)
-static inline _syscall3(pid_t,waitpid,pid_t,pid,int *,wait_stat,int,options)
-static inline _syscall1(int,delete_module,const char *,name)
-
-static inline pid_t wait(int * wait_stat)
-{
-	return waitpid(-1,wait_stat,0);
-}
-
-/*
- * This is the mechanism for creating a new kernel thread.
- *
- * NOTE! Only a kernel-only process(ie the swapper or direct descendants
- * who haven't done an "execve()") should use this: it will work within
- * a system call from a "real" process, but the process memory space will
- * not be free'd until both the parent and the child have exited.
- */
-static inline pid_t kernel_thread(int (*fn)(void *), void * arg, unsigned long flags)
-{
-	long retval;
-
-	__asm__ __volatile__(
-		"movl %%esp,%%esi\n\t"
-		"int $0x80\n\t"		/* Linux/i386 system call */
-		"cmpl %%esp,%%esi\n\t"	/* child or parent? */
-		"je 1f\n\t"		/* parent - jump */
-		"pushl %3\n\t"		/* push argument */
-		"call *%4\n\t"		/* call fn */
-		"movl %2,%0\n\t"	/* exit */
-		"int $0x80\n"
-		"1:\t"
-		:"=a" (retval)
-		:"0" (__NR_clone), "i" (__NR_exit),
-		 "r" (arg), "r" (fn),
-		 "b" (flags | CLONE_VM)
-		:"si");
-	return retval;
-}
-
-#endif
-
-#endif /* _ASM_I386_UNISTD_H_ */
--- a/kernel/table21/version.h
+++ b/kernel/table21/version.h
@@ -1 +0,0 @@
-#define _TABLE_VERSION	1
--- a/kernel/version.h
+++ b/kernel/version.h
@@ -1 +0,0 @@
-#define _TABLE_VERSION	1
--- a/lib/init.c
+++ b/lib/init.c
@@ -29,7 +29,7 @@
 #define DEFAULT_PORT 42800
 #endif

-static glibtop _glibtop_global_server = { .flags = 0 };
+static glibtop _glibtop_global_server = { 0 };
 glibtop *glibtop_global_server = &_glibtop_global_server;

 static void
--- a/lib/read.c
+++ b/lib/read.c
@@ -42,8 +42,7 @@ do_read (int s, void *ptr, size_t total_size)

 	if(nread == 0)
 		close (s);
-
-	if (nread < 0)
+	else if (nread < 0)
 		glibtop_error_io ("recv");
 }

--- a/libgtop-mirror.sh
+++ b/libgtop-mirror.sh
@@ -1,47 +0,0 @@
-#!/bin/sh
-
-AUTODIR=/home/norwegen/auto
-CVSROOT=/pub/master/home-of-linux
-CVSHOST=cvs:
-MODULE=libgtop
-
-rm -rf $AUTODIR || exit 1
-mkdir $AUTODIR || exit 1
-cd $AUTODIR || exit 1
-
-echo "Making cpio archive out of $CVSROOT/$MODULE ..."
-
-find $CVSROOT/$MODULE | cpio -o --format=crc | gzip -9f > $MODULE-current-cvs.cpio.gz || exit 1
-
-echo "Checking out $MODULE"
-
-cvs -d $CVSHOST$CVSROOT co $MODULE || exit 1
-
-echo "Making cpio archive out of checked out sources ..."
-
-find $MODULE | cpio -o --format=crc | gzip -9f > $MODULE-current.cpio.gz || exit 1
-
-for file in README LIESMICH NEWS ChangeLog ; do
-  if [ -s $MODULE/$file ] ; then
-    cp $MODULE/$file . || exit 1
-  fi
-done
-
-tar cvf - $MODULE | gzip -9f > $MODULE-current.tar.gz || exit 1
-
-find $MODULE/doc -maxdepth 1 -type f -exec cp {} . \;
-
-# echo "Making documentation ..."
-# jade -D /usr/lib/sgml/jade_dsl -d libgtop.dsl -t sgml -V %no-make-index% libgtop.sgml > /dev/null || exit 1
-
-# echo "Making TeX documentation ..."
-# jade -D /usr/lib/sgml/jade_dsl -D /usr/lib/sgml/stylesheets -d docbook.dsl -t tex libgtop.sgml || exit 1
-# jadetex libgtop.tex || exit 1
-# jadetex libgtop.tex || exit 1
-# dvips libgtop || exit 1
-
-echo "Cleaning up ..."
-
-rm -rf $MODULE
-
-echo "Done."
--- a/libgtop-sysdeps.m4
+++ b/libgtop-sysdeps.m4
@@ -10,54 +10,6 @@ dnl                              define 'HAVE_GLIBTOP_MACHINE_H'.
 dnl * 'libgtop_need_server'    - is the server really needed? Defines 'NEED_LIBGTOP'
 dnl                              if true; defines conditional 'NEED_LIBGTOP'.

-AC_DEFUN([LIBGTOP_HACKER_TESTS],[
-	AC_REQUIRE([AC_CANONICAL_HOST])
-
-	case "$host_os" in
-	linux*)
-	  AC_ARG_WITH(linux-table,
-	  [  --with-linux-table      Use the table () function from Martin Baulig],[
-	  linux_table="$withval"],[linux_table=auto])
-	  if test $linux_table = yes ; then
-	    AC_CHECK_HEADER(linux/table.h, linux_table=yes, linux_table=no)
-	  elif test $linux_table = auto ; then
-	    AC_MSG_CHECKING(for table function in Linux Kernel)
-	    AC_TRY_RUN([
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <unistd.h>
-#include <linux/unistd.h>
-#include <linux/table.h>
-
-#include <syscall.h>
-
-static inline _syscall3 (int, table, int, type, union table *, tbl, const void *, param);
-
-int
-main (void)
-{
-	union table tbl;
-	int ret;
-
-	ret = table (TABLE_VERSION, NULL, NULL);
-
-	if (ret == -1)
-		exit (-errno);
-
-	exit (ret < 1 ? ret : 0);
-}
-], linux_table=yes, linux_table=no, linux_table=no)
-	    AC_MSG_RESULT($linux_table)
-	  fi
-	  if test $linux_table = yes ; then
-	    AC_DEFINE(HAVE_LINUX_TABLE)
-	  fi
-	  AM_CONDITIONAL(LINUX_TABLE, test $linux_table = yes)
-	  ;;
-	esac
-])
-
 AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[
 	AC_REQUIRE([AC_CANONICAL_HOST])

@@ -111,14 +63,9 @@ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[

 	case "$host_os" in
 	linux*)
-	  if test x$linux_table = xyes ; then
-	    libgtop_sysdeps_dir=kernel
-	    libgtop_use_machine_h=no
-	  else
-	    libgtop_sysdeps_dir=linux
-	    libgtop_use_machine_h=no
-	    libgtop_have_sysinfo=yes
-	  fi
+	  libgtop_sysdeps_dir=linux
+	  libgtop_use_machine_h=no
+	  libgtop_have_sysinfo=yes
 	  libgtop_need_server=no
 	  ;;
 	freebsd*|netbsd*|openbsd*|bsdi*)
--- a/libgtopconfig.h.in
+++ b/libgtopconfig.h.in
@@ -0,0 +1,8 @@
+#ifndef LIBGTOPCONFIG_H
+#define LIBGTOPCONFIG_H
+
+#define LIBGTOP_MAJOR_VERSION @LIBGTOP_MAJOR_VERSION@
+#define LIBGTOP_MINOR_VERSION @LIBGTOP_MINOR_VERSION@
+#define LIBGTOP_MICRO_VERSION @LIBGTOP_MICRO_VERSION@
+
+#endif /* LIBGTOPCONFIG_H */
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,23 @@
+2004-11-23  Martin Willemoes Hansen  <mwh@sysrq.dk>
+
+	* da.po: Updated Danish translation.
+
+2004-09-26  Adam Weinberger  <adamw@gnome.org>
+
+	* en_CA.po: Updated Canadian English translation.
+
+2004-09-24  Benoît Dejean  <tazforever@dlfp.org>
+
+	* POTFILES.in: Updated.
+
+2004-09-20  Alessio Frusciante  <algol@firenze.linux.it>
+
+	* it.po: Updated Italian translation.
+
+2004-09-14  Gora Mohanty  <gmohanty@cvs.gnome.org>
+                                                                                
+        * or.po: Updated Oriya translation.
+  
 2004-09-12  Laszlo Dvornik  <dvornik@gnome.hu>

 	* hu.po: Updated Hungarian translation by Gabor Kelemen.
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -57,7 +57,6 @@ sysdeps/common/fsusage.c
 sysdeps/common/gnuslib.c
 sysdeps/common/inodedb.c
 sysdeps/common/mountlist.c
-sysdeps/common/mountlist.h
 sysdeps/common/sysdeps_suid.c
 sysdeps/linux/close.c
 sysdeps/linux/cpu.c
--- a/po/da.po
+++ b/po/da.po
@@ -6,15 +6,13 @@
 # Ole Laursen <olau@hardworking.dk>, 2002, 03.
 # Martin Willemoes Hansen <mwh@sysrq.dk>, 2004.
 #
-# BEMÆRK: oversættelsen er overhovedet ikke blevet rettet igennem.
-#     
 msgid ""
 msgstr ""
 "Project-Id-Version: libgtop\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-23 12:21+0200\n"
-"PO-Revision-Date: 2004-08-23 12:21+0200\n"
-"Last-Translator: Ole Laursen <olau@hardworking.dk>\n"
+"POT-Creation-Date: 2004-11-23 13:36+0100\n"
+"PO-Revision-Date: 2004-11-23 13:35+0100\n"
+"Last-Translator: Martin Willemoes Hansen <mwh@sysrq.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -102,7 +100,7 @@ msgstr "CPU %3d      (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
 msgid "Spin:"
 msgstr "Spin:"

-#: lib/read.c:65
+#: lib/read.c:64
 #, c-format
 msgid "read %d byte"
 msgid_plural "read %d bytes"
@@ -127,39 +125,39 @@ msgid_plural "write %d bytes"
 msgstr[0] "skriv %d byte"
 msgstr[1] "skriv %d byte"

-#: src/daemon/gnuserv.c:456
+#: src/daemon/gnuserv.c:461
 msgid "Enable debugging"
 msgstr "Slå fejlfinding til"

-#: src/daemon/gnuserv.c:456
+#: src/daemon/gnuserv.c:461
 msgid "DEBUG"
-msgstr "DEBUG"
+msgstr "FEJLFINDING"

-#: src/daemon/gnuserv.c:458
+#: src/daemon/gnuserv.c:463
 msgid "Enable verbose output"
 msgstr "Slå meddelsom udskrift til"

-#: src/daemon/gnuserv.c:458
+#: src/daemon/gnuserv.c:463
 msgid "VERBOSE"
-msgstr "VERBOSE"
+msgstr "MEDDELSOM"

-#: src/daemon/gnuserv.c:460
+#: src/daemon/gnuserv.c:465
 msgid "Don't fork into background"
 msgstr "Forgren ikke til baggrund"

-#: src/daemon/gnuserv.c:460
+#: src/daemon/gnuserv.c:465
 msgid "NO-DAEMON"
-msgstr "NO-DAEMON"
+msgstr "INGEN-SERVER"

-#: src/daemon/gnuserv.c:462
+#: src/daemon/gnuserv.c:467
 msgid "Invoked from inetd"
 msgstr "Kaldt fra inetd"

-#: src/daemon/gnuserv.c:462
+#: src/daemon/gnuserv.c:467
 msgid "INETD"
 msgstr "INETD"

-#: src/daemon/gnuserv.c:496
+#: src/daemon/gnuserv.c:501
 #, c-format
 msgid ""
 "Error on option %s: %s.\n"
@@ -1317,7 +1315,7 @@ msgstr "Afbryd"

 #: sysdeps/osf1/siglist.c:34 sysdeps/sun4/siglist.c:34
 msgid "EMT error"
-msgstr "EMT fejl"
+msgstr "EMT-fejl"

 #: sysdeps/osf1/siglist.c:35 sysdeps/sun4/siglist.c:35
 msgid "Floating-point exception"
@@ -1325,7 +1323,7 @@ msgstr "Flydende tals-undtagelse"

 #: sysdeps/osf1/siglist.c:36 sysdeps/sun4/siglist.c:36
 msgid "Kill"
-msgstr "Dræb"
+msgstr "Afslut"

 #: sysdeps/osf1/siglist.c:37 sysdeps/sun4/siglist.c:37
 msgid "Bus error"
--- a/po/en_CA.po
+++ b/po/en_CA.po
@@ -4,13 +4,12 @@
 # Adam Weinberger <adamw@gnome.org>, 2004.
 # 
 # 
-# 
 msgid ""
 msgstr ""
 "Project-Id-Version: libgtop\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-03 14:09+0200\n"
-"PO-Revision-Date: 2004-07-18 15:51-0500\n"
+"POT-Creation-Date: 2004-09-26 11:19-0400\n"
+"PO-Revision-Date: 2004-09-26 15:51-0400\n"
 "Last-Translator: Adam Weinberger <adamw@gnome.org>\n"
 "Language-Team: English/Canada <adamw@FreeBSD.org>\n"
 "MIME-Version: 1.0\n"
@@ -124,39 +123,39 @@ msgid_plural "write %d bytes"
 msgstr[0] "write %d byte"
 msgstr[1] "write %d bytes"

-#: src/daemon/gnuserv.c:456
+#: src/daemon/gnuserv.c:461
 msgid "Enable debugging"
 msgstr "Enable debugging"

-#: src/daemon/gnuserv.c:456
+#: src/daemon/gnuserv.c:461
 msgid "DEBUG"
 msgstr "DEBUG"

-#: src/daemon/gnuserv.c:458
+#: src/daemon/gnuserv.c:463
 msgid "Enable verbose output"
 msgstr "Enable verbose output"

-#: src/daemon/gnuserv.c:458
+#: src/daemon/gnuserv.c:463
 msgid "VERBOSE"
 msgstr "VERBOSE"

-#: src/daemon/gnuserv.c:460
+#: src/daemon/gnuserv.c:465
 msgid "Don't fork into background"
 msgstr "Don't fork into background"

-#: src/daemon/gnuserv.c:460
+#: src/daemon/gnuserv.c:465
 msgid "NO-DAEMON"
 msgstr "NO-DAEMON"

-#: src/daemon/gnuserv.c:462
+#: src/daemon/gnuserv.c:467
 msgid "Invoked from inetd"
 msgstr "Invoked from inetd"

-#: src/daemon/gnuserv.c:462
+#: src/daemon/gnuserv.c:467
 msgid "INETD"
 msgstr "INETD"

-#: src/daemon/gnuserv.c:496
+#: src/daemon/gnuserv.c:501
 #, c-format
 msgid ""
 "Error on option %s: %s.\n"
@@ -544,7 +543,6 @@ msgstr "NWChan"
 msgid "WChan"
 msgstr "WChan"

-#. K_Flags
 #: sysdeps/names/prockernel.c:51
 msgid ""
 "Kernel flags of the process.\n"
@@ -565,7 +563,6 @@ msgstr ""
 "\n"
 "The math bit should be a decimal 4, and the traced bit is decimal 10."

-#. Min_Flt
 #: sysdeps/names/prockernel.c:60
 msgid ""
 "The number of minor faults the process has made, those which have not "
@@ -574,7 +571,6 @@ msgstr ""
 "The number of minor faults the process has made, those which have not "
 "required loading a memory page from disk."

-#. Maj_Flt
 #: sysdeps/names/prockernel.c:63
 msgid ""
 "The number of major faults the process has made, those which have required "
@@ -583,19 +579,16 @@ msgstr ""
 "The number of major faults the process has made, those which have required "
 "loading a memory page from disk."

-#. CMin_Flt
 #: sysdeps/names/prockernel.c:66
 msgid "The number of minor faults that the process and its children have made."
 msgstr ""
 "The number of minor faults that the process and its children have made."

-#. CMaj_Flt
 #: sysdeps/names/prockernel.c:69
 msgid "The number of major faults that the process and its children have made."
 msgstr ""
 "The number of major faults that the process and its children have made."

-#. KStk_ESP
 #: sysdeps/names/prockernel.c:72
 msgid ""
 "The current value of esp (32-bit stack pointer), as found in the kernel "
@@ -609,7 +602,6 @@ msgstr ""
 msgid "The current EIP (32-bit instruction pointer)."
 msgstr "The current EIP (32-bit instruction pointer)."

-#. NWChan
 #: sysdeps/names/prockernel.c:77
 msgid ""
 "This is the \"channel\" in which the process is waiting.  This is the "
@@ -943,47 +935,47 @@ msgstr "SMP kernel-mode CPU time accumulated by process"

 #: sysdeps/names/procuid.c:48
 msgid "Uid"
-msgstr "Uid"
+msgstr "UID"

 #: sysdeps/names/procuid.c:48
 msgid "EUid"
-msgstr "EUid"
+msgstr "EUID"

 #: sysdeps/names/procuid.c:48
 msgid "Gid"
-msgstr "Gid"
+msgstr "GID"

 #: sysdeps/names/procuid.c:48
 msgid "EGid"
-msgstr "EGid"
+msgstr "EGID"

 #: sysdeps/names/procuid.c:48
 msgid "SUid"
-msgstr "SUid"
+msgstr "SUID"

 #: sysdeps/names/procuid.c:49
 msgid "SGid"
-msgstr "SGid"
+msgstr "SGID"

 #: sysdeps/names/procuid.c:49
 msgid "FSUid"
-msgstr "FSUid"
+msgstr "FSUID"

 #: sysdeps/names/procuid.c:49
 msgid "FSGid"
-msgstr "FSGid"
+msgstr "FSGID"

 #: sysdeps/names/procuid.c:49
 msgid "Pid"
-msgstr "Pid"
+msgstr "PID"

 #: sysdeps/names/procuid.c:50
 msgid "PPid"
-msgstr "PPid"
+msgstr "PPID"

 #: sysdeps/names/procuid.c:50
 msgid "PGrp"
-msgstr "PGrp"
+msgstr "PGRP"

 #: sysdeps/names/procuid.c:50
 msgid "Session"
@@ -991,11 +983,11 @@ msgstr "Session"

 #: sysdeps/names/procuid.c:50
 msgid "Tty"
-msgstr "Tty"
+msgstr "TTY"

 #: sysdeps/names/procuid.c:51
 msgid "TPGid"
-msgstr "TPGid"
+msgstr "TPGID"

 #: sysdeps/names/procuid.c:51
 msgid "Priority"
@@ -1071,7 +1063,7 @@ msgstr "Kernel scheduling priority"

 #: sysdeps/names/procuid.c:71
 msgid "Standard unix nice level of process"
-msgstr "Standard unix nice level of process"
+msgstr "Standard UNIX nice level of process"

 #: sysdeps/names/procuid.c:72
 msgid "Number of additional process groups"
@@ -1091,11 +1083,11 @@ msgstr "Max number of arrays"

 #: sysdeps/names/sem_limits.c:45 sysdeps/names/sem_limits.c:59
 msgid "Max semaphores system wide"
-msgstr "Max semaphores system wide"
+msgstr "Max semaphores, system-wide"

 #: sysdeps/names/sem_limits.c:46 sysdeps/names/sem_limits.c:60
 msgid "Number of undo structures system wide"
-msgstr "Number of undo structures system wide"
+msgstr "Number of undo structures, system-wide"

 #: sysdeps/names/sem_limits.c:47 sysdeps/names/sem_limits.c:61
 msgid "Max semaphores per array"
--- a/po/gu.po
+++ b/po/gu.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libgtop.HEAD.gu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-18 12:10+0200\n"
-"PO-Revision-Date: 2004-08-20 15:47+0530\n"
+"POT-Creation-Date: 2004-10-26 04:44+0200\n"
+"PO-Revision-Date: 2004-10-26 17:39+0530\n"
 "Last-Translator: Ankit Patel <ankit@redhat.com>\n"
 "Language-Team: Gujarati\n"
 "MIME-Version: 1.0\n"
@@ -16,6 +16,7 @@ msgstr ""
 "<magnet@magnet-i.com>\n"
 "Plural-Forms: Plural-Forms: nplurals=2; plural=(n!=1);\n\n"
 "\n"
+"\n"
 "X-Generator: KBabel 1.3.1\n"

 #: examples/smp.c:76
@@ -99,7 +100,7 @@ msgstr "CPU %3d    (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
 msgid "Spin:"
 msgstr "ફેરવો:"

-#: lib/read.c:65
+#: lib/read.c:64
 #, c-format
 msgid "read %d byte"
 msgid_plural "read %d bytes"
@@ -124,46 +125,46 @@ msgid_plural "write %d bytes"
 msgstr[0] "%d બાઈટ લખો"
 msgstr[1] "%d બાઈટો લખો"

-#: src/daemon/gnuserv.c:456
+#: src/daemon/gnuserv.c:461
 msgid "Enable debugging"
 msgstr "ભૂલ શોધવાની પ્રક્રિયાને સક્રિય કરો"

-#: src/daemon/gnuserv.c:456
+#: src/daemon/gnuserv.c:461
 msgid "DEBUG"
 msgstr "ભૂલ શોધો"

-#: src/daemon/gnuserv.c:458
+#: src/daemon/gnuserv.c:463
 msgid "Enable verbose output"
 msgstr "વર્ણનીય પરિણામને સક્રિય કરો"

-#: src/daemon/gnuserv.c:458
+#: src/daemon/gnuserv.c:463
 msgid "VERBOSE"
 msgstr "વર્ણનીય"

-#: src/daemon/gnuserv.c:460
+#: src/daemon/gnuserv.c:465
 msgid "Don't fork into background"
-msgstr "પાછળના ભાગમાં fork કરો નહિંં"
+msgstr "પાછળના ભાગમાં fork કરો નહિં"

-#: src/daemon/gnuserv.c:460
+#: src/daemon/gnuserv.c:465
 msgid "NO-DAEMON"
 msgstr "ડિમન નહિં"

-#: src/daemon/gnuserv.c:462
+#: src/daemon/gnuserv.c:467
 msgid "Invoked from inetd"
 msgstr "inetd માંથી શરુ કરાયેલુ"

-#: src/daemon/gnuserv.c:462
+#: src/daemon/gnuserv.c:467
 msgid "INETD"
 msgstr "INETD"

-#: src/daemon/gnuserv.c:496
+#: src/daemon/gnuserv.c:501
 #, 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"
+"પ્રાપ્ય આદેશના વિકલ્પોની પૂર્ણ યાદિ જોવા માટે '%s --help' ચાલુ કરો.\n"

 #: sysdeps/names/cpu.c:44
 msgid "Total CPU Time"
@@ -187,7 +188,7 @@ msgstr "ફાજલ કાર્યમાં CPU સમય"

 #: sysdeps/names/cpu.c:49
 msgid "Tick Frequency"
-msgstr "ટકોરની અાવૃત્તિ"
+msgstr "ટકોરની આવૃત્તિ"

 #: sysdeps/names/cpu.c:50
 msgid "SMP Total CPU Time"
@@ -235,7 +236,7 @@ msgstr "ફાજલ કાર્યમાં સિસ્ટમે પસાર

 #: sysdeps/names/cpu.c:65
 msgid "Tick frequency (default is 100)"
-msgstr "ટકોરની અાવૃત્તિ (મૂળભૂત ૧૦૦ છે)"
+msgstr "ટકોરની આવૃત્તિ (મૂળભૂત ૧૦૦ છે)"

 #: sysdeps/names/cpu.c:71
 msgid "Bit field indicating which CPU is currently running"
@@ -291,7 +292,7 @@ msgstr "છેલ્લું PID"

 #: sysdeps/names/loadavg.c:48
 msgid "Number of jobs running simultaneously averaged over 1, 5 and 15 minutes"
-msgstr "૧, ૫ અને ૧૫ મિનિટના સરેરાશે અેકસાથે કામો ચાલી રહ્યા છે"
+msgstr "૧, ૫ અને ૧૫ મિનિટના સરેરાશે એકસાથે કામો ચાલી રહ્યા છે"

 #: sysdeps/names/loadavg.c:49
 msgid "Number of tasks currently running"
@@ -377,7 +378,7 @@ msgstr "યાદીનું કુલ માપ"
 #: sysdeps/names/proclist.c:41 sysdeps/names/proclist.c:48
 #: sysdeps/names/procmap.c:41 sysdeps/names/procmap.c:48
 msgid "Size of a single list element"
-msgstr "યાદીની અેક વસ્તુનું માપ"
+msgstr "યાદીની એક વસ્તુનું માપ"

 #: sysdeps/names/msg_limits.c:41 sysdeps/names/msg_limits.c:52
 msgid "Size in kilobytes of message pool"
@@ -397,7 +398,7 @@ msgstr "હરોળનું મૂળભૂત મહત્તમ માપ"

 #: sysdeps/names/msg_limits.c:45 sysdeps/names/msg_limits.c:56
 msgid "Max queues system wide"
-msgstr "અાખી સિસ્ટમમાં મહત્તમ હરોળ"
+msgstr "આખી સિસ્ટમમાં મહત્તમ હરોળ"

 #: sysdeps/names/msg_limits.c:46 sysdeps/names/msg_limits.c:57
 msgid "Message segment size"
@@ -477,7 +478,7 @@ msgstr "IPv6 હદ"

 #: sysdeps/names/netload.c:68
 msgid "Maximum Transfer Unit"
-msgstr "મહત્તમ સ્થળાંતર અેકમ"
+msgstr "મહત્તમ સ્થળાંતર એકમ"

 #: sysdeps/names/ppp.c:39 sysdeps/names/ppp.c:46
 msgid "PPP State"
@@ -556,7 +557,7 @@ msgid ""
 "The math bit should be a decimal 4, and the traced bit is decimal 10."
 msgstr ""
 "પ્રક્રિયાની કર્નલ નિશાનીઓ હાલમાં દરેક નિશાની માટે ગાણિતીક બીટ ગોઠવાયેલ છે\n"
-"કારણકે crt0.s ગાણિતીક સ્પર્ધા માટે ચકાસે છે.માટે આ પરિણામમાં સમાવિષ્ટ નથી.\n"
+"કારણકે crt0.s ગાણિતીક સ્પર્ધા માટે ચકાસે છે. માટે આ પરિણામમાં સમાવિષ્ટ નથી.\n"
 "આ કદાચ ભૂલ છે,કારણકે દરેક પ્રક્રિયાઓ કમ્પાઇલ C કાર્યક્રમ છે.\n"
 "ગાણિતીક બિટ દશાંશ ૪ અને આલેખાયેલ બિટ ૧૦ હોવી જોઇએ."

@@ -594,7 +595,7 @@ msgstr "esp (32-બિટ સ્ટેક દર્શક),ની વર્ત
 #. KStk_EIP
 #: sysdeps/names/prockernel.c:75
 msgid "The current EIP (32-bit instruction pointer)."
-msgstr "વર્તમાન EIP (32-બિટ સૂચના દર્શક)"
+msgstr "વર્તમાન EIP (32-બિટ સૂચના દર્શક)."

 #. NWChan
 #: sysdeps/names/prockernel.c:77
@@ -604,8 +605,8 @@ msgid ""
 "textual name.  (If you have an up-to-date /etc/psdatabase, then try ps -l to "
 "see the WCHAN field in action)"
 msgstr ""
-"આ \"માધ્યમ\" કે જેમાં પ્રક્રિયા રાહ જોવે છે.જો તમારે લખાણ રુપમાં તેનું નામ જોઇતુ હોય તો "
-"નામની યાદીમાંથી શોધી શકાય છે,(જો તમારી પાસે પૂરેપૂરો /etc/psdatabase હોય તો WCHAN "
+"આ \"માધ્યમ\" કે જેમાં પ્રક્રિયા રાહ જોવે છે. જો તમારે લખાણ રુપમાં તેનું નામ જોઇતુ હોય તો "
+"નામની યાદીમાંથી શોધી શકાય છે, (જો તમારી પાસે પૂરેપૂરો /etc/psdatabase હોય તો WCHAN "
 "ક્ષેત્ર કાર્યશીલ જોવા માટે ps -l પ્રયત્ન કરો)"

 #. WChan
@@ -635,11 +636,11 @@ msgstr "રહેવાસીના સમૂહના માપની સીમ

 #: sysdeps/names/procmem.c:54
 msgid "Total # of pages of memory"
-msgstr "મૅમરી ના કુલ પાનાની સંખ્યા"
+msgstr "મૅમરીના કુલ પાનાની સંખ્યા"

 #: sysdeps/names/procmem.c:55
 msgid "Number of pages of virtual memory"
-msgstr "આભાસી મૅમરી ના પાનાની સંખ્યા"
+msgstr "આભાસી મૅમરીના પાનાની સંખ્યા"

 #: sysdeps/names/procmem.c:56
 msgid "Number of resident set (non-swapped) pages"
@@ -656,7 +657,7 @@ msgid ""
 "space. This does not include pages which have not been demand-loaded in, or "
 "which are swapped out."
 msgstr ""
-"પ્રક્રિયા પાસે રહેલી વાસ્તવિક મૅમરીના પાનાની સંખ્યા,તેમાંથી ૩ સંચાલકીય હેતુ માટે છે. આ માત્ર "
+"પ્રક્રિયા પાસે રહેલી વાસ્તવિક મૅમરીના પાનાની સંખ્યા, તેમાંથી ૩ સંચાલકીય હેતુ માટે છે. આ માત્ર "
 "એપાના છે કે જે લખાણ, માહિતિ અથવા સ્ટૅકની જગ્યા ની ગણતરી કરે છે. આ એવા પાનાઓનો સમાવેશ "
 "નથી કરતુ કે જે માંગણી પ્રમાણે લાવવામાં આવ્યા ન હોય અને જેની અદલાબદલી થયેલી છે."

@@ -686,11 +687,11 @@ msgstr "ખોટું માપ"

 #: sysdeps/names/procsegment.c:44
 msgid "Start_Code"
-msgstr "શરુઆતનો કાૅડ"
+msgstr "શરુઆતનો કોડ"

 #: sysdeps/names/procsegment.c:44
 msgid "End_Code"
-msgstr "અંતિમ કાૅડ"
+msgstr "અંતિમ કોડ"

 #: sysdeps/names/procsegment.c:44
 msgid "Start_Stack"
@@ -718,15 +719,15 @@ msgstr "ખોટા પાનાઓનુ કુલ માપ"

 #: sysdeps/names/procsegment.c:54
 msgid "Address of beginning of code segment"
-msgstr "કાૅડ વિભાગની શરુઆતનું સરનામું"
+msgstr "કોડ વિભાગની શરુઆતનું સરનામું"

 #: sysdeps/names/procsegment.c:55
 msgid "Address of end of code segment"
-msgstr "કાૅડ વિભાગનુ અંતનુ સરનામું"
+msgstr "કોડ વિભાગનુ અંતનુ સરનામું"

 #: sysdeps/names/procsegment.c:56
 msgid "Address of the bottom of stack segment"
-msgstr "સ્ટૅક વિભાગનુ નીચેનુ સરનામુંંંંં"
+msgstr "સ્ટૅક વિભાગનુ નીચેનુ સરનામું"

 #: sysdeps/names/procsignal.c:41
 msgid "Signal"
@@ -738,11 +739,11 @@ msgstr "અટકેલુ"

 #: sysdeps/names/procsignal.c:41
 msgid "SigIgnore"
-msgstr "Sig અવગણવુ"
+msgstr "Sig અવગણવું"

 #: sysdeps/names/procsignal.c:41
 msgid "SigCatch"
-msgstr "Sigપકડાયેલ"
+msgstr "Sig પકડાયેલ"

 #: sysdeps/names/procsignal.c:46
 msgid "Mask of pending signals"
@@ -754,11 +755,11 @@ msgstr "અટકી રહેલા સંકેતોનુ છૂપાવવ

 #: sysdeps/names/procsignal.c:48
 msgid "Mask of ignored signals"
-msgstr "અવગણેલા સંકેતોનુ છૂપાવવુ"
+msgstr "અવગણેલા સંકેતોનુ છૂપાવવું"

 #: sysdeps/names/procsignal.c:49
 msgid "Mask of caught signals"
-msgstr "પકડાયેલા સંકેતોનુ છૂપાવવુ"
+msgstr "પકડાયેલા સંકેતોનુ છૂપાવવું"

 #: sysdeps/names/procstate.c:43
 msgid "Cmd"
@@ -803,7 +804,7 @@ msgstr "exec() માટે ચલાવી શકાય તેવી ફાઇ

 #: sysdeps/names/procstate.c:50
 msgid "Single-Char code for process state (S=sleeping)"
-msgstr "પ્રક્રિયાની સ્થિતિ માટે Single-Char કાૅડ (S=sleeping)"
+msgstr "પ્રક્રિયાની સ્થિતિ માટે Single-Char કોડ (S=sleeping)"

 #: sysdeps/names/procstate.c:51
 msgid "UID of process"
@@ -879,7 +880,7 @@ msgstr "XCPU_STime"

 #: sysdeps/names/proctime.c:52
 msgid "Start time of process in seconds since the epoch"
-msgstr "ઇપોકથી પ્રક્રિયાનો શરિઆતનો સમય(સેકંડમાં)"
+msgstr "ઇપોકથી પ્રક્રિયાનો શરિઆતનો સમય (સેકન્ડમાં)"

 #: sysdeps/names/proctime.c:53
 msgid "Real time accumulated by process (should be utime + stime)"
@@ -903,7 +904,7 @@ msgstr "પ્રક્રિયા અને ફળરુપી બાળકો

 #: sysdeps/names/proctime.c:58
 msgid "The time (in jiffies) of the process's next timeout"
-msgstr "પ્રક્રિયાના બીજા સમય સમાપ્તિનો સમય (જીફી માં)"
+msgstr "પ્રક્રિયાના બીજા સમય સમાપ્તિનો સમય (જીફીમાં)"

 #: sysdeps/names/proctime.c:59
 msgid ""
@@ -1061,7 +1062,7 @@ msgstr "વધારાના પ્રક્રિયા જૂથોની સ

 #: sysdeps/names/procuid.c:73
 msgid "Array of additional process groups"
-msgstr "વધારાના પ્રક્રિયા જૂથોનો અૅરે"
+msgstr "વધારાના પ્રક્રિયા જૂથોનો એરે"

 #: sysdeps/names/sem_limits.c:43 sysdeps/names/sem_limits.c:57
 msgid "Number of entries in semaphore map"
@@ -1069,7 +1070,7 @@ msgstr "સેમાફોર નકશામાં દાખલાની સં

 #: sysdeps/names/sem_limits.c:44 sysdeps/names/sem_limits.c:58
 msgid "Max number of arrays"
-msgstr "અૅરૅનો મહત્તમ ક્રમાંક"
+msgstr "એરૅનો મહત્તમ ક્રમાંક"

 #: sysdeps/names/sem_limits.c:45 sysdeps/names/sem_limits.c:59
 msgid "Max semaphores system wide"
@@ -1081,11 +1082,11 @@ msgstr "આખી સિસ્ટમમાં રદ કરેલ બંધા

 #: sysdeps/names/sem_limits.c:47 sysdeps/names/sem_limits.c:61
 msgid "Max semaphores per array"
-msgstr "એક અૅરૅમાં મહત્તમ સેમાફોર"
+msgstr "એક એરૅમાં મહત્તમ સેમાફોર"

 #: sysdeps/names/sem_limits.c:48 sysdeps/names/sem_limits.c:62
 msgid "Max ops per semop call"
-msgstr "એક semopના કાૅલમાં મહત્તમ પ્રક્રિયાઓ"
+msgstr "એક semopના કોલમાં મહત્તમ પ્રક્રિયાઓ"

 #: sysdeps/names/sem_limits.c:49 sysdeps/names/sem_limits.c:63
 msgid "Max number of undo entries per process"
@@ -1157,7 +1158,7 @@ msgstr "સર્વરના લક્ષણો"

 #: sysdeps/names/sysdeps.c:51 sysdeps/names/sysdeps.c:78
 msgid "CPU Usage"
-msgstr "CPUનો વપરાશ"
+msgstr "CPU નો વપરાશ"

 #: sysdeps/names/sysdeps.c:52 sysdeps/names/sysdeps.c:79
 msgid "Memory Usage"
@@ -1173,11 +1174,11 @@ msgstr "સિસ્ટમ ચાલુ રહે તેટલો સમય"

 #: sysdeps/names/sysdeps.c:55 sysdeps/names/sysdeps.c:82
 msgid "Load Averange"
-msgstr "અેવરેન્જ બોજો"
+msgstr "એવરેન્જ બોજો"

 #: sysdeps/names/sysdeps.c:56 sysdeps/names/sysdeps.c:83
 msgid "Shared Memory Limits"
-msgstr "સહભાગી મૅમરી ની સીમા"
+msgstr "સહભાગી મૅમરીની સીમા"

 #: sysdeps/names/sysdeps.c:57 sysdeps/names/sysdeps.c:84
 msgid "Message Queue Limits"
@@ -1261,11 +1262,11 @@ msgstr "ફાજલ સમય"

 #: sysdeps/names/uptime.c:41
 msgid "BootTime"
-msgstr "BootTime"
+msgstr "બુટસમય"

 #: sysdeps/names/uptime.c:46
 msgid "Time in seconds since system boot"
-msgstr "સિસ્ટમ શરુ થઇ ત્યારથી સમય સેકંડમાં"
+msgstr "સિસ્ટમ શરુ થઇ ત્યારથી સમય સેકન્ડમાં"

 #: sysdeps/names/uptime.c:47
 msgid "Time in seconds the system spent in the idle task since system boot"
@@ -1273,7 +1274,7 @@ msgstr "સિસ્ટમ શરુ થઇ ત્યારથી ફાજલ

 #: sysdeps/names/uptime.c:48
 msgid "Time of last system boot in seconds since the epoch"
-msgstr "ઇપોકથી પ્રક્રિયાનો છેલ્લી પ્રક્રિયા શરુ થઈ ત્યારનો સમય સેકંડમાં"
+msgstr "ઇપોકથી પ્રક્રિયાનો છેલ્લી પ્રક્રિયા શરુ થઈ ત્યારનો સમય સેકન્ડમાં"

 #: sysdeps/osf1/siglist.c:28 sysdeps/sun4/siglist.c:28
 msgid "Hangup"
@@ -1289,7 +1290,7 @@ msgstr "બહાર નીકળો"

 #: sysdeps/osf1/siglist.c:31 sysdeps/sun4/siglist.c:31
 msgid "Illegal instruction"
-msgstr "અસામાન્ય માહિતિ"
+msgstr "અસામાન્ય માહિતી"

 #: sysdeps/osf1/siglist.c:32 sysdeps/sun4/siglist.c:32
 msgid "Trace trap"
@@ -1313,7 +1314,7 @@ msgstr "મારી નાખો"

 #: sysdeps/osf1/siglist.c:37 sysdeps/sun4/siglist.c:37
 msgid "Bus error"
-msgstr "Busની ભૂલ"
+msgstr "Bus ની ભૂલ"

 #: sysdeps/osf1/siglist.c:38 sysdeps/sun4/siglist.c:38
 msgid "Segmentation violation"
@@ -1321,7 +1322,7 @@ msgstr "વિભાગનુ ખંડન"

 #: sysdeps/osf1/siglist.c:39 sysdeps/sun4/siglist.c:39
 msgid "Bad argument to system call"
-msgstr "સિસ્ટમ કાૅલ માટેની ખરાબ દલીલ"
+msgstr "સિસ્ટમ કોલ માટેની ખરાબ દલીલ"

 #: sysdeps/osf1/siglist.c:40 sysdeps/sun4/siglist.c:40
 msgid "Broken pipe"
@@ -1337,7 +1338,7 @@ msgstr "પૂરું કરી રહ્યા છે"

 #: sysdeps/osf1/siglist.c:43 sysdeps/sun4/siglist.c:43
 msgid "Urgent condition on socket"
-msgstr "સાૅકેટ પરની તાત્કાલિક શરત"
+msgstr "સોકેટ પરની તાત્કાલિક શરત"

 #: sysdeps/osf1/siglist.c:44 sysdeps/sun4/siglist.c:44
 msgid "Stop"
@@ -1345,7 +1346,7 @@ msgstr "અટકો"

 #: sysdeps/osf1/siglist.c:45 sysdeps/sun4/siglist.c:45
 msgid "Keyboard stop"
-msgstr "કી બાૅર્ડ અટકાવો"
+msgstr "કી બોર્ડ અટકાવો"

 #: sysdeps/osf1/siglist.c:46 sysdeps/sun4/siglist.c:46
 msgid "Continue"
@@ -1357,11 +1358,11 @@ msgstr "બાળ સ્થિતિ બદલાઇ ગઇ છે"

 #: sysdeps/osf1/siglist.c:48 sysdeps/sun4/siglist.c:48
 msgid "Background read from tty"
-msgstr "પાછળના ભાગનું ttyમાંથી વંચાય છે"
+msgstr "પાછળના ભાગનું tty માંથી વંચાય છે"

 #: sysdeps/osf1/siglist.c:49 sysdeps/sun4/siglist.c:49
 msgid "Background write to tty"
-msgstr "પાછળનો ભાગ ttyમાં લખે છે"
+msgstr "પાછળનો ભાગ tty માં લખે છે"

 #: sysdeps/osf1/siglist.c:50 sysdeps/sun4/siglist.c:50
 msgid "I/O now possible"
@@ -1385,7 +1386,7 @@ msgstr "રુપરેખાંકિત એલાર્મ ઘડિયાળ"

 #: sysdeps/osf1/siglist.c:55 sysdeps/sun4/siglist.c:55
 msgid "Window size change"
-msgstr "વિન્ડાૅના માપમાં બદલાવ"
+msgstr "વિન્ડોના માપમાં બદલાવ"

 #: sysdeps/osf1/siglist.c:56 sysdeps/sun4/siglist.c:56
 msgid "Information request"
--- a/po/it.po
+++ b/po/it.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libgtop\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-03 14:09+0200\n"
-"PO-Revision-Date: 2004-03-15 21:15+0100\n"
+"POT-Creation-Date: 2004-09-20 00:04+0200\n"
+"PO-Revision-Date: 2004-09-20 00:05+0200\n"
 "Last-Translator: Alessio Frusciante <algol@firenze.linux.it>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
 "MIME-Version: 1.0\n"
@@ -121,39 +121,39 @@ msgid_plural "write %d bytes"
 msgstr[0] "scrittura di %d byte"
 msgstr[1] "scrittura di %d byte"

-#: src/daemon/gnuserv.c:456
+#: src/daemon/gnuserv.c:461
 msgid "Enable debugging"
 msgstr "Abilita debug"

-#: src/daemon/gnuserv.c:456
+#: src/daemon/gnuserv.c:461
 msgid "DEBUG"
 msgstr "DEBUG"

-#: src/daemon/gnuserv.c:458
+#: src/daemon/gnuserv.c:463
 msgid "Enable verbose output"
 msgstr "Abilita output prolisso"

-#: src/daemon/gnuserv.c:458
+#: src/daemon/gnuserv.c:463
 msgid "VERBOSE"
 msgstr "VERBOSE"

-#: src/daemon/gnuserv.c:460
+#: src/daemon/gnuserv.c:465
 msgid "Don't fork into background"
 msgstr "Non fare fork in background"

-#: src/daemon/gnuserv.c:460
+#: src/daemon/gnuserv.c:465
 msgid "NO-DAEMON"
 msgstr "NO-DAEMON"

-#: src/daemon/gnuserv.c:462
+#: src/daemon/gnuserv.c:467
 msgid "Invoked from inetd"
 msgstr "Invocato da inetd"

-#: src/daemon/gnuserv.c:462
+#: src/daemon/gnuserv.c:467
 msgid "INETD"
 msgstr "INETD"

-#: src/daemon/gnuserv.c:496
+#: src/daemon/gnuserv.c:501
 #, c-format
 msgid ""
 "Error on option %s: %s.\n"
@@ -260,9 +260,8 @@ msgid "Free file nodes"
 msgstr "Nodi file liberi"

 #: sysdeps/names/fsusage.c:45 sysdeps/names/fsusage.c:55
-#, fuzzy
 msgid "Block size"
-msgstr "Bloccato"
+msgstr "Dimensione blocco"

 #: sysdeps/names/fsusage.c:51
 msgid "Free blocks available to the superuser"
@@ -415,14 +414,12 @@ msgid "MTU"
 msgstr "MTU"

 #: sysdeps/names/netload.c:48 sysdeps/names/netload.c:69
-#, fuzzy
 msgid "IPv4 Subnet"
-msgstr "Sottorete"
+msgstr "Sottorete IPv4"

 #: sysdeps/names/netload.c:49 sysdeps/names/netload.c:70
-#, fuzzy
 msgid "IPv4 Address"
-msgstr "Indirizzo"
+msgstr "Indirizzo IPv4"

 #: sysdeps/names/netload.c:50 sysdeps/names/netload.c:71
 msgid "Packets In"
@@ -465,17 +462,16 @@ msgid "Collisions"
 msgstr "Collisioni"

 #: sysdeps/names/netload.c:60 sysdeps/names/netload.c:81
-#, fuzzy
 msgid "IPv6 Address"
-msgstr "Indirizzo"
+msgstr "Indirizzo IPv6"

 #: sysdeps/names/netload.c:61 sysdeps/names/netload.c:82
 msgid "IPv6 Prefix"
-msgstr ""
+msgstr "Prefisso IPv6"

 #: sysdeps/names/netload.c:62 sysdeps/names/netload.c:83
 msgid "IPv6 Scope"
-msgstr ""
+msgstr "Scope IPv6"

 #: sysdeps/names/netload.c:68
 msgid "Maximum Transfer Unit"
--- a/po/mk.po
+++ b/po/mk.po
@@ -5,23 +5,23 @@
 # translation of mk.po to Macedonian
 # translation of libgtop.libgtop-GNOME-2-0-port.po to Macedonian
 # This file is distributed under the same license as the PACKAGE package.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# Ivan Stojmirov <stojmir@linux.net.mk>, 2002,2003
-# Jovan Kostovski <chombium@freemail.com.mk>, 2003
-# Глигор Костоски <gigo@ajvar.com.mk>, 2003
+# Copyright (C) 2004 THE PACKAGE'S COPYRIGHT HOLDER.
+# Ivan Stojmirov <stojmir@linux.net.mk>, 2002,2003.
+# Jovan Kostovski <chombium@freemail.com.mk>, 2003.
+# Глигор Костоски <gigo@ajvar.com.mk>, 2003.
+# Arangel Angov <ufo@linux.net.mk>, 2004.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: libgtop-GNOME-2-0-port.mk\n"
+"Project-Id-Version: mk\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2004-08-03 14:09+0200\n"
-"PO-Revision-Date: 2003-06-15 10:09+0200\n"
-"Last-Translator: Ivan Stojmirov <stojmir@linux.net.mk>\n"
-"Language-Team: Macedonian <lug@lists.linux.net.mk>\n"
+"PO-Revision-Date: 2004-09-21 23:37+0200\n"
+"Last-Translator: Arangel Angov <ufo@linux.net.mk>\n"
+"Language-Team: Macedonian <ossm-members@hedona.on.net.mk>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.0\n"
+"Content-Transfer-Encoding: 8bit"

 #: examples/smp.c:76
 #, c-format
@@ -105,29 +105,23 @@ msgid "Spin:"
 msgstr "Ротација:"

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

 #: lib/read_data.c:51
 msgid "read data size"
 msgstr "големина на прочитаните податоци"

 #: lib/read_data.c:68
-#, fuzzy, c-format
+#, c-format
 msgid "read data %d byte"
-msgid_plural "read data %d bytes"
-msgstr[0] "прочитани %d бајти"
-msgstr[1] "прочитани %d бајти"
+msgstr "прочитани податоци %d бајти"

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

 #: src/daemon/gnuserv.c:456
 msgid "Enable debugging"
@@ -216,7 +210,7 @@ msgstr "Процесорско време за SMP без задачи"

 #: sysdeps/names/cpu.c:55
 msgid "SMP CPU Flags"
-msgstr ""
+msgstr "SMP CPU знаменца"

 #: sysdeps/names/cpu.c:60 sysdeps/names/cpu.c:66
 msgid "Number of clock ticks since system boot"
@@ -244,7 +238,7 @@ msgstr "Фреквенција на такт (стандардно 100)"

 #: sysdeps/names/cpu.c:71
 msgid "Bit field indicating which CPU is currently running"
-msgstr ""
+msgstr "Поле кое покажува кој процесор работи"

 #: sysdeps/names/fsusage.c:40 sysdeps/names/fsusage.c:50
 msgid "Total blocks"
@@ -267,9 +261,8 @@ msgid "Free file nodes"
 msgstr "Слободни јазли за датотеки"

 #: sysdeps/names/fsusage.c:45 sysdeps/names/fsusage.c:55
-#, fuzzy
 msgid "Block size"
-msgstr "Блокиран"
+msgstr "Големина на блокот"

 #: sysdeps/names/fsusage.c:51
 msgid "Free blocks available to the superuser"
@@ -422,14 +415,12 @@ msgid "MTU"
 msgstr "MTU"

 #: sysdeps/names/netload.c:48 sysdeps/names/netload.c:69
-#, fuzzy
 msgid "IPv4 Subnet"
-msgstr "Subnet"
+msgstr "IPv4 подмрежа"

 #: sysdeps/names/netload.c:49 sysdeps/names/netload.c:70
-#, fuzzy
 msgid "IPv4 Address"
-msgstr "Адреса"
+msgstr "IPv4 адреса"

 #: sysdeps/names/netload.c:50 sysdeps/names/netload.c:71
 msgid "Packets In"
@@ -472,17 +463,16 @@ msgid "Collisions"
 msgstr "Колизии"

 #: sysdeps/names/netload.c:60 sysdeps/names/netload.c:81
-#, fuzzy
 msgid "IPv6 Address"
-msgstr "Адреса"
+msgstr "IPv6 адреса"

 #: sysdeps/names/netload.c:61 sysdeps/names/netload.c:82
 msgid "IPv6 Prefix"
-msgstr ""
+msgstr "Префикс за IPv6"

 #: sysdeps/names/netload.c:62 sysdeps/names/netload.c:83
 msgid "IPv6 Scope"
-msgstr ""
+msgstr "Опсег на IPv6"

 #: sysdeps/names/netload.c:68
 msgid "Maximum Transfer Unit"
@@ -682,10 +672,8 @@ msgstr ""
 "свопувани"

 #: sysdeps/names/procmem.c:63
-msgid ""
-"Current limit in bytes on the rss of the process (usually 2,147,483,647)."
-msgstr ""
-"Моментална граница во бајти на rss на процесот (вообичаено 2,147,483,647)"
+msgid "Current limit in bytes on the rss of the process (usually 2,147,483,647)."
+msgstr "Моментална граница во бајти на rss на процесот (вообичаено 2,147,483,647)"

 #: sysdeps/names/procsegment.c:43
 msgid "Text_RSS"
@@ -800,26 +788,24 @@ msgid "GID"
 msgstr "GID"

 #: sysdeps/names/procstate.c:44
-#, fuzzy
 msgid "RGid"
-msgstr "Gid"
+msgstr "RGid"

 #: sysdeps/names/procstate.c:44
-#, fuzzy
 msgid "RUid"
-msgstr "Uid"
+msgstr "RUid"

 #: sysdeps/names/procstate.c:44
 msgid "HasCPU"
-msgstr ""
+msgstr "Има процесор"

 #: sysdeps/names/procstate.c:44
 msgid "Proc"
-msgstr ""
+msgstr "Proc"

 #: sysdeps/names/procstate.c:44
 msgid "LProc"
-msgstr ""
+msgstr "LProc"

 #: sysdeps/names/procstate.c:49
 msgid "Basename of executable file in call to exec()"
@@ -838,31 +824,28 @@ msgid "GID of process"
 msgstr "GID на процес"

 #: sysdeps/names/procstate.c:53
-#, fuzzy
 msgid "Real UID of process"
-msgstr "UID на процес"
+msgstr "Вистински UID на процесот"

 #: sysdeps/names/procstate.c:54
-#, fuzzy
 msgid "Real GID of process"
-msgstr "GID на процес"
+msgstr "Вистински GID на процесот"

 #: sysdeps/names/procstate.c:55
 msgid "Has CPU"
-msgstr ""
+msgstr "Има процесор"

 #: sysdeps/names/procstate.c:56
-#, fuzzy
 msgid "Processor"
-msgstr "ИД на процесот"
+msgstr "Процесор"

 #: sysdeps/names/procstate.c:57
 msgid "Last Processor"
-msgstr ""
+msgstr "Последен процесор"

 #: sysdeps/names/proctime.c:45
 msgid "Start_Time"
-msgstr "Start_Time"
+msgstr "Почетно време"

 #: sysdeps/names/proctime.c:45
 msgid "RTime"
@@ -890,7 +873,7 @@ msgstr "TimeOut"

 #: sysdeps/names/proctime.c:46
 msgid "It_Real_Value"
-msgstr "It_Real_Value"
+msgstr "Реална вредност"

 #: sysdeps/names/proctime.c:47
 msgid "Frequency"
@@ -906,7 +889,7 @@ msgstr "XCPU_STime"

 #: sysdeps/names/proctime.c:52
 msgid "Start time of process in seconds since the epoch"
-msgstr "Стартно време  на процесот од во секунди од epoch"
+msgstr "Почетно време  на процесот од во секунди од епохата"

 #: sysdeps/names/proctime.c:53
 msgid "Real time accumulated by process (should be utime + stime)"
@@ -918,19 +901,19 @@ msgstr "Кориснични режим, процесорско време ак

 #: sysdeps/names/proctime.c:55
 msgid "kernel-mode CPU time accumulated by process"
-msgstr "Кернел режим, процесорско време акумулирано од процесот"
+msgstr "Режим на кернелот, процесорското време акумулирано од процесот"

 #: sysdeps/names/proctime.c:56
 msgid "cumulative utime of process and reaped children"
-msgstr "Вкупно utime на процесот собрано со времето од децата"
+msgstr "cumulative utime of process and reaped children"

 #: sysdeps/names/proctime.c:57
 msgid "cumulative stime of process and reaped children"
-msgstr "Вкупно stime на процесот собрано со времето од децата"
+msgstr "cumulative stime of process and reaped children"

 #: sysdeps/names/proctime.c:58
 msgid "The time (in jiffies) of the process's next timeout"
-msgstr "Време (во jiffies) за следниот тајмаут на процесот"
+msgstr "Време (во jiffies) за следното истекување на процесот"

 #: sysdeps/names/proctime.c:59
 msgid ""
@@ -969,24 +952,20 @@ msgid "EGid"
 msgstr "EGid"

 #: sysdeps/names/procuid.c:48
-#, fuzzy
 msgid "SUid"
-msgstr "Uid"
+msgstr "SUid"

 #: sysdeps/names/procuid.c:49
-#, fuzzy
 msgid "SGid"
-msgstr "Gid"
+msgstr "SGid"

 #: sysdeps/names/procuid.c:49
-#, fuzzy
 msgid "FSUid"
-msgstr "Uid"
+msgstr "FSUid"

 #: sysdeps/names/procuid.c:49
-#, fuzzy
 msgid "FSGid"
-msgstr "Gid"
+msgstr "FSGid"

 #: sysdeps/names/procuid.c:49
 msgid "Pid"
@@ -1017,66 +996,60 @@ msgid "Priority"
 msgstr "Приоритет"

 #: sysdeps/names/procuid.c:51
-#, fuzzy
 msgid "NGroups"
-msgstr "Група ИД"
+msgstr "NGroups"

 #: sysdeps/names/procuid.c:51
-#, fuzzy
 msgid "Groups"
-msgstr "Група ИД"
+msgstr "Групи"

 #: sysdeps/names/procuid.c:56
 msgid "User ID"
-msgstr "ID на Корисник"
+msgstr "ID на корисник"

 #: sysdeps/names/procuid.c:57
 msgid "Effective User ID"
-msgstr "Корисничко име"
+msgstr "Ефективен кориснички ID"

 #: sysdeps/names/procuid.c:58
 msgid "Group ID"
-msgstr "Група ИД"
+msgstr "ID на група"

 #: sysdeps/names/procuid.c:59
 msgid "Effective Group ID"
 msgstr "ID на ефективна Група"

 #: sysdeps/names/procuid.c:60
-#, fuzzy
 msgid "Set User ID"
-msgstr "ID на Корисник"
+msgstr "Поставете ID за корисникот"

 #: sysdeps/names/procuid.c:61
-#, fuzzy
 msgid "Set Group ID"
-msgstr "Група ИД"
+msgstr "Поставете ID на група"

 #: sysdeps/names/procuid.c:62
-#, fuzzy
 msgid "Filesystem User ID"
-msgstr "Искористеност на фајл системот"
+msgstr "Кориснички ID на датотечниот систем"

 #: sysdeps/names/procuid.c:63
-#, fuzzy
 msgid "Filesystem Group ID"
-msgstr "ID на ефективна Група"
+msgstr "Групен ID на датотечниот систем"

 #: sysdeps/names/procuid.c:64
 msgid "Process ID"
-msgstr "ИД на процесот"
+msgstr "ID на процесот"

 #: sysdeps/names/procuid.c:65
 msgid "PID of parent process"
-msgstr "ИД на родителскиот процес"
+msgstr "ID на родителскиот процес"

 #: sysdeps/names/procuid.c:66
 msgid "Process group ID"
-msgstr "ИД на групата"
+msgstr "ID на групата"

 #: sysdeps/names/procuid.c:67
 msgid "Session ID"
-msgstr "ИД на сесијата"
+msgstr "ID на сесијата"

 #: sysdeps/names/procuid.c:68
 msgid "Full device number of controlling terminal"
@@ -1092,17 +1065,15 @@ msgstr "Кернел приоритет при распоредување"

 #: sysdeps/names/procuid.c:71
 msgid "Standard unix nice level of process"
-msgstr "Стандардно Unix ниво на процеси"
+msgstr "Стандардно јуникс ниво на процеси"

 #: sysdeps/names/procuid.c:72
-#, fuzzy
 msgid "Number of additional process groups"
-msgstr "ID на група терминални процеси"
+msgstr "Број на додатни групи за процеси"

 #: sysdeps/names/procuid.c:73
-#, fuzzy
 msgid "Array of additional process groups"
-msgstr "ID на група терминални процеси"
+msgstr "Низа на додатни групи за процеси"

 #: sysdeps/names/sem_limits.c:43 sysdeps/names/sem_limits.c:57
 msgid "Number of entries in semaphore map"
@@ -1166,15 +1137,15 @@ msgstr "Максимална големина на поделена мемори

 #: sysdeps/names/swap.c:40 sysdeps/names/swap.c:49
 msgid "Total Swap Space"
-msgstr "Вкупно Swap простор"
+msgstr "Вкупен swap простор"

 #: sysdeps/names/swap.c:41 sysdeps/names/swap.c:50
 msgid "Used Swap Space"
-msgstr "Искористен Swap простор"
+msgstr "Искористен swap простор"

 #: sysdeps/names/swap.c:42 sysdeps/names/swap.c:51
 msgid "Free Swap Space"
-msgstr "Слободен Swap простор"
+msgstr "Слободен swap простор"

 #: sysdeps/names/swap.c:43
 msgid "Page In"
@@ -1301,9 +1272,8 @@ msgid "Idletime"
 msgstr "Време на неактивност"

 #: sysdeps/names/uptime.c:41
-#, fuzzy
 msgid "BootTime"
-msgstr "RTime"
+msgstr "При подигнување"

 #: sysdeps/names/uptime.c:46
 msgid "Time in seconds since system boot"
@@ -1311,13 +1281,11 @@ msgstr "Време во секунди од последното бутирањ

 #: sysdeps/names/uptime.c:47
 msgid "Time in seconds the system spent in the idle task since system boot"
-msgstr ""
-"Време во секунди што поминале за неактивна задача од последното бутирање"
+msgstr "Време во секунди што поминале за неактивна задача од последното бутирање"

 #: sysdeps/names/uptime.c:48
-#, fuzzy
 msgid "Time of last system boot in seconds since the epoch"
-msgstr "Стартно време  на процесот од во секунди од epoch"
+msgstr "Времето од последното подигнување на системот во секунди од епохата"

 #: sysdeps/osf1/siglist.c:28 sysdeps/sun4/siglist.c:28
 msgid "Hangup"
@@ -1329,7 +1297,7 @@ msgstr "Прекин"

 #: sysdeps/osf1/siglist.c:30 sysdeps/sun4/siglist.c:30
 msgid "Quit"
-msgstr "Напушти"
+msgstr "Излез"

 #: sysdeps/osf1/siglist.c:31 sysdeps/sun4/siglist.c:31
 msgid "Illegal instruction"
@@ -1443,44 +1411,3 @@ msgstr "Сигнал 1 дефиниран од корисникот"
 msgid "User defined signal 2"
 msgstr "Сигнал 2 дефиниран од корисникот"

-#~ msgid "Unknown system error"
-#~ msgstr "Непозната системска грешка"
-
-#~ msgid "%s: option `%s' is ambiguous\n"
-#~ msgstr "%s: опцијата s %s e премногу општ\n"
-
-#~ msgid "%s: option `--%s' doesn't allow an argument\n"
-#~ msgstr "%s: опцијa. --%s не дозволува аргументи\n"
-
-#~ msgid "%s: option `%c%s' doesn't allow an argument\n"
-#~ msgstr "%s: опцијa. --%c%s не дозволува аргументи\n"
-
-#~ msgid "%s: option `%s' requires an argument\n"
-#~ msgstr "%s: опцијa. --%s бара аргументи\n"
-
-#~ msgid "%s: unrecognized option `--%s'\n"
-#~ msgstr "%s: непрепознаена опција --%s\n"
-
-#~ msgid "%s: unrecognized option `%c%s'\n"
-#~ msgstr "%s: непрепознаена опција --%c%s\n"
-
-#~ msgid "%s: illegal option -- %c\n"
-#~ msgstr "%s: невалидна опција --%c\n"
-
-#~ msgid "%s: invalid option -- %c\n"
-#~ msgstr "%s: невалидна опција --%c\n"
-
-#~ msgid "%s: option requires an argument -- %c\n"
-#~ msgstr "%s: опцијaбара аргументи --%c \n"
-
-#~ msgid "%s: option `-W %s' is ambiguous\n"
-#~ msgstr "%s опција  W %s е премногу општа\n"
-
-#~ msgid "%s: option `-W %s' doesn't allow an argument\n"
-#~ msgstr "%s опција W %s не дозволува аргументи\n"
-
-#~ msgid "Show this help message"
-#~ msgstr "Прикажи ја оваа порака за помош"
-
-#~ msgid "Display brief usage message"
-#~ msgstr "Прикажи помош за користење"
--- a/po/or.po
+++ b/po/or.po
--- a/src/daemon/ChangeLog
+++ b/src/daemon/ChangeLog
@@ -1,3 +1,9 @@
+2004-09-19  Benoît Dejean  <tazforever@dlfp.org>
+
+	* gnuserv.c: (setup_table): 'screen' is only defined when AUTH_MAGIC_COOKIE
+	is defined.
+	Added missing initializers for popt options.
+
 2004-05-25  Benoît Dejean  <tazforever@dlfp.org>

 	* gnuserv.c: (permitted): Cast to size_t to remove warning.
--- a/src/daemon/gnuserv.c
+++ b/src/daemon/gnuserv.c
@@ -274,7 +274,12 @@ permitted (u_long host_addr, int fd)
 static int
 setup_table (void)
 {
-    char hostname [HOSTNAMSZ], screen [BUFSIZ];
+    char hostname [HOSTNAMSZ];
+
+#ifdef AUTH_MAGIC_COOKIE
+    char screen [BUFSIZ];
+#endif
+
    long host_addr;
    int i, hosts = 0;

@@ -460,7 +465,7 @@ const struct poptOption popt_options [] = {
      N_("Don't fork into background"), N_("NO-DAEMON") },
    { "inetd", 'i', POPT_ARG_NONE, &invoked_from_inetd, 0,
      N_("Invoked from inetd"), N_("INETD") },
-    { NULL, '\0', 0, NULL, 0 }
+    { NULL, '\0', 0, NULL, 0, NULL, NULL }
 };

 int
--- a/src/daemon/version.c
+++ b/src/daemon/version.c
@@ -24,6 +24,9 @@
 #include <glibtop.h>
 #include <glibtop/error.h>
 #include <glibtop/version.h>
+#include <glibtop/union.h>
+#include <glibtop/command.h>
+

 void
 glibtop_send_version (glibtop *server, int fd)
--- a/structures.def
+++ b/structures.def
@@ -1,5 +1,4 @@
 glibtop_map_entry|ulong(flags,start,end,offset,perm,inode,device):string(filename)
 glibtop_mountentry|ulong(dev):string(devname,mountdir,type)
-glibtop_interface|ulong(flags,if_flags,transport,type,number,instance,num_logical):string(name)
-glibtop_sysdeps|ulong(features,pointer_size,cpu,mem,swap,uptime,loadavg,shm_limits,msg_limits,sem_limits,proclist,proc_state,proc_uid,proc_mem,proc_time,proc_signal,proc_kernel,proc_segment,proc_args,proc_map,mountlist,fsusage,interface_names,netload,ppp)
-glibtop_ifaddr|ulong(flags,transport):ushort(addr_len,address[GLIBTOP_IFADDR_LEN]):ulong(subnet,scope)
+glibtop_sysdeps|ulong(features,pointer_size,cpu,mem,swap,uptime,loadavg,shm_limits,msg_limits,sem_limits,proclist,proc_state,proc_uid,proc_mem,proc_time,proc_signal,proc_kernel,proc_segment,proc_args,proc_map,mountlist,fsusage,interface_names,netlist,netload,ppp)
+
--- a/sysdeps/Makefile.am
+++ b/sysdeps/Makefile.am
@@ -1,5 +1,5 @@

 SUBDIRS			= common @sysdeps_dir@ names

-DIST_SUBDIRS		= common linux kernel names osf1 \
+DIST_SUBDIRS		= common linux names osf1 \
 			  stub stub_suid sun4 freebsd solaris aix
--- a/sysdeps/aix/ChangeLog
+++ b/sysdeps/aix/ChangeLog
@@ -1,3 +1,51 @@
+2004-10-22  Benoît Dejean  <tazforever@dlfp.org>
+
+	* procargs.c: (glibtop_get_proc_args_s):
+	* prockernel.c: (glibtop_get_proc_kernel_s):
+	* procmem.c: (glibtop_get_proc_mem_s):
+	* procsegment.c: (glibtop_get_proc_segment_s):
+	* procsignal.c: (glibtop_get_proc_signal_s):
+	* procstate.c: (glibtop_get_proc_state_s):
+	* proctime.c: (glibtop_get_proc_time_s):
+	* procuid.c: (glibtop_get_proc_uid_s): No longer abort() is no such pid.
+	buf.flags == 0ULL means that there no data could be retrieve at all.
+	Closes #154876. Thanks to Christophe Belle.
+
+2004-10-04  Benoît Dejean  <tazforever@dlfp.org>
+
+	* procstate.c: (glibtop_get_proc_state_s): Fixed .state to follow 
+	LibGTop2 specification.
+
+2004-10-04  Benoît Dejean  <tazforever@dlfp.org>
+
+	* procmap.c: (glibtop_get_proc_map_s): Fixed glibtop_init_s call.
+
+2004-10-04  Benoît Dejean  <tazforever@dlfp.org>
+
+	* Makefile.am:
+	* cpu.c: (glibtop_init_cpu_p), (glibtop_get_cpu_p):
+	* glibtop_machine.h:
+	* glibtop_server.h:
+	* mem.c: (glibtop_get_mem_s):
+	* netload.c: (glibtop_get_netload_p):
+	* procargs.c: (glibtop_get_proc_args_s):
+	* prockernel.c: (glibtop_get_proc_kernel_s):
+	* proclist.c: (glibtop_get_proclist_s):
+	* procmem.c: (glibtop_get_proc_mem_s):
+	* procsegment.c: (glibtop_get_proc_segment_s):
+	* procsignal.c: (glibtop_get_proc_signal_s):
+	* procstate.c: (glibtop_get_proc_state_s):
+	* proctime.c: (glibtop_get_proc_time_s):
+	* procuid.c: (glibtop_get_proc_uid_s):
+	* swap.c: (glibtop_get_swap_s):
+	* sysinfo.c: (add_info), (init_sysinfo):
+	* uptime.c: (glibtop_init_uptime_s), (glibtop_get_uptime_s):
+	
+	AIX support updated by Laurent Vivier <Laurent.Vivier@BULL.NET>.
+	
+	Fixed cpu/uptime/sysinfo.
+	Added missing calls to glibtop_init_s.
+
 2004-06-13  Benoît Dejean  <tazforever@dlfp.org>

 	* sysinfo.c: Added missing const qualifier.
--- a/sysdeps/aix/Makefile.am
+++ b/sysdeps/aix/Makefile.am
@@ -3,16 +3,18 @@ INCLUDES			= @INCLUDES@

 noinst_LTLIBRARIES		= libgtop_sysdeps-2.0.la libgtop_sysdeps_suid-2.0.la

-libgtop_sysdeps_2_0_la_SOURCES  = siglist.c nosuid.c
+libgtop_sysdeps_2_0_la_SOURCES  = siglist.c nosuid.c mem.c swap.c uptime.c \
+				  procargs.c prockernel.c proclist.c procmap.c \
+				  procmem.c procsegment.c procsignal.c \
+				  proctime.c procuid.c procmem.c utils.c \
+				  procstate.c sysinfo.c
+				

 libgtop_sysdeps_2_0_la_LDFLAGS	= $(LT_VERSION_INFO)

-libgtop_sysdeps_suid_2_0_la_SOURCES = open.c close.c cpu.c mem.c swap.c \
-				  uptime.c loadavg.c shm_limits.c msg_limits.c \
-				  sem_limits.c proclist.c procstate.c procuid.c \
-				  proctime.c procmem.c procsignal.c prockernel.c \
-				  procsegment.c procargs.c procmap.c netload.c \
-				  ppp.c utils.c utils.h sysinfo.c
+libgtop_sysdeps_suid_2_0_la_SOURCES = open.c close.c cpu.c loadavg.c \
+				  msg_limits.c shm_limits.c sem_limits.c \
+				  netload.c ppp.c utils.c

 libgtop_sysdeps_suid_2_0_la_LDFLAGS	= $(LT_VERSION_INFO)
 libgtop_sysdeps_suid_2_0_la_LIBADD	= $(top_builddir)/sysdeps/common/libgtop_suid_common-2.0.la $(GLIB_LIBS)
--- a/sysdeps/aix/cpu.c
+++ b/sysdeps/aix/cpu.c
@@ -52,6 +52,13 @@ glibtop_init_cpu_p (glibtop *server)
 		server->ncpu = 0; /* means single-processor, see glibtop.h */
 	}

+	result = _glibtop_get_kmem_offset(server, "sysinfo");
+	if (result == -1)
+	{
+		return;
+	}
+	server->machine.sysinfo_offset = result;
+
 	result = _glibtop_get_kmem_offset(server, "cpuinfo");
 	if (result == -1)
 	{
@@ -73,11 +80,27 @@ glibtop_get_cpu_p (glibtop *server, glibtop_cpu *buf)
 {
 	int result;
 	int cpu;
+	struct sysinfo sysinfo;

 	glibtop_init_p (server, (1L << GLIBTOP_SYSDEPS_CPU), 0);

 	memset (buf, 0, sizeof (glibtop_cpu));

+	result = _glibtop_get_kmem_info(server, server->machine.sysinfo_offset,
+					&sysinfo, sizeof(struct sysinfo));
+	if (result <= 0)
+	{
+		glibtop_error_io_r (server, "Cannot read sysinfo");
+		return;
+	}
+
+	buf->idle = sysinfo.cpu[CPU_IDLE];
+	buf->user = sysinfo.cpu[CPU_USER];
+	buf->sys  = sysinfo.cpu[CPU_KERNEL];
+	buf->nice = sysinfo.cpu[CPU_WAIT];
+
+	buf->total = buf->idle + buf->user + buf->sys + buf->nice ;
+
 	result = _glibtop_get_kmem_info(server, server->machine.cpuinfo_offset,
 					server->machine.cpuinfo,
 					_system_configuration.ncpus
@@ -89,37 +112,25 @@ glibtop_get_cpu_p (glibtop *server, glibtop_cpu *buf)
 		return;
 	}

-	buf->idle = 0;
-	buf->user = 0;
-	buf->sys = 0;
-	buf->nice = 0;
-	for (cpu = 0; cpu < _system_configuration.ncpus; cpu++)
+
+	for (cpu = 0; cpu < MIN(GLIBTOP_NCPU, _system_configuration.ncpus); cpu++)
 	{
-		if (cpu < GLIBTOP_NCPU)
-		{
-			buf->xcpu_idle[cpu] =
-				server->machine.cpuinfo[cpu].cpu[CPU_IDLE];
-			buf->xcpu_user[cpu] =
-				server->machine.cpuinfo[cpu].cpu[CPU_USER];
-			buf->xcpu_sys[cpu] =
-				server->machine.cpuinfo[cpu].cpu[CPU_KERNEL];
-			buf->xcpu_nice[cpu] =
-				server->machine.cpuinfo[cpu].cpu[CPU_WAIT];
+		buf->xcpu_idle[cpu] =
+			server->machine.cpuinfo[cpu].cpu[CPU_IDLE];
+		buf->xcpu_user[cpu] =
+			server->machine.cpuinfo[cpu].cpu[CPU_USER];
+		buf->xcpu_sys[cpu] =
+			server->machine.cpuinfo[cpu].cpu[CPU_KERNEL];
+		buf->xcpu_nice[cpu] =
+			server->machine.cpuinfo[cpu].cpu[CPU_WAIT];

-			buf->xcpu_total[cpu] = buf->xcpu_idle[cpu] +
-					       buf->xcpu_user[cpu] +
-					       buf->xcpu_sys[cpu] +
-					       buf->xcpu_nice[cpu];
-		}
-
-		buf->idle += server->machine.cpuinfo[cpu].cpu[CPU_IDLE];
-		buf->user += server->machine.cpuinfo[cpu].cpu[CPU_USER];
-		buf->sys  += server->machine.cpuinfo[cpu].cpu[CPU_KERNEL];
-		buf->nice += server->machine.cpuinfo[cpu].cpu[CPU_WAIT];
-
-		buf->total = buf->idle + buf->user + buf->sys + buf->nice ;
+		buf->xcpu_total[cpu] = buf->xcpu_idle[cpu] +
+			buf->xcpu_user[cpu] +
+			buf->xcpu_sys[cpu] +
+			buf->xcpu_nice[cpu];
 	}

+
 	buf->frequency = sysconf(_SC_CLK_TCK);
 	buf->flags = _glibtop_sysdeps_cpu;
 }
--- a/sysdeps/aix/glibtop_machine.h
+++ b/sysdeps/aix/glibtop_machine.h
@@ -38,6 +38,7 @@ struct _glibtop_machine
 	int kmem_fd;

 	off_t cpuinfo_offset;
+	off_t sysinfo_offset;
 	off_t ifnet_offset;
 	off_t loadavg_offset;
 	off_t shminfo_offset;
--- a/sysdeps/aix/glibtop_server.h
+++ b/sysdeps/aix/glibtop_server.h
@@ -29,7 +29,7 @@ G_BEGIN_DECLS
 #define GLIBTOP_SUID_CPU		(1 << GLIBTOP_SYSDEPS_CPU)
 #define GLIBTOP_SUID_MEM		0
 #define GLIBTOP_SUID_SWAP		0
-#define GLIBTOP_SUID_UPTIME		(1 << GLIBTOP_SYSDEPS_UPTIME)
+#define GLIBTOP_SUID_UPTIME		0
 #define GLIBTOP_SUID_LOADAVG		(1 << GLIBTOP_SYSDEPS_LOADAVG)
 #define GLIBTOP_SUID_SHM_LIMITS		(1 << GLIBTOP_SYSDEPS_SHM_LIMITS)
 #define GLIBTOP_SUID_MSG_LIMITS		(1 << GLIBTOP_SYSDEPS_MSG_LIMITS)
--- a/sysdeps/aix/mem.c
+++ b/sysdeps/aix/mem.c
@@ -49,6 +49,8 @@ glibtop_get_mem_s (glibtop *server, glibtop_mem *buf)
 	int pagesize;
 	int result;

+	glibtop_init_s (&server, (1L << GLIBTOP_SYSDEPS_MEM), 0);
+
 	memset (buf, 0, sizeof (glibtop_mem));

 	pagesize = sysconf(_SC_PAGESIZE);
--- a/sysdeps/aix/netload.c
+++ b/sysdeps/aix/netload.c
@@ -119,6 +119,8 @@ glibtop_get_netload_p (glibtop *server, glibtop_netload *buf,
 	long mask;
 	char name[16];

+	glibtop_init_p (server, (1L << GLIBTOP_SYSDEPS_UPTIME), 0);
+
 	memset (buf, 0, sizeof (glibtop_netload));

 	for ( offset = server->machine.ifnet_offset;
--- a/sysdeps/aix/procargs.c
+++ b/sysdeps/aix/procargs.c
@@ -62,15 +62,12 @@ glibtop_get_proc_args_s (glibtop *server, glibtop_proc_args *buf,
 	int result;
 	int len;

+	glibtop_init_s (&server, (1L << GLIBTOP_SYSDEPS_PROC_ARGS), 0);
+
 	memset (buf, 0, sizeof (glibtop_proc_args));

 	pinfo = _glibtop_get_procinfo(server, pid);
-	if (pinfo == NULL)
-	{
-		glibtop_error_io_r (server, "Cannot read procsinfo");
-
-		return NULL;
-	}
+	if (pinfo == NULL) return NULL;

 	size = max_len != 0 ? max_len : 4096;
 	args_buffer = g_malloc (size);
--- a/sysdeps/aix/prockernel.c
+++ b/sysdeps/aix/prockernel.c
@@ -57,15 +57,12 @@ glibtop_get_proc_kernel_s (glibtop *server, glibtop_proc_kernel *buf,
 	tid_t thid;
 	int result;

+	glibtop_init_s (&server, (1L << GLIBTOP_SYSDEPS_PROC_KERNEL), 0);
+
 	memset (buf, 0, sizeof (glibtop_proc_kernel));

 	pinfo = _glibtop_get_procinfo(server, pid);
-	if (pinfo == NULL)
-	{
-		glibtop_error_io_r(server, "Cannot read procsinfo");
-
-		return;
-	}
+	if (pinfo == NULL) return;

 	if (!(pinfo->pi_flags | SKPROC))
 	{
--- a/sysdeps/aix/proclist.c
+++ b/sysdeps/aix/proclist.c
@@ -59,6 +59,8 @@ glibtop_get_proclist_s (glibtop *server, glibtop_proclist *buf,
 	pid_t current;
 	int result;

+	glibtop_init_s (&server, (1L << GLIBTOP_SYSDEPS_PROCLIST), 0);
+
 	memset (buf, 0, sizeof (glibtop_proclist));

 	for( count = total = 0, current = 0
--- a/sysdeps/aix/procmap.c
+++ b/sysdeps/aix/procmap.c
@@ -41,7 +41,7 @@ glibtop_init_proc_map_s (glibtop *server)
 glibtop_map_entry *
 glibtop_get_proc_map_s (glibtop *server, glibtop_proc_map *buf,	pid_t pid)
 {
-	glibtop_init_p (&server, GLIBTOP_SYSDEPS_PROC_MAP, 0);
+	glibtop_init_p (&server, (1L << GLIBTOP_SYSDEPS_PROC_MAP), 0);

 	memset (buf, 0, sizeof (glibtop_proc_map));

--- a/sysdeps/aix/procmem.c
+++ b/sysdeps/aix/procmem.c
@@ -53,15 +53,12 @@ glibtop_get_proc_mem_s (glibtop *server, glibtop_proc_mem *buf,
 	struct procsinfo *pinfo;
 	int pagesize;

+	glibtop_init_s (&server, (1L << GLIBTOP_SYSDEPS_PROC_MEM), 0);
+
 	memset (buf, 0, sizeof (glibtop_proc_mem));

 	pinfo = _glibtop_get_procinfo(server, pid);
-        if (pinfo == NULL)
-        {
-                glibtop_error_io_r (server, "Cannot read procsinfo");
-
-		return;
-        }
+	if (pinfo == NULL) return;

 	pagesize = sysconf(_SC_PAGESIZE);

--- a/sysdeps/aix/procsegment.c
+++ b/sysdeps/aix/procsegment.c
@@ -53,15 +53,12 @@ glibtop_get_proc_segment_s (glibtop *server, glibtop_proc_segment *buf,
 	struct procsinfo *pinfo;
 	int pagesize;

+	glibtop_init_s (&server, (1L << GLIBTOP_SYSDEPS_PROC_SEGMENT), 0);
+
 	memset (buf, 0, sizeof (glibtop_proc_segment));

 	pinfo = _glibtop_get_procinfo(server, pid);
-	if (pinfo == NULL)
-	{
-		glibtop_error_io_r (server, "Cannot read procsinfo");
-
-		return;
-	}
+	if (pinfo == NULL) return;

 	pagesize = sysconf(_SC_PAGESIZE);

--- a/sysdeps/aix/procsignal.c
+++ b/sysdeps/aix/procsignal.c
@@ -54,15 +54,12 @@ glibtop_get_proc_signal_s (glibtop *server, glibtop_proc_signal *buf,
 	int i;
 	long bit;

+	glibtop_init_s (&server, (1L << GLIBTOP_SYSDEPS_PROC_SIGNAL), 0);
+
 	memset (buf, 0, sizeof (glibtop_proc_signal));

 	pinfo = _glibtop_get_procinfo(server, pid);
-	if (pinfo == NULL)
-	{
-		glibtop_error_io_r (server, "Cannot read procsinfo");
-
-		return;
-	}
+	if (pinfo == NULL) return;

 	/* pending signals */

--- a/sysdeps/aix/procstate.c
+++ b/sysdeps/aix/procstate.c
@@ -53,15 +53,12 @@ glibtop_get_proc_state_s (glibtop *server, glibtop_proc_state *buf,
 	tid_t thid;
 	int result;

+	glibtop_init_s (&server, (1L << GLIBTOP_SYSDEPS_PROC_STATE), 0);
+
 	memset (buf, 0, sizeof (glibtop_proc_state));

 	pinfo = _glibtop_get_procinfo(server, pid);
-	if (pinfo == NULL)
-	{
-		glibtop_error_io_r(server, "Cannot read procsinfo");
-
-		return;
-	}
+	if (pinfo == NULL) return;

 	if (pinfo->pi_pid == 0)
 	{
@@ -82,7 +79,7 @@ glibtop_get_proc_state_s (glibtop *server, glibtop_proc_state *buf,

 	if (pinfo->pi_state == SZOMB)
 	{
-		buf->state = 'Z';
+		buf->state = GLIBTOP_PROCESS_ZOMBIE;
 		strcpy(buf->cmd, "<defunct>");
 	}
 	else
@@ -90,7 +87,7 @@ glibtop_get_proc_state_s (glibtop *server, glibtop_proc_state *buf,
 		/* get state of first thread */

 		thid = 0;
-        	result = getthrds(pid, &thinfo, sizeof(thinfo), &thid, 1);
+		result = getthrds(pid, &thinfo, sizeof(thinfo), &thid, 1);
 		if (result != 1)
 		{
 			glibtop_error_io_r(server, "Cannot read threadinfo");
@@ -99,23 +96,24 @@ glibtop_get_proc_state_s (glibtop *server, glibtop_proc_state *buf,
 		switch (thinfo.ti_state)
 		{
 			case TSIDL:
-				buf->state = 'D';
+				/* FIXME */
+				/* buf->state = GLIBTOP_PROCESS_UNINTERRUPTIBLE; */
 				break;
 			case TSRUN:
-				buf->state = 'R';
+				buf->state = GLIBTOP_PROCESS_RUNNING;
 				break;
 			case TSSLEEP:
-				buf->state = 'S';
+				buf->state = GLIBTOP_PROCESS_INTERRUPTIBLE;
 				break;
 			case TSZOMB:
-				buf->state = 'Z';
+				buf->state = GLIBTOP_PROCESS_ZOMBIE;
 				strcpy(buf->cmd, "<defunct>");
 				break;
 			case TSSTOP:
-				buf->state = 'T';
+				buf->state = GLIBTOP_PROCESS_STOPPED;
 				break;
 			case TSSWAP:
-				buf->state = 'W';
+				buf->state = GLIBTOP_PROCESS_SWAPPING;
 				break;
 			default:
 				buf->state = 0;
--- a/sysdeps/aix/proctime.c
+++ b/sysdeps/aix/proctime.c
@@ -51,14 +51,12 @@ glibtop_get_proc_time_s (glibtop *server, glibtop_proc_time *buf,
 {
 	struct procsinfo *pinfo;

+	glibtop_init_s (&server, (1L << GLIBTOP_SYSDEPS_PROC_TIME), 0);
+
 	memset (buf, 0, sizeof (glibtop_proc_time));

 	pinfo = _glibtop_get_procinfo(server, pid);
-	if (pinfo == NULL)
-	{
-		glibtop_error_io_r (server, "Cannot read procsinfo");
-		return;
-	}
+	if (pinfo == NULL) return;

 	buf->start_time = pinfo->pi_start;
 	buf->utime = pinfo->pi_ru.ru_utime.tv_sec + (double)pinfo->pi_ru.ru_utime.tv_usec/1000000.0;
--- a/sysdeps/aix/procuid.c
+++ b/sysdeps/aix/procuid.c
@@ -59,15 +59,12 @@ glibtop_get_proc_uid_s (glibtop *server, glibtop_proc_uid *buf,
 	tid_t thid;
 	int result;

+	glibtop_init_s (&server, (1L << GLIBTOP_SYSDEPS_PROC_UID), 0);
+
 	memset (buf, 0, sizeof (glibtop_proc_uid));

 	pinfo = _glibtop_get_procinfo(server, pid);
-	if (pinfo == NULL)
-	{
-		glibtop_error_io_r (server, "Cannot read procsinfo");
-
-		return;
-	}
+	if (pinfo == NULL) return;

 	buf->uid = pinfo->pi_cred.cr_ruid;
 	buf->euid =  pinfo->pi_cred.cr_uid;
--- a/sysdeps/aix/swap.c
+++ b/sysdeps/aix/swap.c
@@ -57,6 +57,8 @@ glibtop_get_swap_s (glibtop *server, glibtop_swap *buf)
 	int comment = 0;
 	int pos = 0;

+	glibtop_init_s (&server, (1L << GLIBTOP_SYSDEPS_SWAP), 0);
+
 	memset (buf, 0, sizeof (glibtop_swap));

 	pagesize = sysconf(_SC_PAGESIZE);
--- a/sysdeps/aix/sysinfo.c
+++ b/sysdeps/aix/sysinfo.c
@@ -31,10 +31,16 @@ static const unsigned long _glibtop_sysdeps_sysinfo =

 static glibtop_sysinfo sysinfo;

-static void add_info(glibtop_entry* entry, char* label, char* value)
+static void add_info(glibtop_entry* entry, char* label, char* attribute)
 {
-	g_ptr_array_add(entry->labels, g_strdup(label));
-	g_hash_table_insert(entry->values, label, g_strdup(value));
+	char* key;
+	char* value;
+
+	key = g_strdup(label);
+	value = g_strdup(attribute);
+
+	g_ptr_array_add(entry->labels, key);
+	g_hash_table_insert(entry->values, key, value);
 }

 static void init_sysinfo(void)
@@ -60,22 +66,22 @@ static void init_sysinfo(void)
 			case POWER_RS:
 				add_info( &sysinfo.cpuinfo[cpu]
 					, "architecture"
-					, "Power Classic architecture");
+					, "Power Classic");
 				break;
 			case POWER_PC:
 				add_info( &sysinfo.cpuinfo[cpu]
 					, "architecture"
-					, "Power PC architecture");
+					, "Power PC");
 				break;
 			case IA64:
 				add_info( &sysinfo.cpuinfo[cpu]
 					, "architecture"
-					, "Intel IA64 architecture");
+					, "Intel IA64");
 				break;
 			default:
 				add_info( &sysinfo.cpuinfo[cpu]
 					, "architecture"
-					, "Unknown architecture");
+					, "Unknown");
 				break;
 		}

@@ -161,7 +167,7 @@ static void init_sysinfo(void)
 		sprintf(buf,"%d", _system_configuration.width);
 		add_info( &sysinfo.cpuinfo[cpu], "width", buf);

-		if (_system_configuration.cache_attrib & (1 << 31))
+		if (_system_configuration.cache_attrib & 1 )
 		{
 			/* L1 cache is present */

--- a/sysdeps/aix/uptime.c
+++ b/sysdeps/aix/uptime.c
@@ -21,6 +21,8 @@
   Boston, MA 02111-1307, USA.
 */

+#include <sys/times.h>
+
 #include <glibtop.h>
 #include <glibtop/error.h>
 #include <glibtop/uptime.h>
@@ -32,16 +34,13 @@
 #include <time.h>

 static const unsigned long _glibtop_sysdeps_uptime =
-(1L << GLIBTOP_UPTIME_UPTIME) + (1L << GLIBTOP_UPTIME_IDLETIME);
+(1L << GLIBTOP_UPTIME_UPTIME) + (1L << GLIBTOP_UPTIME_BOOT_TIME);

-static const unsigned long _required_cpu_flags =
-(1L << GLIBTOP_CPU_TOTAL) + (1L << GLIBTOP_CPU_IDLE) +
-(1L << GLIBTOP_CPU_FREQUENCY);

 /* Init function. */

 void
-glibtop_init_uptime_p (glibtop *server)
+glibtop_init_uptime_s (glibtop *server)
 {
 	server->sysdeps.uptime = _glibtop_sysdeps_uptime;
 }
@@ -49,28 +48,17 @@ glibtop_init_uptime_p (glibtop *server)
 /* Provides uptime and idle time. */

 void
-glibtop_get_uptime_p (glibtop *server, glibtop_uptime *buf)
+glibtop_get_uptime_s (glibtop *server, glibtop_uptime *buf)
 {
-	glibtop_cpu cpu;
+	time_t uptime;
+	struct tms tbuf;

-	glibtop_init_p (server, (1L << GLIBTOP_SYSDEPS_UPTIME), 0);
+	glibtop_init_s (&server, (1L << GLIBTOP_SYSDEPS_UPTIME), 0);

 	memset (buf, 0, sizeof (glibtop_uptime));

-	/* We simply calculate it from the CPU usage. */
-
-	glibtop_get_cpu_p (server, &cpu);
-
-	/* Make sure all required fields are present. */
-
-	if ((cpu.flags & _required_cpu_flags) != _required_cpu_flags)
-		return;
-
-	/* Calculate values. */
-
-	buf->uptime = (double) cpu.total / (double) cpu.frequency;
-	buf->idletime = (double) cpu.idle / (double) cpu.frequency;
+	buf->uptime = (double)times(&tbuf) / (double)sysconf(_SC_CLK_TCK);
 	buf->boot_time = (guint64) time(NULL) - (guint64) buf->uptime;
-
 	buf->flags = _glibtop_sysdeps_uptime;
 }
+
--- a/sysdeps/common/ChangeLog
+++ b/sysdeps/common/ChangeLog
@@ -1,3 +1,50 @@
+2004-09-24  Benoît Dejean  <tazforever@dlfp.org>
+
+	* fsusage.c: (glibtop_get_fsusage_s): Fixed .block_size on Solaris.
+
+2004-09-24  Benoît Dejean  <tazforever@dlfp.org>
+
+	* Makefile.am:
+	* mountlist.c:
+	* mountlist.h: Removed mountlist.h.
+
+2004-09-23  Benoît Dejean  <tazforever@dlfp.org>
+
+	* mountlist.c: (ignore_mount_entry): Added openpromfs.
+
+2004-09-22  Benoît Dejean  <tazforever@dlfp.org>
+
+	* fsusage.c: (glibtop_get_fsusage_s): Linux: Sanitize. Removed calls
+	to obfuscated PROPAGATE_ALL_ONES(x) which seems to return unpredictable
+	values on some arch (e.g sparc).
+	Closes #153141.
+
+2004-09-22  Benoît Dejean  <tazforever@dlfp.org>
+
+	* mountlist.c: (ignore_mount_entry): Added mntfs to ignore list.
+
+2004-09-21  Benoît Dejean  <tazforever@dlfp.org>
+
+	* fsusage.c: (_glibtop_get_fsusage_read_write),
+	(glibtop_get_fsusage_s):
+	* mountlist.c: (glibtop_get_mountlist_s): Back to previous version.
+
+2004-09-19  Benoît Dejean  <tazforever@dlfp.org>
+
+	* fsusage.c: (_glibtop_get_fsusage_read_write) : Added new flag.
+	(_glibtop_get_fsusage_read_write): Changed prototype. Returns TRUE on
+	success, then _glibtop_get_fsusage_read_write is set.
+	
+	Added comment to locate Linux code.
+	
+	* mountlist.c: (read_filesystem_list): Dropped unused need_fs_type parameter.
+	This is now default.
+	Fixed possible leak.
+	
+	(ignore_mount_entry): Added "usbfs" to ignored FS.
+	
+	(glibtop_get_mountlist_s): Updated.
+
 2004-08-22  Benoît Dejean  <tazforever@dlfp.org>

 	* mountlist.c: (read_filesystem_list): Merged FreeBSD Marcus' patch.
--- a/sysdeps/common/Makefile.am
+++ b/sysdeps/common/Makefile.am
@@ -15,7 +15,7 @@ noinst_LTLIBRARIES		= libgtop_common-2.0.la libgtop_suid_common-2.0.la

 libgtop_common_2_0_la_SOURCES	= error.c gnuslib.c \
 				  fsusage.c \
-                                  mountlist.c mountlist.h \
+                                  mountlist.c \
                                  procargs.c \
 				  $(inodedb_SRCLIST)

--- a/sysdeps/common/fsusage.c
+++ b/sysdeps/common/fsusage.c
@@ -16,7 +16,7 @@
   along with this program; if not, write to the Free Software Foundation,
   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */

-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif

@@ -26,26 +26,26 @@
 #include <sys/types.h>
 #include <sys/stat.h>

-#if HAVE_LIMITS_H
+#ifdef HAVE_LIMITS_H
 # include <limits.h>
 #endif
 #ifndef CHAR_BIT
 # define CHAR_BIT 8
 #endif

-#if HAVE_SYS_PARAM_H
+#ifdef HAVE_SYS_PARAM_H
 # include <sys/param.h>
 #endif

-#if HAVE_SYS_MOUNT_H
+#ifdef HAVE_SYS_MOUNT_H
 # include <sys/mount.h>
 #endif

-#if HAVE_SYS_VFS_H
+#ifdef HAVE_SYS_VFS_H
 # include <sys/vfs.h>
 #endif

-#if HAVE_SYS_FS_S5PARAM_H	/* Fujitsu UXP/V */
+#ifdef HAVE_SYS_FS_S5PARAM_H	/* Fujitsu UXP/V */
 # include <sys/fs/s5param.h>
 #endif

@@ -53,21 +53,21 @@
 # include <sys/filsys.h>	/* SVR2 */
 #endif

-#if HAVE_FCNTL_H
+#ifdef HAVE_FCNTL_H
 # include <fcntl.h>
 #endif

-#if HAVE_SYS_STATFS_H
+#ifdef HAVE_SYS_STATFS_H
 # include <sys/statfs.h>
 #endif

-#if HAVE_DUSTAT_H		/* AIX PS/2 */
+#ifdef HAVE_DUSTAT_H		/* AIX PS/2 */
 # include <sys/dustat.h>
 #endif

-#if HAVE_SYS_STATVFS_H		/* SVR4 */
+#ifdef HAVE_SYS_STATVFS_H		/* SVR4 */
 # include <sys/statvfs.h>
-int statvfs ();
+int statvfs (const char *path, struct statvfs *buf);
 #endif

 /* Many space usage primitives use all 1 bits to denote a value that is
@@ -109,7 +109,6 @@ static const unsigned long _glibtop_sysdeps_fsusage =
 + (1L << GLIBTOP_FSUSAGE_FFREE) + (1L << GLIBTOP_FSUSAGE_BLOCK_SIZE);


-
 /*
 * _glibtop_get_fsusage_read_write
 * New function to retrieve total read and write
@@ -119,24 +118,30 @@ static const unsigned long _glibtop_sysdeps_fsusage =
 * function full of #something where everything is mixed.
 * These functions are private.
 *
- * void _glibtop_<arch>_get_fsusage_read_write(glibtop*server,
- *                                               glibtop_fsusage *buf,
- *                                               const char *path);
+ * void  _glibtop_<arch>_get_fsusage_read_write(glibtop*server,
+ *                                              glibtop_fsusage *buf,
+ *                                              const char *path);
 *
 * TODO: split this file properly, is possible
 */

 #ifdef linux
 void _glibtop_linux_get_fsusage_read_write(glibtop *server,
-					     glibtop_fsusage *buf,
-					     const char *path);
+					   glibtop_fsusage *buf,
+					   const char *path);

 #define _glibtop_get_fsusage_read_write(S, B, P) \
        _glibtop_linux_get_fsusage_read_write(S, B, P)

 #else /* default fallback */
 #warning glibtop_get_fsusage .read .write are not implemented.
-#define _glibtop_get_fsusage_read_write(S, B, P) ((void)0)
+static inline void
+_glibtop_get_fsusage_read_write(glibtop *server,
+				glibtop_fsusage *buf,
+				const char *path)
+{
+  /* NOOP */
+}
 #endif

 /* end _glibtop_get_fsusage_read_write */
@@ -147,7 +152,7 @@ void
 glibtop_get_fsusage_s (glibtop *server, glibtop_fsusage *buf,
 		       const char *path)
 {
-#if defined STAT_STATFS3_OSF1 
+#if defined STAT_STATFS3_OSF1
  struct statfs fsd;
 #elif defined STAT_STATFS2_FS_DATA  /* Ultrix */
  struct fs_data fsd;
@@ -165,8 +170,6 @@ glibtop_get_fsusage_s (glibtop *server, glibtop_fsusage *buf,

  memset (buf, 0, sizeof (glibtop_fsusage));

-  _glibtop_get_fsusage_read_write(server, buf, path);
-
 #ifdef STAT_STATFS3_OSF1

  if (statfs (path, &fsd, sizeof (struct statfs)) != 0)
@@ -245,30 +248,37 @@ glibtop_get_fsusage_s (glibtop *server, glibtop_fsusage *buf,
 #endif /* STAT_STATFS4 */

 #ifdef STAT_STATVFS		/* SVR4 */
+   /* Linux, Solaris */

  if (statvfs (path, &fsd) < 0)
    return;

-  /* f_frsize isn't guaranteed to be supported.  */
-  buf->block_size = (fsd.f_frsize
-			? PROPAGATE_ALL_ONES (fsd.f_frsize)
-			: PROPAGATE_ALL_ONES (fsd.f_bsize));
+#if (defined(sun) || defined(__sun)) && (defined(__SVR4) || defined(__svr4__))
+  /* Solaris but not SunOS */
+  buf->block_size = fsd.f_frsize;
+#else
+  /* else, including Linux */
+  buf->block_size = fsd.f_bsize;
+#endif

 #endif /* STAT_STATVFS */

 #if !defined STAT_STATFS2_FS_DATA && !defined STAT_READ_FILSYS
 				/* !Ultrix && !SVR2 */
+  /* Linux */

-  buf->blocks = PROPAGATE_ALL_ONES (fsd.f_blocks);
-  buf->bfree = PROPAGATE_ALL_ONES (fsd.f_bfree);
-  buf->bavail = PROPAGATE_TOP_BIT (fsd.f_bavail);
-  /* buf->bavail_top_bit_set = EXTRACT_TOP_BIT (fsd.f_bavail) != 0; */
-  buf->files = PROPAGATE_ALL_ONES (fsd.f_files);
-  buf->ffree = PROPAGATE_ALL_ONES (fsd.f_ffree);
+  buf->blocks = fsd.f_blocks;
+  buf->bfree  = fsd.f_bfree;
+  buf->bavail = fsd.f_bavail;
+  buf->files  = fsd.f_files;
+  buf->ffree  = fsd.f_ffree;

 #endif /* not STAT_STATFS2_FS_DATA && not STAT_READ_FILSYS */

-  buf->flags= _glibtop_sysdeps_fsusage;
+  buf->flags = _glibtop_sysdeps_fsusage;
+
+  /* setting additional flags is delegated */
+  _glibtop_get_fsusage_read_write(server, buf, path);
 }

 #if defined _AIX && defined _I386
--- a/sysdeps/common/gnuslib.c
+++ b/sysdeps/common/gnuslib.c
@@ -58,10 +58,7 @@ static int connect_to_internet_server (const char *serverhost, u_short port);
 #include <arpa/inet.h>

 int
-glibtop_make_connection (hostarg, portarg, s)
-     const char *hostarg;
-     int portarg;
-     int *s;
+glibtop_make_connection (const char *hostarg, int portarg, int *s)
 {
 #ifdef INTERNET_DOMAIN_SOCKETS
 	char *ptr;
@@ -186,7 +183,7 @@ connect_to_unix_server (void)
 #else /* HIDE_UNIX_SOCKET */
 	sprintf (server.sun_path, "/tmp/lgtd%d", (int) geteuid ());
 #endif /* HIDE_UNIX_SOCKET */
-	if (connect (s, (struct sockaddr *) &server, strlen (server.sun_path) + 2) < 0)
+	if (connect (s, (struct sockaddr *)&server, strlen (server.sun_path) + 2) < 0)
 		glibtop_error_io ("unable to connect to local");

 	return (s);
@@ -201,8 +198,7 @@ connect_to_unix_server (void)
 * internet address passed. Return -1 on error.
 */
 long
-glibtop_internet_addr (host)
-     const char *host;
+glibtop_internet_addr (const char *host)
 {
 	struct hostent *hp;	/* pointer to host info for remote host */
 	IN_ADDR numeric_addr;	/* host address */
--- a/sysdeps/common/mountlist.c
+++ b/sysdeps/common/mountlist.c
@@ -22,7 +22,6 @@
 #include <glib.h>
 #include <stdio.h>
 #include <sys/types.h>
-#include "mountlist.h"

 #if defined(STDC_HEADERS) || defined(HAVE_STRING_H)
 #include <string.h>
@@ -33,7 +32,18 @@
 #include <glibtop.h>
 #include <glibtop/mountlist.h>

-static struct mount_entry *read_filesystem_list (gboolean need_fs_type);
+/* A mount table entry. */
+struct mount_entry
+{
+  char *me_devname;             /* Device node pathname, including "/dev/". */
+  char *me_mountdir;            /* Mount point directory pathname. */
+  char *me_type;                /* "nfs", "4.2", etc. */
+  dev_t me_dev;                 /* Device number of me_mountdir. */
+  struct mount_entry *me_next;
+};
+
+
+static struct mount_entry *read_filesystem_list (void);

 #ifdef HAVE_SYS_PARAM_H
 #include <sys/param.h>
@@ -207,12 +217,10 @@ fstype_to_string (int t)

 /* Return a list of the currently mounted filesystems, or NULL on error.
   Add each entry to the tail of the list so that they stay in order.
-   If NEED_FS_TYPE is nonzero, ensure that the filesystem type fields in
-   the returned list are valid.  Otherwise, they might not be.
 */

 static struct mount_entry *
-read_filesystem_list (gboolean need_fs_type)
+read_filesystem_list (void)
 {
  struct mount_entry *mount_list;
  struct mount_entry *me;
@@ -396,9 +404,8 @@ read_filesystem_list (gboolean need_fs_type)
 #endif
 	me->me_mountdir = g_strdup (mnt.mt_filsys);
 	me->me_dev = (dev_t) -1;	/* Magic; means not known yet. */
-	me->me_type = g_strdup ("");
+
 #ifdef GETFSTYP			/* SVR3.  */
-	if (need_fs_type)
 	  {
 	    struct statfs fsd;
 	    char typebuf[FSTYPSZ];
@@ -407,7 +414,10 @@ read_filesystem_list (gboolean need_fs_type)
 		&& sysfs (GETFSTYP, fsd.f_fstyp, typebuf) != -1)
 	      me->me_type = g_strdup (typebuf);
 	  }
+#else
+	me->me_type = g_strdup ("");
 #endif
+
 	me->me_next = NULL;

 	/* Add to the linked list. */
@@ -530,11 +540,14 @@ static gboolean ignore_mount_entry(const struct mount_entry *me)
 		"procfs",
 		"autofs",
 		"sysfs",
+		"usbfs",
 		"none",
 		"devpts",
 		"usbdevfs",
 		"binfmt_misc",
-		"supermount"
+		"supermount",
+		"mntfs",
+		"openpromfs"
 	};

 	const char (*i)[12] = &ignored[0];
@@ -563,7 +576,7 @@ glibtop_get_mountlist_s (glibtop *server, glibtop_mountlist *buf, int all_fs)

 	/* Read filesystem list. */

-	if((entries = read_filesystem_list (TRUE)) == NULL)
+	if((entries = read_filesystem_list ()) == NULL)
 		return NULL;

 	for (cur = &entries[0]; cur != NULL; cur = next) {
@@ -592,5 +605,9 @@ glibtop_get_mountlist_s (glibtop *server, glibtop_mountlist *buf, int all_fs)
 	buf->number = mount_array->len;
 	buf->total  = buf->number * buf->size;

+	buf->flags  = (1 << GLIBTOP_MOUNTLIST_SIZE)
+	  | (1 << GLIBTOP_MOUNTLIST_SIZE)
+	  | (1 << GLIBTOP_MOUNTLIST_TOTAL);
+
 	return (glibtop_mountentry*) g_array_free(mount_array, FALSE);
 }
--- a/sysdeps/common/mountlist.h
+++ b/sysdeps/common/mountlist.h
@@ -1,27 +0,0 @@
-/* mountlist.h -- declarations for list of mounted filesystems
-   Copyright (C) 1991, 1992 Free Software Foundation, Inc.
-
-   This program 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, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-/* A mount table entry. */
-struct mount_entry
-{
-  char *me_devname;		/* Device node pathname, including "/dev/". */
-  char *me_mountdir;		/* Mount point directory pathname. */
-  char *me_type;		/* "nfs", "4.2", etc. */
-  dev_t me_dev;			/* Device number of me_mountdir. */
-  struct mount_entry *me_next;
-};
-
--- a/sysdeps/common/procargs.c
+++ b/sysdeps/common/procargs.c
@@ -41,26 +41,3 @@ glibtop_get_proc_argv_l (glibtop *server, glibtop_proc_args *buf,
 	const char * const args0 = glibtop_get_proc_args_l(server, buf, pid, max_len);
 	return split_args0(args0, buf->size);
 }
-
-
-
-#if GLIBTOP_SUID_PROC_ARGS
-
-char **
-glibtop_get_proc_argv_p (glibtop *server, glibtop_proc_args *buf,
-			 pid_t pid, unsigned max_len)
-{
-	const char * const args0 = glibtop_get_proc_args_p(server, buf, pid, max_len);
-	return split_args0(args0, buf->size);
-}
-
-#else /* !GLIBTOP_SUID_PROC_ARGS */
-
-char **
-glibtop_get_proc_argv_s (glibtop *server, glibtop_proc_args *buf,
-			 pid_t pid, unsigned max_len)
-{
-	const char * const args0 = glibtop_get_proc_args_s(server, buf, pid, max_len);
-	return split_args0(args0, buf->size);
-}
-#endif /* GLIBTOP_SUID_PROC_ARGS */
--- a/sysdeps/kernel/.cvsignore
+++ b/sysdeps/kernel/.cvsignore
@@ -1,28 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-close.lo
-cpu.lo
-init.lo
-ipc_limits.lo
-libgtop_sysdeps.la
-loadavg.lo
-mem.lo
-msg_limits.lo
-open.lo
-procdata.lo
-prockernel.lo
-proclist.lo
-procmem.lo
-procsegment.lo
-procsignal.lo
-procstate.lo
-proctime.lo
-procuid.lo
-sem_limits.lo
-shm_limits.lo
-swap.lo
-sysdeps.lo
-sysinfo.lo
-uptime.lo
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Benoît Dejean	8ce468228a	released 2.9.0 * NEWS: * configure.in: released 2.9.0	2004-11-30 12:06:46 +00:00
Benoît Dejean	e9e2b7c09b	Glibified. g_array_free which returns a char* ! If you want to change * proclist.c: (glibtop_get_proclist_s): Glibified. g_array_free which returns a char* ! If you want to change this, please tell them http://bugzilla.gnome.org/show_bug.cgi?id=145767 .	2004-11-29 23:55:03 +00:00
Benoît Dejean	2fa0dc1cd8	Added Added Removed * Makefile.am: * cpu.c: * fsusage.c: * glibtop_private.c: (get_scaled), (try_file_to_buffer), (file_to_buffer): Added * glibtop_private.h: Added * glibtop_server.c: Removed * glibtop_server.h: * loadavg.c: * mem.c: * netload.c: * open.c: * prockernel.c: * procmem.c: * procsegment.c: * procsignal.c: * procstate.c: * proctime.c: * procuid.c: * swap.c: * sysinfo.c: * uptime.c: Moved linux impl utils function from glibtop_server.* to glibtob_private.* because glibtop_server.h is a public header.	2004-11-28 01:32:55 +00:00
Martin Willemoes Hansen	faa80b7b24	Updated Danish translation. * da.po: Updated Danish translation.	2004-11-23 12:36:48 +00:00
Benoît Dejean	7ff2372249	UTF-8-ified. * AUTHORS: * MAINTAINERS: UTF-8-ified. * acconfig.h: * acinclude.m4: * configure.in: * kernel/ChangeLog: * kernel/sysctl/.cvsignore: * kernel/sysctl/Makefile: * kernel/sysctl/libgtop.c: * kernel/sysctl/libgtop.h: * kernel/sysctl/libgtop_syms.c: * kernel/sysctl/main.c: * kernel/sysctl/patch-2.2.1: * kernel/sysctl/patch-2.2.x: * kernel/table.h: * kernel/table20/Makefile: * kernel/table20/README: * kernel/table20/entry-i386.S: * kernel/table20/kernel.patch: * kernel/table20/main.c: * kernel/table20/unistd-i386.h: * kernel/table20/version.h: * kernel/table21/.cvsignore: * kernel/table21/Makefile: * kernel/table21/README: * kernel/table21/entry-i386.S: * kernel/table21/main.c: * kernel/table21/module.c: * kernel/table21/unistd-i386.h: * kernel/table21/version.h: * kernel/version.h: * libgtop-sysdeps.m4: * sysdeps/Makefile.am: * sysdeps/kernel/.cvsignore: * sysdeps/kernel/ChangeLog: * sysdeps/kernel/Makefile.am: * sysdeps/kernel/close.c: * sysdeps/kernel/cpu.c: * sysdeps/kernel/glibtop_private.h: * sysdeps/kernel/glibtop_server.h: * sysdeps/kernel/kernel.h: * sysdeps/kernel/kernel.s: * sysdeps/kernel/loadavg.c: * sysdeps/kernel/mem.c: * sysdeps/kernel/msg_limits.c: * sysdeps/kernel/netload.c: * sysdeps/kernel/open.c: * sysdeps/kernel/ppp.c: * sysdeps/kernel/procargs.c: * sysdeps/kernel/procdata.c: * sysdeps/kernel/prockernel.c: * sysdeps/kernel/proclist.c: * sysdeps/kernel/procmap.c: * sysdeps/kernel/procmem.c: * sysdeps/kernel/procsegment.c: * sysdeps/kernel/procsignal.c: * sysdeps/kernel/procstate.c: * sysdeps/kernel/proctime.c: * sysdeps/kernel/procuid.c: * sysdeps/kernel/sem_limits.c: * sysdeps/kernel/shm_limits.c: * sysdeps/kernel/siglist.c: * sysdeps/kernel/swap.c: * sysdeps/kernel/sysinfo.c: * sysdeps/kernel/uptime.c: Removed kernel patch and implementation.	2004-11-22 11:13:24 +00:00
Benoît Dejean	f378a263b0	Forgot to ship libgtopconfig.h. * Makefile.am: Forgot to ship libgtopconfig.h.	2004-11-19 08:32:16 +00:00
Benoît Dejean	77b892ebf7	Removed unused files. * LIBGTOP-VERSION: * libgtop-mirror.sh: Removed unused files. * libgtopconfig.h.in: Added. * Makefile.am: * configure.in: * glibtop.h: Added libgtopconfig.h and LIBGTOP_VERSION_CHECK(X, Y, Z). This can be used in build tests.	2004-11-18 21:25:22 +00:00
Benoît Dejean	db2fed4da3	Added myself. * copyright.txt: Added myself.	2004-11-15 21:50:35 +00:00
Benoît Dejean	160bdeaecd	Updated. * netload.c: (hwaddress_format_for_display), (main): Updated.	2004-11-15 16:07:23 +00:00
Benoît Dejean	1d6debfa56	Added a check for NULL pointer when wlaking though interfaces (though i * netload.c: (get_ipv6), (glibtop_get_netload_s): Added a check for NULL pointer when wlaking though interfaces (though i don't understand why some interface don't have an ifa_addr). Move all ipv6 code into a separate function. Added a paranoid check on getifaddrs.	2004-11-15 14:58:06 +00:00
Benoît Dejean	bbb6cbaa87	Updated. * pprint.c: (pprint_get_fsusage), (pprint_get_mountlist), (pprint_get_netload), (pprint_get_netlist), (main): Updated.	2004-11-13 21:06:08 +00:00
Benoît Dejean	ce229a4e19	Added stub for glibtop_get_netlist. * Makefile.am: * netlist.c: (glibtop_init_netlist_s), (glibtop_get_netlist_s): Added stub for glibtop_get_netlist.	2004-11-13 12:43:28 +00:00
Benoît Dejean	544aff2f18	Removed SUID wrappers because glibtop_proc_argv_l is a client-side * include/glibtop/procargs.h: * sysdeps/common/procargs.c: (glibtop_get_proc_argv_l): Removed SUID wrappers because glibtop_proc_argv_l is a client-side function that wraps glibtop_get_proc_args.	2004-11-13 11:42:48 +00:00
Benoît Dejean	74f20ca469	Removed old functions. OMG, everything is really broken here :/ * structures.def: Removed old functions. OMG, everything is really broken here :/	2004-11-13 11:14:33 +00:00
Benoît Dejean	edd5156ca0	Killed warning. * netlist.c: (glibtop_get_netlist_s): Killed warning.	2004-11-13 11:10:57 +00:00
Benoît Dejean	7e5ccec8bf	Bumped to 2.9.0 * configure.in: Bumped to 2.9.0 * configure.in: * examples/.cvsignore: * examples/Makefile.am: * examples/netlist.c: (main): * features.def: * include/glibtop/Makefile.am: * include/glibtop/command.h: * include/glibtop/netlist.h: * include/glibtop/sysdeps.h: * include/glibtop/union.h: * include/glibtop/version.h: * src/daemon/version.c: * sysdeps/linux/Makefile.am: * sysdeps/linux/netlist.c: (glibtop_init_netlist_s), (glibtop_get_netlist_s): * sysdeps/names/Makefile.am: * sysdeps/names/netlist.c: * sysdeps/solaris/Makefile.am: * sysdeps/solaris/netlist.c: (glibtop_init_netlist_s), (glibtop_get_netlist_s): Added new function glibtop_get_netlist(). Implemented for linux and solaris. Doc needed.	2004-11-13 00:53:20 +00:00
Benoît Dejean	fdf313cdf6	Set .rtime. At last ! * proctime.c: (glibtop_get_proc_time_s): Set .rtime. At last !	2004-10-26 20:26:25 +00:00
Ankitkumar Rameshchandra Patel	9a6bb02fb1	ankit@redhat.com * Changed some wrong rendered characters	2004-10-26 12:06:56 +00:00
Benoît Dejean	e6f0664c3b	No longer abort() is no such pid. buf.flags == 0ULL means that there no * procargs.c: (glibtop_get_proc_args_s): * prockernel.c: (glibtop_get_proc_kernel_s): * procmem.c: (glibtop_get_proc_mem_s): * procsegment.c: (glibtop_get_proc_segment_s): * procsignal.c: (glibtop_get_proc_signal_s): * procstate.c: (glibtop_get_proc_state_s): * proctime.c: (glibtop_get_proc_time_s): * procuid.c: (glibtop_get_proc_uid_s): No longer abort() is no such pid. buf.flags == 0ULL means that there no data could be retrieve at all. Closes #154876. Thanks to Christophe Belle.	2004-10-22 15:35:57 +00:00
Benoît Dejean	405f0602e0	Released 2.8.1. * NEWS: Released 2.8.1.	2004-10-11 18:11:48 +00:00
Benoît Dejean	b3dfc1d1d2	Updated. Lots of cleanup. * cpu.c: (glibtop_init_cpu_s), (glibtop_get_cpu_s): * loadavg.c: (glibtop_get_loadavg_s): * mem.c: (glibtop_init_mem_s), (glibtop_get_mem_s): * open.c: (glibtop_get_kstats), (glibtop_open_s): * procargs.c: (glibtop_get_proc_args_s): * procdata.c: (glibtop_get_proc_data_psinfo_s), (glibtop_get_proc_data_usage_s), (glibtop_get_proc_credentials_s), (glibtop_get_proc_status_s): * proclist.c: (glibtop_get_proclist_s): * procmap.c: (glibtop_get_proc_map_s): * procmem.c: (glibtop_get_proc_mem_s): * procstate.c: (glibtop_get_proc_state_s): * safeio.c: * safeio.h: * shm_limits.c: (glibtop_init_shm_limits_p), (glibtop_get_shm_limits_p): * swap.c: (glibtop_get_swap_s): * uptime.c: (glibtop_get_uptime_s): Updated. Lots of cleanup.	2004-10-11 18:01:25 +00:00
Benoît Dejean	13025c6c5f	Replaced C99 initializer. * lib/init.c: Replaced C99 initializer. * lib/read.c: (do_read): 1-line cleanup.	2004-10-10 17:21:57 +00:00
Benoît Dejean	bbcbe6b67d	Depends on glib 2.4.0 * configure.in: Depends on glib 2.4.0	2004-10-09 12:47:10 +00:00
Benoît Dejean	6c586e844f	Fixed .state to follow LibGTop2 specification. * procstate.c: (glibtop_get_proc_state_s): Fixed .state to follow LibGTop2 specification.	2004-10-04 12:22:15 +00:00
Benoît Dejean	a1677aefa8	Fixed glibtop_init_s call. * procmap.c: (glibtop_get_proc_map_s): Fixed glibtop_init_s call.	2004-10-04 12:08:44 +00:00
Benoît Dejean	9f91b2ddb8	AIX support updated by Laurent Vivier <Laurent.Vivier@BULL.NET>. * Makefile.am: * cpu.c: (glibtop_init_cpu_p), (glibtop_get_cpu_p): * glibtop_machine.h: * glibtop_server.h: * mem.c: (glibtop_get_mem_s): * netload.c: (glibtop_get_netload_p): * procargs.c: (glibtop_get_proc_args_s): * prockernel.c: (glibtop_get_proc_kernel_s): * proclist.c: (glibtop_get_proclist_s): * procmem.c: (glibtop_get_proc_mem_s): * procsegment.c: (glibtop_get_proc_segment_s): * procsignal.c: (glibtop_get_proc_signal_s): * procstate.c: (glibtop_get_proc_state_s): * proctime.c: (glibtop_get_proc_time_s): * procuid.c: (glibtop_get_proc_uid_s): * swap.c: (glibtop_get_swap_s): * sysinfo.c: (add_info), (init_sysinfo): * uptime.c: (glibtop_init_uptime_s), (glibtop_get_uptime_s): AIX support updated by Laurent Vivier <Laurent.Vivier@BULL.NET>. Fixed cpu/uptime/sysinfo. Added missing calls to glibtop_init_s.	2004-10-04 11:57:05 +00:00
Adam Weinberger	ca8d9657f0	Updated Canadian English translation. * en_CA.po: Updated Canadian English translation.	2004-09-26 15:23:08 +00:00
Benoît Dejean	5bd4c5feeb	Added missing include <glibtop/close.h>. * glibtop.h: Added missing include <glibtop/close.h>.	2004-09-25 19:31:18 +00:00
Benoît Dejean	15a4ba35a9	Re-added pprint_get_msg_limits() * pprint.c: (main): Re-added pprint_get_msg_limits()	2004-09-25 19:30:00 +00:00
Benoît Dejean	f028bd79bf	Added missing call to glibgtop_init() / glibtop_close() * df.c: (main): * pprint.c: (main): * procargs.c: (main): Added missing call to glibgtop_init() / glibtop_close()	2004-09-25 08:56:38 +00:00
Benoît Dejean	d809faba3e	Added missing call to libgtop_init(); * df.c: (main): * pprint.c: (main): * procargs.c: (main): Added missing call to libgtop_init();	2004-09-25 08:46:44 +00:00
Benoît Dejean	d0833edb66	Fixed .block_size on Solaris. * fsusage.c: (glibtop_get_fsusage_s): Fixed .block_size on Solaris.	2004-09-24 21:26:34 +00:00
Benoît Dejean	9aae957919	../configure.in Added new example, just like 'df'. * .cvsignore: * Makefile.am: * ../configure.in * df.c: (print_fsusage), (main): Added new example, just like 'df'.	2004-09-24 12:59:29 +00:00
Benoît Dejean	6d24f84fd6	Updated. * POTFILES.in: Updated.	2004-09-23 22:48:32 +00:00
Benoît Dejean	fe08779c6c	Removed mountlist.h. * Makefile.am: * mountlist.c: * mountlist.h: Removed mountlist.h.	2004-09-23 22:47:56 +00:00
Benoît Dejean	804b82eff8	Small cleanup. * loadavg.c: (glibtop_get_loadavg_s): * msg_limits.c: (glibtop_get_msg_limits_s): * shm_limits.c: (glibtop_get_shm_limits_s): Small cleanup.	2004-09-23 22:44:53 +00:00
Benoît Dejean	61889bc182	Removed get_pageshift(). Every one can affort a * instead of a >>, no need * glibtop_server.c: * glibtop_server.h: * procmem.c: (glibtop_get_proc_mem_s): * procsegment.c: (glibtop_get_proc_segment_s): Removed get_pageshift(). Every one can affort a * instead of a >>, no need for this kind of non-reentrant optimization. Saved 144B (obviously perfect cleanup ;)	2004-09-23 08:13:28 +00:00
Benoît Dejean	c29887d4b0	Added openpromfs. * mountlist.c: (ignore_mount_entry): Added openpromfs.	2004-09-22 22:20:31 +00:00
Benoît Dejean	edb1e6a773	CFLAGS: Removed -W, added -Winline. * configure.in: CFLAGS: Removed -W, added -Winline.	2004-09-22 17:39:18 +00:00
Benoît Dejean	5d97c3fa5e	Linux: Sanitize. Removed calls to obfuscated PROPAGATE_ALL_ONES(x) which * fsusage.c: (glibtop_get_fsusage_s): Linux: Sanitize. Removed calls to obfuscated PROPAGATE_ALL_ONES(x) which seems to return unpredictable values on some arch (e.g sparc). Closes #153141.	2004-09-22 17:38:18 +00:00
Benoît Dejean	e830a8eeb6	Removed #warning, my gcc is not buggy anymore. * glibtop_server.c: Removed #warning, my gcc is not buggy anymore.	2004-09-22 17:33:19 +00:00
Benoît Dejean	a6410588cd	Disable pprint_get_msg_limits() because it can fail. * pprint.c: (main): Disable pprint_get_msg_limits() because it can fail.	2004-09-22 11:25:37 +00:00
Benoît Dejean	339b79b100	Added mntfs to ignore list * mountlist.c: (ignore_mount_entry): Added mntfs to ignore list	2004-09-22 11:16:42 +00:00
Ivan Stojmirov	831f0e7d68	gotovo	2004-09-21 21:37:42 +00:00
Benoît Dejean	4882405885	Updated. * pprint.c: (pprint_get_swap), (main): Updated.	2004-09-21 09:41:34 +00:00
Benoît Dejean	5b15a2d1a5	Updated. * procargs.c: (show_args), (main): Updated.	2004-09-21 08:37:52 +00:00
Benoît Dejean	6954b81396	Updated. * pprint.c: (pprint_get_mountlist), (pprint_get_netload), (pprint_get_uptime), (main): Updated.	2004-09-21 08:01:45 +00:00
Benoît Dejean	35dd4cf1ca	Updated. * pprint.c: (pprint_get_mountlist): Updated.	2004-09-20 23:44:19 +00:00
Benoît Dejean	0b0b1ab43c	Back to previous version. * fsusage.c: (_glibtop_get_fsusage_read_write), (glibtop_get_fsusage_s): * mountlist.c: (glibtop_get_mountlist_s): Back to previous version. * fsusage.c: (linux_2_6_0), (linux_2_4_0), (_glibtop_linux_get_fsusage_read_write): Back to previous version. Now set .flags correctly.	2004-09-20 23:43:24 +00:00
Benoît Dejean	a6311d88c3	Updated. * procargs.c: (show_args), (main): Updated.	2004-09-20 22:05:32 +00:00
Benoît Dejean	f561120748	Updated. * procargs.c: (show_args), (main): Updated.	2004-09-20 22:03:58 +00:00
Benoît Dejean	b35532dd6f	Updated. * procargs.c: (show_args), (main): Updated.	2004-09-20 22:03:02 +00:00
Benoît Dejean	c7d323749c	Added new example : pretty prints the result of glibtop_. Work in .cvsignore: * Makefile.am: * pprint.c: (pprint_get_cpu), (pprint_get_fsusage), (pprint_get_loadavg), (pprint_get_mem), (pprint_get_mountlist), (pprint_get_msg_limits), (main): Added new example : pretty prints the result of glibtop_. Work in progress. Now builds procargs. ../configure.in: Added to static list.	2004-09-20 20:14:46 +00:00
Alessio Frusciante	3d1997ca94	Updated Italian translation.	2004-09-19 22:03:58 +00:00
Benoît Dejean	b3fd15c190	Updated to match new prototype. * fsusage.c: (linux_2_6_0), (linux_2_4_0), (_glibtop_linux_get_fsusage_read_write): Updated to match new prototype.	2004-09-19 21:03:21 +00:00
Benoît Dejean	601cfef32f	: Added new flag. (_glibtop_get_fsusage_read_write): Changed prototype. * fsusage.c: (_glibtop_get_fsusage_read_write) : Added new flag. (_glibtop_get_fsusage_read_write): Changed prototype. Returns TRUE on success, then _glibtop_get_fsusage_read_write is set. Added comment to locate Linux code. * mountlist.c: (read_filesystem_list): Dropped unused need_fs_type parameter. This is now default. Fixed possible leak. (ignore_mount_entry): Added "usbfs" to ignored FS. (glibtop_get_mountlist_s): Updated.	2004-09-19 21:02:10 +00:00
Benoît Dejean	86fd7f23c4	'screen' is only defined when AUTH_MAGIC_COOKIE is defined. Added missing * gnuserv.c: (setup_table): 'screen' is only defined when AUTH_MAGIC_COOKIE is defined. Added missing initializers for popt options.	2004-09-19 12:08:55 +00:00
Benoît Dejean	3668b5bb19	Added missing memset( , 0, ). * mem.c: (glibtop_get_mem_s): Added missing memset( , 0, ).	2004-09-19 12:06:10 +00:00
Gora Mohanty	89f531cdbc	configure.in: Added 'or' to ALL_LINGUAS. po/or.po: Updated Oriya translation.	2004-09-13 20:42:54 +00:00
Benoît Dejean	35488aef90	bumped to 2.8.1. * configure.in: bumped to 2.8.1. * sysdeps/common/fsusage.c: * sysdeps/common/gnuslib.c: (glibtop_make_connection), (connect_to_unix_server), (glibtop_internet_addr): * sysdeps/linux/glibtop_server.c: (get_pageshift): * sysdeps/linux/glibtop_server.h: * sysdeps/linux/open.c: (glibtop_open_s): * sysdeps/linux/ppp.c: (is_ISDN_on): Cleanups. Thanks to Kjartan Maraas. Closes #151557.	2004-09-13 15:21:54 +00:00