add back the support stuf but make it really work

2002-01-10  Kevin Vandersloot <kfv101@psu.edu>

        * acininclude.m4: add back the support stuf but make it really
        work

        * configure.in: bump version number, add back GNOME_SUPPORT
        check since that was causing a build failure

        * release 1.90.1

.cvsignore

@@ -13,7 +13,6 @@ gtopConf.sh
 i386-bsdi
 i686-pc-linux-gnu
 intl
-libgtop-0.01.tar.gz
 libgtop-mirror.sh.swp
 libgtopConf.sh
 libtool
@@ -30,7 +29,6 @@ i686-pc-linux-gnu-linux
 libgtop-config
 ABOUT-NLS
 libgtop.spec
-libgtop-0.99.*.tar.gz
-libgtop-0.99.*
+libgtop*.tar.gz
 *-debstamp
-libgtop-1.*.*.tar.gz
+libgtop*.pc

ChangeLog

@@ -1,25 +1,56 @@
-2003-05-11  Andrew Sobala  <aes@gnome.org>
+2002-01-10  Kevin Vandersloot <kfv101@psu.edu>
 
-	* up version to 1.0.14
+	* acininclude.m4: add back the support stuf but make it really
+	work
 
-2002-12-11  Stanislav Brabec  <sbrabec@suse.cz>
+	* configure.in: bump version number, add back GNOME_SUPPORT 
+	check since that was causing a build failure
 
-	* sysdeps/guile/Makefile.am, sysdeps/guile/names/Makefile.am:
-	Changed order of arguments for guile-snarf - .c file must be first
-	(fixes bug #82684).
+	* release 1.90.1
 
-2002-02-05  Abel Cheung  <maddog@linux.org.hk>
+2002-01-09  Kevin Vandersloot <kfv101@psu.edu>
 
-	* configure.in (ALL_LINGUAS): zh_CN.GB2312 -> zh_CN
+	* acinclude.m4: remove gnome support check. Fixes the build
+	for those with automake < 1.4p5.
 
-2001-01-14  Hasbullah bin Pit <sebol@ikhlas.com>
+	* configure.in: remove check for GNOME_SUPPORT
 
-        * configure.in: Added ms in ALL_LINGUAS.
-        * po/ms.po: Added Malay Translation.
+2001-14-27  Miles Lane <miles@megapathdsl.net>
 
-2001-10-26  Kevin Vandersloot <kfv101@psu.edu>
+	* acconfig.h:  Added "#undef HAVE_GETTEXT" entry.
+	* LIBGTOP_VERSION:  Removed file.
+	* configure.in:  added glib-gettextize support and
+	  moved in the *VERSION* stuff from LIBGTOP_VERSION.
 
-	* up version to 1.0.13
+2001-11-27  Kevin Vandersloot <kfv101@psu.edu>
+
+	* acinclude.m4: copy some of the macros that were formerly
+	in gnome-macros
+
+	* configure.in, sysdeps/Makefile.am: comment out guile
+	support for now.
+
+	* release 1.90.0
+
+2001-11-26  Kevin Vandersloot <kfv101@psu.edu>
+
+	* src/daemon/gnuserv.c:  Apply patch fixing security issue from
+        intexxia labs - #1048-261101
+
+2001-11-26  Abel Cheung <maddog@linux.org.hk>
+
+	* src/inodedb/file_by_inode.c: Rename to file_by_inode2.c
+	* src/inodedb/mkinodedb.c: Rename to mkinodedb2.c
+
+	* po/POTFILES.in: Reflect above change
+
+	* */.cvsignore: Add various files
+
+2001-11-25  Kevin Vandersloot <kfv101@psu.edu>
+
+	* port stable libgtop to GNOME 2.0. Too much to detail.
+	pkgconfig is now used. Libs are named libgtop-2.0 etc for
+	parallel install. 
 
 2001-10-17  Abel Chueng  <maddog@linux.org.hk>
 

LIBGTOP-VERSION

@@ -7,11 +7,11 @@
 # set LIBGTOP_BINARY_AGE and LIBGTOP_INTERFACE_AGE to 0.
 #
 LIBGTOP_MAJOR_VERSION=1
-LIBGTOP_MINOR_VERSION=0
-LIBGTOP_MICRO_VERSION=14
+LIBGTOP_MINOR_VERSION=90
+LIBGTOP_MICRO_VERSION=0
 
-LIBGTOP_INTERFACE_AGE=12
-LIBGTOP_BINARY_AGE=12
+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=

Makefile.am

@@ -10,16 +10,16 @@ if BUILD_GNOME_SUPPORT
 support = support
 endif
 
-SUBDIRS = po intl $(support) macros misc include sysdeps lib src \
+SUBDIRS = po $(support) misc include sysdeps lib src \
 	  $(examples_SUBDIRS) doc
 
 libgtopinclude_HEADERS = glibtop.h
-libgtopincludedir = $(includedir)/libgtop-1.0
+libgtopincludedir = $(includedir)/libgtop-2.0
 
 EXTRA_DIST = autogen.sh libgtop.spec.in copyright.txt libgtopConf.sh.in \
 	LIBGTOP-VERSION features.def libgtop-config.in RELNOTES-0.25 \
 	RELNOTES-1.0 RELNOTES-1.0.x libgtop-sysdeps.m4 README \
-	libgtop-mirror.sh
+	libgtop-mirror.sh libgtop-2.0.pc.in acinclude.m4
 
 dist-hook:
 	cp libgtop.spec $(distdir)
@@ -29,19 +29,22 @@ release:
 
 ## Put `exec' in the name because this should be installed by
 ## `install-exec', not `install-data'.
-confexecdir	= $(libdir)
-confexec_DATA	= $(top_builddir)/libgtopConf.sh \
-		  $(top_builddir)/libgtop-features.def
+## confexecdir	= $(libdir)
+## confexec_DATA	= $(top_builddir)/libgtopConf.sh \
+##		  $(top_builddir)/libgtop-features.def
+		  
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = libgtop-2.0.pc
 
 CLEANFILES=libgtopConf.sh
 
-bin_SCRIPTS = $(top_builddir)/libgtop-config
+## bin_SCRIPTS = $(top_builddir)/libgtop-config
 
 ## to automatically rebuild aclocal.m4 if any of the macros in
 ## `macros/' change
-@MAINT@ include macros/macros.dep
-@MAINT@macros/macros.dep: macros/Makefile.am
-@MAINT@	cd macros && $(MAKE) macros.dep
+## @MAINT@ include macros/macros.dep
+## @MAINT@macros/macros.dep: macros/Makefile.am
+## @MAINT@	cd macros && $(MAKE) macros.dep
 
 @MAINT@$(top_srcdir)/aclocal.m4: libgtop-sysdeps.m4 LIBGTOP-VERSION
 
@@ -52,7 +55,7 @@ bin_SCRIPTS = $(top_builddir)/libgtop-config
 libgtopConf.sh: libgtopConf.sh.in Makefile
 ## Use sed and then mv to avoid problems if the user interrupts.
 	sed -e 's#\@LIBGTOP_LIBDIR\@#$(libdir)#g' \
-	  -e 's#\@LIBGTOP_INCLUDEDIR\@#$(includedir)/libgtop-1.0#g' \
+	  -e 's#\@LIBGTOP_INCLUDEDIR\@#$(includedir)/libgtop-2.0#g' \
 	  -e 's#\@LIBGTOP_DATADIR\@#$(datadir)#g' \
 	  -e 's#\@LIBGTOP_EXTRA_LIBS\@#$(LIBGTOP_EXTRA_LIBS)#g' \
 	  -e 's#\@LIBGTOP_LIBS\@#$(LIBGTOP_LIBS)#g' \
@@ -79,11 +82,11 @@ libgtopConf.sh: libgtopConf.sh.in Makefile
 	      < $(srcdir)/libgtopConf.sh.in > libgtopConf.tmp \
 	  && mv libgtopConf.tmp libgtopConf.sh
 
-libgtop-config: libgtop-config.in Makefile
-	sed -e 's#\@LIBGTOP_LIBDIR\@#$(libdir)#g' \
-	      < $(srcdir)/libgtop-config.in > libgtop-config.tmp \
-	  && mv libgtop-config.tmp libgtop-config && \
-		chmod 755 libgtop-config
+# libgtop-config: libgtop-config.in Makefile
+#	sed -e 's#\@LIBGTOP_LIBDIR\@#$(libdir)#g' \
+#	      < $(srcdir)/libgtop-config.in > libgtop-config.tmp \
+#	  && mv libgtop-config.tmp libgtop-config && \
+#		chmod 755 libgtop-config
 
 libgtop-features.def: features.def
 	@LN_S@ $< $@

NEWS

@@ -1,12 +1,3 @@
-November 26, 2001:
-================
-
-* Released LIbGTop 1.0.13
-
-  - security fix
-
-  - update for parallel install with libgtop-2.0
-
 February 27, 2001:
 =================
 

acconfig.h

@@ -18,6 +18,7 @@
 
 #undef ENABLE_NLS
 #undef HAVE_CATGETS
+#undef GETTEXT_PACKAGE
 #undef HAVE_GETTEXT
 #undef HAVE_LC_MESSAGES
 #undef HAVE_STPCPY

acinclude.m4

@@ -0,0 +1,876 @@
+dnl This is just copied m4s from need-declaration.m4 gnome-fileutils.m4
+dnl gnome-supprt-checks.m4 and a little from gnome-libgtop-check.m4
+dnl and finally libgtop-sysdeps.m4
+
+dnl
+dnl LIBGTOP_CHECK_TYPE
+dnl
+dnl Improved version of AC_CHECK_TYPE which takes into account
+dnl that we need to #include some other header files on some
+dnl systems to get some types.
+
+dnl AC_LIBGTOP_CHECK_TYPE(TYPE, DEFAULT)
+AC_DEFUN([AC_LIBGTOP_CHECK_TYPE],
+[AC_REQUIRE([AC_HEADER_STDC])dnl
+AC_MSG_CHECKING(for $1)
+AC_CACHE_VAL(ac_cv_type_$1,
+[AC_EGREP_CPP(dnl
+changequote(<<,>>)dnl
+<<(^|[^a-zA-Z_0-9])$1[^a-zA-Z_0-9]>>dnl
+changequote([,]), [#include <sys/types.h>
+#if STDC_HEADERS
+#include <stdlib.h>
+#include <stddef.h>
+#endif
+
+/* For Tru64 */
+#ifdef HAVE_SYS_BITYPES_H
+#include <sys/bitypes.h>
+#endif
+], ac_cv_type_$1=yes, ac_cv_type_$1=no)])dnl
+AC_MSG_RESULT($ac_cv_type_$1)
+if test $ac_cv_type_$1 = no; then
+  AC_DEFINE($1, $2)
+fi
+])
+
+dnl
+dnl GNOME_LIBGTOP_TYPES
+dnl
+dnl some typechecks for libgtop.
+dnl
+
+AC_DEFUN([GNOME_LIBGTOP_TYPES],
+[
+        AC_CHECK_HEADERS(sys/bitypes.h)
+        AC_LIBGTOP_CHECK_TYPE(u_int64_t, unsigned long long int)
+        AC_LIBGTOP_CHECK_TYPE(int64_t, signed long long int)
+])
+
+dnl See whether we need a declaration for a function.
+dnl GCC_NEED_DECLARATION(FUNCTION [, EXTRA-HEADER-FILES])
+AC_DEFUN([GCC_NEED_DECLARATION],
+[AC_MSG_CHECKING([whether $1 must be declared])
+AC_CACHE_VAL(gcc_cv_decl_needed_$1,
+[AC_TRY_COMPILE([
+#include <stdio.h>
+#ifdef HAVE_STRING_H
+#include <string.h>
+#else
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
+#endif
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+$2],
+[char *(*pfn) = (char *(*)) $1],
+eval "gcc_cv_decl_needed_$1=no", eval "gcc_cv_decl_needed_$1=yes")])
+if eval "test \"`echo '$gcc_cv_decl_needed_'$1`\" = yes"; then
+  AC_MSG_RESULT(yes)
+  gcc_need_declarations="$gcc_need_declarations $1"
+  gcc_tr_decl=NEED_DECLARATION_`echo $1 | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+  AC_DEFINE_UNQUOTED($gcc_tr_decl)
+else
+  AC_MSG_RESULT(no)
+fi
+])dnl
+
+dnl Check multiple functions to see whether each needs a declaration.
+dnl GCC_NEED_DECLARATIONS(FUNCTION... [, EXTRA-HEADER-FILES])
+AC_DEFUN([GCC_NEED_DECLARATIONS],
+[for ac_func in $1
+do
+GCC_NEED_DECLARATION($ac_func, $2)
+done
+]
+)
+
+dnl
+dnl GNOME_FILEUTILS_CHECKS
+dnl
+dnl checks that are needed for the diskusage applet.
+dnl
+
+AC_DEFUN([GNOME_FILEUTILS_CHECKS],
+[
+AC_CHECK_HEADERS(fcntl.h sys/param.h sys/statfs.h sys/fstyp.h \
+mnttab.h mntent.h sys/statvfs.h sys/vfs.h sys/mount.h \
+sys/filsys.h sys/fs_types.h sys/fs/s5param.h)
+
+AC_CHECK_FUNCS(bcopy endgrent endpwent fchdir ftime ftruncate \
+getcwd getmntinfo gettimeofday isascii lchown \
+listmntent memcpy mkfifo strchr strerror strrchr vprintf)
+
+dnl Set some defaults when cross-compiling
+
+if test x$cross_compiling = xyes ; then
+        case "$host_os" in
+        linux*)
+          fu_cv_sys_mounted_getmntent1=yes
+          fu_cv_sys_stat_statfs2_bsize=yes
+          ;;
+        sunos*)
+          fu_cv_sys_stat_statfs4=yes
+          ;;
+        freebsd*)
+          fu_cv_sys_stat_statfs2_bsize=yes
+          ;;
+        osf*)
+          fu_cv_sys_stat_statfs3_osf1=yes
+          ;;
+        esac
+fi
+
+# Determine how to get the list of mounted filesystems.
+list_mounted_fs=
+
+# If the getmntent function is available but not in the standard library,
+# make sure LIBS contains -lsun (on Irix4) or -lseq (on PTX).
+AC_FUNC_GETMNTENT
+
+# This test must precede the ones for getmntent because Unicos-9 is
+# reported to have the getmntent function, but its support is incompatible
+# with other getmntent implementations.
+
+# NOTE: Normally, I wouldn't use a check for system type as I've done for
+# `CRAY' below since that goes against the whole autoconf philosophy.  But
+# I think there is too great a chance that some non-Cray system has a
+# function named listmntent to risk the false positive.
+
+if test -z "$list_mounted_fs"; then
+# Cray UNICOS 9
+AC_MSG_CHECKING([for listmntent of Cray/Unicos-9])
+AC_CACHE_VAL(fu_cv_sys_mounted_cray_listmntent,
+[fu_cv_sys_mounted_cray_listmntent=no
+AC_EGREP_CPP(yes,
+[#ifdef _CRAY
+yes
+#endif
+], [test $ac_cv_func_listmntent = yes \
+&& fu_cv_sys_mounted_cray_listmntent=yes]
+)
+]
+)
+AC_MSG_RESULT($fu_cv_sys_mounted_cray_listmntent)
+if test $fu_cv_sys_mounted_cray_listmntent = yes; then
+list_mounted_fs=found
+AC_DEFINE(MOUNTED_LISTMNTENT)
+fi
+fi
+
+if test $ac_cv_func_getmntent = yes; then
+
+# This system has the getmntent function.
+# Determine whether it's the one-argument variant or the two-argument one.
+
+if test -z "$list_mounted_fs"; then
+# 4.3BSD, SunOS, HP-UX, Dynix, Irix
+AC_MSG_CHECKING([for one-argument getmntent function])
+AC_CACHE_VAL(fu_cv_sys_mounted_getmntent1,
+[test $ac_cv_header_mntent_h = yes \
+&& fu_cv_sys_mounted_getmntent1=yes \
+|| fu_cv_sys_mounted_getmntent1=no])
+AC_MSG_RESULT($fu_cv_sys_mounted_getmntent1)
+if test $fu_cv_sys_mounted_getmntent1 = yes; then
+list_mounted_fs=found
+AC_DEFINE(MOUNTED_GETMNTENT1)
+fi
+fi
+
+if test -z "$list_mounted_fs"; then
+# SVR4
+AC_MSG_CHECKING([for two-argument getmntent function])
+AC_CACHE_VAL(fu_cv_sys_mounted_getmntent2,
+[AC_EGREP_HEADER(getmntent, sys/mnttab.h,
+fu_cv_sys_mounted_getmntent2=yes,
+fu_cv_sys_mounted_getmntent2=no)])
+AC_MSG_RESULT($fu_cv_sys_mounted_getmntent2)
+if test $fu_cv_sys_mounted_getmntent2 = yes; then
+list_mounted_fs=found
+AC_DEFINE(MOUNTED_GETMNTENT2)
+fi
+fi
+
+if test -z "$list_mounted_fs"; then
+AC_MSG_ERROR([could not determine how to read list of mounted filesystems])
+fi
+
+fi
+
+if test -z "$list_mounted_fs"; then
+# DEC Alpha running OSF/1.
+AC_MSG_CHECKING([for getfsstat function])
+AC_CACHE_VAL(fu_cv_sys_mounted_getsstat,
+[AC_TRY_LINK([
+#include <sys/types.h>
+#include <sys/mount.h>
+#include <sys/fs_types.h>],
+[struct statfs *stats;
+int numsys = getfsstat ((struct statfs *)0, 0L, MNT_WAIT); ],
+fu_cv_sys_mounted_getsstat=yes,
+fu_cv_sys_mounted_getsstat=no)])
+AC_MSG_RESULT($fu_cv_sys_mounted_getsstat)
+if test $fu_cv_sys_mounted_getsstat = yes; then
+list_mounted_fs=found
+AC_DEFINE(MOUNTED_GETFSSTAT)
+fi
+fi
+
+if test -z "$list_mounted_fs"; then
+# AIX.
+AC_MSG_CHECKING([for mntctl function and struct vmount])
+AC_CACHE_VAL(fu_cv_sys_mounted_vmount,
+[AC_TRY_CPP([#include <fshelp.h>],
+fu_cv_sys_mounted_vmount=yes,
+fu_cv_sys_mounted_vmount=no)])
+AC_MSG_RESULT($fu_cv_sys_mounted_vmount)
+if test $fu_cv_sys_mounted_vmount = yes; then
+list_mounted_fs=found
+AC_DEFINE(MOUNTED_VMOUNT)
+fi
+fi
+
+if test -z "$list_mounted_fs"; then
+# SVR3
+AC_MSG_CHECKING([for FIXME existence of three headers])
+AC_CACHE_VAL(fu_cv_sys_mounted_fread_fstyp,
+[AC_TRY_CPP([
+#include <sys/statfs.h>
+#include <sys/fstyp.h>
+#include <mnttab.h>],
+fu_cv_sys_mounted_fread_fstyp=yes,
+fu_cv_sys_mounted_fread_fstyp=no)])
+AC_MSG_RESULT($fu_cv_sys_mounted_fread_fstyp)
+if test $fu_cv_sys_mounted_fread_fstyp = yes; then
+list_mounted_fs=found
+AC_DEFINE(MOUNTED_FREAD_FSTYP)
+fi
+fi
+
+if test -z "$list_mounted_fs"; then
+# 4.4BSD and DEC OSF/1.
+AC_MSG_CHECKING([for getmntinfo function])
+AC_CACHE_VAL(fu_cv_sys_mounted_getmntinfo,
+[
+ok=
+if test $ac_cv_func_getmntinfo = yes; then
+AC_EGREP_HEADER(f_type;, sys/mount.h,
+ok=yes)
+fi
+test -n "$ok" \
+&& fu_cv_sys_mounted_getmntinfo=yes \
+|| fu_cv_sys_mounted_getmntinfo=no
+])
+AC_MSG_RESULT($fu_cv_sys_mounted_getmntinfo)
+if test $fu_cv_sys_mounted_getmntinfo = yes; then
+list_mounted_fs=found
+AC_DEFINE(MOUNTED_GETMNTINFO)
+fi
+fi
+
+# FIXME: add a test for netbsd-1.1 here
+
+if test -z "$list_mounted_fs"; then
+# Ultrix
+AC_MSG_CHECKING([for getmnt function])
+AC_CACHE_VAL(fu_cv_sys_mounted_getmnt,
+[AC_TRY_CPP([
+#include <sys/fs_types.h>
+#include <sys/mount.h>],
+fu_cv_sys_mounted_getmnt=yes,
+fu_cv_sys_mounted_getmnt=no)])
+AC_MSG_RESULT($fu_cv_sys_mounted_getmnt)
+if test $fu_cv_sys_mounted_getmnt = yes; then
+list_mounted_fs=found
+AC_DEFINE(MOUNTED_GETMNT)
+fi
+fi
+
+if test -z "$list_mounted_fs"; then
+# SVR2
+AC_MSG_CHECKING([whether it is possible to resort to fread on /etc/mnttab])
+AC_CACHE_VAL(fu_cv_sys_mounted_fread,
+[AC_TRY_CPP([#include <mnttab.h>],
+fu_cv_sys_mounted_fread=yes,
+fu_cv_sys_mounted_fread=no)])
+AC_MSG_RESULT($fu_cv_sys_mounted_fread)
+if test $fu_cv_sys_mounted_fread = yes; then
+list_mounted_fs=found
+AC_DEFINE(MOUNTED_FREAD)
+fi
+fi
+
+if test -z "$list_mounted_fs"; then
+AC_MSG_ERROR([could not determine how to read list of mounted filesystems])
+# FIXME -- no need to abort building the whole package
+# Cannot build mountlist.c or anything that needs its functions
+fi
+
+AC_CHECKING(how to get filesystem space usage)
+space=no
+
+# Perform only the link test since it seems there are no variants of the
+# statvfs function.  This check is more than just AC_CHECK_FUNCS(statvfs)
+# because that got a false positive on SCO OSR5.  Adding the declaration
+# of a `struct statvfs' causes this test to fail (as it should) on such
+# systems.  That system is reported to work fine with STAT_STATFS4 which
+# is what it gets when this test fails.
+if test $space = no; then
+# SVR4
+AC_CACHE_CHECK([statvfs function (SVR4)], fu_cv_sys_stat_statvfs,
+[AC_TRY_LINK([#include <sys/types.h>
+#include <sys/statvfs.h>],
+[struct statvfs fsd; statvfs (0, &fsd);],
+fu_cv_sys_stat_statvfs=yes,
+fu_cv_sys_stat_statvfs=no)])
+if test $fu_cv_sys_stat_statvfs = yes; then
+space=yes
+AC_DEFINE(STAT_STATVFS)
+fi
+fi
+
+if test $space = no; then
+# DEC Alpha running OSF/1
+AC_MSG_CHECKING([for 3-argument statfs function (DEC OSF/1)])
+AC_CACHE_VAL(fu_cv_sys_stat_statfs3_osf1,
+[AC_TRY_RUN([
+#include <sys/param.h>
+#include <sys/types.h>
+#include <sys/mount.h>
+int main ()
+{
+struct statfs fsd;
+fsd.f_fsize = 0;
+return (statfs (".", &fsd, sizeof (struct statfs)));
+}],
+fu_cv_sys_stat_statfs3_osf1=yes,
+fu_cv_sys_stat_statfs3_osf1=no,
+fu_cv_sys_stat_statfs3_osf1=no)])
+AC_MSG_RESULT($fu_cv_sys_stat_statfs3_osf1)
+if test $fu_cv_sys_stat_statfs3_osf1 = yes; then
+space=yes
+AC_DEFINE(STAT_STATFS3_OSF1)
+fi
+fi
+
+if test $space = no; then
+# AIX
+AC_MSG_CHECKING([for two-argument statfs with statfs.bsize dnl
+member (AIX, 4.3BSD)])
+AC_CACHE_VAL(fu_cv_sys_stat_statfs2_bsize,
+[AC_TRY_RUN([
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+#ifdef HAVE_SYS_MOUNT_H
+#include <sys/mount.h>
+#endif
+#ifdef HAVE_SYS_VFS_H
+#include <sys/vfs.h>
+#endif
+int main ()
+{
+struct statfs fsd;
+fsd.f_bsize = 0;
+return (statfs (".", &fsd));
+}],
+fu_cv_sys_stat_statfs2_bsize=yes,
+fu_cv_sys_stat_statfs2_bsize=no,
+fu_cv_sys_stat_statfs2_bsize=no)])
+AC_MSG_RESULT($fu_cv_sys_stat_statfs2_bsize)
+if test $fu_cv_sys_stat_statfs2_bsize = yes; then
+space=yes
+AC_DEFINE(STAT_STATFS2_BSIZE)
+fi
+fi
+
+if test $space = no; then
+# SVR3
+AC_MSG_CHECKING([for four-argument statfs (AIX-3.2.5, SVR3)])
+AC_CACHE_VAL(fu_cv_sys_stat_statfs4,
+[AC_TRY_RUN([#include <sys/types.h>
+#include <sys/statfs.h>
+int main ()
+{
+struct statfs fsd;
+return (statfs (".", &fsd, sizeof fsd, 0));
+}],
+fu_cv_sys_stat_statfs4=yes,
+fu_cv_sys_stat_statfs4=no,
+fu_cv_sys_stat_statfs4=no)])
+AC_MSG_RESULT($fu_cv_sys_stat_statfs4)
+if test $fu_cv_sys_stat_statfs4 = yes; then
+space=yes
+AC_DEFINE(STAT_STATFS4)
+fi
+fi
+
+if test $space = no; then
+# 4.4BSD and NetBSD
+AC_MSG_CHECKING([for two-argument statfs with statfs.fsize dnl
+member (4.4BSD and NetBSD)])
+AC_CACHE_VAL(fu_cv_sys_stat_statfs2_fsize,
+[AC_TRY_RUN([#include <sys/types.h>
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+#ifdef HAVE_SYS_MOUNT_H
+#include <sys/mount.h>
+#endif
+int main ()
+{
+struct statfs fsd;
+fsd.f_fsize = 0;
+return (statfs (".", &fsd));
+}],
+fu_cv_sys_stat_statfs2_fsize=yes,
+fu_cv_sys_stat_statfs2_fsize=no,
+fu_cv_sys_stat_statfs2_fsize=no)])
+AC_MSG_RESULT($fu_cv_sys_stat_statfs2_fsize)
+if test $fu_cv_sys_stat_statfs2_fsize = yes; then
+space=yes
+AC_DEFINE(STAT_STATFS2_FSIZE)
+fi
+fi
+
+if test $space = no; then
+# Ultrix
+AC_MSG_CHECKING([for two-argument statfs with struct fs_data (Ultrix)])
+AC_CACHE_VAL(fu_cv_sys_stat_fs_data,
+[AC_TRY_RUN([#include <sys/types.h>
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+#ifdef HAVE_SYS_MOUNT_H
+#include <sys/mount.h>
+#endif
+#ifdef HAVE_SYS_FS_TYPES_H
+#include <sys/fs_types.h>
+#endif
+int main ()
+{
+struct fs_data fsd;
+/* Ultrix's statfs returns 1 for success,
+0 for not mounted, -1 for failure.  */
+return (statfs (".", &fsd) != 1);
+}],
+fu_cv_sys_stat_fs_data=yes,
+fu_cv_sys_stat_fs_data=no,
+fu_cv_sys_stat_fs_data=no)])
+AC_MSG_RESULT($fu_cv_sys_stat_fs_data)
+if test $fu_cv_sys_stat_fs_data = yes; then
+space=yes
+AC_DEFINE(STAT_STATFS2_FS_DATA)
+fi
+fi
+
+if test $space = no; then
+# SVR2
+AC_TRY_CPP([#include <sys/filsys.h>],
+AC_DEFINE(STAT_READ_FILSYS) space=yes)
+fi
+
+if test -n "$list_mounted_fs" && test $space != no; then
+DF_PROG="df"
+# LIBOBJS="$LIBOBJS fsusage.o"
+# LIBOBJS="$LIBOBJS mountlist.o"
+fi
+
+# Check for SunOS statfs brokenness wrt partitions 2GB and larger.
+# If <sys/vfs.h> exists and struct statfs has a member named f_spare,
+# enable the work-around code in fsusage.c.
+AC_MSG_CHECKING([for statfs that truncates block counts])
+AC_CACHE_VAL(fu_cv_sys_truncating_statfs,
+[AC_TRY_COMPILE([
+#if !defined(sun) && !defined(__sun)
+choke -- this is a workaround for a Sun-specific problem
+#endif
+#include <sys/types.h>
+#include <sys/vfs.h>],
+[struct statfs t; long c = *(t.f_spare);],
+fu_cv_sys_truncating_statfs=yes,
+fu_cv_sys_truncating_statfs=no,
+)])
+if test $fu_cv_sys_truncating_statfs = yes; then
+AC_DEFINE(STATFS_TRUNCATES_BLOCK_COUNTS)
+fi
+AC_MSG_RESULT($fu_cv_sys_truncating_statfs)
+
+AC_CHECKING(for AFS)
+test -d /afs && AC_DEFINE(AFS)
+])
+
+dnl GNOME_SUPPORT_CHECKS
+dnl    Check for various support functions needed by the standard
+dnl    Gnome libraries.  Sets LIBOBJS, might define some macros.
+dnl    This should only be used when building the Gnome libs; 
+dnl    Gnome clients should not need this macro.
+AC_DEFUN([GNOME_SUPPORT_CHECKS],[
+  # we need an `awk' to build `gnomesupport.h'
+  AC_REQUIRE([AC_PROG_AWK])
+
+  # this should go away soon
+  need_gnome_support=yes
+
+  save_LIBOBJS="$LIBOBJS"
+  LIBOBJS=
+
+  AC_CHECK_FUNCS(getopt_long,,LIBOBJS="$LIBOBJS getopt.o getopt1.o")
+
+  # for `scandir'
+  AC_HEADER_DIRENT
+
+  # copied from `configure.in' of `libiberty'
+  vars="program_invocation_short_name program_invocation_name sys_errlist"
+  for v in $vars; do
+    AC_MSG_CHECKING([for $v])
+    AC_CACHE_VAL(gnome_cv_var_$v,
+      [AC_TRY_LINK([int *p;], [extern int $v; p = &$v;],
+		   [eval "gnome_cv_var_$v=yes"],
+		   [eval "gnome_cv_var_$v=no"])])
+    if eval "test \"`echo '$gnome_cv_var_'$v`\" = yes"; then
+      AC_MSG_RESULT(yes)
+      n=HAVE_`echo $v | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+      AC_DEFINE_UNQUOTED($n)
+    else
+      AC_MSG_RESULT(no)
+    fi
+  done
+
+  AC_REPLACE_FUNCS(memmove mkstemp scandir strcasecmp strerror strndup strnlen)
+  AC_REPLACE_FUNCS(strtok_r strtod strtol strtoul vasprintf vsnprintf)
+
+  AC_CHECK_FUNCS(realpath,,LIBOBJS="$LIBOBJS canonicalize.o")
+
+  # to include `error.c' error.c has some HAVE_* checks
+  AC_CHECK_FUNCS(vprintf doprnt strerror_r)
+  # stolen from am_func_error_at_line
+  AC_CACHE_CHECK([for error_at_line], am_cv_lib_error_at_line,
+  [AC_TRY_LINK([],[error_at_line(0, 0, "", 0, "");],
+              am_cv_lib_error_at_line=yes,
+              am_cv_lib_error_at_line=no)])
+  if test $am_cv_lib_error_at_line = no; then
+   LIBOBJS="$LIBOBJS error.o"
+  fi
+  AC_SUBST(LIBOBJS)dnl
+  
+  # This is required if we declare setreuid () and setregid ().
+  AC_TYPE_UID_T
+
+  # see if we need to declare some functions.  Solaris is notorious for
+  # putting functions into the `libc' but not listing them in the headers
+  AC_CHECK_HEADERS(string.h strings.h stdlib.h unistd.h dirent.h)
+  GCC_NEED_DECLARATIONS(gethostname setreuid setregid getpagesize)
+  GCC_NEED_DECLARATION(scandir,[
+#ifdef HAVE_DIRENT_H
+#include <dirent.h>
+#endif
+])
+
+  # Turn our LIBOBJS into libtool objects.  This is gross, but it
+  # requires changes to autoconf before it goes away.
+  LTLIBOBJS=`echo "$LIBOBJS" | sed 's/\.o/.lo/g'`
+  AC_SUBST(need_gnome_support)
+  AC_SUBST(LTLIBOBJS)
+
+  LIBOBJS="$save_LIBOBJS"
+  AM_CONDITIONAL(BUILD_GNOME_SUPPORT, test "$need_gnome_support" = yes)
+])
+
+
+dnl This file is intended for use both internally in libgtop and in every program
+dnl that wants to use it.
+dnl
+dnl It defines the following variables:
+dnl
+dnl * 'libgtop_sysdeps_dir'    - sysdeps dir for libgtop.
+dnl * 'libgtop_use_machine_h'  - some of system dependend parts of libgtop provide
+dnl                              their own header file. In this case we need to
+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])
+
+	AC_SUBST(libgtop_sysdeps_dir)
+	AC_SUBST(libgtop_use_machine_h)
+	AC_SUBST(libgtop_need_server)
+
+	AC_ARG_WITH(libgtop-examples,
+	[  --with-libgtop-examples Build the libgtop examples (default=no)],[
+	build_examples="$withval"], [build_examples=no])
+
+	AM_CONDITIONAL(EXAMPLES, test x"$build_examples" = xyes)
+
+	AC_ARG_ENABLE(hacker-mode,
+	[  --enable-hacker-mode    Enable building of unstable sysdeps],
+	[hacker_mode="$enableval"], [hacker_mode=no])
+
+	AM_CONDITIONAL(HACKER_MODE, test x"$hacker_mode" = xyes)
+
+	if test x$hacker_mode = xyes ; then
+	  LIBGTOP_HACKER_TESTS
+	fi
+
+	AC_ARG_WITH(libgtop-smp,
+	[  --with-libgtop-smp      Enable SMP support (default-auto)],[
+	libgtop_smp="$withval"],[libgtop_smp=auto])
+
+	if test $libgtop_smp = auto ; then
+	  AC_MSG_CHECKING(whether to enable SMP support)
+	  case "$host_os" in
+	  linux*)
+	    libgtop_smp=yes
+	    ;;
+	  *)
+	    libgtop_smp=no
+	    ;;
+	  esac
+	  AC_MSG_RESULT($libgtop_smp)
+	fi
+
+	if test $libgtop_smp = yes ; then
+	  AC_DEFINE(HAVE_LIBGTOP_SMP)
+	fi
+
+	AM_CONDITIONAL(LIBGTOP_SMP, test $libgtop_smp = yes)
+
+	AC_MSG_CHECKING(for libgtop sysdeps directory)
+
+	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_need_server=no
+	  ;;
+	freebsd*|netbsd*|openbsd*|bsdi*)
+	  libgtop_sysdeps_dir=freebsd
+	  libgtop_use_machine_h=yes
+	  libgtop_need_server=yes
+	  libgtop_postinstall='chgrp kmem $(bindir)/libgtop_server && chmod 2755 $(bindir)/libgtop_server'
+	  ;;
+	solaris*)
+	  libgtop_sysdeps_dir=solaris
+	  libgtop_use_machine_h=yes
+	  libgtop_need_server=yes
+	  libgtop_postinstall='chgrp sys $(bindir)/libgtop_server && chmod 2755 $(bindir)/libgtop_server'
+	  ;;
+	*)
+	  if test x$hacker_mode = xyes ; then
+	    case "$host_os" in
+	    sunos4*)
+	      #Please note that this port is obsolete and not working at
+	      #all. It is only useful for people who want to fix it ... :-)
+	      libgtop_sysdeps_dir=sun4
+	      libgtop_use_machine_h=yes
+	      libgtop_need_server=yes
+	      ;;
+	    osf*)
+	      libgtop_sysdeps_dir=osf1
+	      libgtop_use_machine_h=yes
+	      libgtop_need_server=yes
+	      ;;
+	    *)
+	      libgtop_sysdeps_dir=stub
+	      libgtop_use_machine_h=no
+	      libgtop_need_server=no
+	      ;;
+	    esac
+	  else
+	    libgtop_sysdeps_dir=stub
+	    libgtop_use_machine_h=no
+	    libgtop_need_server=no
+	  fi
+	  ;;
+	esac
+
+	test -z "$libgtop_postinstall" && libgtop_postinstall=:
+
+	AC_MSG_RESULT($libgtop_sysdeps_dir)
+
+	AC_SUBST(libgtop_sysdeps_dir)
+	AC_SUBST(libgtop_postinstall)
+	AC_SUBST(libgtop_have_sysinfo)
+
+	case "$host_os" in
+	*bsd*)
+	  AC_CHECK_HEADERS(net/if_var.h)
+	  AC_MSG_CHECKING([for I4B])
+	  AC_TRY_COMPILE([
+#include <sys/types.h>
+#include <sys/socket.h>
+
+#include <net/if.h>
+#include <net/if_types.h>
+
+#ifdef HAVE_NET_IF_VAR_H
+#include <net/if_var.h>
+#endif
+
+#include <net/netisr.h>
+#include <net/route.h>
+
+#if defined(__FreeBSD__) || defined(__NetBSD__)
+#include <net/if_sppp.h>
+#else
+#include <i4b/sppp/if_sppp.h>
+#endif
+],[
+	size_t size = sizeof (struct sppp);
+], have_i4b=yes, have_i4b=no)
+	  AC_MSG_RESULT($have_i4b)
+	  if test x$have_i4b = xyes; then
+	    AC_DEFINE(HAVE_I4B)
+	    AC_MSG_CHECKING([for I4B accounting])
+	    AC_TRY_COMPILE([
+#include <sys/types.h>
+#include <sys/socket.h>
+
+#include <net/if.h>
+#include <net/if_types.h>
+
+#ifdef HAVE_NET_IF_VAR_H
+#include <net/if_var.h>
+#endif
+
+#include <net/netisr.h>
+#include <net/route.h>
+
+#if defined(__FreeBSD__) || defined(__NetBSD__)
+#include <net/if_sppp.h>
+#else
+#include <i4b/sppp/if_sppp.h>
+#endif
+
+#include <machine/i4b_acct.h>
+],[
+	size_t size = sizeof (struct i4bisppp_softc);
+], have_i4b_acct=yes, have_i4b_acct=no)
+	    AC_MSG_RESULT($have_i4b_acct)
+	    if test x$have_i4b_acct = xyes ; then
+	      AC_DEFINE(HAVE_I4B_ACCT)
+	    else
+	      AC_WARN([
+*** I4B accounting disabled - you won't get any PPP statistics.
+*** Read "misc/i4b_acct.txt" in the LibGTop source directory
+*** to see how to enable it.])
+	    fi
+	  fi
+	  ;;
+	linux*)
+	  os_major_version=`uname -r | sed 's/-pre[[0-9]]*//' | \
+	    sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+	  os_minor_version=`uname -r | sed 's/-pre[[0-9]]*//' | \
+	    sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+	  os_micro_version=`uname -r | sed 's/-pre[[0-9]]*//' | \
+	    sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+	  os_version_expr="$os_major_version 65536 * $os_minor_version 256 * + $os_micro_version + p q"
+
+	  AC_CHECK_HEADERS(linux/version.h, have_linux_version_h=yes,
+	    have_linux_version_h=no)
+
+	  if test x$have_linux_version_h = xyes ; then
+	    version_code=`cat /usr/include/linux/version.h | \
+	      grep \#define | grep LINUX_VERSION_CODE`
+	    os_version_code=`echo $version_code | \
+	      sed 's/^.*LINUX_VERSION_CODE[[ \t]]*\([[0-9]]*\).*$/\1/'`
+	  else
+	    os_version_code=`echo "$os_version_expr" | dc`
+	  fi
+
+	  AC_MSG_CHECKING(for Linux kernel version code)
+	  AC_DEFINE_UNQUOTED(GLIBTOP_LINUX_VERSION_CODE, $os_version_code)
+	  AC_MSG_RESULT($os_version_code)
+	  ;;
+	solaris*)
+	  os_major_version=`uname -r | sed 's/\([[0-9]]*\).\([[0-9]]\)\.*\([[0-9]]*\)/\1/'`
+	  os_minor_version=`uname -r | sed 's/\([[0-9]]*\).\([[0-9]]\)\.*\([[0-9]]*\)/\2/'`
+	  os_micro_version=`uname -r | sed 's/\([[0-9]]*\).\([[0-9]]\)\.*\([[0-9]]*\)/\3/'`
+	  test -z "$os_micro_version" && os_micro_version=0
+	  os_version_expr="$os_major_version 100 * $os_minor_version 10 * + $os_micro_version + p q"
+	  os_version_code=`echo "$os_version_expr" | dc`
+
+	  AC_MSG_CHECKING(for Solaris release code)
+	  AC_DEFINE_UNQUOTED(GLIBTOP_SOLARIS_RELEASE, $os_version_code)
+	  AC_MSG_RESULT($os_version_code)
+	  ;;
+	esac
+
+	AC_MSG_CHECKING(for machine.h in libgtop sysdeps dir)
+	AC_MSG_RESULT($libgtop_use_machine_h)
+
+	AC_MSG_CHECKING(whether we need libgtop)
+	AC_MSG_RESULT($libgtop_need_server)
+
+	if test x$libgtop_need_server = xyes ; then
+	  AC_DEFINE(NEED_LIBGTOP)
+	fi
+
+	if test x$libgtop_use_machine_h = xyes ; then
+	  AC_DEFINE(HAVE_GLIBTOP_MACHINE_H)
+	fi
+
+	AM_CONDITIONAL(NEED_LIBGTOP, test x$libgtop_need_server = xyes)
+])
+
+  

autogen.sh

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

configure.in

@@ -22,8 +22,22 @@ AC_MSG_ERROR([
 ***])
 fi
 
-. $srcdir/LIBGTOP-VERSION
-AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
+LIBGTOP_MAJOR_VERSION=1
+LIBGTOP_MINOR_VERSION=90
+LIBGTOP_MICRO_VERSION=1
+LIBGTOP_VERSION=$LIBGTOP_MAJOR_VERSION.$LIBGTOP_MINOR_VERSION.$LIBGTOP_MICRO_VERSION
+AM_INIT_AUTOMAKE(libgtop, $LIBGTOP_VERSION)
+LIBGTOP_INTERFACE_AGE=1
+LIBGTOP_BINARY_AGE=1
+
+# 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
+
+LIBGTOP_VERSION_CODE=`echo "$LIBGTOP_MAJOR_VERSION 1000000 * $LIBGTOP_MINOR_VERSION 1000 * + $LIBGTOP_MICRO_VERSION + p q" | dc`
 
 AC_SUBST(LIBGTOP_MAJOR_VERSION)
 AC_SUBST(LIBGTOP_MINOR_VERSION)
@@ -35,6 +49,22 @@ AC_SUBST(LIBGTOP_VERSION)
 AC_SUBST(LIBGTOP_VERSION_CODE)
 AC_SUBST(LIBGTOP_VERSION_SUFFIX)
 
+dnl This is required at several places
+AC_CHECK_PROG(ac_dc_found, dc, yes, no)
+if test x$ac_dc_found != xyes ; then
+AC_MSG_ERROR([
+*** The "dc" utility was not found on your system.
+***
+*** When using RedHat Linux, you need to install the "bc" package.
+***
+*** It is now part of the "bc" package, so you should look at
+*** ftp://ftp.gnu.org/pub/gnu/bc/ if you want to compile it yourself.
+***
+*** Other systems and distributions may also have it in their "bc" package,
+*** so if there's no "dc" one, please look for "bc".
+***])
+fi
+
 # libtool versioning
 LT_RELEASE=$LIBGTOP_MAJOR_VERSION.$LIBGTOP_MINOR_VERSION
 LT_CURRENT=`expr $LIBGTOP_MICRO_VERSION - $LIBGTOP_INTERFACE_AGE`
@@ -47,12 +77,12 @@ AC_SUBST(LT_CURRENT)
 AC_SUBST(LT_REVISION)
 AC_SUBST(LT_AGE)
 
-AM_ACLOCAL_INCLUDE(. macros)
+ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I ."
 
 AC_ISC_POSIX
 AC_PROG_CC
 AC_STDC_HEADERS
-AC_ARG_PROGRAM
+dnl AC_ARG_PROGRAM
 
 dnl We need this at some places.
 libgtop_top_builddir=`pwd`
@@ -85,42 +115,43 @@ export cross_compiling
 AM_PROG_LIBTOOL
 
 dnl Let the user enable compiler warnings
-GNOME_COMPILE_WARNINGS
+dnl GNOME_COMPILE_WARNINGS
 
-GNOME_INIT_HOOK(gnome_found=yes)
+dnl GNOME_INIT_HOOK(gnome_found=yes)
 
-if test "x$gnome_found" != xyes; then
-  if test "x$want_gnome" != xno ; then
-    AC_MSG_ERROR([
-*** GNOME was not found on this system. ***
-
-*** If you want to use LibGTop without GNOME, you need
-*** to give configure the --without-gnome parameter.
-])
-  else
-    AC_DEFINE(WITHOUT_GNOME)
-  fi
-  GNOME_SUPPORT_CHECKS
-else
-  if test "x$want_gnome" != xno ; then
-    AM_CONDITIONAL(BUILD_GNOME_SUPPORT, false)
-  else
-    GNOME_SUPPORT_CHECKS
-  fi
-fi
+dnl if test "x$gnome_found" != xyes; then
+dnl   if test "x$want_gnome" != xno ; then
+dnl     AC_MSG_ERROR([
+dnl *** GNOME was not found on this system. ***
+dnl 
+dnl *** If you want to use LibGTop without GNOME, you need
+dnl *** to give configure the --without-gnome parameter.
+dnl ])
+dnl   else
+dnl     AC_DEFINE(WITHOUT_GNOME)
+dnl   fi
+dnl   GNOME_SUPPORT_CHECKS
+dnl else
+dnl   if test "x$want_gnome" != xno ; then
+dnl     AM_CONDITIONAL(BUILD_GNOME_SUPPORT, false)
+dnl   else
+dnl     GNOME_SUPPORT_CHECKS
+dnl   fi
+dnl fi
+AM_CONDITIONAL(BUILD_GNOME_SUPPORT, false)
 
 AM_CONDITIONAL(CROSS_COMPILING, test "x$cross_compiling" = xyes)
 
 GNOME_LIBGTOP_SYSDEPS
 GNOME_LIBGTOP_TYPES
 
-AC_ARG_WITH(libgtop-guile,
-[  --with-libgtop-guile    Build the libgtop guile interface (default=no)],
-[build_guile="$withval"], [build_guile=yes])
+dnl AC_ARG_WITH(libgtop-guile,
+dnl [  --with-libgtop-guile    Build the libgtop guile interface (default=no)],
+dnl [build_guile="$withval"], [build_guile=yes])
 
-if test x$build_guile != xno ; then
-  GNOME_CHECK_GUILE
-fi
+dnl if test x$build_guile != xno ; then
+dnl  GNOME_CHECK_GUILE
+dnl fi
 
 AC_ARG_WITH(libgtop-inodedb,
 [  --with-libgtop-inodedb  Build the inodedb stuff (default=no)],
@@ -178,11 +209,17 @@ AC_SUBST(guile_subdirs)
 
 AM_PROG_LIBTOOL
 
-AM_PATH_GLIB(1.2.0,,AC_MSG_ERROR(GLIB >= 1.2.0 is required for LibGTop))
+GLIB_REQUIRED=1.3.10
+
+PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED)
+AC_SUBST(GLIB_CFLAGS)
+AC_SUBST(GLIB_LIBS)
+
+dnl (1.2.0,,AC_MSG_ERROR(GLIB >= 1.2.0 is required for LibGTop))
 
 dnl You need to uncomment the following line if you want to use
 dnl libGTop without Gnome.
-dnl GNOME_SUPPORT_CHECKS
+GNOME_SUPPORT_CHECKS
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
@@ -243,18 +280,18 @@ AC_CHECK_LIB(kvm, kvm_open,[
 dnl For DEC OSF1
 AC_CHECK_LIB(mach, vm_statistics)
 
-dnl For some broken libc5 systems (Debian 1.3)                                                           
-saved_CFLAGS=$CFLAGS                                                                                     
-CFLAGS="$CFLAGS -D_GNU_SOURCE"                                                                           
+dnl For some broken libc5 systems (Debian 1.3)
+saved_CFLAGS=$CFLAGS
+CFLAGS="$CFLAGS -D_GNU_SOURCE"
 GCC_NEED_DECLARATION(program_invocation_name, [                           
-#include <errno.h>                                                                                       
-#include <stdio.h>                                                                                       
-#include <stdlib.h>                                                                                      
-#include <string.h>                                                                                      
-])                                                                                                       
-CFLAGS=$saved_CFLAGS                                                                                     
-                                                                                                         
-dnl Check for Internet sockets.
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+])
+
+CFLAGS=$saved_CFLAGS
+
 AC_CHECK_FUNC(socket,
  [AC_CHECK_HEADER(netinet/in.h,
    [AC_CHECK_HEADER(arpa/inet.h, [
@@ -277,8 +314,13 @@ AC_FUNC_STRFTIME
 AC_CHECK_FUNCS(getcwd gettimeofday getwd putenv strdup strtoul uname)
 
 dnl ## all 'es_??' are only needed for format numbers different of 'es'
-ALL_LINGUAS="az ca da de el es es_DO es_GT es_HN es_MX es_PA es_PE es_SV fi fr ga gl hu ja ko ms nl no pl pt pt_BR ru sk sl sv tr uk zh_CN zh_TW"
-AM_GNOME_GETTEXT
+ALL_LINGUAS="az ca da de el es es_DO es_GT es_HN es_MX es_PA es_PE es_SV fi fr ga gl hu ja ko nl no pl pt pt_BR ru sk sl sv tr uk zh_CN.GB2312 zh_TW"
+
+GETTEXT_PACKAGE=libgtop
+AC_SUBST(GETTEXT_PACKAGE)
+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE")
+
+AM_GLIB_GNU_GETTEXT
 
 AC_PATH_XTRA
 
@@ -322,7 +364,7 @@ if test "x$gnome_found" = xyes ; then
   LIBSUPPORT="$GNOME_LIBDIR -lgnomesupport"
   SUPPORTINCS="$GNOME_INCLUDEDIR"
 else
-  LIBSUPPORT='$(top_builddir)/support/libgnomesupport.la'
+  LIBSUPPORT='$(top_builddir)/support/libgnomesupport-2.0.la'
   SUPPORTINCS='-DNEED_GNOMESUPPORT_H -I$(top_builddir)/support -I$(top_srcdir)/support'
 fi
 
@@ -338,7 +380,7 @@ AC_SUBST(SUPPORTINCS)
 
 dnl These definitions are expanded in make.
 LIBGTOP_LIBS='-L$(libdir)'
-LIBGTOP_INCS='-I$(includedir)/libgtop-1.0'
+LIBGTOP_INCS='-I$(includedir)/libgtop-2.0'
 
 if test x$libgtop_use_machine_h = xyes ; then
   LIBGTOP_INCS="$LIBGTOP_INCS -DHAVE_GLIBTOP_MACHINE_H"
@@ -367,7 +409,7 @@ sysdeps_dir="$libgtop_sysdeps_dir"
 AC_SUBST(sysdeps_dir)
 
 if test x$ac_cv_guile_found = xyes ; then
-  LIBGTOP_GUILE_LIBS="$LIBGTOP_GUILE_LIBS -lgtop_guile"
+  LIBGTOP_GUILE_LIBS="$LIBGTOP_GUILE_LIBS -lgtop_guile-2.0"
   libgtop_guile_found=yes
 else
   libgtop_guile_found=no
@@ -383,11 +425,11 @@ fi
 
 LIBGTOP_EXTRA_LIBS="$LIBGTOP_EXTRA_LIBS $GLIB_LIBS"
 
-LIBGTOP_LIBS="$LIBGTOP_LIBS -lgtop -lgtop_sysdeps -lgtop_common"
-LIBGTOP_GUILE_LIBS="$LIBGTOP_GUILE_LIBS -lgtop -lgtop_sysdeps -lgtop_common"
+LIBGTOP_LIBS="$LIBGTOP_LIBS -lgtop-2.0 -lgtop_sysdeps-2.0 -lgtop_common-2.0"
+LIBGTOP_GUILE_LIBS="$LIBGTOP_GUILE_LIBS -lgtop-2.0 -lgtop_sysdeps-2.0 -lgtop_common-2.0"
 
-LIBGTOP_NAMES_LIBS="$LIBGTOP_LIBS -lgtop_names"
-LIBGTOP_GUILE_NAMES_LIBS="$LIBGTOP_GUILE_LIBS -lgtop_guile_names -lgtop_names"
+LIBGTOP_NAMES_LIBS="$LIBGTOP_LIBS -lgtop_names-2.0"
+LIBGTOP_GUILE_NAMES_LIBS="$LIBGTOP_GUILE_LIBS -lgtop_guile_names-2.0 -lgtop_names-2.0"
 
 LIBGTOP_LIBS="$LIBGTOP_LIBS" 
 LIBGTOP_NAMES_LIBS="$LIBGTOP_NAMES_LIBS"
@@ -411,12 +453,12 @@ else
   guile_def=""
 fi
 
-INCLUDES="-D_IN_LIBGTOP -D_GNU_SOURCE -DGLIBTOP_NAMES -I\$(top_builddir) -I\$(top_srcdir) -I\$(top_srcdir)/sysdeps/$sysdeps_dir -I\$(top_srcdir)/include -I\$(top_srcdir)/intl $SUPPORTINCS $GLIB_CFLAGS $CFLAGS $X_CFLAGS $guile_def "'-DGTOPLOCALEDIR=\"$(datadir)/locale\" -DLIBGTOP_VERSION=\"'"$LIBGTOP_VERSION"'\" -DLIBGTOP_SERVER_VERSION=\"'"$LIBGTOP_SERVER_VERSION"'\" -DLIBGTOP_VERSION_CODE='$LIBGTOP_VERSION_CODE' -DLIBGTOP_SERVER=\"'"$LIBGTOP_SERVER"'\"'
+INCLUDES="-D_IN_LIBGTOP -D_GNU_SOURCE -DGLIBTOP_NAMES -I\$(top_builddir) -I\$(top_srcdir) -I\$(top_srcdir)/sysdeps/$sysdeps_dir -I\$(top_srcdir)/include $SUPPORTINCS $GLIB_CFLAGS $CFLAGS $X_CFLAGS $guile_def "'-DGTOPLOCALEDIR=\"$(datadir)/locale\" -DLIBGTOP_VERSION=\"'"$LIBGTOP_VERSION"'\" -DLIBGTOP_SERVER_VERSION=\"'"$LIBGTOP_SERVER_VERSION"'\" -DLIBGTOP_VERSION_CODE='$LIBGTOP_VERSION_CODE' -DLIBGTOP_SERVER=\"'"$LIBGTOP_SERVER"'\"'
 
 AC_SUBST(INCLUDES)
 
 AC_SUBST(LIBGTOP_EXTRA_LIBS)
-
+AC_SUBST(GLIB_LIBS)
 AC_SUBST(LIBGTOP_LIBS)
 AC_SUBST(LIBGTOP_INCS)
 AC_SUBST(LIBGTOP_NAMES_LIBS)
@@ -429,7 +471,7 @@ AC_SUBST(LIBGTOP_BINDIR)
 AC_SUBST(LIBGTOP_SERVER)
 
 if test x$libgtop_need_server = xyes ; then
-   sysdeps_suid_lib="\$(top_builddir)/sysdeps/\$(sysdeps_dir)/libgtop_sysdeps_suid.la"
+   sysdeps_suid_lib="\$(top_builddir)/sysdeps/\$(sysdeps_dir)/libgtop_sysdeps_suid-2.0.la"
    server_programs='libgtop_server'
 else
    sysdeps_suid_lib=
@@ -442,7 +484,6 @@ AC_OUTPUT([
 Makefile
 libgtop.spec
 po/Makefile.in
-intl/Makefile
 misc/Makefile
 include/Makefile
 include/glibtop/Makefile
@@ -466,4 +507,5 @@ lib/Makefile
 examples/Makefile
 doc/Makefile
 support/Makefile
-macros/Makefile])
+libgtop-2.0.pc
+])

doc/.cvsignore

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

doc/ChangeLog

@@ -0,0 +1,43 @@
+2001-11-26  Abel Cheung  <maddog@linux.org.hk>
+
+	* libgtop.texi, Makefile.am: Renamed to libgtop2.texi
+	* about.texi: Very minor update.
+
+1999-10-18  Martin Baulig  <martin@home-of-linux.org>
+
+	* about.texi: Added a note about LibGTop and GNOME.
+
+	* reference.texi (glibtop_proc_state): Fix description of the `state'
+ 	field for LibGTop 1.0.x.
+
+1999-09-29  Martin Baulig  <martin@home-of-linux.org>
+
+	* Makefile.am (MAKEINFO): Add `-I @libgtop_top_builddir@/doc' here.
+
+1999-05-16  Martin Baulig  <martin@home-of-linux.org>
+
+	* main.texi: This is now the main file which will @include all
+	chapter files so we can use `texinfo-multiple-files-update'.
+
+	* reference.texi: Added all missing sections with a "not yet written"
+	notice.
+
+1999-05-16  Martin Baulig  <martin@home-of-linux.org>
+
+	* white-paper.texi: Initial version of the LibGTop White Paper.
+
+	* Makefile.am: Create `auto-macros.texi' from `auto-macros.texi.in'
+ 	which will contain some `@set' commands for the LibGTop version etc.
+
+	* auto-macros.texi.in: New file. This is a template for
+	`auto-macros.texi' which will be automatically generated.
+
+1999-05-09  Martin Baulig  <martin@home-of-linux.org>
+
+	* about.texi: Split the `libgtop.texi' into one file pro chapter,
+	this is the "About LibGTop".
+
+	* reference.texi: The "LibGTop Reference Manual".
+
+	* libgtop.texi: Initial version of the new LibGTop Manual.
+

doc/Makefile.am

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

doc/about.texi

@@ -33,10 +33,10 @@ latest release tarballs from
 @noindent
 or any of its mirror sites.
 
-The latest stable version of LibGTop is 1.0.1 which is also the one that comes
-together with GNOME 1.0. In CVS, there is a @code{LIBGTOP_STABLE_1_0} branch
-which is rooted at the @code{LIBGTOP_1_0_1} tag while actual development occurs
-in the @code{HEAD} which currently has version 1.1.0.
+The latest stable version of LibGTop is 1.0.12 which is also the one that comes
+together with GNOME 1.0. It belongs to @code{LIBGTOP_STABLE_1_0} branch in CVS.
+Actual development occurs in the @code{libgtop-GNOME-2-0-port} which is
+currently versioned 1.90.0.
 
 @node Supported Platforms, Mailing List, Availability, About
 @section Supported Platforms
@@ -47,7 +47,7 @@ The stable branch currently supports the following platforms:
 @item All versions of Linux
 
 LibGTop was tested under Linux 2.0.x and 2.2.x on the ix86 and the alpha, but
-it should also work without problems on SparcLinux.
+it should also work without problems on SparcLinux or Linux 2.4.x.
 
 Note: I'm speaking of the Linux kernel here, not the GNU/Linux operating system.
 
@@ -116,6 +116,7 @@ me a lot in the early beginning.
 @item Timur Bakeyev for the BSDI port.
 @item Drazen Kacar and the other people on the LibGTop development mailing
 list for the Solaris port.
+@item Kevin Vandersloot for the effort to port to GNOME 2.0.
 @item All people sending me patches, having good ideas, ...
 @item Everyone I have forgotten in this list ...
 @end itemize

doc/auto-macros.texi.in

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

doc/libgtop2.texi

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

doc/white-paper.texi

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

examples/Makefile.am

@@ -22,9 +22,9 @@ EXTRA_PROGRAMS		= first_static second_static \
 			  timings_static
 
 first_SOURCES		= first.c
-first_LDADD		= $(top_builddir)/lib/libgtop.la \
-			  $(top_builddir)/sysdeps/common/libgtop_common.la \
-			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps.la \
+first_LDADD		= $(top_builddir)/lib/libgtop-2.0.la \
+			  $(top_builddir)/sysdeps/common/libgtop_common-2.0.la \
+			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la \
 			  @LIBSUPPORT@ @INTLLIBS@
 
 first_static_SOURCES	= $(first_SOURCES)
@@ -32,9 +32,9 @@ first_static_LDADD	= $(first_LDADD)
 first_static_LDFLAGS	= -static
 
 second_SOURCES		= second.c
-second_LDADD		= $(top_builddir)/lib/libgtop.la \
-			  $(top_builddir)/sysdeps/common/libgtop_common.la \
-			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps.la \
+second_LDADD		= $(top_builddir)/lib/libgtop-2.0.la \
+			  $(top_builddir)/sysdeps/common/libgtop_common-2.0.la \
+			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la \
 			  @LIBSUPPORT@ @INTLLIBS@
 
 second_static_SOURCES	= $(second_SOURCES)
@@ -42,9 +42,9 @@ second_static_LDADD	= $(second_LDADD)
 second_static_LDFLAGS	= -static
 
 procmap_SOURCES		= procmap.c
-procmap_LDADD		= $(top_builddir)/lib/libgtop.la \
-			  $(top_builddir)/sysdeps/common/libgtop_common.la \
-			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps.la \
+procmap_LDADD		= $(top_builddir)/lib/libgtop-2.0.la \
+			  $(top_builddir)/sysdeps/common/libgtop_common-2.0.la \
+			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la \
 			  @LIBSUPPORT@ @INTLLIBS@
 
 
@@ -54,9 +54,9 @@ procmap_static_LDADD	= $(procmap_LDADD)
 procmap_static_LDFLAGS	= -static
 
 netload_SOURCES		= netload.c
-netload_LDADD		= $(top_builddir)/lib/libgtop.la \
-			  $(top_builddir)/sysdeps/common/libgtop_common.la \
-			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps.la \
+netload_LDADD		= $(top_builddir)/lib/libgtop-2.0.la \
+			  $(top_builddir)/sysdeps/common/libgtop_common-2.0.la \
+			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la \
 			  @LIBSUPPORT@ @INTLLIBS@
 
 netload_static_SOURCES	= $(netload_SOURCES)
@@ -73,15 +73,15 @@ sysdeps_static_SOURCES	= $(sysdeps_SOURCES)
 sysdeps_static_LDADD	= $(sysdeps_LDADD)
 sysdeps_static_LDFLAGS	= -static
 
-third_guile_names_LIBS	= $(top_builddir)/sysdeps/guile/names/libgtop_guile_names.la
-third_names_LIBS	= $(top_builddir)/sysdeps/names/libgtop_names.la
+third_guile_names_LIBS	= $(top_builddir)/sysdeps/guile/names/libgtop_guile_names-2.0.la
+third_names_LIBS	= $(top_builddir)/sysdeps/names/libgtop_names-2.0.la
 
 third_SOURCES		= third.c
-third_LDADD		= $(top_builddir)/sysdeps/guile/libgtop_guile.la \
+third_LDADD		= $(top_builddir)/sysdeps/guile/libgtop_guile-2.0.la \
 			  $(third_guile_names_LIBS) $(third_names_LIBS) \
-			  $(top_builddir)/lib/libgtop.la \
-			  $(top_builddir)/sysdeps/common/libgtop_common.la \
-			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps.la \
+			  $(top_builddir)/lib/libgtop-2.0.la \
+			  $(top_builddir)/sysdeps/common/libgtop_common-2.0.la \
+			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la \
 			  @GUILE_LIBS@ @LIBSUPPORT@ @INTLLIBS@
 
 third_static_SOURCES	= $(third_SOURCES)
@@ -89,9 +89,9 @@ third_static_LDADD	= $(third_LDADD)
 third_static_LDFLAGS	= -static
 
 mountlist_SOURCES	= mountlist.c
-mountlist_LDADD		= $(top_builddir)/lib/libgtop.la \
-			  $(top_builddir)/sysdeps/common/libgtop_common.la \
-			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps.la \
+mountlist_LDADD		= $(top_builddir)/lib/libgtop-2.0.la \
+			  $(top_builddir)/sysdeps/common/libgtop_common-2.0.la \
+			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la \
 			  @LIBSUPPORT@ @INTLLIBS@
 
 mountlist_static_SOURCES= $(mountlist_SOURCES)
@@ -100,9 +100,9 @@ mountlist_static_LDFLAGS= -static
 
 
 smp_SOURCES		= smp.c
-smp_LDADD		= $(top_builddir)/lib/libgtop.la \
-			  $(top_builddir)/sysdeps/common/libgtop_common.la \
-			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps.la \
+smp_LDADD		= $(top_builddir)/lib/libgtop-2.0.la \
+			  $(top_builddir)/sysdeps/common/libgtop_common-2.0.la \
+			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la \
 			  @LIBSUPPORT@ @INTLLIBS@
 
 smp_static_SOURCES	= $(smp_SOURCES)
@@ -110,9 +110,9 @@ smp_static_LDADD	= $(smp_LDADD)
 smp_static_LDFLAGS	= -static
 
 timings_SOURCES		= timings.c
-timings_LDADD		= $(top_builddir)/lib/libgtop.la \
-			  $(top_builddir)/sysdeps/common/libgtop_common.la \
-			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps.la \
+timings_LDADD		= $(top_builddir)/lib/libgtop-2.0.la \
+			  $(top_builddir)/sysdeps/common/libgtop_common-2.0.la \
+			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la \
 			  @LIBSUPPORT@ @INTLLIBS@
 
 timings_static_SOURCES	= $(timings_SOURCES)

include/glibtop/Makefile.am

@@ -1,4 +1,4 @@
-glibtopdir		= $(includedir)/libgtop-1.0/glibtop
+glibtopdir		= $(includedir)/libgtop-2.0/glibtop
 
 glibtop_HEADERS		= close.h loadavg.h prockernel.h procstate.h \
 			  sem_limits.h uptime.h command.h mem.h proclist.h \

lib/Makefile.am

@@ -2,13 +2,13 @@ LINK				= $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
 
 INCLUDES			= @INCLUDES@
 
-lib_LTLIBRARIES			= libgtop.la
+lib_LTLIBRARIES			= libgtop-2.0.la
 
-libgtop_la_SOURCES		= init.c open.c close.c command.c read.c \
+libgtop_2_0_la_SOURCES		= init.c open.c close.c command.c read.c \
 				  read_data.c write.c lib.c parameter.c \
 				  sysdeps.c
 
-libgtop_la_LDFLAGS		= $(LT_VERSION_INFO)
+libgtop_2_0_la_LDFLAGS		= $(LT_VERSION_INFO)
 
 BUILT_SOURCES			= lib.c
 

libgtop-2.0.pc.in

@@ -0,0 +1,13 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+          
+Name: libgtop
+Description: Portable System Access Library
+Requires: glib-2.0
+Version: @VERSION@
+Libs: -L${libdir} @LIBGTOP_LIBS@
+Cflags: -I${includedir}/libgtop-2.0
+
+

po/.cvsignore

@@ -7,3 +7,5 @@ cat-id-tbl.c
 libgtop.pot
 Makefile.in.in
 messages
+stamp-cat-id
+po2tbl.sed

po/ChangeLog

@@ -1,26 +1,6 @@
-2002-12-14  Christophe Merlet  <redfox@redfoxcenter.org>
+2001-11-26  Abel Cheung  <maddog@linux.org.hk>
 
-	* fr.po: Updated French translation.
-
-2002-02-09  Abel Cheung  <maddog@linux.org.hk>
-
-	* zh_TW.po: Updated traditional Chinese translation.
-
-2002-02-05  Abel Cheung  <maddog@linux.org.hk>
-
-	* zh_CN.GB2312.po -> zh_CN.po
-
-2001-01-14  Hasbullah bin Pit <sebol@ikhlas.com>
-
-	* ms.po: Added Malay Translation.
-
-2001-12-07  Pablo Saratxaga <pablo@mandrakesoft.com>
-
-	* az.po: Updated Azeri file
-
-2001-11-27  Roy-Magne Mo  <rmo@sunnmore.net>
-
-	* nn.po: Updated Norwegian (nynorsk) translation.
+	* stamp-cat-id: Removed, and add it to .cvsignore.
 
 2001-10-30  Zbigniew Chyla  <cyba@gnome.pl>
 
@@ -92,7 +72,7 @@
 	* fi.po: Reverted Jarkko Ranta's change; please do
 	not commit any compressed files in future.
 
-2001-02-10  Christophe Merlet  <christophe@merlet.net>
+2001-02-10  Christophe Merlet  <redfox@eikonex.org>
 
 	* fr.po: Updated French translation.
 
@@ -108,7 +88,7 @@
 
 	* ru.po: Updated russian translation.
 
-2001-02-05  Christophe Merlet  <christophe@merlet.net>
+2001-02-05  Christophe Merlet  <redfox@eikonex.org>
 
 	* fr.po: Updated French translation.
 

po/POTFILES.in

@@ -51,8 +51,8 @@ src/daemon/main.c
 src/daemon/server.c
 src/daemon/slave.c
 src/daemon/version.c
-src/inodedb/file_by_inode.c
-src/inodedb/mkinodedb.c
+src/inodedb/file_by_inode2.c
+src/inodedb/mkinodedb2.c
 support/easy-vsnprintf.c
 support/error.c
 support/error.h

po/fr.po

@@ -1,16 +1,16 @@
-# French translation of libgtop.
-# Copyright (C) 1998-2002 Free Software Foundation, Inc.
+# libgtop fr.po
+# Copyright (C) 1998-2001 Free Software Foundation, Inc.
 # Vincent Renardias <vincent@ldsol.com>, 1998-1999.
 # Fabrice Bellet <Fabrice.Bellet@imag.fr>, 1999.
-# Christophe Merlet (RedFox) <redfox@redfoxcenter.org>, 2000-2002.
+# Christophe Merlet (RedFox) <redfox@eikonex.org>, 2000-2001.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: libgtop 1.0.13\n"
-"POT-Creation-Date: 2002-12-14 12:44+0100\n"
-"PO-Revision-Date: 2002-12-14 12:44+0100\n"
-"Last-Translator: Christophe Merlet (RedFox) <redfox@redfoxcenter.org>\n"
-"Language-Team: GNOME French Team <gnomefr@traduc.org>\n"
+"Project-Id-Version: libgtop 1.0.10\n"
+"POT-Creation-Date: 2001-02-13 13:30+0100\n"
+"PO-Revision-Date: 2001-02-10 11:33+0100\n"
+"Last-Translator: Christophe Merlet (RedFox) <redfox@eikonex.org>\n"
+"Language-Team: GNOME French Team <gnomefr@gnomefr.traduc.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,7 +18,7 @@ msgstr ""
 #: examples/smp.c:68
 #, c-format
 msgid "Ticks (%ld per second):"
-msgstr "Ticks (%ld par seconde)<EFBFBD>:"
+msgstr "Ticks (%ld par seconde) :"
 
 #: examples/smp.c:71
 msgid "Total"
@@ -46,17 +46,17 @@ msgid ""
 "CPU          (0x%08lx): %12.0f %12.0f %12.0f %12.0f %12.0f\n"
 "\n"
 msgstr ""
-"CPU          (0x%08lx)<EFBFBD>: %12.0f %12.0f %12.0f %12.0f %12.0f\n"
+"CPU          (0x%08lx) : %12.0f %12.0f %12.0f %12.0f %12.0f\n"
 "\n"
 
 #: examples/smp.c:77
 #, c-format
 msgid "CPU %3d      (0x%08lx): %12lu %12lu %12lu %12lu %12lu\n"
-msgstr "CPU %3d      (0x%08lx)<EFBFBD>: %12lu %12lu %12lu %12lu %12lu\n"
+msgstr "CPU %3d      (0x%08lx) : %12lu %12lu %12lu %12lu %12lu\n"
 
 #: examples/smp.c:94
 msgid "Percent:"
-msgstr "Pourcentage<EFBFBD>:"
+msgstr "Pourcentage :"
 
 #: examples/smp.c:95
 msgid "Total (%)"
@@ -84,17 +84,17 @@ msgid ""
 "CPU          (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
 "\n"
 msgstr ""
-"CPU          (0x%08lx)<EFBFBD>: %12.3f %12.3f %12.3f %12.3f %12.3f\n"
+"CPU          (0x%08lx) : %12.3f %12.3f %12.3f %12.3f %12.3f\n"
 "\n"
 
 #: examples/smp.c:114
 #, c-format
 msgid "CPU %3d      (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
-msgstr "CPU %3d      (0x%08lx)<EFBFBD>: %12.3f %12.3f %12.3f %12.3f %12.3f\n"
+msgstr "CPU %3d      (0x%08lx) : %12.3f %12.3f %12.3f %12.3f %12.3f\n"
 
 #: examples/smp.c:120
 msgid "Spin:"
-msgstr "Spin<EFBFBD>:"
+msgstr "Spin :"
 
 #: lib/read.c:75
 #, c-format
@@ -154,7 +154,7 @@ msgid ""
 "Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
 "Erreur sur l'option %s: %s.\n"
-"Executer <20><EFBFBD>%s --help<EFBFBD><EFBFBD> pour avoir la liste des options de la ligne de "
+"Executer <20> %s --help <EFBFBD> pour avoir la liste des options de la ligne de "
 "commande.\n"
 
 #: support/error.c:109
@@ -164,61 +164,61 @@ msgstr "Erreur syst
 #: support/getopt.c:669
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s<EFBFBD>: l'option <20><EFBFBD>%s<EFBFBD><EFBFBD> est ambig<69>e\n"
+msgstr "%s : l'option <20> %s <EFBFBD> est ambig<69>e\n"
 
 #: support/getopt.c:693
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s<EFBFBD>: l'option <20><EFBFBD>--%s<EFBFBD><EFBFBD> ne supporte pas d'arguments\n"
+msgstr "%s : l'option <20> --%s <EFBFBD> ne supporte pas d'arguments\n"
 
 #: support/getopt.c:698
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr "%s<EFBFBD>: l'option <20><EFBFBD>%c%s<EFBFBD><EFBFBD> ne supporte pas d'arguments\n"
+msgstr "%s : l'option <20> %c%s <EFBFBD> ne supporte pas d'arguments\n"
 
 #: support/getopt.c:715 support/getopt.c:888
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
-msgstr "%s<EFBFBD>: l'option <20><EFBFBD>%s<EFBFBD><EFBFBD> n<>cessite un argument\n"
+msgstr "%s : l'option <20> %s <EFBFBD> n<>cessite un argument\n"
 
 #. --option
 #: support/getopt.c:744
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s<EFBFBD>: option inconnue <20><EFBFBD>--%s<EFBFBD><EFBFBD>\n"
+msgstr "%s : option inconnue <20> --%s <EFBFBD>\n"
 
 #. +option or -option
 #: support/getopt.c:748
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s<EFBFBD>: option inconnue <20><EFBFBD>%c%s<EFBFBD><EFBFBD>\n"
+msgstr "%s : option inconnue <20> %c%s <EFBFBD>\n"
 
 #. 1003.2 specifies the format of this message.
 #: support/getopt.c:774
 #, c-format
 msgid "%s: illegal option -- %c\n"
-msgstr "%s<EFBFBD>: option ill<6C>gale -- %c\n"
+msgstr "%s : option ill<6C>gale -- %c\n"
 
 #: support/getopt.c:777
 #, c-format
 msgid "%s: invalid option -- %c\n"
-msgstr "%s<EFBFBD>: option non valide -- %c\n"
+msgstr "%s : option non valide -- %c\n"
 
 #. 1003.2 specifies the format of this message.
 #: support/getopt.c:807 support/getopt.c:937
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
-msgstr "%s<EFBFBD>: l'option n<>cessite un argument -- %c\n"
+msgstr "%s : l'option n<>cessite un argument -- %c\n"
 
 #: support/getopt.c:854
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s<EFBFBD>: l'option <20><EFBFBD>-W %s<EFBFBD><EFBFBD> is ambig<69>e\n"
+msgstr "%s : l'option <20> -W %s <EFBFBD> is ambig<69>e\n"
 
 #: support/getopt.c:872
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr "%s<EFBFBD>: l'option <20><EFBFBD>-W %s<EFBFBD><EFBFBD> ne supporte pas d'arguments\n"
+msgstr "%s : l'option <20> -W %s <EFBFBD> ne supporte pas d'arguments\n"
 
 #: sysdeps/names/cpu.c:43
 msgid "Total CPU Time"
@@ -653,7 +653,7 @@ msgid ""
 "textual name.  (If you have an up-to-date /etc/psdatabase, then try ps -l to "
 "see the WCHAN field in action)"
 msgstr ""
-"Il s'agit du <20><EFBFBD>canal<EFBFBD><EFBFBD> dans lequel le processus est en attente, constitu<74> "
+"Il s'agit du <20> canal <EFBFBD> dans lequel le processus est en attente, constitu<74> "
 "par l'adresse d'un appel syst<73>me dans lequel le processus est bloqu<71>. La "
 "correspondance entre l'adresse et le nom de l'appel syst<73>me est disponible "
 "si le fichier /etc/psdatabase est <20> jour par rapport <20><>la version du noyau "
@@ -1032,7 +1032,7 @@ msgstr "Priorit
 
 #: sysdeps/names/procuid.c:74
 msgid "Standard unix nice level of process"
-msgstr "Niveau de <20><EFBFBD>nice<EFBFBD><EFBFBD> (standard unix) du processus"
+msgstr "Niveau de <20> nice <EFBFBD> (standard unix) du processus"
 
 #: sysdeps/names/sem_limits.c:42 sysdeps/names/sem_limits.c:56
 msgid "Number of entries in semaphore map"
@@ -1378,7 +1378,7 @@ msgstr "Signal utilisateur 2"
 #~ msgstr "Instruction EMT"
 
 #~ msgid "Kill, unblockable (POSIX)"
-#~ msgstr "Signal <20><EFBFBD>Kill<EFBFBD><EFBFBD>, non blocable (POSIX)"
+#~ msgstr "Signal <20> Kill <EFBFBD>, non blocable (POSIX)"
 
 #~ msgid "BUS error (4.2 BSD)"
 #~ msgstr "Erreur de Bus (BSD 4.2)"

po/nn.po

@@ -1,13 +1,14 @@
 # Norwegian (nynorsk) translation of libgtop.
-# Copyright (C) 2001 Roy-Magne Mo
+# Copyright (C) 2000 Gaute Hvoslef Kvalnes.
+# Gaute Hvoslef Kvalnes <ai98ghk@stud.hib.no>, 2000
 # Kjartan Maraas <kmaraas@gnome.org>, 2001.
-# Roy-Magne Mo <rmo@sunnmore.net>, 2001.
+
 msgid ""
 msgstr ""
 "Project-Id-Version: libgtop 1.0.13\n"
-"POT-Creation-Date: 2001-11-27 07:16+0100\n"
+"POT-Creation-Date: 2001-07-16 21:07+0200\n"
 "PO-Revision-Date: 2001-06-25 18:55+02:00\n"
-"Last-Translator: Roy-Magne Mo <rmo@sunnmore.net>\n"
+"Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian (Nynorsk)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
@@ -31,8 +32,9 @@ msgid "Nice"
 msgstr "Snill"
 
 #: examples/smp.c:71
+#, fuzzy
 msgid "Sys"
-msgstr "Sys"
+msgstr "Sys Req"
 
 #: examples/smp.c:71
 msgid "Idle"
@@ -51,28 +53,34 @@ msgid "CPU %3d      (0x%08lx): %12lu %12lu %12lu %12lu %12lu\n"
 msgstr ""
 
 #: examples/smp.c:94
+#, fuzzy
 msgid "Percent:"
-msgstr "Prosent:"
+msgstr "Prosent"
 
 #: examples/smp.c:95
+#, fuzzy
 msgid "Total (%)"
-msgstr "Totalt (%)"
+msgstr "Totalt: %1"
 
 #: examples/smp.c:95
+#, fuzzy
 msgid "User (%)"
-msgstr "Brukar (%)"
+msgstr "Brukar%"
 
 #: examples/smp.c:95
+#, fuzzy
 msgid "Nice (%)"
-msgstr "Snill (%)"
+msgstr "Linje (%1)"
 
 #: examples/smp.c:95
+#, fuzzy
 msgid "Sys (%)"
-msgstr "Sys (%)"
+msgstr "Dagar (d)"
 
 #: examples/smp.c:96
+#, fuzzy
 msgid "Idle (%)"
-msgstr "Inaktiv (%)"
+msgstr "Inaktiv"
 
 #: examples/smp.c:98
 #, c-format
@@ -80,26 +88,26 @@ msgid ""
 "CPU          (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
 "\n"
 msgstr ""
-"CPU          (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
-"\n"
 
 #: examples/smp.c:114
 #, c-format
 msgid "CPU %3d      (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
-msgstr "CPU %3d      (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
+msgstr ""
 
 #: examples/smp.c:120
+#, fuzzy
 msgid "Spin:"
-msgstr "Rotasjon:"
+msgstr "Spania"
 
 #: lib/read.c:75
-#, c-format
+#, fuzzy, c-format
 msgid "read %d bytes"
-msgstr "las %d byte"
+msgstr "%2 (%1 byte)"
 
 #: lib/read_data.c:49
+#, fuzzy
 msgid "read data size"
-msgstr "lesestorleik"
+msgstr "Set storleik"
 
 #: lib/read_data.c:66
 #, c-format
@@ -107,117 +115,121 @@ msgid "read data %d bytes"
 msgstr ""
 
 #: lib/write.c:48
-#, c-format
+#, fuzzy, c-format
 msgid "write %d bytes"
-msgstr "skriv %d byte"
+msgstr "Skrivartest"
 
 #: src/daemon/gnuserv.c:448
+#, fuzzy
 msgid "Enable debugging"
 msgstr "Skru p<> avlusingsinfo"
 
 #: src/daemon/gnuserv.c:448
 msgid "DEBUG"
-msgstr "DEBUG"
+msgstr ""
 
 #: src/daemon/gnuserv.c:450
+#, fuzzy
 msgid "Enable verbose output"
-msgstr "Skru p<> verbos utdata"
+msgstr "Skru p<> avlusingsinfo"
 
 #: src/daemon/gnuserv.c:450
 msgid "VERBOSE"
-msgstr "VERBOSE"
+msgstr ""
 
 #: src/daemon/gnuserv.c:452
+#, fuzzy
 msgid "Don't fork into background"
-msgstr "Ikkje fork av inn i bakgrunnen"
+msgstr "Bokmerkebakgrunn"
 
 #: src/daemon/gnuserv.c:452
 msgid "NO-DAEMON"
-msgstr "NO-DAEMON"
+msgstr ""
 
 #: src/daemon/gnuserv.c:454
+#, fuzzy
 msgid "Invoked from inetd"
-msgstr "Starta fr<66> inetd"
+msgstr "Kom fr<66> venstre"
 
 #: src/daemon/gnuserv.c:454
+#, fuzzy
 msgid "INETD"
-msgstr "INETD"
+msgstr "INT"
 
 #: src/daemon/gnuserv.c:488
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Error on option %s: %s.\n"
 "Run '%s --help' to see a full list of available command line options.\n"
-msgstr ""
-"Feil p<> val %s: %s.\n"
-"K<>yr <20>%s --help<6C> for <20> sj<73> full liste av tilgjengelege kommandlinjeval.\n"
+msgstr "Bruk --help for <20> f<> ei liste over tilgjengelege kommandolinjeval."
 
 #: support/error.c:109
 msgid "Unknown system error"
-msgstr "Ukjent systemfeil"
+msgstr ""
 
 #: support/getopt.c:669
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: valet <20>%s<> er fleirtydig\n"
+msgstr "%s: flagg <20>%s<> er fleirtydig\n"
 
 #: support/getopt.c:693
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s: valet <20>--%s<> tillet ikkje argument\n"
+msgstr "%s: flagg <20>--%s<> tek ikkje argument\n"
 
 #: support/getopt.c:698
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr "%s: valet <20>%c%s<> tillet ikkje argument\n"
+msgstr "%s: flagg <20>%c%s<> tek ikkje argument\n"
 
 #: support/getopt.c:715 support/getopt.c:888
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: valet <20>%s<> treng eit argument\n"
+msgstr "%s: flagg <20>%s<> treng eit argument\n"
 
 #. --option
 #: support/getopt.c:744
-#, c-format
+#, fuzzy, c-format
 msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: ukjent val <20>--%s<>\n"
+msgstr "%s: ulovleg flagg -- %c\n"
 
 #. +option or -option
 #: support/getopt.c:748
-#, c-format
+#, fuzzy, c-format
 msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: ukjent val <20>%c%s<>\n"
+msgstr "%s: ulovleg flagg -- %c\n"
 
 #. 1003.2 specifies the format of this message.
 #: support/getopt.c:774
 #, c-format
 msgid "%s: illegal option -- %c\n"
-msgstr "%s: ulovleg val -- %c\n"
+msgstr "%s: ulovleg flagg -- %c\n"
 
 #: support/getopt.c:777
-#, c-format
+#, fuzzy, c-format
 msgid "%s: invalid option -- %c\n"
-msgstr "%s: ugyldig val -- %c\n"
+msgstr "%s: ulovleg flagg -- %c\n"
 
 #. 1003.2 specifies the format of this message.
 #: support/getopt.c:807 support/getopt.c:937
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: valet treng eit argument -- %c\n"
+msgstr "%s: flagg treng eit argument -- %c\n"
 
 #: support/getopt.c:854
-#, c-format
+#, fuzzy, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: valet <20>-W %s<> er fleirtydig\n"
+msgstr "%s: flagg <20>%s<> er fleirtydig\n"
 
 #: support/getopt.c:872
-#, c-format
+#, fuzzy, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr "%s: valet <20>-W %s<> kan ikkje ha argument\n"
+msgstr "%s: flagg <20>--%s<> tek ikkje argument\n"
 
 #: sysdeps/names/cpu.c:43
+#, fuzzy
 msgid "Total CPU Time"
-msgstr "Total CPU-tid"
+msgstr "Totaltid"
 
 #: sysdeps/names/cpu.c:44
 msgid "CPU Time in User Mode"
@@ -236,12 +248,14 @@ msgid "CPU Time in the Idle Task"
 msgstr ""
 
 #: sysdeps/names/cpu.c:48
+#, fuzzy
 msgid "Tick Frequency"
-msgstr "Tikkfrekvens"
+msgstr "Klokkefrekvens"
 
 #: sysdeps/names/cpu.c:49
+#, fuzzy
 msgid "SMP Total CPU Time"
-msgstr "SMP Total CPU-tid"
+msgstr "Totaltid"
 
 #: sysdeps/names/cpu.c:50
 msgid "SMP CPU Time in User Mode"
@@ -284,62 +298,74 @@ msgid "Tick frequency (default is 100)"
 msgstr ""
 
 #: sysdeps/names/fsusage.c:39 sysdeps/names/fsusage.c:48
+#, fuzzy
 msgid "Total blocks"
-msgstr "Totale blokker"
+msgstr "Tal p<> filer totalt:"
 
 #: sysdeps/names/fsusage.c:40
+#, fuzzy
 msgid "Free blocks"
-msgstr "Ledige blokker"
+msgstr "M<EFBFBD>rke felt"
 
 #: sysdeps/names/fsusage.c:41
+#, fuzzy
 msgid "Available blocks"
-msgstr "Tilgjengelege blokker"
+msgstr "Tilgjengelege reglar"
 
 #: sysdeps/names/fsusage.c:42 sysdeps/names/fsusage.c:51
+#, fuzzy
 msgid "Total file nodes"
-msgstr "Totale filnoder"
+msgstr "Tal p<> filer totalt:"
 
 #: sysdeps/names/fsusage.c:43 sysdeps/names/fsusage.c:52
+#, fuzzy
 msgid "Free file nodes"
-msgstr "Ledige filnodar"
+msgstr "F<EFBFBD>rehandsvis filinformasjon"
 
 #: sysdeps/names/fsusage.c:49
 msgid "Free blocks available to the superuser"
-msgstr "Ledige blokker tilgjengeleg for superbrukar"
+msgstr ""
 
 #: sysdeps/names/fsusage.c:50
 msgid "Free blocks available to non-superusers"
-msgstr "Ledige blokker tilgjengeleg for ikkje-superbrukar"
+msgstr ""
 
 #: sysdeps/names/loadavg.c:39
+#, fuzzy
 msgid "Load Average"
-msgstr "Snittlast"
+msgstr "Snittlast (1 min)"
 
 #: sysdeps/names/loadavg.c:40
+#, fuzzy
 msgid "Running Tasks"
-msgstr "K<>yrande oppg<70>ver "
+msgstr "K<>yrer "
 
 #: sysdeps/names/loadavg.c:41
+#, fuzzy
 msgid "Number of Tasks"
-msgstr "Tal p<> oppg<EFBFBD>ver"
+msgstr "Tal p<> maur:"
 
 #: sysdeps/names/loadavg.c:42 sysdeps/names/loadavg.c:50
+#, fuzzy
 msgid "Last PID"
-msgstr "Siste PID"
+msgstr "har GID"
 
 #: sysdeps/names/loadavg.c:47
 msgid "Number of jobs running simultaneously averaged over 1, 5 and 15 minutes"
 msgstr ""
 
 #: sysdeps/names/loadavg.c:48
+#, fuzzy
 msgid "Number of tasks currently running"
-msgstr "Tal p<> k<EFBFBD>yrande oppg<70>ver"
+msgstr "Tal p<> tekstar:"
 
 #: sysdeps/names/loadavg.c:49
+#, fuzzy
 msgid "Total number of tasks"
-msgstr "Totalt tal p<> oppg<70>ver"
+msgstr "Tal p<> element i alt"
 
 #: sysdeps/names/mem.c:41
+#, fuzzy
 msgid "Total Memory"
 msgstr "Totalt minne"
 
@@ -352,6 +378,7 @@ msgid "Free Memory"
 msgstr "Ledig minne"
 
 #: sysdeps/names/mem.c:44
+#, fuzzy
 msgid "Shared Memory"
 msgstr "Delt minne"
 
@@ -364,52 +391,61 @@ msgid "Cached"
 msgstr "Sn<53>gglagra"
 
 #: sysdeps/names/mem.c:48
+#, fuzzy
 msgid "Locked"
 msgstr "L<>s"
 
 #: sysdeps/names/mem.c:53
+#, fuzzy
 msgid "Total physical memory in kB"
-msgstr "Totalt fysisk minne i kB"
+msgstr "Totalt fysisk minne"
 
 #: sysdeps/names/mem.c:54
+#, fuzzy
 msgid "Used memory size in kB"
-msgstr "Brukt minne kB"
+msgstr "Brukt minne"
 
 #: sysdeps/names/mem.c:55
+#, fuzzy
 msgid "Free memory size in kB"
-msgstr "Ledig minne i kB"
+msgstr "Ledig minne"
 
 #: sysdeps/names/mem.c:56
+#, fuzzy
 msgid "Shared memory size in kB"
-msgstr "Delt minne i kB"
+msgstr "Delt minne i kilobyte"
 
 #: sysdeps/names/mem.c:57
+#, fuzzy
 msgid "Size of buffers kB"
-msgstr "Storleik p<> buffer kB"
+msgstr "Skjema-&storleik"
 
 #: sysdeps/names/mem.c:58
+#, fuzzy
 msgid "Size of cached memory in kB"
-msgstr "Storleik p<> mellomlagra minne i kilobyte"
+msgstr "Delt minne i kilobyte"
 
 #: sysdeps/names/mem.c:59
 msgid "Memory used from user processes in kB"
-msgstr "Minne brukt av brukarprosessar i kB"
+msgstr ""
 
 #: sysdeps/names/mem.c:60
 msgid "Memory in locked pages in kB"
-msgstr "Minne i l<>ste sider i kB"
+msgstr ""
 
 #: sysdeps/names/mountlist.c:38 sysdeps/names/mountlist.c:45
 #: sysdeps/names/proclist.c:38 sysdeps/names/proclist.c:45
 #: sysdeps/names/procmap.c:38 sysdeps/names/procmap.c:45
+#, fuzzy
 msgid "Number of list elements"
-msgstr "Tal p<> listeelement"
+msgstr "Tal p<> element i alt"
 
 #: sysdeps/names/mountlist.c:39 sysdeps/names/mountlist.c:46
 #: sysdeps/names/proclist.c:39 sysdeps/names/proclist.c:46
 #: sysdeps/names/procmap.c:39 sysdeps/names/procmap.c:46
+#, fuzzy
 msgid "Total size of list"
-msgstr "Total storleik p<EFBFBD> liste"
+msgstr "Total storleik er %1 byte"
 
 #: sysdeps/names/mountlist.c:40 sysdeps/names/mountlist.c:47
 #: sysdeps/names/proclist.c:40 sysdeps/names/proclist.c:47
@@ -427,8 +463,9 @@ msgid "Number of entries in message map"
 msgstr "Tal p<> filer i bruk:"
 
 #: sysdeps/names/msg_limits.c:42 sysdeps/names/msg_limits.c:53
+#, fuzzy
 msgid "Max size of message"
-msgstr "Maks storleik p<> melding"
+msgstr "storleik p<> vertsnamn"
 
 #: sysdeps/names/msg_limits.c:43 sysdeps/names/msg_limits.c:54
 #, fuzzy
@@ -450,12 +487,13 @@ msgid "Number of system message headers"
 msgstr "Tal p<> programtekstar: %1\n"
 
 #: sysdeps/names/netload.c:45 sysdeps/names/netload.c:63
+#, fuzzy
 msgid "Interface Flags"
-msgstr "Grensesnittflagg"
+msgstr "Avbrot"
 
 #: sysdeps/names/netload.c:46
 msgid "MTU"
-msgstr "MTU"
+msgstr ""
 
 #: sysdeps/names/netload.c:47 sysdeps/names/netload.c:65
 #, fuzzy
@@ -467,22 +505,27 @@ msgid "Address"
 msgstr "Adresse"
 
 #: sysdeps/names/netload.c:49 sysdeps/names/netload.c:67
+#, fuzzy
 msgid "Packets In"
-msgstr "Pakkar inn"
+msgstr "pakkar inn"
 
 #: sysdeps/names/netload.c:50 sysdeps/names/netload.c:68
+#, fuzzy
 msgid "Packets Out"
-msgstr "Pakkar ut"
+msgstr "pakkar ut"
 
 #: sysdeps/names/netload.c:51 sysdeps/names/netload.c:69
+#, fuzzy
 msgid "Packets Total"
-msgstr "Totale pakkar"
+msgstr "pakkar ut"
 
 #: sysdeps/names/netload.c:52 sysdeps/names/netload.c:70
+#, fuzzy
 msgid "Bytes In"
 msgstr "Byte inn"
 
 #: sysdeps/names/netload.c:53 sysdeps/names/netload.c:71
+#, fuzzy
 msgid "Bytes Out"
 msgstr "Byte ut"
 
@@ -789,8 +832,9 @@ msgid "Signal"
 msgstr "Signal"
 
 #: sysdeps/names/procsignal.c:40
+#, fuzzy
 msgid "Blocked"
-msgstr "Blokkert"
+msgstr "Blokk"
 
 #: sysdeps/names/procsignal.c:40
 #, fuzzy
@@ -824,9 +868,8 @@ msgid "Cmd"
 msgstr "LC-modus"
 
 #: sysdeps/names/procstate.c:40
-#, fuzzy
 msgid "State"
-msgstr "Tilstand"
+msgstr "Stat"
 
 #: sysdeps/names/procstate.c:40
 msgid "UID"
@@ -944,8 +987,9 @@ msgid ""
 msgstr ""
 
 #: sysdeps/names/proctime.c:60
+#, fuzzy
 msgid "Tick frequency"
-msgstr "Tikkfrekvens"
+msgstr "Klokkefrekvens"
 
 #: sysdeps/names/proctime.c:61
 msgid "SMP user-mode CPU time accumulated by process"
@@ -956,44 +1000,53 @@ msgid "SMP kernel-mode CPU time accumulated by process"
 msgstr ""
 
 #: sysdeps/names/procuid.c:56
+#, fuzzy
 msgid "Uid"
-msgstr "Uid"
+msgstr "Brukar-id"
 
 #: sysdeps/names/procuid.c:56
+#, fuzzy
 msgid "EUid"
-msgstr "EUid"
+msgstr "Avslutta"
 
 #: sysdeps/names/procuid.c:56
+#, fuzzy
 msgid "Gid"
-msgstr "Gid"
+msgstr "Ingen rutenett"
 
 #: sysdeps/names/procuid.c:56
+#, fuzzy
 msgid "EGid"
-msgstr "EGid"
+msgstr "Avslutta"
 
 #: sysdeps/names/procuid.c:56
+#, fuzzy
 msgid "Pid"
-msgstr "Pid"
+msgstr "Pod"
 
 #: sysdeps/names/procuid.c:57
+#, fuzzy
 msgid "PPid"
-msgstr "PPid"
+msgstr "Punktum"
 
 #: sysdeps/names/procuid.c:57
+#, fuzzy
 msgid "PGrp"
-msgstr "PGrp"
+msgstr "Grep"
 
 #: sysdeps/names/procuid.c:57
 msgid "Session"
 msgstr "<22>kt"
 
 #: sysdeps/names/procuid.c:57
+#, fuzzy
 msgid "Tty"
-msgstr "Tty"
+msgstr "Txt"
 
 #: sysdeps/names/procuid.c:58
+#, fuzzy
 msgid "TPGid"
-msgstr "TPGid"
+msgstr "Til rutenett"
 
 #: sysdeps/names/procuid.c:58
 msgid "Priority"
@@ -1009,8 +1062,9 @@ msgid "Effective User ID"
 msgstr "Effektiv rente"
 
 #: sysdeps/names/procuid.c:65
+#, fuzzy
 msgid "Group ID"
-msgstr "Gruppe-ID"
+msgstr " Gruppe "
 
 #: sysdeps/names/procuid.c:66
 #, fuzzy
@@ -1121,22 +1175,27 @@ msgid "Max total shared memory"
 msgstr "Totalt veksleminne"
 
 #: sysdeps/names/swap.c:39 sysdeps/names/swap.c:48
+#, fuzzy
 msgid "Total Swap Space"
 msgstr "Totalt veksleminne"
 
 #: sysdeps/names/swap.c:40 sysdeps/names/swap.c:49
+#, fuzzy
 msgid "Used Swap Space"
-msgstr "Brukt veksleminne"
+msgstr "Bruk midi-mapper"
 
 #: sysdeps/names/swap.c:41 sysdeps/names/swap.c:50
+#, fuzzy
 msgid "Free Swap Space"
 msgstr "Ledig veksleminne"
 
 #: sysdeps/names/swap.c:42
+#, fuzzy
 msgid "Page In"
 msgstr "Sider inn"
 
 #: sysdeps/names/swap.c:43
+#, fuzzy
 msgid "Page Out"
 msgstr "Sider ut"
 
@@ -1154,24 +1213,29 @@ msgid "Server Features"
 msgstr "Tenarnamn"
 
 #: sysdeps/names/sysdeps.c:50 sysdeps/names/sysdeps.c:77
+#, fuzzy
 msgid "CPU Usage"
-msgstr "CPU bruk"
+msgstr "Bruk"
 
 #: sysdeps/names/sysdeps.c:51 sysdeps/names/sysdeps.c:78
+#, fuzzy
 msgid "Memory Usage"
-msgstr "Minnebruk"
+msgstr "Minneomr<EFBFBD>de"
 
 #: sysdeps/names/sysdeps.c:52 sysdeps/names/sysdeps.c:79
+#, fuzzy
 msgid "Swap Usage"
-msgstr "Veksleminnebruk"
+msgstr "Bruk"
 
 #: sysdeps/names/sysdeps.c:53 sysdeps/names/sysdeps.c:80
+#, fuzzy
 msgid "System Uptime"
-msgstr "Oppetid for systemet"
+msgstr "Set systemdato/-tid"
 
 #: sysdeps/names/sysdeps.c:54 sysdeps/names/sysdeps.c:81
+#, fuzzy
 msgid "Load Averange"
-msgstr "Snittlast"
+msgstr "Snittlast (1 min)"
 
 #: sysdeps/names/sysdeps.c:55 sysdeps/names/sysdeps.c:82
 #, fuzzy
@@ -1228,32 +1292,39 @@ msgid "Process Segment information"
 msgstr "Dokumentinformasjon"
 
 #: sysdeps/names/sysdeps.c:66
+#, fuzzy
 msgid "Process Arguments"
-msgstr "Prosessargument"
+msgstr "Prosessoppteljing"
 
 #: sysdeps/names/sysdeps.c:67 sysdeps/names/sysdeps.c:94
+#, fuzzy
 msgid "Process Memory Map"
-msgstr "Prosessminnekart"
+msgstr "Prosessor"
 
 #: sysdeps/names/sysdeps.c:68
+#, fuzzy
 msgid "Mount List"
-msgstr "Monteringsliste"
+msgstr "Liste over skrifttypar"
 
 #: sysdeps/names/sysdeps.c:69 sysdeps/names/sysdeps.c:96
+#, fuzzy
 msgid "File System Usage"
-msgstr "Filsystembruk"
+msgstr "Filsystemtype:"
 
 #: sysdeps/names/sysdeps.c:70 sysdeps/names/sysdeps.c:97
+#, fuzzy
 msgid "Network Load"
-msgstr "Nettverkslast"
+msgstr "Leit p<> nettverket"
 
 #: sysdeps/names/sysdeps.c:71 sysdeps/names/sysdeps.c:98
+#, fuzzy
 msgid "PPP Statistics"
-msgstr "PPP statistikk"
+msgstr "Statistikk"
 
 #: sysdeps/names/sysdeps.c:93
+#, fuzzy
 msgid "Command line arguments of the process"
-msgstr "Kommandolinjeargumenta til prosessen"
+msgstr "Kommandolinja som starta prosessen"
 
 #: sysdeps/names/sysdeps.c:95
 #, fuzzy
@@ -1261,16 +1332,18 @@ msgid "List of currently mounted filesystems"
 msgstr "S<>k i monterte filsystem"
 
 #: sysdeps/names/uptime.c:38
+#, fuzzy
 msgid "Uptime"
-msgstr "Oppetid"
+msgstr "Tid"
 
 #: sysdeps/names/uptime.c:39
+#, fuzzy
 msgid "Idletime"
 msgstr "Inaktiv-tid"
 
 #: sysdeps/names/uptime.c:44
 msgid "Time in seconds since system boot"
-msgstr "Tid i sekund sidan system-oppstart"
+msgstr ""
 
 #: sysdeps/names/uptime.c:45
 msgid "Time in seconds the system spent in the idle task since system boot"
@@ -1289,8 +1362,9 @@ msgid "Quit"
 msgstr "Avslutt"
 
 #: sysdeps/osf1/siglist.c:31 sysdeps/sun4/siglist.c:31
+#, fuzzy
 msgid "Illegal instruction"
-msgstr "Ulovleg instruksjon."
+msgstr "Comment=Ulovleg instruksjon."
 
 #: sysdeps/osf1/siglist.c:32 sysdeps/sun4/siglist.c:32
 #, fuzzy
@@ -1316,8 +1390,9 @@ msgid "Kill"
 msgstr "Drep"
 
 #: sysdeps/osf1/siglist.c:37 sysdeps/sun4/siglist.c:37
+#, fuzzy
 msgid "Bus error"
-msgstr "Bussfeil"
+msgstr "Vertsfeil"
 
 #: sysdeps/osf1/siglist.c:38 sysdeps/sun4/siglist.c:38
 #, fuzzy
@@ -1329,16 +1404,19 @@ msgid "Bad argument to system call"
 msgstr ""
 
 #: sysdeps/osf1/siglist.c:40 sysdeps/sun4/siglist.c:40
+#, fuzzy
 msgid "Broken pipe"
-msgstr "Brote r<>yr"
+msgstr "Broten"
 
 #: sysdeps/osf1/siglist.c:41 sysdeps/sun4/siglist.c:41
+#, fuzzy
 msgid "Alarm clock"
-msgstr "Alarmklokke"
+msgstr "Kolonnar:"
 
 #: sysdeps/osf1/siglist.c:42 sysdeps/sun4/siglist.c:42
+#, fuzzy
 msgid "Termination"
-msgstr "Avlustting"
+msgstr "Terminalval"
 
 #: sysdeps/osf1/siglist.c:43 sysdeps/sun4/siglist.c:43
 msgid "Urgent condition on socket"
@@ -1359,7 +1437,7 @@ msgstr "Fortset"
 
 #: sysdeps/osf1/siglist.c:47 sysdeps/sun4/siglist.c:47
 msgid "Child status has changed"
-msgstr "Status p<> born er endra"
+msgstr ""
 
 #: sysdeps/osf1/siglist.c:48 sysdeps/sun4/siglist.c:48
 #, fuzzy
@@ -1372,8 +1450,9 @@ msgid "Background write to tty"
 msgstr "Bakgrunn:"
 
 #: sysdeps/osf1/siglist.c:50 sysdeps/sun4/siglist.c:50
+#, fuzzy
 msgid "I/O now possible"
-msgstr "I/O no mogleg"
+msgstr "Kan ikkje angra"
 
 #: sysdeps/osf1/siglist.c:51 sysdeps/sun4/siglist.c:51
 #, fuzzy
@@ -1390,16 +1469,18 @@ msgstr ""
 "G<>tt over <20>vre grense!"
 
 #: sysdeps/osf1/siglist.c:53 sysdeps/sun4/siglist.c:53
+#, fuzzy
 msgid "Virtual alarm clock"
-msgstr "Virtuel alarmklokke"
+msgstr "Virtuelt teikn "
 
 #: sysdeps/osf1/siglist.c:54 sysdeps/sun4/siglist.c:54
 msgid "Profiling alarm clock"
 msgstr ""
 
 #: sysdeps/osf1/siglist.c:55 sysdeps/sun4/siglist.c:55
+#, fuzzy
 msgid "Window size change"
-msgstr "Endring i vindaugsstorleik"
+msgstr "Rull opp vindauge"
 
 #: sysdeps/osf1/siglist.c:56 sysdeps/sun4/siglist.c:56
 #, fuzzy
@@ -1407,9 +1488,11 @@ msgid "Information request"
 msgstr "Krev stadfesting"
 
 #: sysdeps/osf1/siglist.c:57 sysdeps/sun4/siglist.c:57
+#, fuzzy
 msgid "User defined signal 1"
-msgstr "Eigendefinert 1"
+msgstr "Eigendefinert 1:"
 
 #: sysdeps/osf1/siglist.c:58 sysdeps/sun4/siglist.c:58
+#, fuzzy
 msgid "User defined signal 2"
-msgstr "Eigendefinert 2"
+msgstr "Eigendefinert 2:"

po/stamp-cat-id

@@ -1 +0,0 @@
-timestamp

po/zh_TW.po

@@ -1,12 +1,12 @@
 # Traditional chinese translation for libgtop.
-# Copyright (C) 2001-2002 Free Software Foundation, Inc.
-# Abel Cheung <maddog@linux.org.hk>, 2001-2002.
+# Copyright (C) 2001 Free Software Foundation, Inc.
+# Abel Cheung <maddog@linux.org.hk>, 2001.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: libgtop 1.0.13\n"
-"POT-Creation-Date: 2002-02-07 00:51+0800\n"
-"PO-Revision-Date: 2002-02-09 00:59+0800\n"
+"Project-Id-Version: libgtop 1.1.6\n"
+"POT-Creation-Date: 2001-09-16 07:15+0800\n"
+"PO-Revision-Date: 2001-09-11 02:39+0800\n"
 "Last-Translator: Abel Cheung <maddog@linux.org.hk>\n"
 "Language-Team: Traditional Chinese <zh-l10n@linux.org.tw>\n"
 "MIME-Version: 1.0\n"
@@ -449,7 +449,7 @@ msgstr "
 
 #: sysdeps/names/netload.c:45 sysdeps/names/netload.c:63
 msgid "Interface Flags"
-msgstr "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>X<EFBFBD><EFBFBD>"
+msgstr ""
 
 #: sysdeps/names/netload.c:46
 msgid "MTU"
@@ -685,19 +685,19 @@ msgstr ""
 
 #: sysdeps/names/procsegment.c:42
 msgid "Text_RSS"
-msgstr "Text_RSS"
+msgstr ""
 
 #: sysdeps/names/procsegment.c:42
 msgid "ShLib_RSS"
-msgstr "ShLib_RSS"
+msgstr ""
 
 #: sysdeps/names/procsegment.c:42
 msgid "Data_RSS"
-msgstr "Data_RSS"
+msgstr ""
 
 #: sysdeps/names/procsegment.c:42
 msgid "Stack_RSS"
-msgstr "Stack_RSS"
+msgstr ""
 
 #: sysdeps/names/procsegment.c:43
 msgid "Dirty Size"
@@ -705,15 +705,15 @@ msgstr ""
 
 #: sysdeps/names/procsegment.c:43
 msgid "Start_Code"
-msgstr "Start_Code"
+msgstr ""
 
 #: sysdeps/names/procsegment.c:43
 msgid "End_Code"
-msgstr "End_Code"
+msgstr ""
 
 #: sysdeps/names/procsegment.c:43
 msgid "Start_Stack"
-msgstr "Start_Stack"
+msgstr ""
 
 #: sysdeps/names/procsegment.c:48
 msgid "Text resident set size"
@@ -813,7 +813,7 @@ msgstr "
 
 #: sysdeps/names/proctime.c:44
 msgid "Start_Time"
-msgstr "Start_Time"
+msgstr ""
 
 #: sysdeps/names/proctime.c:44
 msgid "RTime"
@@ -837,11 +837,11 @@ msgstr "CSTime"
 
 #: sysdeps/names/proctime.c:45
 msgid "TimeOut"
-msgstr "TimeOut"
+msgstr ""
 
 #: sysdeps/names/proctime.c:45
 msgid "It_Real_Value"
-msgstr "It_Real_Value"
+msgstr ""
 
 #: sysdeps/names/proctime.c:46
 msgid "Frequency"
@@ -987,7 +987,7 @@ msgstr ""
 
 #: sysdeps/names/procuid.c:73
 msgid "Kernel scheduling priority"
-msgstr "<EFBFBD>֤߱Ƶ{<7B><><EFBFBD>u<EFBFBD><75><EFBFBD><EFBFBD>"
+msgstr ""
 
 #: sysdeps/names/procuid.c:74
 msgid "Standard unix nice level of process"
@@ -1035,11 +1035,11 @@ msgstr ""
 
 #: sysdeps/names/shm_limits.c:39 sysdeps/names/shm_limits.c:48
 msgid "Max segment size"
-msgstr "<22>̤j<EFBFBD>Ϭq<EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+msgstr "<22>Ϭq<CFAC>̤j<EFBFBD><EFBFBD>"
 
 #: sysdeps/names/shm_limits.c:40 sysdeps/names/shm_limits.c:49
 msgid "Min segment size"
-msgstr "<22>̤p<EFBFBD>Ϭq<EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+msgstr "<22>Ϭq<CFAC>̤p<EFBFBD><EFBFBD>"
 
 #: sysdeps/names/shm_limits.c:41 sysdeps/names/shm_limits.c:50
 msgid "Max number of segments"
@@ -1147,7 +1147,7 @@ msgstr ""
 
 #: sysdeps/names/sysdeps.c:65 sysdeps/names/sysdeps.c:92
 msgid "Process Segment information"
-msgstr "<EFBFBD>{<7B>ǰϬq<CFAC><71><EFBFBD>T"
+msgstr ""
 
 #: sysdeps/names/sysdeps.c:66
 msgid "Process Arguments"
@@ -1159,7 +1159,7 @@ msgstr ""
 
 #: sysdeps/names/sysdeps.c:68
 msgid "Mount List"
-msgstr "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>C<EFBFBD><EFBFBD>"
+msgstr ""
 
 #: sysdeps/names/sysdeps.c:69 sysdeps/names/sysdeps.c:96
 msgid "File System Usage"

src/daemon/.cvsignore

@@ -1,7 +1,7 @@
 Makefile.in
 Makefile
-libgtop_daemon
-libgtop_server
+libgtop_daemon2
+libgtop_server2
 server.conf
 .libs
 .deps

src/daemon/ChangeLog

@@ -1,12 +1,3 @@
-2003-05-11  Andrew Sobala  <aes@gnome.org>
-
-	* gnuserv.c: (permitted): fix buffer overflow vulnerability
-
-2001-11-26  Kevin Vandersloot <kfv101@psu.edu>
-
-	* gnuserv.c: Apply patch fixing security issue from
-	intexxia labs - #1048-261101
-
 2001-02-14  Martin Baulig  <baulig@suse.de>
 
 	* Makefile.am (libgtop_server_LDADD): Removed @LIBSUPPORT@.

src/daemon/Makefile.am

@@ -14,43 +14,43 @@
 
 LINK				= $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
 
-INCLUDES			= @INCLUDES@ -D_BSD \
+INCLUDES			= $(LIBGTOP_CFLAGS) @INCLUDES@ -D_BSD \
 				  -DLIBGTOP_COMPILE_SYSTEM=\"`uname -s`\" \
 				  -DLIBGTOP_COMPILE_RELEASE=\"`uname -r`\" \
 				  -DLIBGTOP_COMPILE_MACHINE=\"`uname -m`\"
 
 if NEED_LIBGTOP
-suid_sysdeps			= $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps_suid.la
-suid_common			= $(top_builddir)/sysdeps/common/libgtop_suid_common.la
+suid_sysdeps			= $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps_suid-2.0.la
+suid_common			= $(top_builddir)/sysdeps/common/libgtop_suid_common-2.0.la
 else
 suid_sysdeps			=
 suid_common			=
 endif
 
-bin_PROGRAMS			= libgtop_daemon @server_programs@
+bin_PROGRAMS			= libgtop_daemon2 @server_programs@
 
-EXTRA_PROGRAMS			= libgtop_server
+EXTRA_PROGRAMS			= libgtop_server2
 
-libgtop_daemon_SOURCES		= gnuserv.c slave.c main.c io.c version.c \
+libgtop_daemon2_SOURCES		= gnuserv.c slave.c main.c io.c version.c \
 				  daemon.h server_config.h
-libgtop_daemon_LDADD		= $(top_builddir)/lib/libgtop.la \
-				  $(top_builddir)/sysdeps/common/libgtop_common.la \
-				  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps.la \
+libgtop_daemon2_LDADD		= $(top_builddir)/lib/libgtop-2.0.la \
+				  $(top_builddir)/sysdeps/common/libgtop_common-2.0.la \
+				  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la \
 				  @sysdeps_suid_lib@ \
 				  $(suid_sysdeps) $(suid_common)\
-				  $(GLIB_LIBS)\
+				  $(LIBGTOP_LIBS)\
 				  @LIBSUPPORT@ @INTLLIBS@ @libs_xauth@
 
 if ENABLE_STATIC
-libgtop_daemon_LDFLAGS		= -static
+libgtop_daemon2_LDFLAGS		= -static
 endif
 
-libgtop_server_SOURCES		= server.c slave.c io.c version.c daemon.h
-libgtop_server_LDADD		= $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps_suid.la \
-				  $(top_builddir)/sysdeps/common/libgtop_suid_common.la
+libgtop_server2_SOURCES		= server.c slave.c io.c version.c daemon.h
+libgtop_server2_LDADD		= $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps_suid-2.0.la \
+				  $(top_builddir)/sysdeps/common/libgtop_suid_common-2.0.la
 
 if ENABLE_STATIC
-libgtop_server_LDFLAGS		= -static
+libgtop_server2_LDFLAGS		= -static
 endif
 
 EXTRA_DIST			= server_config.h.in server_config.pl

src/daemon/gnuserv.c

@@ -200,11 +200,6 @@ permitted (u_long host_addr, int fd)
 
 	auth_data_len = atoi (buf);
 
-	if (auth_data_len < 1 || auth_data_len > sizeof(buf)) {
-	    syslog_message(LOG_WARNING, "Invalid data length supplied by client");
-	    return FALSE;
-	}
-
 	if (timed_read (fd, buf, auth_data_len, AUTH_TIMEOUT, 0) != auth_data_len)
 	    return FALSE;
 

src/inodedb/Makefile.am

@@ -1,15 +1,15 @@
-bin_PROGRAMS		= mkinodedb file_by_inode
+bin_PROGRAMS		= mkinodedb2 file_by_inode2
 
 INCLUDES		= @INCLUDES@
 
-mkinodedb_LDADD		= $(top_builddir)/lib/libgtop.la \
-			  $(top_builddir)/sysdeps/common/libgtop_common.la \
-			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps.la \
+mkinodedb2_LDADD		= $(top_builddir)/lib/libgtop-2.0.la \
+			  $(top_builddir)/sysdeps/common/libgtop_common-2.0.la \
+			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la \
 			  @LIBSUPPORT@ @INTLLIBS@
 
-file_by_inode_LDADD	= $(top_builddir)/lib/libgtop.la \
-			  $(top_builddir)/sysdeps/common/libgtop_common.la \
-			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps.la \
+file_by_inode2_LDADD	= $(top_builddir)/lib/libgtop-2.0.la \
+			  $(top_builddir)/sysdeps/common/libgtop_common-2.0.la \
+			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la \
 			  @LIBSUPPORT@ @INTLLIBS@
 
 EXTRA_DIST		= README.inodedb

sysdeps/Makefile.am

@@ -1,8 +1,8 @@
-if GUILE
-guile_SUBDIRS		= guile
-else
+## if GUILE
+## guile_SUBDIRS		= guile
+## else
 guile_SUBDIRS		=
-endif
+## endif
 
 SUBDIRS			= @sysdeps_dir@ common names $(guile_SUBDIRS)
 

sysdeps/common/Makefile.am

@@ -12,17 +12,17 @@ endif
 
 CFLAGS				= @CFLAGS@ $(inodedb_DEFS)
 
-lib_LTLIBRARIES			= libgtop_common.la libgtop_suid_common.la
+lib_LTLIBRARIES			= libgtop_common-2.0.la libgtop_suid_common-2.0.la
 
-libgtop_common_la_SOURCES	= xmalloc.c error.c gnuslib.c \
+libgtop_common_2_0_la_SOURCES	= xmalloc.c error.c gnuslib.c \
 				  fsusage.c fsusage.h mountlist.c mountlist.h \
 				  $(inodedb_SRCLIST)
 
-libgtop_common_la_LDFLAGS	= $(LT_VERSION_INFO)
-libgtop_common_la_LIBADD	= $(LIBGTOP_EXTRA_LIBS)
+libgtop_common_2_0_la_LDFLAGS	= $(LT_VERSION_INFO)
+libgtop_common_2_0_la_LIBADD	= $(LIBGTOP_EXTRA_LIBS)
 
-libgtop_suid_common_la_SOURCES	= xmalloc.c error.c sysdeps_suid.c
+libgtop_suid_common_2_0_la_SOURCES	= xmalloc.c error.c sysdeps_suid.c
 
-libgtop_suid_common_la_LDFLAGS	= $(LT_VERSION_INFO)
+libgtop_suid_common_2_0_la_LDFLAGS	= $(LT_VERSION_INFO)
 
 EXTRA_DIST			= inodedb.c

sysdeps/freebsd/Makefile.am

@@ -2,22 +2,22 @@ LINK				= $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
 
 INCLUDES			= @INCLUDES@
 
-lib_LTLIBRARIES			= libgtop_sysdeps.la libgtop_sysdeps_suid.la
+lib_LTLIBRARIES			= libgtop_sysdeps-2.0.la libgtop_sysdeps_suid-2.0.la
 
-libgtop_sysdeps_la_SOURCES	= nosuid.c siglist.c
+libgtop_sysdeps_2_0_la_SOURCES	= nosuid.c siglist.c
 
-libgtop_sysdeps_la_LDFLAGS	= $(LT_VERSION_INFO)
+libgtop_sysdeps_2_0_la_LDFLAGS	= $(LT_VERSION_INFO)
 
-libgtop_sysdeps_suid_la_SOURCES	= open.c close.c siglist.c cpu.c mem.c swap.c \
+libgtop_sysdeps_suid_2_0_la_SOURCES	= open.c close.c siglist.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
 
-libgtop_sysdeps_suid_la_LDFLAGS	= $(LT_VERSION_INFO)
+libgtop_sysdeps_suid_2_0_la_LDFLAGS	= $(LT_VERSION_INFO)
 
 libgtopinclude_HEADERS		= glibtop_server.h glibtop_machine.h \
 				  glibtop_suid.h
 
-libgtopincludedir		= $(includedir)/libgtop-1.0
+libgtopincludedir		= $(includedir)/libgtop-2.0

sysdeps/guile/Makefile.am

@@ -6,11 +6,11 @@ INCLUDES			= @INCLUDES@
 
 BUILT_SOURCES			= guile.c guile.x
 
-lib_LTLIBRARIES			= libgtop_guile.la
+lib_LTLIBRARIES			= libgtop_guile-2.0.la
 
-libgtop_guile_la_SOURCES	= $(BUILT_SOURCES)
+libgtop_guile_2_0_la_SOURCES	= $(BUILT_SOURCES)
 
-libgtop_guile_la_LDFLAGS	= $(LT_VERSION_INFO)
+libgtop_guile_2_0_la_LDFLAGS	= $(LT_VERSION_INFO)
 
 Makefile: $(BUILT_SOURCES)
 
@@ -19,7 +19,7 @@ guile.c: guile.pl $(top_builddir)/config.h $(top_srcdir)/features.def
 	mv gnc-t guile.c
 
 guile.x: guile.c
-	guile-snarf $< $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) > $@
+	guile-snarf $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $< > $@
 
 EXTRA_DIST			= guile.pl
 

sysdeps/guile/names/Makefile.am

@@ -2,13 +2,13 @@ LINK				= $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
 
 INCLUDES			= @INCLUDES@
 
-lib_LTLIBRARIES			= libgtop_guile_names.la
+lib_LTLIBRARIES			= libgtop_guile_names-2.0.la
 
 BUILT_SOURCES			= guile-names.c guile-names.x
 
-libgtop_guile_names_la_SOURCES	= $(BUILT_SOURCES)
+libgtop_guile_names_2_0_la_SOURCES	= $(BUILT_SOURCES)
 
-libgtop_guile_names_la_LDFLAGS	= $(LT_VERSION_INFO)
+libgtop_guile_names_2_0_la_LDFLAGS	= $(LT_VERSION_INFO)
 
 Makefile: $(BUILT_SOURCES)
 
@@ -17,7 +17,7 @@ guile-names.c: guile-names.pl $(top_builddir)/config.h $(top_srcdir)/features.de
 	mv gnc-t guile-names.c
 
 guile-names.x: guile-names.c
-	guile-snarf $< $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) > $@
+	guile-snarf $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $< > $@
 
 EXTRA_DIST			= guile-names.pl
 

sysdeps/kernel/Makefile.am

@@ -2,19 +2,19 @@ LINK				= $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
 
 INCLUDES			= @INCLUDES@
 
-lib_LTLIBRARIES			= libgtop_sysdeps.la
+lib_LTLIBRARIES			= libgtop_sysdeps-2.0.la
 
-libgtop_sysdeps_la_SOURCES	= open.c close.c kernel.s cpu.c mem.c swap.c \
+libgtop_sysdeps_2_0_la_SOURCES	= open.c close.c kernel.s 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 siglist.c procargs.c procmap.c \
 				  netload.c ppp.c
 
-libgtop_sysdeps_la_LDFLAGS	= $(LT_VERSION_INFO)
+libgtop_sysdeps_2_0_la_LDFLAGS	= $(LT_VERSION_INFO)
 
 libgtopinclude_HEADERS		= glibtop_server.h
-libgtopincludedir		= $(includedir)/libgtop-1.0
+libgtopincludedir		= $(includedir)/libgtop-2.0
 
 noinst_HEADERS			= kernel.h
 

sysdeps/linux/Makefile.am

@@ -2,17 +2,17 @@ LINK				= $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
 
 INCLUDES			= @INCLUDES@
 
-lib_LTLIBRARIES			= libgtop_sysdeps.la
+lib_LTLIBRARIES			= libgtop_sysdeps-2.0.la
 
-libgtop_sysdeps_la_SOURCES	= open.c close.c cpu.c mem.c swap.c \
+libgtop_sysdeps_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 siglist.c \
 				  sysinfo.c netload.c ppp.c
-libgtop_sysdeps_la_LIBADD	= @GLIB_LIBS@
+libgtop_sysdeps_2_0_la_LIBADD	=  @GLIB_LIBS@
 
-libgtop_sysdeps_la_LDFLAGS	= $(LT_VERSION_INFO)
+libgtop_sysdeps_2_0_la_LDFLAGS	= $(LT_VERSION_INFO)
 
 libgtopinclude_HEADERS		= glibtop_server.h glibtop_machine.h
-libgtopincludedir		= $(includedir)/libgtop-1.0
+libgtopincludedir		= $(includedir)/libgtop-2.0

sysdeps/names/Makefile.am

@@ -2,9 +2,9 @@ LINK				= $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
 
 INCLUDES			= @INCLUDES@
 
-lib_LTLIBRARIES			= libgtop_names.la
+lib_LTLIBRARIES			= libgtop_names-2.0.la
 
-libgtop_names_la_SOURCES	= cpu.c mem.c swap.c uptime.c loadavg.c \
+libgtop_names_2_0_la_SOURCES	= cpu.c mem.c swap.c uptime.c loadavg.c \
 				  shm_limits.c msg_limits.c sem_limits.c \
 				  proclist.c sysdeps.c procstate.c procuid.c \
 				  proctime.c procmem.c procsignal.c \
@@ -12,5 +12,5 @@ libgtop_names_la_SOURCES	= cpu.c mem.c swap.c uptime.c loadavg.c \
 				  mountlist.c procargs.c procmap.c netload.c \
 				  ppp.c
 
-libgtop_names_la_LDFLAGS	= $(LT_VERSION_INFO)
+libgtop_names_2_0_la_LDFLAGS	= $(LT_VERSION_INFO)
 

sysdeps/osf1/Makefile.am

@@ -2,22 +2,22 @@ LINK				= $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
 
 INCLUDES			= @INCLUDES@
 
-lib_LTLIBRARIES			= libgtop_sysdeps.la libgtop_sysdeps_suid.la
+lib_LTLIBRARIES			= libgtop_sysdeps-2.0.la libgtop_sysdeps_suid-2.0.la
 
-libgtop_sysdeps_la_SOURCES	= open.c close.c siglist.c cpu.c mem.c swap.c \
+libgtop_sysdeps_2_0_la_SOURCES	= open.c close.c siglist.c cpu.c mem.c swap.c \
 				  uptime.c loadavg.c shm_limits.c msg_limits.c \
 				  sem_limits.c ppp.c
-libgtop_sysdeps_la_LDFLAGS	= $(LT_VERSION_INFO)
-libgtop_sysdeps_la_LIBADD	= -lmach
+libgtop_sysdeps_2_0_la_LDFLAGS	= $(LT_VERSION_INFO)
+libgtop_sysdeps_2_0_la_LIBADD	= -lmach
 
-libgtop_sysdeps_suid_la_SOURCES	= open_suid.c close_suid.c proclist.c \
+libgtop_sysdeps_suid_2_0_la_SOURCES	= open_suid.c close_suid.c proclist.c \
 				  procstate.c procuid.c proctime.c procmem.c \
 				  procsignal.c prockernel.c procsegment.c \
 				  procmap.c procargs.c netload.c
-libgtop_sysdeps_suid_la_LDFLAGS	= $(LT_VERSION_INFO)
-libgtop_sysdeps_suid_la_LIBADD	= -lmach
+libgtop_sysdeps_suid_2_0_la_LDFLAGS	= $(LT_VERSION_INFO)
+libgtop_sysdeps_suid_2_0_la_LIBADD	= -lmach
 
 libgtopinclude_HEADERS		= glibtop_server.h glibtop_machine.h
-libgtopincludedir		= $(includedir)/libgtop-1.0
+libgtopincludedir		= $(includedir)/libgtop-2.0
 
 noinst_HEADERS			= glibtop_suid.h

sysdeps/solaris/Makefile.am

@@ -2,27 +2,27 @@ LINK				= $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
 
 INCLUDES			= @INCLUDES@
 
-lib_LTLIBRARIES			= libgtop_sysdeps.la libgtop_sysdeps_suid.la
+lib_LTLIBRARIES			= libgtop_sysdeps-2.0.la libgtop_sysdeps_suid-2.0.la
 
-libgtop_sysdeps_la_SOURCES	= open.c close.c siglist.c cpu.c mem.c \
+libgtop_sysdeps_2_0_la_SOURCES	= open.c close.c siglist.c cpu.c mem.c \
 				  safeio.c swap.c uptime.c loadavg.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 procdata.c
 
-libgtop_sysdeps_la_LDFLAGS	= $(LT_VERSION_INFO)
+libgtop_sysdeps_2_0_la_LDFLAGS	= $(LT_VERSION_INFO)
 
-libgtop_sysdeps_la_LIBADD	= @DL_LIB@
+libgtop_sysdeps_2_0_la_LIBADD	= @DL_LIB@
 
-libgtop_sysdeps_suid_la_SOURCES	= open_suid.c close_suid.c \
+libgtop_sysdeps_suid_2_0_la_SOURCES	= open_suid.c close_suid.c \
 				  shm_limits.c msg_limits.c sem_limits.c
 
-libgtop_sysdeps_suid_la_LDFLAGS	= $(LT_VERSION_INFO)
+libgtop_sysdeps_suid_2_0_la_LDFLAGS	= $(LT_VERSION_INFO)
 
 
 libgtopinclude_HEADERS		= glibtop_server.h glibtop_machine.h
-libgtopincludedir		= $(includedir)/libgtop-1.0
+libgtopincludedir		= $(includedir)/libgtop-2.0
 
 noinst_HEADERS			= glibtop_private.h glibtop_suid.h safeio.h
 

sysdeps/stub/Makefile.am

@@ -2,16 +2,16 @@ LINK				= $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
 
 INCLUDES			= @INCLUDES@
 
-lib_LTLIBRARIES			= libgtop_sysdeps.la
+lib_LTLIBRARIES			= libgtop_sysdeps-2.0.la
 
-libgtop_sysdeps_la_SOURCES	= open.c close.c siglist.c cpu.c mem.c swap.c \
+libgtop_sysdeps_2_0_la_SOURCES	= open.c close.c siglist.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
 
-libgtop_sysdeps_la_LDFLAGS	= $(LT_VERSION_INFO)
+libgtop_sysdeps_2_0_la_LDFLAGS	= $(LT_VERSION_INFO)
 
 libgtopinclude_HEADERS		= glibtop_server.h
-libgtopincludedir		= $(includedir)/libgtop-1.0
+libgtopincludedir		= $(includedir)/libgtop-2.0

sysdeps/stub_suid/Makefile.am

@@ -2,22 +2,22 @@ LINK				= $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
 
 INCLUDES			= @INCLUDES@
 
-lib_LTLIBRARIES			= libgtop_sysdeps.la libgtop_sysdeps_suid.la
+lib_LTLIBRARIES			= libgtop_sysdeps-2.0.la libgtop_sysdeps_suid-2.0.la
 
-libgtop_sysdeps_la_SOURCES	= nosuid.c siglist.c
+libgtop_sysdeps_2_0_la_SOURCES	= nosuid.c siglist.c
 
-libgtop_sysdeps_la_LDFLAGS	= $(LT_VERSION_INFO)
+libgtop_sysdeps_2_0_la_LDFLAGS	= $(LT_VERSION_INFO)
 
-libgtop_sysdeps_suid_la_SOURCES	= open.c close.c siglist.c cpu.c mem.c swap.c \
+libgtop_sysdeps_suid_2_0_la_SOURCES	= open.c close.c siglist.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
 
-libgtop_sysdeps_suid_la_LDFLAGS	= $(LT_VERSION_INFO)
+libgtop_sysdeps_suid_2_0_la_LDFLAGS	= $(LT_VERSION_INFO)
 
 libgtopinclude_HEADERS		= glibtop_server.h glibtop_machine.h
-libgtopincludedir		= $(includedir)/libgtop-1.0
+libgtopincludedir		= $(includedir)/libgtop-2.0
 
 noinst_HEADERS			= glibtop_suid.h

sysdeps/sun4/Makefile.am

@@ -2,21 +2,21 @@ LINK				= $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
 
 INCLUDES			= @INCLUDES@
 
-lib_LTLIBRARIES			= libgtop_sysdeps.la libgtop_sysdeps_suid.la
+lib_LTLIBRARIES			= libgtop_sysdeps-2.0.la libgtop_sysdeps_suid-2.0.la
 
-libgtop_sysdeps_la_SOURCES	= nosuid.c siglist.c
-libgtop_sysdeps_la_LDFLAGS	= $(LT_VERSION_INFO)
-libgtop_sysdeps_la_LIBADD	= -lkvm
+libgtop_sysdeps_2_0_la_SOURCES	= nosuid.c siglist.c
+libgtop_sysdeps_2_0_la_LDFLAGS	= $(LT_VERSION_INFO)
+libgtop_sysdeps_2_0_la_LIBADD	= -lkvm
 
-libgtop_sysdeps_suid_la_SOURCES	= open.c close.c cpu.c mem.c swap.c \
+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 ppp.c
-libgtop_sysdeps_suid_la_LDFLAGS	= $(LT_VERSION_INFO)
-libgtop_sysdeps_suid_la_LIBADD	= -lkvm
+libgtop_sysdeps_suid_2_0_la_LDFLAGS	= $(LT_VERSION_INFO)
+libgtop_sysdeps_suid_2_0_la_LIBADD	= -lkvm
 
 libgtopinclude_HEADERS		= glibtop_server.h glibtop_machine.h
-libgtopincludedir		= $(includedir)/libgtop-1.0
+libgtopincludedir		= $(includedir)/libgtop-2.0
 
 noinst_HEADERS			= glibtop_suid.h