Importing `stub' sysdeps code here.

1999-03-21  Martin Baulig  <martin@home-of-linux.org>

	Added a new sysctl () interface to the Linux Kernel.

	* kernel/sysctl: Imported.

	* libgtop-sysdeps.m4: If `--enable-hacker-mode' is given, check
	for my new sysctl () interface.

.cvsignore

@@ -32,5 +32,8 @@ ABOUT-NLS
 libgtop.spec
 libgtop-0.99.*.tar.gz
 libgtop-0.99.*
-*-debstamp
+install-sh
-libgtop-1.*.*.tar.gz
+mkinstalldirs
+missing
+INSTALL
+COPYING

AUTHORS

@@ -1,2 +1,2 @@
 Martin Baulig (martin@home-of-linux.org)
-Drazen Kacar (dave@srce.hr)
+Josh Sled <jsled@scam.XCF.Berkeley.EDU>

ChangeLog

@@ -1,231 +1,41 @@
-2003-05-11  Andrew Sobala  <aes@gnome.org>
+1999-03-21  Martin Baulig  <martin@home-of-linux.org>
 
-	* up version to 1.0.14
+	Added a new sysctl () interface to the Linux Kernel.
-
-2002-12-11  Stanislav Brabec  <sbrabec@suse.cz>
-
-	* sysdeps/guile/Makefile.am, sysdeps/guile/names/Makefile.am:
-	Changed order of arguments for guile-snarf - .c file must be first
-	(fixes bug #82684).
-
-2002-02-05  Abel Cheung  <maddog@linux.org.hk>
-
-	* configure.in (ALL_LINGUAS): zh_CN.GB2312 -> zh_CN
-
-2001-01-14  Hasbullah bin Pit <sebol@ikhlas.com>
-
-        * configure.in: Added ms in ALL_LINGUAS.
-        * po/ms.po: Added Malay Translation.
-
-2001-10-26  Kevin Vandersloot <kfv101@psu.edu>
-
-	* up version to 1.0.13
-
-2001-10-17  Abel Chueng  <maddog@linux.org.hk>
-
-	* configure.in, Makefile.am, include/glibtop/Makefile.am: headers
-	moved to $(includedir)/libgtop-1.0/glibtop.
-
-2001-09-16  Abel Chueng  <maddog@linux.org.hk>
-
-	* configure.in: Added "zh_TW" to ALL_LINGUAS.
-
-2001-02-13  Martin Baulig  <baulig@suse.de>
-
-	Released LibGTop 1.0.12 "Gerolzhofen".
-
-	* NEWS: Added news entry to 1.0.12.
-
-	* LIBGTOP-VERSION: Set version number to 1.0.12, binary age 11,
-	interface age 11.
-
-2001-02-19  Simos Xenitellis  <simos@hellug.gr>
-
-	* configure.in: Added "el" to ALL_LINGUAS.
-
-2001-02-15  Martin Baulig  <baulig@suse.de>
-
-	Released LibGTop 1.0.11 "Jasmin".
-
-	* NEWS: Added news entry for 1.0.11.
-
-2001-02-14  Martin Baulig  <baulig@suse.de>
-
-	Merged from LIBGTOP_1_1_2_PATCHES.
-
-	* libgtop-sysdeps.m4 (GLIBTOP_SOLARIS_RELEASE): Define this on Solaris;
-	we use version codes like 270 for SunOS 5.7 and 251 for SunOS 2.5.1.
-
-	* LIBGTOP-VERSION (LIBGTOP_VERSION_SUFFIX): Added this so you can
-	have your tarballs called `libgtop-1.x.y-snap.tar.gz' or whatever.
-	This only affects the `VERSION' variable and thus how the resulting
-	tarball will be called, but not `LIBGTOP_VERSION_CODE' etc.
-
-	* configure.in, acconfig.h: Added checks for <procfs.h>
-	and <sys/procfs.h>
-
-	* configure.in (DL_LIB): Check for dlopen() and AC_SUBST this.
-
-	* Makefile.am: Make `aclocal.m4' also depend on `LIBGTOP-VERSION'
-	when in maintainer-mode.
-
-2001-02-14  Martin Baulig  <baulig@suse.de>
-
-	* include/glibtop/limits.h: Removed; this file doesn't exist
-	in the stable branch.
-
-2001-02-13  Martin Baulig  <baulig@suse.de>
-
-	* LIBGTOP-VERSION: Set version number to 1.0.11, binary age 10,
-	interface age 10.
-
-2001-02-13  Stanislav Visnovsky  <visnovsky@nenya.ms.mff.cuni.cz>
-
-	* configure.in: Added sk to ALL_LINGUAS
-
-2001-02-08  Gustavo Maciel Dias Vieira  <gdvieira@zaz.com.br>
-
-	* configure.in (ALL_LINGUAS): Added pt_BR to ALL_LINGUAS.
-
-2000-11-21  Martin Baulig  <baulig@suse.de>
-
-	* libgtop-config.h.in: Added `--cflags', `--libs' and `--extra-libs'
-	parameters.
-
-2000-11-20  Martin Baulig  <baulig@suse.de>
-
-	Released LibGTop 1.0.10 "November Rain".
-
-	* LIBGTOP-VERSION: Set version number to 1.0.10, binary age 9,
-	interface age 9.
-
-2000-05-25  Martin Baulig  <baulig@suse.de>
-
-	Released LibGTop 1.0.9 "Stuttgart".
-
-	* LIBGTOP-VERSION: Set version number to 1.0.9 binary age 8,
-	interface age 8.
-
-	(LibGTop 1.0.8 "Frankfurt" was not publically released.)
-
-2000-02-20  Martin Baulig  <martin@home-of-linux.org>
-
-	* LIBGTOP-VERSION: Set version number to 1.0.8 binary age 7,
-	interface age 7.
-
-2000-02-15  Martin Baulig  <martin@home-of-linux.org>
-
-	Released LibGTop 1.0.7 "Copenhagen".
-
-1999-10-19  Martin Baulig  <martin@home-of-linux.org>
-
-	* LIBGTOP-VERSION: Set version number to 1.0.7 binary age 6,
-	interface age 6.
-
-1999-10-18  Martin Baulig  <martin@home-of-linux.org>
-
-	Released LibGTop 1.0.6 "October LibGTop".
-
-1999-10-18  Martin Baulig  <martin@home-of-linux.org>
-
-	* NEWS.old: Removed obsolete file.
-
-	* RELNOTES-1.0.x: Added release notes for LibGTop 1.0.6.
-
-	* TODO: Removed obsolete file.
-
-	* NEWS: We start maintaining a NEWS file now :)
-
-1999-10-16  Martin Baulig  <martin@home-of-linux.org>
-
-	* LIBGTOP-VERSION: Set version number to 1.0.6 binary age 5,
-	interface age 5.
-
-1999-10-09  Jesus Bravo Alvarez  <jba@pobox.com>
-
-	* configure.in (ALL_LINGUAS): Added Galician (gl)
-
-1999-09-29  Martin Baulig  <martin@home-of-linux.org>
-
-	Released LibGTop 1.0.5.
-
-1999-09-29  Martin Baulig  <martin@home-of-linux.org>
-
-	* configure.in (libgtop_top_builddir): AC_SUBST this.
-
-1999-09-24  Martin Baulig  <martin@home-of-linux.org>
-
-	* LIBGTOP-VERSION: Set version number to 1.0.5 binary age 4,
-	interface age 4.
-
-1999-09-24  Martin Baulig  <martin@home-of-linux.org>
-
-	Released LibGTop 1.0.4.
-
-1999-09-22  Kjartan Maraas  <kmaraas@online.no>
-
-	* configure.in: Added "da" to ALL_LINGUAS.
 	
-1999-09-19  Martin Baulig  <martin@home-of-linux.org>
+	* kernel/sysctl: Imported.
+	
+	* libgtop-sysdeps.m4: If `--enable-hacker-mode' is given, check
+	for my new sysctl () interface.
 
-	* libgtopConf.sh.in: Added MODULE_VERSION on Miguel's
+1999-03-20  Martin Baulig  <martin@home-of-linux.org>
-	request (set it to "libgtop-@LIBGTOP_VERSION@").
 
-1999-09-18  Pablo Saratxaga <pablo@mandrakesoft.com>
+	Removed all traces of my old table () Linux kernel hack.
 
-	* configure.in, po/*.po: merged *.po files from HEAD CVS
+	* kernel: Removed.
+	* sysdeps/kernel: Removed.
+	* libgtop-sysdeps.m4: Don't check for table (); it does not
+	exist any longer.
 
-1999-09-17  Martin Baulig  <martin@home-of-linux.org>
+1999-03-19  Martin Baulig  <martin@home-of-linux.org>
 
-	* configure.in: Make it work if we have GNOME and the user
+	This is *untested* - please read "sysdeps/freebsd/ChangeLog" !
-	gave use --without-gnome (fixes bug #1735).
 
-1999-09-17  Martin Baulig  <martin@home-of-linux.org>
+	* libgtop-sysdeps.m4: Use the `freebsd' sysdeps directory for
+	BSDI as well if the `--enable-hacker-mode' parameter was given.
 
-	* LIBGTOP-VERSION: Set version number to 1.0.4 binary age 3,
+1999-03-18  Martin Baulig  <martin@home-of-linux.org>
-	interface age 3.
 
-1999-09-16  Martin Baulig  <martin@home-of-linux.org>
+	* LIBGTOP-VERSION: Set version number to 1.0.2 binary age 1,
+	intergace age 1.
 
-	Merged everything since May 31 from HEAD and released
+1999-03-17  Martin Baulig  <martin@home-of-linux.org>
- 	LibGTop 1.0.3.
 
-1999-07-29  Martin Baulig  <martin@home-of-linux.org>
+	Imported first version of my Solaris port.
 
-	* include/glibtop/error.h: Use G_GNUC_UNUSED.
+	* configure.in: Check for `kstat_open' in `-lkstat'.
 
-	* configure.in (ENABLE_STATIC, ENABLE_SHARED): New automake
+	* libgtop-sysdeps.m4: Recognize the `solaris' sysdeps directory
-	conditionals.
+	when the `--enable-hacker-mode' parameter was given.
-
-1999-07-11  Tomas Ogren  <stric@ing.umu.se>
-
-	* configure.in: Added sv to ALL_LINGUAS
-
-1999-07-11  Tomas Ogren  <stric@ing.umu.se>
-
-	* sysdeps/names/procmem.c: Fixed a tyop
-
-1999-05-31  Martin Baulig  <martin@home-of-linux.org>
-
-	* LIBGTOP-VERSION: Set version number to 1.0.3 binary age 2,
-	interface age 2.
-
-1999-05-31  Martin Baulig  <martin@home-of-linux.org>
-
-	Released LibGTop 1.0.2.
-
-1999-05-26  Martin Baulig  <martin@home-of-linux.org>
-
-	* configure.in (INCLUDES): Define `LIBGTOP_VERSION_CODE' here so we
-	can use version conditionals in the sysdeps code.
-
-1999-05-25  Martin Baulig  <martin@home-of-linux.org>
-
-	* libgtop-sysdeps.m4: Make the I4B check work for NetBSD.
-
-1999-05-16  Martin Baulig  <martin@home-of-linux.org>
-
-	* doc: Merged the LibGTop Manual from the HEAD.
 
 1999-03-01  Martin Baulig  <martin@home-of-linux.org>
 

LIBGTOP-VERSION

@@ -8,13 +8,10 @@
 #
 LIBGTOP_MAJOR_VERSION=1
 LIBGTOP_MINOR_VERSION=0
-LIBGTOP_MICRO_VERSION=14
+LIBGTOP_MICRO_VERSION=2
 
-LIBGTOP_INTERFACE_AGE=12
+LIBGTOP_INTERFACE_AGE=1
-LIBGTOP_BINARY_AGE=12
+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
@@ -24,5 +21,5 @@ LIBGTOP_VERSION=$LIBGTOP_MAJOR_VERSION.$LIBGTOP_MINOR_VERSION.$LIBGTOP_MICRO_VER
 LIBGTOP_VERSION_CODE=`echo "$LIBGTOP_MAJOR_VERSION 1000000 * $LIBGTOP_MINOR_VERSION 1000 * + $LIBGTOP_MICRO_VERSION + p q" | dc`
 
 # For automake.
-VERSION=$LIBGTOP_VERSION$LIBGTOP_VERSION_SUFFIX
+VERSION=$LIBGTOP_VERSION
 PACKAGE=libgtop

Makefile.am

@@ -11,15 +11,13 @@ support = support
 endif
 
 SUBDIRS = po intl $(support) macros misc include sysdeps lib src \
-	  $(examples_SUBDIRS) doc
+	  $(examples_SUBDIRS)
 
-libgtopinclude_HEADERS = glibtop.h
+include_HEADERS = glibtop.h
-libgtopincludedir = $(includedir)/libgtop-1.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 \
+	RELNOTES-1.0 libgtop-sysdeps.m4 README NEWS.old libgtop-mirror.sh
-	libgtop-mirror.sh
 
 dist-hook:
 	cp libgtop.spec $(distdir)
@@ -33,8 +31,6 @@ confexecdir	= $(libdir)
 confexec_DATA	= $(top_builddir)/libgtopConf.sh \
 		  $(top_builddir)/libgtop-features.def
 
-CLEANFILES=libgtopConf.sh
-
 bin_SCRIPTS = $(top_builddir)/libgtop-config
 
 ## to automatically rebuild aclocal.m4 if any of the macros in
@@ -43,7 +39,7 @@ bin_SCRIPTS = $(top_builddir)/libgtop-config
 @MAINT@macros/macros.dep: macros/Makefile.am
 @MAINT@	cd macros && $(MAKE) macros.dep
 
-@MAINT@$(top_srcdir)/aclocal.m4: libgtop-sysdeps.m4 LIBGTOP-VERSION
+@MAINT@$(top_srcdir)/aclocal.m4: libgtop-sysdeps.m4
 
 ## We create libgtopConf.sh here and not from configure because we want
 ## to get the paths expanded correctly.  Macros like srcdir are given
@@ -52,7 +48,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)#g' \
 	  -e 's#\@LIBGTOP_DATADIR\@#$(datadir)#g' \
 	  -e 's#\@LIBGTOP_EXTRA_LIBS\@#$(LIBGTOP_EXTRA_LIBS)#g' \
 	  -e 's#\@LIBGTOP_LIBS\@#$(LIBGTOP_LIBS)#g' \

NEWS

@@ -1,77 +0,0 @@
-November 26, 2001:
-================
-
-* Released LIbGTop 1.0.13
-
-  - security fix
-
-  - update for parallel install with libgtop-2.0
-
-February 27, 2001:
-=================
-
-* Released LibGTop 1.0.12 "Gerolzhofen".
-
-  - fix for Solaris 8 from Laszlo PETER (msg_limits, sem_limits).
-
-  - fix for FreeBSD 4.2 from Rolf Grossmann (FreeBSD now uses
-    `_KERNEL' instead of `KERNEL'). Bug #51334.
-
-  - for BSDI, comment out `subnet' field in netload; this should make
-    it compile, but there may be other problems. Bug #13345.
-
-  This release is for GNOME 1.4 Beta2.
-
-February 14, 2001:
-=================
-
-* Released LibGTop 1.0.11 "Jasmin":
-
-  [The release which was supposed to be called "Gerolzhofen".]
-
-  - merged in the Solaris code from LIBGTOP_1_1_2_PATCHES.
-
-  - minor OpenBSD fixes.
-
-  - again a bunch of updated translations.
-
-  Please test the Solaris stuff and report and bugs and
-  problems as soon as possible; I'll make a new release
-  for the 2nd beta of GNOME 1.4 if necessary.
-
-November 20, 2000:
-=================
-
-* Released LibGTop 1.0.10 "November Rain":
-
-  - this release contains a bunch of updated translations.
-
-May 25, 2000:
-============
-
-* Released LibGTop 1.0.9 "Stuttgart".
-
-  (LibGTop 1.0.8 "Frankfurt" was not publically released.)
-
-February 15, 2000:
-=================
-
-* Released LibGTop 1.0.7 "Copenhagen":
-
-  - this is a bug fix release for the GUADEC CD-ROM;
-    it contains fixes in both the Linux and *BSD sysdeps
-    directory.
-
-October 18, 1999:
-================
-
-* Released LibGTop 1.0.6 "October LibGTop":
-
-  - compilation fixes for FreeBSD.
-  - updated reference manual.
-
-September 29, 1999:
-==================
-
-* Released LibGTop 1.0.5.
-

NEWS.old

@@ -0,0 +1,244 @@
+$Id$
+
+Jun/01/1998
+===========
+
+	* We have some new ``suffix rules'':
+
+	  '__l' is a function defined in the client part;
+	  '__s' is a function defined in the sysdeps part and
+	  '__p' is a function that needs special priviledges.
+	  '__r' is mapped either on '__p' or on '__s'.
+	  the function without suffix is mapped on '__l'.
+
+	* We now decide at runtime whether or not using the server
+	is required for a particular function. All user programs
+	now call the '__l' function defined in '-lgtop' (in the lib
+	subdir). These functions either use 'glibtop_call__l' to
+	call the server or call the '__r' function.
+
+	* A function in the sysdeps directory now has the '__s' suffix
+	if it do not need any priviledges (and thus can be called directly
+	from client code) and the '__p' suffix otherwise (when it has to
+	be called from the server).
+
+	* If you call one of these functions:
+
+	  -> use the '__p' suffix to be sure to get the SUID-safe one
+	     (used in the server).
+	  -> use the '__s' suffix to be sure to get a function that
+	     doesn't need any priviledges.
+	  -> use the '__r' suffix otherwise (it is mapped either on the
+	     '__p' or on the '__s' one).
+
+	Only use the '__p' and '__s' functions in a 'GLIBTOP_SUID_<feature>'
+	conditional, otherwise you'll get undefined symbols !
+
+	* The server is now started from 'glibtop_init__r', but only when
+	it's really needed; for instance on DEC OSF/1 you only need it
+	for the proc* features - if you program only fetches the CPU usage,
+	now server will be started.
+
+	* Sorry, at the moment everything is a little bit unstable, I'm doing
+	heavy changes. I've just some great ideas which still need some work:
+
+	  -> I want to have a SUID server that only implements those features
+	     that need to be SUID; everything else uses the sysdeps code directly.
+
+	  -> If a program only uses stuff that do not need the server, the
+	     server will not be started at all.
+
+	  -> I'm working on some kind of proxy server that can be used on a remote
+	     host; in feature one can then use the MDI stuff from ghex in gtop to
+	     have notebook pages displaying processes from different hosts.
+
+	* Well it is as much unstable that it only works under Linux at the moment.
+
+1998-06-01  Martin Baulig  <martin@home-of-linux.org>
+
+	* sysdeps/common/sysdeps.c: now using '__r' functions,
+	they are #defined either as the '__p' or the '__s' ones.
+
+	* sysdeps/linux/*.c: changed call of 'glibtop_init__r',
+	it now takes two additional arguments.
+
+	* examples/{first.c, second.c}: now using 'glibtop_init'
+	instead of 'glibtop_init__r'.
+
+	* include/glibtop/sysdeps.h: added 'dummy' member so
+	'GLIBTOP_SYSDEPS_<feature>' now start with 1.
+
+	* include/glibtop/*.h: we now #define 'glibtop_get_<feature>'
+	as 'glibtop_get_<feature>__l' and 'glibtop_get_<feature>__r'
+	either as the '__p' or the '__s' function.
+
+	* lib/*.c: removed #if's - we now decide at runtime
+	whether to use the server or to call the appropriate
+	function for the sysdeps directory.
+
+1998-05-28  Martin Baulig  <baulig@merkur.uni-trier.de>
+
+	* src/server/main.c: we now use the '__p' functions,
+	but only if the appropriate 'GLIBTOP_SUID_<feature>'
+	has a non-zero value.
+	
+	* configure.in (@machine_incs@): always use 
+	`-I$(top_srcdir)/sysdeps/@sysdeps_dir@'; it's no
+	longer conditional.
+
+	* examples/Makefile.am: removed the '_linux' examples.
+	
+	* sysdeps/linux/*.c: renamed all functions implementing
+	features to '__s'.
+	
+	* lib/*.c: renamed all functions implementing features
+	to '__l'; we only emit code for those functions if the
+ 	corresponding 'GLIBTOP_SUID_<feature>' has a positive value.
+	
+	* include/glibtop/*.h: added some new function suffixes:
+	'__l' is a function defined in the client part;
+	'__s' is a function defined in the sysdeps part and
+	'__p' is a function that needs special priviledges.
+	'__r' is mapped either on '__l' or on '__s'.
+	
+	* sysdeps/linux/glibtop_server.h: New file -
+	defines system dependent constants 'GLIBTOP_SUID_<feature>'
+	being either 'GLIBTOP_SYSDEPS_<feature>'+1 depending upon
+ 	whether or not this feature requires using the server.
+
+	* lib/sysdeps.c: removed that file; it is no longer
+	needed.
+
+
+
+May/21/1998
+===========
+
+* doc/gnome-hackers.sgml: This is a short intro on how to use libgtop
+  in the GNOME project. It covers especially the use of its 'configure'
+  script and the automatically generated 'gtopConf.sh'.
+
+May/20/1998
+===========
+
+* 'gtopConf.sh' now defines 'GTOP_LIBS' and 'GTOP_INCS' in a manner
+  that they contain everything that is needed to link some program with
+  libgtop. It will use '-lgtop' only if the server is really needed and
+  '-lgtop_sysdeps' otherwise;
+
+* 'gtopConf.sh' additionally defines 'GTOP_GUILE_LIBS' and 'GTOP_GUILE_INCS'
+  containing everything that is needed to link some program both with
+  libgtop and its guile interface. They are identically to 'GTOP_LIBS'
+  and 'GTOP_INCS' if building the guile interface is disabled or guile
+  cannot be found on the system.
+
+* 'configure' takes additional arguments '--enable-libgtop-server' and
+  '--disable-libgtop-server' to use the server even when it's not needed
+  or to disable it's use where it's needed.
+
+* 'configure' takes an argument '--without-libgtop-guile' to disable
+  guile support.
+
+* 'configure takes an argument '--without-libgtop-names' to remove
+  '-lgtop_names' (and '-lgtop_guile_names' when we have guile) from
+  'GTOP_LIBS'; in this case these libraries are not even built.
+
+May/19/1998
+===========
+
+* Libgtop is now in the GNOME CVS Repository.
+
+May/17/1998
+===========
+
+* we have now 'const char *glibtop_types_* []' consisting
+  of the C types of the corresponding files of '_glibtop_*'.
+
+* added guile function '(glibtop-types-*)' and '(glibtop-descriptions-*)'.
+
+May/10/1998
+===========
+
+* Port to DEC OSF1 3.0 has been made:
+
+  cpu		(total, user, nice, sys, idle)
+  mem		(total, used, free)
+
+  loadavg	(loadavg)
+  uptime	(uptime)
+
+  msg_limits	(map, max, mnb, mni, tql)
+  sem_limits	(mni, msl, opm, vmx, aem)
+  shm_limits	(max, min, mni, seg)
+
+  The following need the server to be SUID root:
+
+  proclist	(total, number, size)
+  procdata	(cmd, state, uid, pid, ppid, pgrp, tty, k_flags,
+		 session, tpgid, sigignore, sigcatch, signal, nice, 
+		 priority, resident, rss, vsize, utime, stime,
+		 cutime, cstime, trs, drs)
+
+May/07/1998
+===========
+
+* 'flags' member of sysdeps/linux/procdata.c is now
+  'unsigned long flags [2]'.
+
+* When we give glibtop_get_procdata () a pid of zero, only
+  the flags are returned.
+
+* We now use static constants instead of #defines for sysdeps flags.
+
+May/03/1998
+===========
+
+* VPATH-Build now working; sometimes it's necessary to copy
+  $(top_srcdir)/po/cat-id-tbl.c to $(top_builddir)/po.
+
+* The library has been tested on the following systems:
+
+  - i686-pc-linux-gnu
+  - sparc-sun-sunos4.1.1
+  - alpha-dec-osf1 (that's DEC OSF1 3.0 and 3.2)
+
+* Compilation has been tested on the following systems (I have no root
+  access there and cannot test the library because of this):
+
+  - sparc-sun-solaris2
+  - i386-bsdi
+
+* Does no longer require Gnome.
+
+* Guile-Parts are compiled only if guile can be found.
+
+* Some of the executables are statically linked to copy them more easily
+  between machines.
+
+May/02/1998
+===========
+
+ * Global changes to the interfaces, all functions except glibtop_open()
+   and glibtop_close() that took a server argument have now a '__r' suffix;
+   the original name is now a macro that uses glibtop_global_server.
+
+Apr/10/1998
+===========
+Added new directory sysdeps/guile/names. It is the guile interface
+to the gtop_names library found in sysdeps/names. Changed
+GLIBTOP_DESCRIPTIONS to GLIBTOP_NAMES and added GLIBTOP_GUILE_NAMES
+to the header files.
+
+Apr/09/1998
+===========
+Added new directories guile and names to sysdeps. In names are
+some string constants about the data stored in the structures.
+guile is a guile interface for the library. It is used in
+examples/third (which has been completely rewritten).
+The header files define things from names when GLIBTOP_DESCRIPTIONS
+if defined and/or from guile when HAVE_GUILE is defined.
+
+Apr/08/1998
+===========
+
+Added guile wrapper for the library (see examples/third).

RELNOTES-1.0

@@ -87,7 +87,7 @@ LibGTop is currently used in various places in the GNOME Project,
 for instance in some of the applets in gnome-core and - of cause -
 this ultra-cool application called GTop ...
 
-Although LibGTop is not specific to GNOME and under GPL license, I
+Although LibGTop is not specific to GNOME and under LGPL license, I
 spent most my time during the last months to work in the GNOME project
 so this is the primary use for LibGTop (and currently the only one).
 

RELNOTES-1.0.x

@@ -1,172 +0,0 @@
-RELEASE NOTES FOR LIBGTOP 1.0.7
-===============================
-
-OVERVIEW
---------
-
-LibGTop is a library that read information about processes and the
-running systems. This information include:
-
-General System Information:
-
-cpu		- CPU Usage
-mem		- Memory Usage
-swap		- Swap Usage (including paging activity)
-loadavg		- Load average (including nr_running, nr_tasks, last_pid)
-uptime		- Uptime and Idle time, can be calculated from CPU usage
-
-SYS V IPC Limits:
-
-shm_limits	- Shared Memory Limits
-msg_limits	- Message Queue Limits
-sem_limits	- Semaphore Set Limits
-
-Network:
-
-netload		- Network load
-ppp		- PPP statistics
-
-Process List:
-
-proclist	- List of processes
-
-Process information:
-
-proc_state	- cmd, state, uid, gid
-proc_uid	- uid,euid,gid,egid,pid,ppid,pgrp
-		  session,tty,tpgid,priority,nice
-proc_mem	- size,vsize,resident,share,rss,rss_rlim
-proc_time	- start_time,rtime,utime,stime,cutime,cstime
-		  timeout,it_real_value,frequency
-proc_signal	- signal,blocked,sigignore,sigcatch
-proc_kernel	- k_flags,min_flt,maj_flt,cmin_flt,cmaj_flt
-		  kstk_esp,kstk_eip,nwchan,wchan
-proc_segment	- text_rss,shlib_rss,data_rss,stack_rss,dirty_size
-		  start_code,end_code,start_stack
-
-Process maps:
-
-proc_args	- Command line arguments
-proc_map	- Process map (/proc/<pid>/maps under Linux)
-
-File system usage:
-
-mountlist	- List of currently mounted filesystems
-fsusage		- File system usage
-
-PORTABILITY:
------------
-
-LibGTop is designed to be as portable as possible. None of the
-functions and retrieved information should be specific to a specific
-operating system. So you only need to port the system dependent part
-of the library to a new system and all application programs can then
-use libgtop on this new system.
-
-CLIENT/SERVER MODEL:
--------------------
-
-Some systems like DEC OSF/1 or BSD require special privileges for the
-calling process to fetch the required information (SUID root/SGID
-kmem). To solve this problem, I designed a client/server model which
-makes a call to a SUID/SGID server which fetches the required
-information whenever it is required. This server is only called for
-features that really require privileges, otherwise the sysdeps code
-is called directory (every user can get the CPU usage on DEC OSF/1,
-but only root can get information about processes other than the
-current one).
-
-There is also some kind of daemon which can be used to fetch
-information from remote systems (still experimental). This daemon
-normally runs as nobody and calls the SUID/SGID itself when needed.
-
-LIBGTOP AND GNOME:
------------------
-
-Although LibGTop is part of the GNOME desktop environment, its main
-interface is totally independent from any particular desktop environment,
-so you can also use it as a standalone library in any piece of GPLed
-software which makes it also a valuable part of the GNU project.
-
-LibGTop is currently used in various places in the GNOME Project,
-for instance in some of the applets in gnome-core and - of cause -
-this ultra-cool application called GTop ...
-
-However, you need to give the configure.in script the `--without-gnome'
-parameter when you want to use LibGTop without GNOME (this is because,
-if you want to use it with GNOME, you need to compile it after the main
-GNOME libraries and I wanted to avoid getting unnecessary bug reports
-about this).
-
-LIBGTOP AND GNOME - PART II:
----------------------------
-
-LibGTop was tested with FreeBSD 3.0 but it should also work with
-FreeBSD 2.2.7, NetBSD and OpenBSD.
-
-Unfortunately, I don't have the power and disk space to install all
-possible operating systems out there on my machine and test things myself,
-so I depend on people telling me whether it works and sending me bug
-reports and patches if not.
-
-However, I consider FreeBSD, NetBSD and OpenBSD as supported systems for
-LibGTop and whenever I get bug reports I will do my best to fix them as
-quickly as possible.
-
-PLATFORM SPECIFIC NOTES FOR LINUX:
-==================================
-
-[I am speaking of the Linux kernel here.]
-
-Under Linux, LibGTop should work without problems and read everything
-from /proc.
-
-LibGTop 0.25 also had an experimental kernel interface to read this
-information directly from the kernel with a system call - but I have
-currently dropped support for this as I am too busy with GNOME
-development to keep current with kernel hacking.
-
-PLATFORM SPECIFIC NOTES FOR SOLARIS:
-====================================
-
-The development branch of LibGTop (the 1.1.x series) has a first version
-of the Solaris port which works at least on Solaris 7.
-
-If you are on a Solaris system and want to give it a try, just fetch the
-latest 1.1.x tarball from ftp://ftp.home-of-linux.org/pub/libgtop/1.1/
-and try it out.
-
-PLATFORM SPECIFIC NOTES FOR BSD:
-=================================
-
-There are a few caveats:
-
-* You need to manually make the `$(prefix)/bin/libgtop_server' SGID to
-  kmem after installation and mount the /proc file system of FreeBSD
-  (/proc/<pid>/mem is used within kvm_uread ()).
-
-* To get the filenames of the process maps displayed in GTop, you need
-  to configure with the `--with-libgtop-inodedb' option (you need GDBM
-  for this to work).
-
-  You have then to create an inode database which is used to look up
-  filenames. This is done using the `mkinodedb' program which comes
-  along with libgtop.
-
-  See the file src/inodedb/README for details:
-
-  The `mkinodedb' program which is build in this directory takes two
-  command line arguments: the full pathname of the database to be
-  created and the name of a configuration file consisting of directory
-  and file names each on a line by itself - see `/etc/ld.so.conf' for
-  an example.
-
-  Putting a directory name in this file means all regular files found
-  in this directory are included in the database, but it will not
-  recursively descend into subdirectories (for instance, we want
-  everything in `/usr/lib' but not every single file in `/usr/lib/sgml').
-  You can also use filenames to include a single file.
-
-Have fun,
-
-Martin <martin@home-of-linux.org>

TODO

@@ -0,0 +1,46 @@
+This is LibGTop 0.99.2,
+
+a feature-freezed version of LibGTop for GNOME 1.0.
+
+You need to use the latest version of LibGTop from CVS for Gnome, it will
+no longer work with older releases.
+
+Martin
+
+--------------------------------------------------------------------------
+
+NOTE:  LibGTop is already feature-freezed for GNOME 1.0, so only bug fixes
+       are ok, no API changes !
+
+Sysdeps directory 'linux':
+==========================
+
+* Add implementation for `ppp' with modems.
+
+Sysdeps directory 'freebsd':
+============================
+
+* FreeBSD 3.0: It works fine on this system, so please make sure not
+               to break it here.
+
+* FreeBSD 2.2: Make sure it still works here.
+
+* NetBSD/OpenBSD: Support was added on Dec 6, but we need to check
+                  whether all data are valid.
+
+Sysdeps directories 'kernel', 'osf1' and 'sun4':
+================================================
+
+* You need to use the `--enable-hacker-mode' parameter to configure
+  to build this directories.
+
+--------------------------------------------------------------------------
+
+Everything except sysdeps directories:
+======================================
+
+* Ready for Gnome 1.0. [ALREADY FEATURE FREEZED]
+
+January 5, 1999
+
+Martin

acconfig.h

@@ -138,7 +138,7 @@
 
 #undef NEED_LIBGTOP
 
-#undef HAVE_LINUX_TABLE
+#undef HAVE_LINUX_SYSCTL
 #undef HAVE_LIBGTOP_SMP
 
 #undef HAVE_XAUTH
@@ -156,14 +156,6 @@
  */
 #undef GLIBTOP_LINUX_VERSION_CODE
 
-/* Solaris release code (eg. 251 for Solaris 2.5.1). */
-#undef GLIBTOP_SOLARIS_RELEASE
-
 /* Define if you want to use LibGTop without GNOME. */
 #undef WITHOUT_GNOME
 
-/* Define if you have the <procfs.h> header file */
-#undef HAVE_PROCFS_H
-
-/* Define if you have the <sys/procfs.h> header file */
-#undef HAVE_SYS_PROCFS_H

configure.in

@@ -13,12 +13,6 @@ 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
 
@@ -33,7 +27,6 @@ AC_SUBST(LIBGTOP_BINARY_AGE)
 AC_SUBST(LIBGTOP_SERVER_VERSION)
 AC_SUBST(LIBGTOP_VERSION)
 AC_SUBST(LIBGTOP_VERSION_CODE)
-AC_SUBST(LIBGTOP_VERSION_SUFFIX)
 
 # libtool versioning
 LT_RELEASE=$LIBGTOP_MAJOR_VERSION.$LIBGTOP_MINOR_VERSION
@@ -54,10 +47,6 @@ AC_PROG_CC
 AC_STDC_HEADERS
 AC_ARG_PROGRAM
 
-dnl We need this at some places.
-libgtop_top_builddir=`pwd`
-AC_SUBST(libgtop_top_builddir)
-
 dnl We don't use `AC_PROG_AWK' since it checks for mawk first which
 dnl does not work for libgtop.
 AC_CHECK_PROGS(AWK, gawk awk, )
@@ -102,15 +91,10 @@ if test "x$gnome_found" != xyes; then
   fi
   GNOME_SUPPORT_CHECKS
 else
-  if test "x$want_gnome" != xno ; then
+  AM_CONDITIONAL(BUILD_GNOME_SUPPORT, false)
-    AM_CONDITIONAL(BUILD_GNOME_SUPPORT, false)
+  AM_CONDITIONAL(CROSS_COMPILING, test "x$cross_compiling" = xyes)
-  else
-    GNOME_SUPPORT_CHECKS
-  fi
 fi
 
-AM_CONDITIONAL(CROSS_COMPILING, test "x$cross_compiling" = xyes)
-
 GNOME_LIBGTOP_SYSDEPS
 GNOME_LIBGTOP_TYPES
 
@@ -163,14 +147,11 @@ else
 fi
 
 if test "x$enable_static" != xno; then
-  static_targets="first_static second_static mountlist_static procmap_static netload_static sysdeps_static timings_static $guile_static_examples $smp_static_examples"
+  static_targets="first_static second_static mountlist_static procmap_static netload_static sysdeps_static $guile_static_examples $smp_static_examples"
 else
   static_targets=""
 fi
 
-AM_CONDITIONAL(ENABLE_STATIC, test x$enable_static = xyes)
-AM_CONDITIONAL(ENABLE_SHARED, test x$enable_static = xyes)
-
 AC_SUBST(static_targets)
 AC_SUBST(smp_examples)
 AC_SUBST(guile_examples)
@@ -200,45 +181,10 @@ AC_CHECK_TYPE(ssize_t, int)
 AC_CHECK_HEADERS(memory.h)
 AC_CHECK_HEADERS(string.h strings.h, break)
 AC_REPLACE_FUNCS(strerror)
+AC_CHECK_LIB(kvm, kvm_open)
 
-dnl dlopen() and dlsym()
+dnl Solaris 7
-DL_LIB=
-AC_CHECK_FUNCS(dlopen,,[
-  AC_CHECK_LIB(dl, dlopen, DL_LIB="-ldl", [
-    AC_CHECK_LIB(dld, shl_load, DL_LIB="-ldld", [
-      AC_CHECK_FUNCS(dlopen, DL_LIB="", DL_LIB="")
-    ])
-  ])
-])
-oLIBS="$LIBS"
-LIBS="$LIBS $DL_LIB"
-AC_CHECK_FUNCS(dlerror,,)
-LIBS="$oLIBS"
-AC_SUBST(DL_LIB)
-
-dnl Solaris
 AC_CHECK_LIB(kstat, kstat_open)
-AC_CHECK_FUNCS(getloadavg swapctl)
-AC_CHECK_HEADERS(procfs.h sys/procfs.h, break)
-
-dnl Some versions of Solaris require -lelf for -lkvm
-AC_CHECK_LIB(kvm, kvm_open,[
-  LIBS="-lkvm $LIBS"
-],[AC_MSG_CHECKING(for kvm_open in -lkvm with -lelf)
-   AC_CACHE_VAL(ac_cv_lib_kvm_with_elf,
-   [ac_save_LIBS="$LIBS"
-    LIBS="-lkvm -lelf $LIBS"
-    AC_TRY_LINK([char kvm_open();], [kvm_open()],
-                ac_cv_lib_kvm_with_elf=yes, ac_cv_lib_kvm_with_elf=no)
-    LIBS="$ac_save_LIBS"
-   ])
-   if test "$ac_cv_lib_kvm_with_elf" = "yes"; then
-     AC_MSG_RESULT(yes)
-     LIBS="-lkvm -lelf $LIBS"
-   else
-     AC_MSG_RESULT(no)
-   fi
-])
 
 dnl For DEC OSF1
 AC_CHECK_LIB(mach, vm_statistics)
@@ -277,7 +223,7 @@ 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"
+ALL_LINGUAS="de es es_DO es_GT es_HN es_MX es_PA es_PE es_SV fr ko no ja"
 AM_GNOME_GETTEXT
 
 AC_PATH_XTRA
@@ -338,7 +284,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)'
 
 if test x$libgtop_use_machine_h = xyes ; then
   LIBGTOP_INCS="$LIBGTOP_INCS -DHAVE_GLIBTOP_MACHINE_H"
@@ -411,7 +357,7 @@ 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 -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_SERVER=\"'"$LIBGTOP_SERVER"'\"'
 
 AC_SUBST(INCLUDES)
 
@@ -456,7 +402,6 @@ sysdeps/stub_suid/Makefile
 sysdeps/sun4/Makefile
 sysdeps/osf1/Makefile
 sysdeps/linux/Makefile
-sysdeps/kernel/Makefile
 sysdeps/freebsd/Makefile
 sysdeps/solaris/Makefile
 src/Makefile
@@ -464,6 +409,5 @@ src/daemon/Makefile
 src/inodedb/Makefile
 lib/Makefile
 examples/Makefile
-doc/Makefile
 support/Makefile
 macros/Makefile])

debian/.cvsignore

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

debian/README.Debian

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

debian/changelog

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

debian/control.in

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

debian/debconfigure

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

debian/libgtop-config.1

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

debian/libgtop-dev.files.in

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

debian/libgtop1.README.Debian

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

debian/libgtop1.copyright

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

debian/libgtop1.docs

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

debian/libgtop1.files.in

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

debian/rules.in

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

doc/about.texi

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

doc/main.texi

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

examples/.cvsignore

@@ -13,4 +13,3 @@ second_static
 second_linux
 smp_static sysdeps_static netload_static procmap_static mountlist_static
 smp sysdeps netload procmap mountlist
-timings timings_static

examples/ChangeLog

@@ -1,22 +1,3 @@
-1999-05-28  Martin Baulig  <martin@home-of-linux.org>
-
-	* first.c, second.c, sysdeps.c: Use LibGTop version conditionals
- 	so we can more easily merge the code into LIBGTOP_STABLE_1_0.
-
-1999-05-07  Martin Baulig  <martin@home-of-linux.org>
-
-	* timings.c (timersub): Renamed this to `libgtop_timersub' and define
-	it on all systems.
-
-Fri Apr  9 00:14:52 1999 Timur Bakeyev  <timur@gnu.org>
-
-	* timings.c: Added timersub defenition, to make code compilable on 
-	BSDI.
-
-1999-03-24  Martin Baulig  <martin@home-of-linux.org>
-
-	* timings.c: New example.
-
 1999-03-17  Martin Baulig  <martin@home-of-linux.org>
 
 	* first.c, second.c: Fixed a bug that caused a core dump when

examples/Makefile.am

@@ -12,14 +12,13 @@ DEFS			= @DEFS@
 libgtopdir		= $(libexecdir)/libgtop
 
 libgtop_PROGRAMS	= first second\
-			  mountlist procmap netload sysdeps timings \
+			  mountlist procmap netload sysdeps\
 			  @static_targets@ @guile_examples@ @smp_examples@
 
 EXTRA_PROGRAMS		= first_static second_static \
 			  mountlist_static procmap_static \
 			  third third_static smp smp_static \
-			  netload_static sysdeps_static \
+			  netload_static sysdeps_static
-			  timings_static
 
 first_SOURCES		= first.c
 first_LDADD		= $(top_builddir)/lib/libgtop.la \
@@ -109,13 +108,3 @@ smp_static_SOURCES	= $(smp_SOURCES)
 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 \
-			  @LIBSUPPORT@ @INTLLIBS@
-
-timings_static_SOURCES	= $(timings_SOURCES)
-timings_static_LDADD	= $(timings_LDADD)
-timings_static_LDFLAGS	= -static
-

examples/first.c

@@ -116,16 +116,9 @@ main (int argc, char *argv [])
 	for (c = 0; c < PROFILE_COUNT; c++)
 		glibtop_get_uptime (&data.uptime);
 
-#if LIBGTOP_VERSION_CODE > 1001000
-	printf ("Uptime       (0x%08lx): %f, %f, %lu\n",
-		(unsigned long) data.uptime.flags,
-		data.uptime.uptime, data.uptime.idletime,
-		(unsigned long) data.uptime.boot_time);
-#else
 	printf ("Uptime       (0x%08lx): %f, %f\n",
 		(unsigned long) data.uptime.flags,
 		data.uptime.uptime, data.uptime.idletime);
-#endif
 
 	for (c = 0; c < PROFILE_COUNT; c++)
 		glibtop_get_loadavg (&data.loadavg);
@@ -249,52 +242,15 @@ main (int argc, char *argv [])
 	for (c = 0; c < PROFILE_COUNT; c++)
 		glibtop_get_proc_state (&data.proc_state, pid);
 
-#if LIBGTOP_VERSION_CODE > 1001000
-	printf ("Proc_State   PID  %5d (0x%08lx): '%s', %u - "
-		"%u, %u, %u, %u - %u, %u, %u\n", (int) pid,
-		(unsigned long) data.proc_state.flags,
-		data.proc_state.cmd, data.proc_state.state,
-		data.proc_state.uid, data.proc_state.gid,
-		data.proc_state.ruid, data.proc_state.rgid,
-		data.proc_state.has_cpu, data.proc_state.processor,
-		data.proc_state.last_processor);
-#else
 	printf ("Proc_State   PID  %5d (0x%08lx): '%s', %c, %lu, %lu\n",
 		(int) pid, (unsigned long) data.proc_state.flags,
 		data.proc_state.cmd, data.proc_state.state,
 		(unsigned long) data.proc_state.uid,
 		(unsigned long) data.proc_state.gid);
-#endif
 
 	for (c = 0; c < PROFILE_COUNT; c++)
 		glibtop_get_proc_uid (&data.proc_uid, pid);
 
-#if LIBGTOP_VERSION_CODE > 1001000
-	printf ("Proc_Uid     PID  %5d (0x%08lx): "
-		"%d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d - %d",
-		(int) pid, (unsigned long) data.proc_uid.flags,
-		data.proc_uid.uid, data.proc_uid.euid,
-		data.proc_uid.gid, data.proc_uid.egid,
-		data.proc_uid.suid, data.proc_uid.sgid,
-		data.proc_uid.fsuid, data.proc_uid.fsgid,
-		data.proc_uid.pid, data.proc_uid.ppid,
-		data.proc_uid.pgrp, data.proc_uid.session,
-		data.proc_uid.tty, data.proc_uid.tpgid,
-		data.proc_uid.priority, data.proc_uid.nice,
-		data.proc_uid.ngroups);
-
-	if (data.proc_uid.ngroups) {
-		for (i = 0; i < data.proc_uid.ngroups; i++) {
-			if (i)
-				printf (" %d", data.proc_uid.groups [i]);
-			else
-				printf (" (%d", data.proc_uid.groups [i]);
-		}
-		printf (")");
-	}
-
-	printf ("\n");
-#else
 	printf ("Proc_Uid     PID  %5d (0x%08lx): "
 		"%d %d %d %d %d %d %d %d %d %d %d %d\n", (int) pid,
 		(unsigned long) data.proc_uid.flags,
@@ -304,7 +260,6 @@ main (int argc, char *argv [])
 		data.proc_uid.pgrp, data.proc_uid.session,
 		data.proc_uid.tty, data.proc_uid.tpgid,
 		data.proc_uid.priority, data.proc_uid.nice);
-#endif
 
 	for (c = 0; c < PROFILE_COUNT; c++)
 		glibtop_get_proc_mem (&data.proc_mem, pid);
@@ -322,30 +277,6 @@ main (int argc, char *argv [])
 	for (c = 0; c < PROFILE_COUNT; c++)
 		glibtop_get_proc_segment (&data.proc_segment, pid);
 
-#if LIBGTOP_VERSION_CODE > 1001000
-	printf ("Proc_Segment PID  %5d (0x%08lx): "
-		"%lu %lu %lu %lu %lu 0x%lx 0x%lx 0x%lx "
-		"0x%lx 0x%lx 0x%lx 0x%lx 0x%lx "
-		"0x%lx 0x%lx 0x%lx 0x%lx\n", (int) pid,
-		(unsigned long) data.proc_segment.flags,
-		(unsigned long) data.proc_segment.text_rss,
-		(unsigned long) data.proc_segment.shlib_rss,
-		(unsigned long) data.proc_segment.data_rss,
-		(unsigned long) data.proc_segment.stack_rss,
-		(unsigned long) data.proc_segment.dirty_size,
-		(unsigned long) data.proc_segment.start_code,
-		(unsigned long) data.proc_segment.end_code,
-		(unsigned long) data.proc_segment.start_data,
-		(unsigned long) data.proc_segment.end_data,
-		(unsigned long) data.proc_segment.start_brk,
-		(unsigned long) data.proc_segment.end_brk,
-		(unsigned long) data.proc_segment.start_stack,
-		(unsigned long) data.proc_segment.start_mmap,
-		(unsigned long) data.proc_segment.arg_start,
-		(unsigned long) data.proc_segment.arg_end,
-		(unsigned long) data.proc_segment.env_start,
-		(unsigned long) data.proc_segment.env_end);
-#else
 	printf ("Proc_Segment PID  %5d (0x%08lx): "
 		"%lu %lu %lu %lu %lu %lu %lu %lu\n", (int) pid,
 		(unsigned long) data.proc_segment.flags,
@@ -357,7 +288,6 @@ main (int argc, char *argv [])
 		(unsigned long) data.proc_segment.start_code,
 		(unsigned long) data.proc_segment.end_code,
 		(unsigned long) data.proc_segment.start_stack);
-#endif
 
 	for (c = 0; c < PROFILE_COUNT; c++)
 		glibtop_get_proc_time (&data.proc_time, pid);
@@ -378,19 +308,6 @@ main (int argc, char *argv [])
 	for (c = 0; c < PROFILE_COUNT; c++)
 		glibtop_get_proc_signal (&data.proc_signal, pid);
 	
-#if LIBGTOP_VERSION_CODE > 1001000
-	printf ("Proc_Signal  PID  %5d (0x%08lx): "
-		"%lx %lx %lx %lx %lx %lx %lx %lx\n", (int) pid,
-		(unsigned long) data.proc_signal.flags,
-		(unsigned long) data.proc_signal.signal [0],
-		(unsigned long) data.proc_signal.signal [1],
-		(unsigned long) data.proc_signal.blocked [0],
-		(unsigned long) data.proc_signal.blocked [1],
-		(unsigned long) data.proc_signal.sigignore [0],
-		(unsigned long) data.proc_signal.sigignore [1],
-		(unsigned long) data.proc_signal.sigcatch [0],
-		(unsigned long) data.proc_signal.sigcatch [1]);
-#else
 	printf ("Proc_Signal  PID  %5d (0x%08lx): "
 		"%lu %lu %lu %lu\n", (int) pid,
 		(unsigned long) data.proc_signal.flags,
@@ -398,13 +315,12 @@ main (int argc, char *argv [])
 		(unsigned long) data.proc_signal.blocked,
 		(unsigned long) data.proc_signal.sigignore,
 		(unsigned long) data.proc_signal.sigcatch);
-#endif
 
 	for (c = 0; c < PROFILE_COUNT; c++)
 		glibtop_get_proc_kernel (&data.proc_kernel, pid);
 
 	printf ("Proc_Kernel  PID  %5d (0x%08lx): "
-		"%lu %lu %lu %lu %lu 0x%lx 0x%lx 0x%lx (%s)\n", (int) pid,
+		"%lu %lu %lu %lu %lu %lu %lu %lu (%s)\n", (int) pid,
 		(unsigned long) data.proc_kernel.flags,
 		(unsigned long) data.proc_kernel.k_flags,
 		(unsigned long) data.proc_kernel.min_flt,
@@ -437,52 +353,15 @@ main (int argc, char *argv [])
 	for (c = 0; c < PROFILE_COUNT; c++)
 		glibtop_get_proc_state (&data.proc_state, ppid);
 
-#if LIBGTOP_VERSION_CODE > 1001000
-	printf ("Proc_State   PPID %5d (0x%08lx): '%s', %u - "
-		"%u, %u, %u, %u - %u, %u, %u\n", (int) ppid,
-		(unsigned long) data.proc_state.flags,
-		data.proc_state.cmd, data.proc_state.state,
-		data.proc_state.uid, data.proc_state.gid,
-		data.proc_state.ruid, data.proc_state.rgid,
-		data.proc_state.has_cpu, data.proc_state.processor,
-		data.proc_state.last_processor);
-#else
 	printf ("Proc_State   PPID %5d (0x%08lx): '%s', %c, %lu, %lu\n",
 		(int) ppid, (unsigned long) data.proc_state.flags,
 		data.proc_state.cmd, data.proc_state.state,
 		(unsigned long) data.proc_state.uid,
 		(unsigned long) data.proc_state.gid);
-#endif
 
 	for (c = 0; c < PROFILE_COUNT; c++)
 		glibtop_get_proc_uid (&data.proc_uid, ppid);
 
-#if LIBGTOP_VERSION_CODE > 1001000
-	printf ("Proc_Uid     PPID %5d (0x%08lx): "
-		"%d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d - %d",
-		(int) ppid, (unsigned long) data.proc_uid.flags,
-		data.proc_uid.uid, data.proc_uid.euid,
-		data.proc_uid.gid, data.proc_uid.egid,
-		data.proc_uid.suid, data.proc_uid.sgid,
-		data.proc_uid.fsuid, data.proc_uid.fsgid,
-		data.proc_uid.pid, data.proc_uid.ppid,
-		data.proc_uid.pgrp, data.proc_uid.session,
-		data.proc_uid.tty, data.proc_uid.tpgid,
-		data.proc_uid.priority, data.proc_uid.nice,
-		data.proc_uid.ngroups);
-
-	if (data.proc_uid.ngroups) {
-		for (i = 0; i < data.proc_uid.ngroups; i++) {
-			if (i)
-				printf (" %d", data.proc_uid.groups [i]);
-			else
-				printf (" (%d", data.proc_uid.groups [i]);
-		}
-		printf (")");
-	}
-
-	printf ("\n");
-#else
 	printf ("Proc_Uid     PPID %5d (0x%08lx): "
 		"%d %d %d %d %d %d %d %d %d %d %d %d\n", (int) ppid,
 		(unsigned long) data.proc_uid.flags,
@@ -492,7 +371,6 @@ main (int argc, char *argv [])
 		data.proc_uid.pgrp, data.proc_uid.session,
 		data.proc_uid.tty, data.proc_uid.tpgid,
 		data.proc_uid.priority, data.proc_uid.nice);
-#endif
 
 	for (c = 0; c < PROFILE_COUNT; c++)
 		glibtop_get_proc_mem (&data.proc_mem, ppid);
@@ -510,30 +388,6 @@ main (int argc, char *argv [])
 	for (c = 0; c < PROFILE_COUNT; c++)
 		glibtop_get_proc_segment (&data.proc_segment, ppid);
 
-#if LIBGTOP_VERSION_CODE > 1001000
-	printf ("Proc_Segment PPID %5d (0x%08lx): "
-		"%lu %lu %lu %lu %lu 0x%lx 0x%lx 0x%lx "
-		"0x%lx 0x%lx 0x%lx 0x%lx 0x%lx "
-		"0x%lx 0x%lx 0x%lx 0x%lx\n", (int) ppid,
-		(unsigned long) data.proc_segment.flags,
-		(unsigned long) data.proc_segment.text_rss,
-		(unsigned long) data.proc_segment.shlib_rss,
-		(unsigned long) data.proc_segment.data_rss,
-		(unsigned long) data.proc_segment.stack_rss,
-		(unsigned long) data.proc_segment.dirty_size,
-		(unsigned long) data.proc_segment.start_code,
-		(unsigned long) data.proc_segment.end_code,
-		(unsigned long) data.proc_segment.start_data,
-		(unsigned long) data.proc_segment.end_data,
-		(unsigned long) data.proc_segment.start_brk,
-		(unsigned long) data.proc_segment.end_brk,
-		(unsigned long) data.proc_segment.start_stack,
-		(unsigned long) data.proc_segment.start_mmap,
-		(unsigned long) data.proc_segment.arg_start,
-		(unsigned long) data.proc_segment.arg_end,
-		(unsigned long) data.proc_segment.env_start,
-		(unsigned long) data.proc_segment.env_end);
-#else
 	printf ("Proc_Segment PPID %5d (0x%08lx): "
 		"%lu %lu %lu %lu %lu %lu %lu %lu\n", (int) ppid,
 		(unsigned long) data.proc_segment.flags,
@@ -545,7 +399,6 @@ main (int argc, char *argv [])
 		(unsigned long) data.proc_segment.start_code,
 		(unsigned long) data.proc_segment.end_code,
 		(unsigned long) data.proc_segment.start_stack);
-#endif
 
 	for (c = 0; c < PROFILE_COUNT; c++)
 		glibtop_get_proc_time (&data.proc_time, ppid);
@@ -566,32 +419,18 @@ main (int argc, char *argv [])
 	for (c = 0; c < PROFILE_COUNT; c++)
 		glibtop_get_proc_signal (&data.proc_signal, ppid);
 
-#if LIBGTOP_VERSION_CODE > 1001000
-	printf ("Proc_Signal  PPID %5d (0x%08lx): "
-		"%lx %lx %lx %lx %lx %lx %lx %lx\n",
-		(int) ppid, (unsigned long) data.proc_signal.flags,
-		(unsigned long) data.proc_signal.signal [0],
-		(unsigned long) data.proc_signal.signal [1],
-		(unsigned long) data.proc_signal.blocked [0],
-		(unsigned long) data.proc_signal.blocked [1],
-		(unsigned long) data.proc_signal.sigignore [0],
-		(unsigned long) data.proc_signal.sigignore [1],
-		(unsigned long) data.proc_signal.sigcatch [0],
-		(unsigned long) data.proc_signal.sigcatch [1]);
-#else
 	printf ("Proc_Signal  PPID %5d (0x%08lx): %lu %lu %lu %lu\n",
 		(int) ppid, (unsigned long) data.proc_signal.flags,
 		(unsigned long) data.proc_signal.signal,
 		(unsigned long) data.proc_signal.blocked,
 		(unsigned long) data.proc_signal.sigignore,
 		(unsigned long) data.proc_signal.sigcatch);
-#endif
 
 	for (c = 0; c < PROFILE_COUNT; c++)
 		glibtop_get_proc_kernel (&data.proc_kernel, ppid);
 
 	printf ("Proc_Kernel  PPID %5d (0x%08lx): "
-		"%lu %lu %lu %lu %lu 0x%lx 0x%lx 0x%lx (%s)\n", (int) ppid,
+		"%lu %lu %lu %lu %lu %lu %lu %lu (%s)\n", (int) ppid,
 		(unsigned long) data.proc_kernel.flags,
 		(unsigned long) data.proc_kernel.k_flags,
 		(unsigned long) data.proc_kernel.min_flt,
@@ -624,52 +463,15 @@ main (int argc, char *argv [])
 	for (c = 0; c < PROFILE_COUNT; c++)
 		glibtop_get_proc_state (&data.proc_state, 1);
 
-#if LIBGTOP_VERSION_CODE > 1001000
-	printf ("Proc_State   INIT %5d (0x%08lx): '%s', %u - "
-		"%u, %u, %u, %u - %u, %u, %u\n", 1,
-		(unsigned long) data.proc_state.flags,
-		data.proc_state.cmd, data.proc_state.state,
-		data.proc_state.uid, data.proc_state.gid,
-		data.proc_state.ruid, data.proc_state.rgid,
-		data.proc_state.has_cpu, data.proc_state.processor,
-		data.proc_state.last_processor);
-#else
 	printf ("Proc_State   INIT %5d (0x%08lx): '%s', %c, %lu, %lu\n", 1,
 		(unsigned long) data.proc_state.flags,
 		data.proc_state.cmd, data.proc_state.state,
 		(unsigned long) data.proc_state.uid,
 		(unsigned long) data.proc_state.gid);
-#endif
 
 	for (c = 0; c < PROFILE_COUNT; c++)
 		glibtop_get_proc_uid (&data.proc_uid, 1);
 
-#if LIBGTOP_VERSION_CODE > 1001000
-	printf ("Proc_Uid     INIT %5d (0x%08lx): "
-		"%d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d - %d", 1,
-		(unsigned long) data.proc_uid.flags,
-		data.proc_uid.uid, data.proc_uid.euid,
-		data.proc_uid.gid, data.proc_uid.egid,
-		data.proc_uid.suid, data.proc_uid.sgid,
-		data.proc_uid.fsuid, data.proc_uid.fsgid,
-		data.proc_uid.pid, data.proc_uid.ppid,
-		data.proc_uid.pgrp, data.proc_uid.session,
-		data.proc_uid.tty, data.proc_uid.tpgid,
-		data.proc_uid.priority, data.proc_uid.nice,
-		data.proc_uid.ngroups);
-
-	if (data.proc_uid.ngroups) {
-		for (i = 0; i < data.proc_uid.ngroups; i++) {
-			if (i)
-				printf (" %d", data.proc_uid.groups [i]);
-			else
-				printf (" (%d", data.proc_uid.groups [i]);
-		}
-		printf (")");
-	}
-
-	printf ("\n");
-#else
 	printf ("Proc_Uid     INIT %5d (0x%08lx): "
 		"%d %d %d %d %d %d %d %d %d %d %d %d\n", 1,
 		(unsigned long) data.proc_uid.flags,
@@ -679,7 +481,6 @@ main (int argc, char *argv [])
 		data.proc_uid.pgrp, data.proc_uid.session,
 		data.proc_uid.tty, data.proc_uid.tpgid,
 		data.proc_uid.priority, data.proc_uid.nice);
-#endif
 
 	for (c = 0; c < PROFILE_COUNT; c++)
 		glibtop_get_proc_mem (&data.proc_mem, 1);
@@ -697,30 +498,6 @@ main (int argc, char *argv [])
 	for (c = 0; c < PROFILE_COUNT; c++)
 		glibtop_get_proc_segment (&data.proc_segment, 1);
 
-#if LIBGTOP_VERSION_CODE > 1001000
-	printf ("Proc_Segment INIT %5d (0x%08lx): "
-		"%lu %lu %lu %lu %lu 0x%lx 0x%lx 0x%lx "
-		"0x%lx 0x%lx 0x%lx 0x%lx 0x%lx "
-		"0x%lx 0x%lx 0x%lx 0x%lx\n", 1,
-		(unsigned long) data.proc_segment.flags,
-		(unsigned long) data.proc_segment.text_rss,
-		(unsigned long) data.proc_segment.shlib_rss,
-		(unsigned long) data.proc_segment.data_rss,
-		(unsigned long) data.proc_segment.stack_rss,
-		(unsigned long) data.proc_segment.dirty_size,
-		(unsigned long) data.proc_segment.start_code,
-		(unsigned long) data.proc_segment.end_code,
-		(unsigned long) data.proc_segment.start_data,
-		(unsigned long) data.proc_segment.end_data,
-		(unsigned long) data.proc_segment.start_brk,
-		(unsigned long) data.proc_segment.end_brk,
-		(unsigned long) data.proc_segment.start_stack,
-		(unsigned long) data.proc_segment.start_mmap,
-		(unsigned long) data.proc_segment.arg_start,
-		(unsigned long) data.proc_segment.arg_end,
-		(unsigned long) data.proc_segment.env_start,
-		(unsigned long) data.proc_segment.env_end);
-#else
 	printf ("Proc_Segment INIT %5d (0x%08lx): "
 		"%lu %lu %lu %lu %lu %lu %lu %lu\n", 1,
 		(unsigned long) data.proc_segment.flags,
@@ -732,7 +509,6 @@ main (int argc, char *argv [])
 		(unsigned long) data.proc_segment.start_code,
 		(unsigned long) data.proc_segment.end_code,
 		(unsigned long) data.proc_segment.start_stack);
-#endif
 
 	for (c = 0; c < PROFILE_COUNT; c++)
 		glibtop_get_proc_time (&data.proc_time, 1);
@@ -753,19 +529,6 @@ main (int argc, char *argv [])
 	for (c = 0; c < PROFILE_COUNT; c++)
 		glibtop_get_proc_signal (&data.proc_signal, 1);
 
-#if LIBGTOP_VERSION_CODE > 1001000
-	printf ("Proc_Signal  INIT %5d (0x%08lx): "
-		"%lx %lx %lx %lx %lx %lx %lx %lx\n", 1,
-		(unsigned long) data.proc_signal.flags,
-		(unsigned long) data.proc_signal.signal [0],
-		(unsigned long) data.proc_signal.signal [1],
-		(unsigned long) data.proc_signal.blocked [0],
-		(unsigned long) data.proc_signal.blocked [1],
-		(unsigned long) data.proc_signal.sigignore [0],
-		(unsigned long) data.proc_signal.sigignore [1],
-		(unsigned long) data.proc_signal.sigcatch [0],
-		(unsigned long) data.proc_signal.sigcatch [1]);
-#else
 	printf ("Proc_Signal  INIT %5d (0x%08lx): "
 		"%lu %lu %lu %lu\n", 1,
 		(unsigned long) data.proc_signal.flags,
@@ -773,13 +536,12 @@ main (int argc, char *argv [])
 		(unsigned long) data.proc_signal.blocked,
 		(unsigned long) data.proc_signal.sigignore,
 		(unsigned long) data.proc_signal.sigcatch);
-#endif
 
 	for (c = 0; c < PROFILE_COUNT; c++)
 		glibtop_get_proc_kernel (&data.proc_kernel, 1);
 
 	printf ("Proc_Kernel  INIT %5d (0x%08lx): "
-		"%lu %lu %lu %lu %lu 0x%lx 0x%lx 0x%lx (%s)\n", 1,
+		"%lu %lu %lu %lu %lu %lu %lu %lu (%s)\n", 1,
 		(unsigned long) data.proc_kernel.flags,
 		(unsigned long) data.proc_kernel.k_flags,
 		(unsigned long) data.proc_kernel.min_flt,

examples/netload.c

@@ -43,7 +43,7 @@ int
 main (int argc, char *argv [])
 {
 	glibtop_netload netload;
-	unsigned method, count, port;
+	unsigned method, count, port, i;
 	struct in_addr addr, subnet;
 	char *address_string, *subnet_string;
 	char buffer [BUFSIZ];

examples/procmap.c

@@ -97,7 +97,7 @@ main (int argc, char *argv [])
 		unsigned device, device_major, device_minor;
 		char perm [5];
 		
-		if (maps [i].flags & (1L << GLIBTOP_MAP_ENTRY_FILENAME))
+		if (maps [i].flags & (1 << GLIBTOP_MAP_ENTRY_FILENAME))
 			filename = maps [i].filename;
 
 #ifdef GLIBTOP_INODEDB
@@ -116,41 +116,24 @@ main (int argc, char *argv [])
 		device_minor = (device & 255);
 		device_major = ((device >> 8) & 255);
 
-		if (filename) {
+		if (filename)
-			char *format;
+			fprintf (stderr, "%08lx-%08lx %08lx - "
-
+				 "%02x:%02x %08lu - %4s - %s\n",
-			if (sizeof (void*) == 8)
-				format = "%016lx-%016lx %016lx - "
-					 "%02x:%02x %08lu - %4s - %s\n";
-			else
-				format = "%08lx-%08lx %08lx - "
-					 "%02x:%02x %08lu - %4s - %s\n";
-
-			fprintf (stderr, format,
 				 (unsigned long) maps [i].start,
 				 (unsigned long) maps [i].end,
 				 (unsigned long) maps [i].offset,
 				 device_major, device_minor,
 				 (unsigned long) maps [i].inode,
 				 perm, filename);
-		} else {
+		else
-			char * format;
+			fprintf (stderr, "%08lx-%08lx %08lx - "
-
+				 "%02x:%02x %08lu - %4s\n",
-			if (sizeof (void*) == 8)
-				format = "%016lx-%016lx %016lx - "
-					 "%02x:%02x %08lu - %4s\n";
-			else
-				format = "%08lx-%08lx %08lx - "
-					 "%02x:%02x %08lu - %4s\n";
-
-			fprintf (stderr, format,
 				 (unsigned long) maps [i].start,
 				 (unsigned long) maps [i].end,
 				 (unsigned long) maps [i].offset,
 				 device_major, device_minor,
 				 (unsigned long) maps [i].inode,
 				 perm);
-		}
 
 		if (filename && (filename != maps [i].filename))
 			glibtop_free (filename);

examples/second.c

@@ -31,6 +31,8 @@
 #include <glibtop/union.h>
 #include <glibtop/sysdeps.h>
 
+#include <math.h>
+
 static void
 output (pid_t pid)
 {
@@ -50,53 +52,16 @@ output (pid_t pid)
 	printf ("\n");
 		
 	glibtop_get_proc_state (&data.proc_state, pid);
-
+		
-#if LIBGTOP_VERSION_CODE > 1001000		
-	printf ("Proc_State   PID  %5d (0x%08lx): '%s', %u - "
-		"%u, %u, %u, %u - %u, %u, %u\n", (int) pid,
-		(unsigned long) data.proc_state.flags,
-		data.proc_state.cmd, data.proc_state.state,
-		data.proc_state.uid, data.proc_state.gid,
-		data.proc_state.ruid, data.proc_state.rgid,
-		data.proc_state.has_cpu, data.proc_state.processor,
-		data.proc_state.last_processor);
-#else
 	printf ("Proc_State   PID  %5d (0x%08lx): "
 		"'%s', %c, %lu, %lu\n", (int) pid,
 		(unsigned long) data.proc_state.flags,
 		data.proc_state.cmd, data.proc_state.state,
 		(unsigned long) data.proc_state.uid,
 		(unsigned long) data.proc_state.gid);
-#endif
 		
 	glibtop_get_proc_uid (&data.proc_uid, pid);
-	
-#if LIBGTOP_VERSION_CODE > 1001000	
-	printf ("Proc_Uid     PID  %5d (0x%08lx): "
-		"%d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d - %d",
-		(int) pid, (unsigned long) data.proc_uid.flags,
-		data.proc_uid.uid, data.proc_uid.euid,
-		data.proc_uid.gid, data.proc_uid.egid,
-		data.proc_uid.suid, data.proc_uid.sgid,
-		data.proc_uid.fsuid, data.proc_uid.fsgid,
-		data.proc_uid.pid, data.proc_uid.ppid,
-		data.proc_uid.pgrp, data.proc_uid.session,
-		data.proc_uid.tty, data.proc_uid.tpgid,
-		data.proc_uid.priority, data.proc_uid.nice,
-		data.proc_uid.ngroups);
 		
-	if (data.proc_uid.ngroups) {
-		for (i = 0; i < data.proc_uid.ngroups; i++) {
-			if (i)
-				printf (" %d", data.proc_uid.groups [i]);
-			else
-				printf (" (%d", data.proc_uid.groups [i]);
-		}
-		printf (")");
-	}
-
-	printf ("\n");
-#else
 	printf ("Proc_Uid     PID  %5d (0x%08lx): "
 		"%d %d %d %d %d %d %d %d %d %d %d %d\n", (int) pid,
 		(unsigned long) data.proc_uid.flags,
@@ -106,8 +71,7 @@ output (pid_t pid)
 		data.proc_uid.pgrp, data.proc_uid.session,
 		data.proc_uid.tty, data.proc_uid.tpgid,
 		data.proc_uid.priority, data.proc_uid.nice);
-#endif
+		
-
 	glibtop_get_proc_mem (&data.proc_mem, pid);
 		
 	printf ("Proc_Mem     PID  %5d (0x%08lx): "
@@ -122,30 +86,6 @@ output (pid_t pid)
 		
 	glibtop_get_proc_segment (&data.proc_segment, pid);
 
-#if LIBGTOP_VERSION_CODE > 1001000
-	printf ("Proc_Segment PID  %5d (0x%08lx): "
-		"%lu %lu %lu %lu %lu 0x%lx 0x%lx 0x%lx "
-		"0x%lx 0x%lx 0x%lx 0x%lx 0x%lx "
-		"0x%lx 0x%lx 0x%lx 0x%lx\n", (int) pid,
-		(unsigned long) data.proc_segment.flags,
-		(unsigned long) data.proc_segment.text_rss,
-		(unsigned long) data.proc_segment.shlib_rss,
-		(unsigned long) data.proc_segment.data_rss,
-		(unsigned long) data.proc_segment.stack_rss,
-		(unsigned long) data.proc_segment.dirty_size,
-		(unsigned long) data.proc_segment.start_code,
-		(unsigned long) data.proc_segment.end_code,
-		(unsigned long) data.proc_segment.start_data,
-		(unsigned long) data.proc_segment.end_data,
-		(unsigned long) data.proc_segment.start_brk,
-		(unsigned long) data.proc_segment.end_brk,
-		(unsigned long) data.proc_segment.start_stack,
-		(unsigned long) data.proc_segment.start_mmap,
-		(unsigned long) data.proc_segment.arg_start,
-		(unsigned long) data.proc_segment.arg_end,
-		(unsigned long) data.proc_segment.env_start,
-		(unsigned long) data.proc_segment.env_end);
-#else
 	printf ("Proc_Segment PID  %5d (0x%08lx): "
 		"%lu %lu %lu %lu %lu %lu %lu %lu\n", (int) pid,
 		(unsigned long) data.proc_segment.flags,
@@ -157,7 +97,6 @@ output (pid_t pid)
 		(unsigned long) data.proc_segment.start_code,
 		(unsigned long) data.proc_segment.end_code,
 		(unsigned long) data.proc_segment.start_stack);
-#endif
 
 	glibtop_get_proc_time (&data.proc_time, pid);
 		
@@ -176,19 +115,6 @@ output (pid_t pid)
 
 	glibtop_get_proc_signal (&data.proc_signal, pid);
 	
-#if LIBGTOP_VERSION_CODE > 1001000
-	printf ("Proc_Signal  PID  %5d (0x%08lx): "
-		"%lx %lx %lx %lx %lx %lx %lx %lx\n", (int) pid,
-		(unsigned long) data.proc_signal.flags,
-		(unsigned long) data.proc_signal.signal [0],
-		(unsigned long) data.proc_signal.signal [1],
-		(unsigned long) data.proc_signal.blocked [0],
-		(unsigned long) data.proc_signal.blocked [1],
-		(unsigned long) data.proc_signal.sigignore [0],
-		(unsigned long) data.proc_signal.sigignore [1],
-		(unsigned long) data.proc_signal.sigcatch [0],
-		(unsigned long) data.proc_signal.sigcatch [1]);
-#else
 	printf ("Proc_Signal  PID  %5d (0x%08lx): "
 		"%lu %lu %lu %lu\n", (int) pid,
 		(unsigned long) data.proc_signal.flags,
@@ -196,12 +122,11 @@ output (pid_t pid)
 		(unsigned long) data.proc_signal.blocked,
 		(unsigned long) data.proc_signal.sigignore,
 		(unsigned long) data.proc_signal.sigcatch);
-#endif
 
 	glibtop_get_proc_kernel (&data.proc_kernel, pid);
 
 	printf ("Proc_Kernel  PID  %5d (0x%08lx): "
-		"%lu %lu %lu %lu %lu 0x%lx 0x%lx 0x%lx (%s)\n", (int) pid,
+		"%lu %lu %lu %lu %lu %lu %lu %lu (%s)\n", (int) pid,
 		(unsigned long) data.proc_kernel.flags,
 		(unsigned long) data.proc_kernel.k_flags,
 		(unsigned long) data.proc_kernel.min_flt,

examples/smp.c

@@ -27,6 +27,8 @@
 #include <glibtop/cpu.h>
 #include <glibtop/xmalloc.h>
 
+#include <math.h>
+
 int
 main (int argc, char *argv [])
 {
@@ -65,7 +67,7 @@ main (int argc, char *argv [])
 	memset (separator, '-', 91);
 	separator [92] = '\0';
 
-	sprintf (buffer, _("Ticks (%ld per second):"), frequency);
+	sprintf (buffer, _("Ticks (%d per second):"), frequency);
 
 	printf ("\n\n%-26s %12s %12s %12s %12s %12s\n%s\n", buffer,
 		_("Total"), _("User"), _("Nice"), _("Sys"), _("Idle"), separator);

examples/sysdeps.c

@@ -38,7 +38,7 @@ int
 main (int argc, char *argv [])
 {
 	glibtop_sysdeps sysdeps;
-	unsigned method, count, port;
+	unsigned method, count, port, i;
 	char buffer [BUFSIZ];
 
 	count = PROFILE_COUNT;
@@ -69,13 +69,10 @@ main (int argc, char *argv [])
 
 	glibtop_get_sysdeps (&sysdeps);
 
-#define FEATURE_CHECK(f) ((sysdeps.features & (1L << GLIBTOP_SYSDEPS_##f##)) ? 1 : 0)
+#define FEATURE_CHECK(f) ((sysdeps.features & (1 << GLIBTOP_SYSDEPS_##f##)) ? 1 : 0)
 
 	printf ("Sysdeps (0x%08lx):\n\n"
 		"\tfeatures:\t\t0x%08lx\n\n"
-#if LIBGTOP_VERSION_CODE > 1001000
-		"\tpointer_size:\t\t0x%08lx\n\n"
-#endif
 		"\tcpu:\t\t%d\t0x%08lx\n"
 		"\tmem:\t\t%d\t0x%08lx\n"
 		"\tswap:\t\t%d\t0x%08lx\n\n"
@@ -100,9 +97,6 @@ main (int argc, char *argv [])
 		"\tppp:\t\t%d\t0x%08lx\n\n",
 		(unsigned long) sysdeps.flags,
 		(unsigned long) sysdeps.features,
-#if LIBGTOP_VERSION_CODE > 1001000
-		(unsigned long) sysdeps.pointer_size,
-#endif
 		FEATURE_CHECK(CPU),
 		(unsigned long) sysdeps.cpu,
 		FEATURE_CHECK(MEM),

examples/timings.c

@@ -1,357 +0,0 @@
-/* $Id$ */
-
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#include <locale.h>
-
-#include <glibtop.h>
-#include <glibtop/open.h>
-#include <glibtop/close.h>
-#include <glibtop/xmalloc.h>
-
-#include <glibtop/parameter.h>
-
-#include <glibtop/union.h>
-#include <glibtop/sysdeps.h>
-
-#include <sys/times.h>
-#include <sys/resource.h>
-
-#ifndef PROFILE_COUNT
-#define PROFILE_COUNT			100000L
-#endif
-
-#ifndef PROFILE_COUNT_EXPENSIVE
-#define PROFILE_COUNT_EXPENSIVE		10000L
-#endif
-
-#define ELAPSED_UTIME ((unsigned long) elapsed_utime.tv_sec * 1000000 +	(unsigned long) elapsed_utime.tv_usec)
-#define ELAPSED_STIME ((unsigned long) elapsed_stime.tv_sec * 1000000 + (unsigned long) elapsed_stime.tv_usec)
-
-#define libgtop_timeradd(tvp, uvp, vvp)						\
-	do {								\
-		(vvp)->tv_sec = (tvp)->tv_sec + (uvp)->tv_sec;		\
-		(vvp)->tv_usec = (tvp)->tv_usec + (uvp)->tv_usec;	\
-		if ((vvp)->tv_usec >= 1000000) {			\
-			(vvp)->tv_sec++;				\
-			(vvp)->tv_usec -= 1000000;			\
-		}							\
-	} while (0)
-#define libgtop_timersub(tvp, uvp, vvp)						\
-	do {								\
-		(vvp)->tv_sec = (tvp)->tv_sec - (uvp)->tv_sec;		\
-		(vvp)->tv_usec = (tvp)->tv_usec - (uvp)->tv_usec;	\
-		if ((vvp)->tv_usec < 0) {				\
-			(vvp)->tv_sec--;				\
-			(vvp)->tv_usec += 1000000;			\
-		}							\
-	} while (0)
-
-int
-main (int argc, char *argv [])
-{
-	glibtop_union data;
-	unsigned c, count, *ptr;
-	struct rusage total_start, total_end;
-	struct rusage rusage_start, rusage_end;
-	struct timeval elapsed_utime, elapsed_stime;
-	pid_t pid;
-
-	count = PROFILE_COUNT;
-
-	setlocale (LC_ALL, "");
-	bindtextdomain (PACKAGE, GTOPLOCALEDIR);
-	textdomain (PACKAGE);
-
-	printf ("%-12s (%-10s): %7s - %9s - %9s\n",
-		"Feature", "Flags", "Count", "utime", "stime");
-	printf ("-------------------------------------------"
-		"---------------\n");
-	
-	glibtop_init_r (&glibtop_global_server, 0, 0);
-
-	getrusage (RUSAGE_SELF, &total_start);
-
-	getrusage (RUSAGE_SELF, &rusage_start);
-
-	for (c = 0; c < PROFILE_COUNT; c++)
-		glibtop_get_cpu (&data.cpu);
-
-	getrusage (RUSAGE_SELF, &rusage_end);
-
-	libgtop_timersub (&rusage_end.ru_utime, &rusage_start.ru_utime,
-			  &elapsed_utime);
-
-	libgtop_timersub (&rusage_end.ru_stime, &rusage_start.ru_stime,
-			  &elapsed_stime);
-
-	printf ("CPU          (0x%08lx): %7lu - %9.2Lf - %9.2Lf\n",
-		(unsigned long) data.cpu.flags, PROFILE_COUNT,
-		(long double) ELAPSED_UTIME / PROFILE_COUNT,
-		(long double) ELAPSED_STIME / PROFILE_COUNT);
-
-	getrusage (RUSAGE_SELF, &rusage_start);
-
-	for (c = 0; c < PROFILE_COUNT_EXPENSIVE; c++)
-		glibtop_get_mem (&data.mem);
-
-	getrusage (RUSAGE_SELF, &rusage_end);
-
-	libgtop_timersub (&rusage_end.ru_utime, &rusage_start.ru_utime,
-			  &elapsed_utime);
-
-	libgtop_timersub (&rusage_end.ru_stime, &rusage_start.ru_stime,
-			  &elapsed_stime);
-
-	printf ("Memory       (0x%08lx): %7lu - %9.2Lf - %9.2Lf\n",
-		(unsigned long) data.mem.flags, PROFILE_COUNT_EXPENSIVE,
-		(long double) ELAPSED_UTIME / PROFILE_COUNT_EXPENSIVE,
-		(long double) ELAPSED_STIME / PROFILE_COUNT_EXPENSIVE);
-
-	getrusage (RUSAGE_SELF, &rusage_start);
-
-	for (c = 0; c < PROFILE_COUNT_EXPENSIVE; c++)
-		glibtop_get_swap (&data.swap);
-
-	getrusage (RUSAGE_SELF, &rusage_end);
-
-	libgtop_timersub (&rusage_end.ru_utime, &rusage_start.ru_utime,
-			  &elapsed_utime);
-
-	libgtop_timersub (&rusage_end.ru_stime, &rusage_start.ru_stime,
-			  &elapsed_stime);
-
-	printf ("Swap         (0x%08lx): %7lu - %9.2Lf - %9.2Lf\n",
-		(unsigned long) data.swap.flags, PROFILE_COUNT_EXPENSIVE,
-		(long double) ELAPSED_UTIME / PROFILE_COUNT_EXPENSIVE,
-		(long double) ELAPSED_STIME / PROFILE_COUNT_EXPENSIVE);
-
-	getrusage (RUSAGE_SELF, &rusage_start);
-
-	for (c = 0; c < PROFILE_COUNT; c++)
-		glibtop_get_uptime (&data.uptime);
-
-	getrusage (RUSAGE_SELF, &rusage_end);
-
-	libgtop_timersub (&rusage_end.ru_utime, &rusage_start.ru_utime,
-			  &elapsed_utime);
-
-	libgtop_timersub (&rusage_end.ru_stime, &rusage_start.ru_stime,
-			  &elapsed_stime);
-
-	printf ("Uptime       (0x%08lx): %7lu - %9.2Lf - %9.2Lf\n",
-		(unsigned long) data.uptime.flags, PROFILE_COUNT,
-		(long double) ELAPSED_UTIME / PROFILE_COUNT,
-		(long double) ELAPSED_STIME / PROFILE_COUNT);
-
-	getrusage (RUSAGE_SELF, &rusage_start);
-
-	for (c = 0; c < PROFILE_COUNT; c++)
-		glibtop_get_loadavg (&data.loadavg);
-
-	getrusage (RUSAGE_SELF, &rusage_end);
-
-	libgtop_timersub (&rusage_end.ru_utime, &rusage_start.ru_utime,
-			  &elapsed_utime);
-
-	libgtop_timersub (&rusage_end.ru_stime, &rusage_start.ru_stime,
-			  &elapsed_stime);
-
-	printf ("Loadavg      (0x%08lx): %7lu - %9.2Lf - %9.2Lf\n",
-		(unsigned long) data.loadavg.flags, PROFILE_COUNT,
-		(long double) ELAPSED_UTIME / PROFILE_COUNT,
-		(long double) ELAPSED_STIME / PROFILE_COUNT);
-
-	printf ("\n");
-
-	getrusage (RUSAGE_SELF, &rusage_start);
-
-	for (c = 0; c < PROFILE_COUNT_EXPENSIVE; c++) {
-		ptr = glibtop_get_proclist (&data.proclist, 0, 0);
-		glibtop_free (ptr);
-	}
-
-	getrusage (RUSAGE_SELF, &rusage_end);
-
-	libgtop_timersub (&rusage_end.ru_utime, &rusage_start.ru_utime,
-			  &elapsed_utime);
-
-	libgtop_timersub (&rusage_end.ru_stime, &rusage_start.ru_stime,
-			  &elapsed_stime);
-
-	printf ("Proclist     (0x%08lx): %7lu - %9.2Lf - %9.2Lf\n",
-		(unsigned long) data.proclist.flags,
-		PROFILE_COUNT_EXPENSIVE,
-		(long double) ELAPSED_UTIME / PROFILE_COUNT_EXPENSIVE,
-		(long double) ELAPSED_STIME / PROFILE_COUNT_EXPENSIVE);
-
-	pid = getpid ();
-
-	printf ("\n");
-
-	getrusage (RUSAGE_SELF, &rusage_start);
-
-	for (c = 0; c < PROFILE_COUNT; c++)
-		glibtop_get_proc_state (&data.proc_state, pid);
-
-	getrusage (RUSAGE_SELF, &rusage_end);
-
-	libgtop_timersub (&rusage_end.ru_utime, &rusage_start.ru_utime,
-			  &elapsed_utime);
-
-	libgtop_timersub (&rusage_end.ru_stime, &rusage_start.ru_stime,
-			  &elapsed_stime);
-
-	printf ("Proc_State   (0x%08lx): %7lu - %9.2Lf - %9.2Lf\n",
-		(unsigned long) data.proc_state.flags, PROFILE_COUNT,
-		(long double) ELAPSED_UTIME / PROFILE_COUNT,
-		(long double) ELAPSED_STIME / PROFILE_COUNT);
-
-	getrusage (RUSAGE_SELF, &rusage_start);
-
-	for (c = 0; c < PROFILE_COUNT; c++)
-		glibtop_get_proc_uid (&data.proc_uid, pid);
-
-	getrusage (RUSAGE_SELF, &rusage_end);
-
-	libgtop_timersub (&rusage_end.ru_utime, &rusage_start.ru_utime,
-			  &elapsed_utime);
-
-	libgtop_timersub (&rusage_end.ru_stime, &rusage_start.ru_stime,
-			  &elapsed_stime);
-
-	printf ("Proc_Uid     (0x%08lx): %7lu - %9.2Lf - %9.2Lf\n",
-		(unsigned long) data.proc_uid.flags, PROFILE_COUNT,
-		(long double) ELAPSED_UTIME / PROFILE_COUNT,
-		(long double) ELAPSED_STIME / PROFILE_COUNT);
-
-	getrusage (RUSAGE_SELF, &rusage_start);
-
-	for (c = 0; c < PROFILE_COUNT; c++)
-		glibtop_get_proc_mem (&data.proc_mem, pid);
-
-	getrusage (RUSAGE_SELF, &rusage_end);
-
-	libgtop_timersub (&rusage_end.ru_utime, &rusage_start.ru_utime,
-			  &elapsed_utime);
-
-	libgtop_timersub (&rusage_end.ru_stime, &rusage_start.ru_stime,
-			  &elapsed_stime);
-
-	printf ("Proc_Mem     (0x%08lx): %7lu - %9.2Lf - %9.2Lf\n",
-		(unsigned long) data.proc_mem.flags, PROFILE_COUNT,
-		(long double) ELAPSED_UTIME / PROFILE_COUNT,
-		(long double) ELAPSED_STIME / PROFILE_COUNT);
-
-	getrusage (RUSAGE_SELF, &rusage_start);
-
-	for (c = 0; c < PROFILE_COUNT; c++)
-		glibtop_get_proc_segment (&data.proc_segment, pid);
-
-	getrusage (RUSAGE_SELF, &rusage_end);
-
-	libgtop_timersub (&rusage_end.ru_utime, &rusage_start.ru_utime,
-			  &elapsed_utime);
-
-	libgtop_timersub (&rusage_end.ru_stime, &rusage_start.ru_stime,
-			  &elapsed_stime);
-
-	printf ("Proc_Segment (0x%08lx): %7lu - %9.2Lf - %9.2Lf\n",
-		(unsigned long) data.proc_segment.flags, PROFILE_COUNT,
-		(long double) ELAPSED_UTIME / PROFILE_COUNT,
-		(long double) ELAPSED_STIME / PROFILE_COUNT);
-
-	getrusage (RUSAGE_SELF, &rusage_start);
-
-	for (c = 0; c < PROFILE_COUNT; c++)
-		glibtop_get_proc_time (&data.proc_time, pid);
-
-	getrusage (RUSAGE_SELF, &rusage_end);
-
-	libgtop_timersub (&rusage_end.ru_utime, &rusage_start.ru_utime,
-			  &elapsed_utime);
-
-	libgtop_timersub (&rusage_end.ru_stime, &rusage_start.ru_stime,
-			  &elapsed_stime);
-
-	printf ("Proc_Time    (0x%08lx): %7lu - %9.2Lf - %9.2Lf\n",
-		(unsigned long) data.proc_time.flags, PROFILE_COUNT,
-		(long double) ELAPSED_UTIME / PROFILE_COUNT,
-		(long double) ELAPSED_STIME / PROFILE_COUNT);
-
-	getrusage (RUSAGE_SELF, &rusage_start);
-
-	for (c = 0; c < PROFILE_COUNT; c++)
-		glibtop_get_proc_signal (&data.proc_signal, pid);
-	
-	getrusage (RUSAGE_SELF, &rusage_end);
-
-	libgtop_timersub (&rusage_end.ru_utime, &rusage_start.ru_utime,
-			  &elapsed_utime);
-
-	libgtop_timersub (&rusage_end.ru_stime, &rusage_start.ru_stime,
-			  &elapsed_stime);
-
-	printf ("Proc_Signal  (0x%08lx): %7lu - %9.2Lf - %9.2Lf\n",
-		(unsigned long) data.proc_signal.flags, PROFILE_COUNT,
-		(long double) ELAPSED_UTIME / PROFILE_COUNT,
-		(long double) ELAPSED_STIME / PROFILE_COUNT);
-
-	getrusage (RUSAGE_SELF, &rusage_start);
-
-	for (c = 0; c < PROFILE_COUNT; c++)
-		glibtop_get_proc_kernel (&data.proc_kernel, pid);
-
-	getrusage (RUSAGE_SELF, &rusage_end);
-
-	libgtop_timersub (&rusage_end.ru_utime, &rusage_start.ru_utime,
-			  &elapsed_utime);
-
-	libgtop_timersub (&rusage_end.ru_stime, &rusage_start.ru_stime,
-			  &elapsed_stime);
-
-	printf ("Proc_Kernel  (0x%08lx): %7lu - %9.2Lf - %9.2Lf\n",
-		(unsigned long) data.proc_kernel.flags, PROFILE_COUNT,
-		(long double) ELAPSED_UTIME / PROFILE_COUNT,
-		(long double) ELAPSED_STIME / PROFILE_COUNT);
-	
-	getrusage (RUSAGE_SELF, &total_end);
-
-	libgtop_timersub (&total_end.ru_utime, &total_start.ru_utime,
-			  &elapsed_utime);
-
-	libgtop_timersub (&total_end.ru_stime, &total_start.ru_stime,
-			  &elapsed_stime);
-
-	printf ("-------------------------------------------"
-		"---------------\n");
-
-	printf ("%-36s %9lu - %9lu\n\n", "TOTAL",
-		ELAPSED_UTIME, ELAPSED_STIME);
-
-	printf ("All timings are in clock ticks "
-		"(1000000 ticks per second).\n\n");
-
-	glibtop_close ();
-
-	exit (0);
-}

include/glibtop/Makefile.am

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

include/glibtop/error.h

@@ -28,22 +28,13 @@
 
 BEGIN_LIBGTOP_DECLS
 
-#ifndef G_GNUC_UNUSED
-#if	__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4)
-#define G_GNUC_UNUSED				\
-  __attribute__((unused))
-#else	/* !__GNUC__ */
-#define	G_GNUC_UNUSED
-#endif	/* !__GNUC__ */
-#endif /* defined G_GNUC_UNUSED */
-
 void glibtop_error_vr (glibtop *server, char *format, va_list args);
 void glibtop_warn_vr (glibtop *server, char *format, va_list args);
 
 void glibtop_error_io_vr (glibtop *server, char *format, int, va_list args);
 void glibtop_warn_io_vr (glibtop *server, char *format, int, va_list args);
 
-static void G_GNUC_UNUSED
+static void
 glibtop_error_r (glibtop *server, char *format, ...)
 {
 	va_list args;
@@ -53,7 +44,7 @@ glibtop_error_r (glibtop *server, char *format, ...)
 	va_end (args);
 }
 
-static void G_GNUC_UNUSED
+static void
 glibtop_warn_r (glibtop *server, char *format, ...)
 {
 	va_list args;
@@ -63,7 +54,7 @@ glibtop_warn_r (glibtop *server, char *format, ...)
 	va_end (args);
 }
 
-static void G_GNUC_UNUSED
+static void
 glibtop_error_io_r (glibtop *server, char *format, ...)
 {
 	va_list args;
@@ -73,7 +64,7 @@ glibtop_error_io_r (glibtop *server, char *format, ...)
 	va_end (args);
 }
 
-static void G_GNUC_UNUSED
+static void
 glibtop_warn_io_r (glibtop *server, char *format, ...)
 {
 	va_list args;

kernel/ChangeLog

@@ -1,14 +0,0 @@
-1998-07-21  Martin Baulig  <martin@home-of-linux.org>
-
-	* table20: New directory for 2.0.xx kernels.
-
-	* table21: New directory for 2.1.xx kernels.
-
-	* *: Moved into `table20' and `table21'.
-
-1998-06-14  Martin Baulig  <baulig@taurus.uni-trier.de>
-
-	* README: Added README.
-
-	* kernel.patch: Patch for the Linux kernel to add the
-	new system call.

kernel/sysctl/.cvsignore

@@ -1 +0,0 @@
-*.flags

kernel/sysctl/libgtop.h

@@ -5,19 +5,12 @@
 
 enum {
     LIBGTOP_VERSION = 1,
+    LIBGTOP_PROC,
     LIBGTOP_UPDATE_EXPENSIVE,
-    LIBGTOP_STAT = 101,
+    LIBGTOP_STAT,
     LIBGTOP_MEM,
     LIBGTOP_SWAP,
-    LIBGTOP_PROCLIST = 201,
+    LIBGTOP_PROCLIST
-    LIBGTOP_PROC_STATE = 211,
-    LIBGTOP_PROC_KERNEL,
-    LIBGTOP_PROC_SEGMENT,
-    LIBGTOP_PROC_MEM,
-    LIBGTOP_PROC_SIGNAL,
-    LIBGTOP_PROC_ARGS = 251,
-    LIBGTOP_PROC_MAPS,
-    LIBGTOP_NETLOAD = 301
 };
 
 enum {
@@ -30,47 +23,12 @@ enum {
     LIBGTOP_PROCLIST_RUID
 };
 
-#define LIBGTOP_NSIG			4
+#define LIBGTOP_PROCLIST_MASK		15	
-
-#define LIBGTOP_PROCLIST_MASK		15
-#define LIBGTOP_MAX_GROUPS		32
 
 #define LIBGTOP_EXCLUDE_IDLE		0x1000
 #define LIBGTOP_EXCLUDE_SYSTEM		0x2000
 #define LIBGTOP_EXCLUDE_NOTTY		0x4000
 
-#define LIBGTOP_TASK_RUNNING		1
-#define LIBGTOP_TASK_INTERRUPTIBLE	2
-#define LIBGTOP_TASK_UNINTERRUPTIBLE	4
-#define LIBGTOP_TASK_ZOMBIE		8
-#define LIBGTOP_TASK_STOPPED		16
-#define LIBGTOP_TASK_SWAPPING		32
-
-#define LIBGTOP_VM_READ		0x0001	/* currently active flags */
-#define LIBGTOP_VM_WRITE	0x0002
-#define LIBGTOP_VM_EXEC		0x0004
-#define LIBGTOP_VM_SHARED	0x0008
-
-#define LIBGTOP_VM_MAYREAD	0x0010	/* limits for mprotect() etc */
-#define LIBGTOP_VM_MAYWRITE	0x0020
-#define LIBGTOP_VM_MAYEXEC	0x0040
-#define LIBGTOP_VM_MAYSHARE	0x0080
-
-#define LIBGTOP_VM_GROWSDOWN	0x0100	/* general info on the segment */
-#define LIBGTOP_VM_GROWSUP	0x0200
-#define LIBGTOP_VM_SHM		0x0400	/* shared memory area, don't swap out */
-#define LIBGTOP_VM_DENYWRITE	0x0800	/* ETXTBSY on write attempts.. */
-
-#define LIBGTOP_VM_EXECUTABLE	0x1000
-#define LIBGTOP_VM_LOCKED	0x2000
-#define LIBGTOP_VM_IO		0x4000  /* Memory mapped I/O or similar */
-
-#define LIBGTOP_MAP_PATH_LEN	(PAGE_SIZE - sizeof (libgtop_proc_maps_header_t))
-
-#ifndef min
-#define min(a,b) ((a < b) ? a : b)
-#endif
-
 typedef struct libgtop_stat libgtop_stat_t;
 
 typedef struct libgtop_cpu libgtop_cpu_t;
@@ -78,17 +36,6 @@ typedef struct libgtop_mem libgtop_mem_t;
 typedef struct libgtop_swap libgtop_swap_t;
 typedef struct libgtop_proclist libgtop_proclist_t;
 
-typedef struct libgtop_proc_state libgtop_proc_state_t;
-typedef struct libgtop_proc_kernel libgtop_proc_kernel_t;
-typedef struct libgtop_proc_segment libgtop_proc_segment_t;
-typedef struct libgtop_proc_mem libgtop_proc_mem_t;
-typedef struct libgtop_proc_signal libgtop_proc_signal_t;
-
-typedef struct libgtop_proc_maps_header libgtop_proc_maps_header_t;
-typedef struct libgtop_proc_maps libgtop_proc_maps_t;
-
-typedef struct libgtop_netload libgtop_netload_t;
-
 struct libgtop_cpu
 {
     unsigned long total;		/* Total CPU Time		*/
@@ -104,7 +51,6 @@ struct libgtop_mem
     unsigned long freeram;		/* Available memory size */
     unsigned long sharedram;		/* Amount of shared memory */
     unsigned long bufferram;		/* Memory used by buffers */
-    unsigned long cachedram;
 };
 
 struct libgtop_swap
@@ -115,7 +61,6 @@ struct libgtop_swap
 
 struct libgtop_proclist
 {
-    int count;
     int nr_running, nr_tasks, last_pid;
     unsigned pids [NR_TASKS];
 };
@@ -134,109 +79,4 @@ struct libgtop_stat
     unsigned int pswpin, pswpout;	/* # of swap pgs brought in/out	*/
 };
 
-struct libgtop_proc_state
-{
-    long state;
-    unsigned long flags;
-    char comm [16];
-    int uid, euid, suid, fsuid;
-    int gid, egid, sgid, fsgid;
-    int pid, pgrp, ppid;
-    int session;
-    unsigned int tty;
-    int tpgid;
-    long priority, counter, def_priority;
-    long utime, stime, cutime, cstime, start_time;
-    long per_cpu_utime [NR_CPUS], per_cpu_stime [NR_CPUS];
-    int has_cpu, processor, last_processor;
-
-    unsigned long context;
-    unsigned long start_code, end_code, start_data, end_data;
-    unsigned long start_brk, brk, start_stack, start_mmap;
-    unsigned long arg_start, arg_end, env_start, env_end;
-    unsigned long rss, rlim, total_vm, locked_vm;
-
-    unsigned long policy, rt_priority;
-    unsigned long it_real_value, it_prof_value, it_virt_value;
-    unsigned long it_real_incr, it_prof_incr, it_virt_incr;
-
-    unsigned long keip, kesp;
-    unsigned long min_flt, maj_flt, cmin_flt, cmaj_flt;
-    unsigned long nswap, cnswap;
-
-    int ngroups, groups [LIBGTOP_MAX_GROUPS];
-};
-
-struct libgtop_proc_kernel
-{
-    unsigned long wchan;
-};
-
-struct libgtop_proc_segment
-{
-    unsigned long vsize, data, exec, stack, lib;
-};
-
-struct libgtop_proc_mem
-{
-    libgtop_proc_segment_t segment;
-    int size, resident, share, trs, lrs, drs, dt;
-    unsigned long rss, rlim;
-};
-
-struct libgtop_proc_signal
-{
-    unsigned long signal [LIBGTOP_NSIG];
-    unsigned long blocked [LIBGTOP_NSIG];
-    unsigned long ignore [LIBGTOP_NSIG];
-    unsigned long catch [LIBGTOP_NSIG];
-};
-
-struct libgtop_proc_maps_header
-{
-    unsigned long start, end, offset, perm;
-    off_t filename_offset;
-    ino_t inode;
-    dev_t device;
-} __attribute__ ((aligned (64)));
-
-struct libgtop_proc_maps
-{
-    libgtop_proc_maps_header_t header;
-    char filename [LIBGTOP_MAP_PATH_LEN];
-};
-
-struct libgtop_netload
-{
-    unsigned long rx_packets;		/* total packets received	*/
-    unsigned long tx_packets;		/* total packets transmitted	*/
-    unsigned long rx_bytes;		/* total bytes received 	*/
-    unsigned long tx_bytes;		/* total bytes transmitted	*/
-    unsigned long rx_errors;		/* bad packets received		*/
-    unsigned long tx_errors;		/* packet transmit problems	*/
-    unsigned long rx_dropped;		/* no space in linux buffers	*/
-    unsigned long tx_dropped;		/* no space available in linux	*/
-    unsigned long multicast;		/* multicast packets received	*/
-    unsigned long collisions;
-    
-    /* detailed rx_errors: */
-    unsigned long rx_length_errors;
-    unsigned long rx_over_errors;	/* receiver ring buff overflow	*/
-    unsigned long rx_crc_errors;	/* recved pkt with crc error	*/
-    unsigned long rx_frame_errors;	/* recv'd frame alignment error */
-    unsigned long rx_fifo_errors;	/* recv'r fifo overrun		*/
-    unsigned long rx_missed_errors;	/* receiver missed packet	*/
-    
-    /* detailed tx_errors */
-    unsigned long tx_aborted_errors;
-    unsigned long tx_carrier_errors;
-    unsigned long tx_fifo_errors;
-    unsigned long tx_heartbeat_errors;
-    unsigned long tx_window_errors;
-    
-    /* for cslip etc */
-    unsigned long rx_compressed;
-    unsigned long tx_compressed;
-};
-
 #endif

kernel/sysctl/libgtop_syms.c

@@ -15,8 +15,6 @@
 extern unsigned long total_forks;
 
 EXPORT_SYMBOL(task);
-EXPORT_SYMBOL(init_mm);
-EXPORT_SYMBOL(pidhash);
 EXPORT_SYMBOL(avenrun);
 EXPORT_SYMBOL(nr_running);
 EXPORT_SYMBOL(nr_tasks);
@@ -24,7 +22,3 @@ EXPORT_SYMBOL(last_pid);
 EXPORT_SYMBOL(total_forks);
 EXPORT_SYMBOL(si_swapinfo);
 
-extern void scheduling_functions_start_here(void);
-extern void scheduling_functions_end_here(void);
-EXPORT_SYMBOL(scheduling_functions_start_here);
-EXPORT_SYMBOL(scheduling_functions_end_here);

kernel/table.h

@@ -1,188 +0,0 @@
-#ifndef _LINUX_TABLE_H
-#define _LINUX_TABLE_H
-
-#ifdef _KERNEL
-#include <linux/types.h>
-#else
-#define NR_TASKS		512
-#endif
-
-#define TABLE_KERN_PROC_ALL		0	/* all processes */
-#define TABLE_KERN_PROC_PID		1
-#define TABLE_KERN_PROC_PGRP		2
-#define TABLE_KERN_PROC_SESSION		3
-#define TABLE_KERN_PROC_TTY		4
-#define TABLE_KERN_PROC_UID		5
-#define TABLE_KERN_PROC_RUID		6
-
-#define TABLE_KERN_PROC_MASK		15	
-
-#define TABLE_EXCLUDE_IDLE		0x1000
-#define TABLE_EXCLUDE_SYSTEM		0x2000
-#define TABLE_EXCLUDE_NOTTY		0x4000
-
-#define TABLE_VERSION		0
-#define TABLE_CPU		1
-#define TABLE_MEM		2
-#define TABLE_SWAP		3
-#define TABLE_LOADAVG		4
-#define TABLE_UPTIME		5
-#define TABLE_PROCLIST		6
-#define TABLE_PROC_UID		7
-#define TABLE_PROC_MEM		8
-#define TABLE_PROC_SEGMENT	9
-#define TABLE_PROC_TIME		10
-#define TABLE_PROC_STATE	11
-#define TABLE_PROC_SIGNAL	12
-#define TABLE_PROC_KERNEL	13
-
-/* CPU Usage (in jiffies = 1/100th seconds) */
-
-struct table_cpu
-{
-	unsigned long total;		/* Total CPU Time		*/
-	unsigned long user;		/* CPU Time in User Mode	*/
-	unsigned long nice;		/* CPU Time in User Mode (nice)	*/
-	unsigned long sys;		/* CPU Time in System Mode	*/
-	unsigned long idle;		/* CPU Time in the Idle Task	*/
-	unsigned long frequency;	/* Tick frequency		*/
-};
-
-/* Memory Usage (in bytes) */
-
-struct table_mem
-{
-	unsigned long total;		/* Total physical memory	*/
-	unsigned long used;		/* Used memory size		*/
-	unsigned long free;		/* Free memory size		*/
-	unsigned long shared;		/* Shared memory size		*/
-	unsigned long buffer;		/* Size of buffers		*/
-	unsigned long cached;		/* Size of cached memory       	*/
-};
-
-/* Swap Space (in bytes) */
-
-struct table_swap
-{
-	unsigned long total;		/* Total swap space		*/
-	unsigned long used;		/* Used swap space		*/
-	unsigned long free;		/* Free swap space		*/
-	unsigned long pagein;		/* Total # of pages swapped in	*/
-	unsigned long pageout;		/* Total # of pages swapped out	*/
-};
-
-/* Load average */
-
-struct table_loadavg
-{
-	double loadavg [3];
-	unsigned nr_running;
-	unsigned nr_tasks;
-	unsigned last_pid;
-};
-
-/* Uptime */
-
-struct table_uptime
-{
-	unsigned long uptime;
-	unsigned long idle;
-};
-
-/* Process list. */
-
-struct proclist_args
-{
-	int which, arg;
-};
-
-struct table_proclist
-{
-	int nr_running, nr_tasks, last_pid;
-	unsigned pids [NR_TASKS];
-};
-
-/* Information about processes. */
-
-struct table_proc_state
-{
-	long state;
-	unsigned long flags;
-	char comm[16];
-	int uid, gid;
-};
-
-struct table_proc_uid
-{
-	int uid, euid, suid, fsuid;
-	int gid, egid, sgid, fsgid;
-	int pid, pgrp, ppid;
-	int session;
-	unsigned int tty;
-	int tpgid;
-	long priority;
-	long counter;
-	long def_priority;
-};
-
-struct table_proc_mem
-{
-	unsigned long context;
-	unsigned long start_code, end_code, start_data, end_data;
-	unsigned long start_brk, brk, start_stack, start_mmap;
-	unsigned long arg_start, arg_end, env_start, env_end;
-	unsigned long rss, rlim, total_vm, locked_vm;
-};
-
-struct table_proc_segment
-{
-	unsigned long vsize;
-	unsigned long size, resident, shared;
-	unsigned long trs, lrs, drs, srs, dt;
-};
-
-struct table_proc_time
-{
-	long utime, stime, cutime, cstime, start_time;
-	unsigned long timeout, policy, rt_priority;
-	unsigned long it_real_value, it_prof_value, it_virt_value;
-	unsigned long it_real_incr, it_prof_incr, it_virt_incr;
-};
-
-struct table_proc_signal
-{
-	unsigned long long signal,
-		blocked,	/* bitmap of masked signals */
-		ignored,	/* mask of ignored signals */
-		caught;		/* mask of caught signals */
-};
-
-struct table_proc_kernel
-{
-	unsigned long keip, kesp, wchan;
-	unsigned long min_flt, maj_flt, cmin_flt, cmaj_flt;
-	unsigned long nswap, cnswap;
-};
-
-/* Union */
-
-union table
-{
-	struct table_cpu cpu;
-	struct table_mem mem;
-	struct table_swap swap;
-	struct table_loadavg loadavg;
-	struct table_uptime uptime;
-	struct table_proclist proclist;
-	struct table_proc_uid proc_uid;
-	struct table_proc_mem proc_mem;
-	struct table_proc_segment proc_segment;
-	struct table_proc_time proc_time;
-	struct table_proc_state proc_state;	
-	struct table_proc_signal proc_signal;
-	struct table_proc_kernel proc_kernel;
-};
-
-#endif /* _LINUX_IPC_H */
-
-

kernel/table20/Makefile

@@ -1,13 +0,0 @@
-#
-# Makefile for the linux system information tables.
-#
-# Note! Dependencies are done automagically by 'make dep', which also
-# removes any old dependencies. DON'T put your own dependencies here
-# unless it's something special (ie not a .c file).
-#
-# Note 2! The CFLAGS definition is now in the main makefile...
-
-O_TARGET := table.o
-O_OBJS   := main.o
-
-include $(TOPDIR)/Rules.make

kernel/table20/README

@@ -1,21 +0,0 @@
-This is a new system call `table ()' for the Linux table. It is faster
-than reading from /proc and can be used to fetch all information required
-for libgtop until whe have some other function (extended sysctl, ...) in
-standard kernels.
-
-I didn't want to change sysctl or some other function myself cause this may
-cause other applications relying upon those function to fail. This is
-something for the ``real'' kernel gurus ...
-
-To use this new system call for libgtop, do the following:
-
-* Copy this directory to /usr/src/linux/table
-* Make /usr/src/linux/include/linux/table.h symlink to /usr/src/linux/table/table.h
-* Apply the patch `kernel.patch' to the kernel, compile, install and reboot
-* Recompile libgtop (remove `config.cache' and run the `autogen.sh' again).
-
-If you want to change and/or add something - feel free to do so !
-
-Have fun,
-
-Martin

kernel/table20/entry-i386.S

@@ -1,706 +0,0 @@
-/*
- *  linux/arch/i386/entry.S
- *
- *  Copyright (C) 1991, 1992  Linus Torvalds
- */
-
-/*
- * entry.S contains the system-call and fault low-level handling routines.
- * This also contains the timer-interrupt handler, as well as all interrupts
- * and faults that can result in a task-switch.
- *
- * NOTE: This code handles signal-recognition, which happens every time
- * after a timer-interrupt and after each system call.
- *
- * I changed all the .align's to 4 (16 byte alignment), as that's faster
- * on a 486.
- *
- * Stack layout in 'ret_from_system_call':
- * 	ptrace needs to have all regs on the stack.
- *	if the order here is changed, it needs to be 
- *	updated in fork.c:copy_process, signal.c:do_signal,
- *	ptrace.c and ptrace.h
- *
- *	 0(%esp) - %ebx
- *	 4(%esp) - %ecx
- *	 8(%esp) - %edx
- *       C(%esp) - %esi
- *	10(%esp) - %edi
- *	14(%esp) - %ebp
- *	18(%esp) - %eax
- *	1C(%esp) - %ds
- *	20(%esp) - %es
- *      24(%esp) - %fs
- *	28(%esp) - %gs
- *	2C(%esp) - orig_eax
- *	30(%esp) - %eip
- *	34(%esp) - %cs
- *	38(%esp) - %eflags
- *	3C(%esp) - %oldesp
- *	40(%esp) - %oldss
- */
-
-#include <linux/sys.h>
-#include <linux/linkage.h>
-#include <asm/segment.h>
-#define ASSEMBLY
-#include <asm/smp.h>
-
-EBX		= 0x00
-ECX		= 0x04
-EDX		= 0x08
-ESI		= 0x0C
-EDI		= 0x10
-EBP		= 0x14
-EAX		= 0x18
-DS		= 0x1C
-ES		= 0x20
-FS		= 0x24
-GS		= 0x28
-ORIG_EAX	= 0x2C
-EIP		= 0x30
-CS		= 0x34
-EFLAGS		= 0x38
-OLDESP		= 0x3C
-OLDSS		= 0x40
-
-CF_MASK		= 0x00000001
-IF_MASK		= 0x00000200
-NT_MASK		= 0x00004000
-VM_MASK		= 0x00020000
-
-/*
- * these are offsets into the task-struct.
- */
-state		=  0
-counter		=  4
-priority	=  8
-signal		= 12
-blocked		= 16
-flags		= 20
-dbgreg6		= 52
-dbgreg7		= 56
-exec_domain	= 60
-
-ENOSYS = 38
-
-#define SAVE_ALL \
-	cld; \
-	push %gs; \
-	push %fs; \
-	push %es; \
-	push %ds; \
-	pushl %eax; \
-	pushl %ebp; \
-	pushl %edi; \
-	pushl %esi; \
-	pushl %edx; \
-	pushl %ecx; \
-	pushl %ebx; \
-	movl $(KERNEL_DS),%edx; \
-	mov %dx,%ds; \
-	mov %dx,%es; \
-	movl $(USER_DS),%edx; \
-	mov %dx,%fs;
-
-#ifdef	__SMP__
-
-#define GET_PROCESSOR_ID \
-	movl SYMBOL_NAME(apic_reg), %edx; \
-	movl 32(%edx), %eax;\
-	movl %eax,SYMBOL_NAME(apic_retval); \
-	shrl $24,%eax; \
-	andb $0x0F,%al;
-
-/*
- *	Get the processor ID multiplied by 4
- */
-
-#define GET_PROCESSOR_OFFSET(x) \
-	movl SYMBOL_NAME(apic_reg), x ; \
-	movl 32( x ), x ; \
-	shrl $22, x ; \
-	andl $0x3C, x ;
-
-/* macro LEAVE_KERNEL decrements kernel_counter and resets kernel_flag and
-   saves processor variables if zero */
-#define	LEAVE_KERNEL \
-	pushfl; \
-	cli; \
-	GET_PROCESSOR_ID \
-	btrl $ SMP_FROM_SYSCALL,SYMBOL_NAME(smp_proc_in_lock)(,%eax,4); \
-	decl SYMBOL_NAME(syscall_count); \
-	decl SYMBOL_NAME(kernel_counter); \
-	jnz 1f;	\
-	movb SYMBOL_NAME(saved_active_kernel_processor), %al; \
-	movb %al, SYMBOL_NAME(active_kernel_processor); \
-	cmpb $(NO_PROC_ID), %al; \
-	jnz 1f; \
-	lock; \
-	btrl $0, SYMBOL_NAME(kernel_flag); \
-1:	popfl;
-
-/* macro ENTER_KERNEL waits for entering the kernel, increments
-   kernel_counter, and reloads the processor variables if necessary
-   uses : %eax, %edx (pushed and popped) 
-
-   Note: We go to great pains to minimise the number of locked operations.
-   We want to spin without locking, and lock when we attempt an update.
-   The pentium has a MESI cache so the spin without lock will exit when
-   another CPU write invalidates our cache, and the lock is avoided when
-   possible so we don't play ping-pong games with the cache line.
-
-*/
-
-#ifndef __SMP_PROF__
-
-#define SMP_PROF_A
-#define SMP_PROF_B 
-
-#else
-
-#define SMP_PROF_A movl $0,SYMBOL_NAME(smp_spins_syscall_cur)(,%eax,4);
-#define SMP_PROF_B incl SYMBOL_NAME(smp_spins_syscall)(,%eax,4); \
-        incl SYMBOL_NAME(smp_spins_syscall_cur)(,%eax,4);
-#endif
-
-#define	ENTER_KERNEL \
-	pushl %eax; \
-	pushl %ebx; \
-	pushl %ecx; \
-	pushl %edx; \
-	pushfl; \
-	cli; \
-	movl $6000, %ebx; \
-	movl SYMBOL_NAME(smp_loops_per_tick), %ecx; \
-	GET_PROCESSOR_ID \
-	btsl $ SMP_FROM_SYSCALL,SYMBOL_NAME(smp_proc_in_lock)(,%eax,4); \
-	SMP_PROF_A \
-1:	lock; \
-	btsl $0, SYMBOL_NAME(kernel_flag); \
-	jnc 3f; \
-	cmpb SYMBOL_NAME(active_kernel_processor), %al; \
-	je 4f; \
-2:	SMP_PROF_B \
-	btl %eax, SYMBOL_NAME(smp_invalidate_needed); \
-	jnc 5f; \
-	lock; \
-	btrl %eax, SYMBOL_NAME(smp_invalidate_needed); \
-	jnc 5f; \
-	movl %cr3,%edx; \
-	movl %edx,%cr3; \
-5:	sti; \
-	decl %ecx; \
-	cli; \
-	jne 7f; \
-	decl %ebx; \
-	jne 6f; \
-	call SYMBOL_NAME(non_irq_deadlock_detected); \
-6:	movl SYMBOL_NAME(smp_loops_per_tick), %ecx; \
-	cmpb SYMBOL_NAME(boot_cpu_id), %al; \
-	jne 7f; \
-	incl SYMBOL_NAME(jiffies);  \
-7:	btl $0, SYMBOL_NAME(kernel_flag); \
-	jc 2b; \
-	jmp 1b; \
-3:	movb %al, SYMBOL_NAME(active_kernel_processor); \
-4:	incl SYMBOL_NAME(kernel_counter); \
-	incl SYMBOL_NAME(syscall_count); \
-	popfl; \
-	popl %edx; \
-	popl %ecx; \
-	popl %ebx; \
-	popl %eax;
-
-
-#define RESTORE_ALL \
-	cmpw $(KERNEL_CS),CS(%esp); \
-	je 1f;   \
-	GET_PROCESSOR_OFFSET(%edx) \
-	movl SYMBOL_NAME(current_set)(,%edx), %eax ; ; \
-	movl dbgreg7(%eax),%ebx; \
-	movl %ebx,%db7;	\
-1:	LEAVE_KERNEL \
-	popl %ebx; \
-	popl %ecx; \
-	popl %edx; \
-	popl %esi; \
-	popl %edi; \
-	popl %ebp; \
-	popl %eax; \
-	pop %ds; \
-	pop %es; \
-	pop %fs; \
-	pop %gs; \
-	addl $4,%esp; \
-	iret
-
-#else
-
-#define RESTORE_ALL \
-	cmpw $(KERNEL_CS),CS(%esp); \
-	je 1f;   \
-	movl SYMBOL_NAME(current_set),%eax; \
-	movl dbgreg7(%eax),%ebx; \
-	movl %ebx,%db7;	\
-1:	\
-	popl %ebx; \
-	popl %ecx; \
-	popl %edx; \
-	popl %esi; \
-	popl %edi; \
-	popl %ebp; \
-	popl %eax; \
-	pop %ds; \
-	pop %es; \
-	pop %fs; \
-	pop %gs; \
-	addl $4,%esp; \
-	iret
-#endif
-
-ENTRY(lcall7)
-	pushfl			# We get a different stack layout with call gates,
-	pushl %eax		# which has to be cleaned up later..
-	SAVE_ALL
-#ifdef __SMP__
-	ENTER_KERNEL
-#endif
-	movl EIP(%esp),%eax	# due to call gates, this is eflags, not eip..
-	movl CS(%esp),%edx	# this is eip..
-	movl EFLAGS(%esp),%ecx	# and this is cs..
-	movl %eax,EFLAGS(%esp)	#
-	movl %edx,EIP(%esp)	# Now we move them to their "normal" places
-	movl %ecx,CS(%esp)	#
-	movl %esp,%eax
-#ifdef __SMP__
-	GET_PROCESSOR_OFFSET(%edx)	# Processor offset into edx
-	movl SYMBOL_NAME(current_set)(,%edx),%edx
-#else
-	movl SYMBOL_NAME(current_set),%edx
-#endif
-	pushl %eax
-	movl exec_domain(%edx),%edx	# Get the execution domain
-	movl 4(%edx),%edx	# Get the lcall7 handler for the domain
-	call *%edx
-	popl %eax
-	jmp ret_from_sys_call
-
-	ALIGN
-handle_bottom_half:
-	incl SYMBOL_NAME(intr_count)
-	call SYMBOL_NAME(do_bottom_half)
-	decl SYMBOL_NAME(intr_count)
-	jmp 9f
-	ALIGN
-reschedule:
-	pushl $ret_from_sys_call
-	jmp SYMBOL_NAME(schedule)    # test
-
-ENTRY(system_call)
-	pushl %eax			# save orig_eax
-	SAVE_ALL
-#ifdef __SMP__
-	ENTER_KERNEL
-#endif
-	movl $-ENOSYS,EAX(%esp)
-	cmpl $(NR_syscalls),%eax
-	jae ret_from_sys_call
-	movl SYMBOL_NAME(sys_call_table)(,%eax,4),%eax
-	testl %eax,%eax
-	je ret_from_sys_call
-#ifdef __SMP__
-	GET_PROCESSOR_OFFSET(%edx)
-	movl SYMBOL_NAME(current_set)(,%edx),%ebx
-#else
-	movl SYMBOL_NAME(current_set),%ebx
-#endif
-	andl $~CF_MASK,EFLAGS(%esp)	# clear carry - assume no errors
-	movl %db6,%edx
-	movl %edx,dbgreg6(%ebx)  # save current hardware debugging status
-	testb $0x20,flags(%ebx)		# PF_TRACESYS
-	jne 1f
-	call *%eax
-	movl %eax,EAX(%esp)		# save the return value
-	jmp ret_from_sys_call
-	ALIGN
-1:	call SYMBOL_NAME(syscall_trace)
-	movl ORIG_EAX(%esp),%eax
-	call SYMBOL_NAME(sys_call_table)(,%eax,4)
-	movl %eax,EAX(%esp)		# save the return value
-#ifdef __SMP__
-	GET_PROCESSOR_OFFSET(%eax)
-	movl SYMBOL_NAME(current_set)(,%eax),%eax
-#else
-	movl SYMBOL_NAME(current_set),%eax
-#endif
-	call SYMBOL_NAME(syscall_trace)
-
-	ALIGN
-	.globl ret_from_sys_call
-ret_from_sys_call:
-	cmpl $0,SYMBOL_NAME(intr_count)
-	jne 2f
-9:	movl SYMBOL_NAME(bh_mask),%eax
-	andl SYMBOL_NAME(bh_active),%eax
-	jne handle_bottom_half
-#ifdef __SMP__
-	cmpb $(NO_PROC_ID), SYMBOL_NAME(saved_active_kernel_processor)
-	jne 2f
-#endif
-	movl EFLAGS(%esp),%eax		# check VM86 flag: CS/SS are
-	testl $(VM_MASK),%eax		# different then
-	jne 1f
-	cmpw $(KERNEL_CS),CS(%esp)	# was old code segment supervisor ?
-	je 2f
-1:	sti
-	orl $(IF_MASK),%eax		# these just try to make sure
-	andl $~NT_MASK,%eax		# the program doesn't do anything
-	movl %eax,EFLAGS(%esp)		# stupid
-	cmpl $0,SYMBOL_NAME(need_resched)
-	jne reschedule
-#ifdef __SMP__
-	GET_PROCESSOR_OFFSET(%eax)
-	movl SYMBOL_NAME(current_set)(,%eax), %eax
-#else
-	movl SYMBOL_NAME(current_set),%eax
-#endif
-	cmpl SYMBOL_NAME(task),%eax	# task[0] cannot have signals
-	je 2f
-	movl blocked(%eax),%ecx
-	movl %ecx,%ebx			# save blocked in %ebx for signal handling
-	notl %ecx
-	andl signal(%eax),%ecx
-	jne signal_return
-2:	RESTORE_ALL
-	ALIGN
-signal_return:
-	movl %esp,%ecx
-	pushl %ecx
-	testl $(VM_MASK),EFLAGS(%ecx)
-	jne v86_signal_return
-	pushl %ebx
-	call SYMBOL_NAME(do_signal)
-	popl %ebx
-	popl %ebx
-	RESTORE_ALL
-	ALIGN
-v86_signal_return:
-	call SYMBOL_NAME(save_v86_state)
-	movl %eax,%esp
-	pushl %eax
-	pushl %ebx
-	call SYMBOL_NAME(do_signal)
-	popl %ebx
-	popl %ebx
-	RESTORE_ALL
-
-ENTRY(divide_error)
-	pushl $0		# no error code
-	pushl $ SYMBOL_NAME(do_divide_error)
-	ALIGN
-error_code:
-	push %fs
-	push %es
-	push %ds
-	pushl %eax
-	xorl %eax,%eax
-	pushl %ebp
-	pushl %edi
-	pushl %esi
-	pushl %edx
-	decl %eax			# eax = -1
-	pushl %ecx
-	pushl %ebx
-	cld
-	xorl %ebx,%ebx			# zero ebx
-	xchgl %eax, ORIG_EAX(%esp)	# orig_eax (get the error code. )
-	mov %gs,%bx			# get the lower order bits of gs
-	movl %esp,%edx
-	xchgl %ebx, GS(%esp)		# get the address and save gs.
-	pushl %eax			# push the error code
-	pushl %edx
-	movl $(KERNEL_DS),%edx
-	mov %dx,%ds
-	mov %dx,%es
-	movl $(USER_DS),%edx
-	mov %dx,%fs
-#ifdef __SMP__
-	ENTER_KERNEL
-	GET_PROCESSOR_OFFSET(%eax)
-	movl SYMBOL_NAME(current_set)(,%eax), %eax
-#else
-	movl SYMBOL_NAME(current_set),%eax
-#endif
-	movl %db6,%edx
-	movl %edx,dbgreg6(%eax)  # save current hardware debugging status
-	call *%ebx
-	addl $8,%esp
-	jmp ret_from_sys_call
-
-ENTRY(coprocessor_error)
-	pushl $0
-	pushl $ SYMBOL_NAME(do_coprocessor_error)
-	jmp error_code
-
-ENTRY(device_not_available)
-	pushl $-1		# mark this as an int
-	SAVE_ALL
-#ifdef __SMP__
-	ENTER_KERNEL
-#endif
-	pushl $ret_from_sys_call
-	movl %cr0,%eax
-	testl $0x4,%eax			# EM (math emulation bit)
-	je SYMBOL_NAME(math_state_restore)
-	pushl $0		# temporary storage for ORIG_EIP
-	call  SYMBOL_NAME(math_emulate)
-	addl $4,%esp
-	ret
-
-ENTRY(debug)
-	pushl $0
-	pushl $ SYMBOL_NAME(do_debug)
-	jmp error_code
-
-ENTRY(nmi)
-	pushl $0
-	pushl $ SYMBOL_NAME(do_nmi)
-	jmp error_code
-
-ENTRY(int3)
-	pushl $0
-	pushl $ SYMBOL_NAME(do_int3)
-	jmp error_code
-
-ENTRY(overflow)
-	pushl $0
-	pushl $ SYMBOL_NAME(do_overflow)
-	jmp error_code
-
-ENTRY(bounds)
-	pushl $0
-	pushl $ SYMBOL_NAME(do_bounds)
-	jmp error_code
-
-ENTRY(invalid_op)
-	pushl $0
-	pushl $ SYMBOL_NAME(do_invalid_op)
-	jmp error_code
-
-ENTRY(coprocessor_segment_overrun)
-	pushl $0
-	pushl $ SYMBOL_NAME(do_coprocessor_segment_overrun)
-	jmp error_code
-
-ENTRY(reserved)
-	pushl $0
-	pushl $ SYMBOL_NAME(do_reserved)
-	jmp error_code
-
-ENTRY(double_fault)
-	pushl $ SYMBOL_NAME(do_double_fault)
-	jmp error_code
-
-ENTRY(invalid_TSS)
-	pushl $ SYMBOL_NAME(do_invalid_TSS)
-	jmp error_code
-
-ENTRY(segment_not_present)
-	pushl $ SYMBOL_NAME(do_segment_not_present)
-	jmp error_code
-
-ENTRY(stack_segment)
-	pushl $ SYMBOL_NAME(do_stack_segment)
-	jmp error_code
-
-ENTRY(general_protection)
-	pushl $ SYMBOL_NAME(do_general_protection)
-	jmp error_code
-
-ENTRY(alignment_check)
-	pushl $ SYMBOL_NAME(do_alignment_check)
-	jmp error_code
-
-ENTRY(page_fault)
-	pushl $ SYMBOL_NAME(do_page_fault)
-	jmp error_code
-
-ENTRY(spurious_interrupt_bug)
-	pushl $0
-	pushl $ SYMBOL_NAME(do_spurious_interrupt_bug)
-	jmp error_code
-
-.data
-ENTRY(sys_call_table)
-	.long SYMBOL_NAME(sys_setup)		/* 0 */
-	.long SYMBOL_NAME(sys_exit)
-	.long SYMBOL_NAME(sys_fork)
-	.long SYMBOL_NAME(sys_read)
-	.long SYMBOL_NAME(sys_write)
-	.long SYMBOL_NAME(sys_open)		/* 5 */
-	.long SYMBOL_NAME(sys_close)
-	.long SYMBOL_NAME(sys_waitpid)
-	.long SYMBOL_NAME(sys_creat)
-	.long SYMBOL_NAME(sys_link)
-	.long SYMBOL_NAME(sys_unlink)		/* 10 */
-	.long SYMBOL_NAME(sys_execve)
-	.long SYMBOL_NAME(sys_chdir)
-	.long SYMBOL_NAME(sys_time)
-	.long SYMBOL_NAME(sys_mknod)
-	.long SYMBOL_NAME(sys_chmod)		/* 15 */
-	.long SYMBOL_NAME(sys_chown)
-	.long SYMBOL_NAME(sys_break)
-	.long SYMBOL_NAME(sys_stat)
-	.long SYMBOL_NAME(sys_lseek)
-	.long SYMBOL_NAME(sys_getpid)		/* 20 */
-	.long SYMBOL_NAME(sys_mount)
-	.long SYMBOL_NAME(sys_umount)
-	.long SYMBOL_NAME(sys_setuid)
-	.long SYMBOL_NAME(sys_getuid)
-	.long SYMBOL_NAME(sys_stime)		/* 25 */
-	.long SYMBOL_NAME(sys_ptrace)
-	.long SYMBOL_NAME(sys_alarm)
-	.long SYMBOL_NAME(sys_fstat)
-	.long SYMBOL_NAME(sys_pause)
-	.long SYMBOL_NAME(sys_utime)		/* 30 */
-	.long SYMBOL_NAME(sys_stty)
-	.long SYMBOL_NAME(sys_gtty)
-	.long SYMBOL_NAME(sys_access)
-	.long SYMBOL_NAME(sys_nice)
-	.long SYMBOL_NAME(sys_ftime)		/* 35 */
-	.long SYMBOL_NAME(sys_sync)
-	.long SYMBOL_NAME(sys_kill)
-	.long SYMBOL_NAME(sys_rename)
-	.long SYMBOL_NAME(sys_mkdir)
-	.long SYMBOL_NAME(sys_rmdir)		/* 40 */
-	.long SYMBOL_NAME(sys_dup)
-	.long SYMBOL_NAME(sys_pipe)
-	.long SYMBOL_NAME(sys_times)
-	.long SYMBOL_NAME(sys_prof)
-	.long SYMBOL_NAME(sys_brk)		/* 45 */
-	.long SYMBOL_NAME(sys_setgid)
-	.long SYMBOL_NAME(sys_getgid)
-	.long SYMBOL_NAME(sys_signal)
-	.long SYMBOL_NAME(sys_geteuid)
-	.long SYMBOL_NAME(sys_getegid)		/* 50 */
-	.long SYMBOL_NAME(sys_acct)
-	.long SYMBOL_NAME(sys_phys)
-	.long SYMBOL_NAME(sys_lock)
-	.long SYMBOL_NAME(sys_ioctl)
-	.long SYMBOL_NAME(sys_fcntl)		/* 55 */
-	.long SYMBOL_NAME(sys_mpx)
-	.long SYMBOL_NAME(sys_setpgid)
-	.long SYMBOL_NAME(sys_ulimit)
-	.long SYMBOL_NAME(sys_olduname)
-	.long SYMBOL_NAME(sys_umask)		/* 60 */
-	.long SYMBOL_NAME(sys_chroot)
-	.long SYMBOL_NAME(sys_ustat)
-	.long SYMBOL_NAME(sys_dup2)
-	.long SYMBOL_NAME(sys_getppid)
-	.long SYMBOL_NAME(sys_getpgrp)		/* 65 */
-	.long SYMBOL_NAME(sys_setsid)
-	.long SYMBOL_NAME(sys_sigaction)
-	.long SYMBOL_NAME(sys_sgetmask)
-	.long SYMBOL_NAME(sys_ssetmask)
-	.long SYMBOL_NAME(sys_setreuid)		/* 70 */
-	.long SYMBOL_NAME(sys_setregid)
-	.long SYMBOL_NAME(sys_sigsuspend)
-	.long SYMBOL_NAME(sys_sigpending)
-	.long SYMBOL_NAME(sys_sethostname)
-	.long SYMBOL_NAME(sys_setrlimit)	/* 75 */
-	.long SYMBOL_NAME(sys_getrlimit)
-	.long SYMBOL_NAME(sys_getrusage)
-	.long SYMBOL_NAME(sys_gettimeofday)
-	.long SYMBOL_NAME(sys_settimeofday)
-	.long SYMBOL_NAME(sys_getgroups)	/* 80 */
-	.long SYMBOL_NAME(sys_setgroups)
-	.long SYMBOL_NAME(old_select)
-	.long SYMBOL_NAME(sys_symlink)
-	.long SYMBOL_NAME(sys_lstat)
-	.long SYMBOL_NAME(sys_readlink)		/* 85 */
-	.long SYMBOL_NAME(sys_uselib)
-	.long SYMBOL_NAME(sys_swapon)
-	.long SYMBOL_NAME(sys_reboot)
-	.long SYMBOL_NAME(old_readdir)
-	.long SYMBOL_NAME(old_mmap)		/* 90 */
-	.long SYMBOL_NAME(sys_munmap)
-	.long SYMBOL_NAME(sys_truncate)
-	.long SYMBOL_NAME(sys_ftruncate)
-	.long SYMBOL_NAME(sys_fchmod)
-	.long SYMBOL_NAME(sys_fchown)		/* 95 */
-	.long SYMBOL_NAME(sys_getpriority)
-	.long SYMBOL_NAME(sys_setpriority)
-	.long SYMBOL_NAME(sys_profil)
-	.long SYMBOL_NAME(sys_statfs)
-	.long SYMBOL_NAME(sys_fstatfs)		/* 100 */
-	.long SYMBOL_NAME(sys_ioperm)
-	.long SYMBOL_NAME(sys_socketcall)
-	.long SYMBOL_NAME(sys_syslog)
-	.long SYMBOL_NAME(sys_setitimer)
-	.long SYMBOL_NAME(sys_getitimer)	/* 105 */
-	.long SYMBOL_NAME(sys_newstat)
-	.long SYMBOL_NAME(sys_newlstat)
-	.long SYMBOL_NAME(sys_newfstat)
-	.long SYMBOL_NAME(sys_uname)
-	.long SYMBOL_NAME(sys_iopl)		/* 110 */
-	.long SYMBOL_NAME(sys_vhangup)
-	.long SYMBOL_NAME(sys_idle)
-	.long SYMBOL_NAME(sys_vm86old)
-	.long SYMBOL_NAME(sys_wait4)
-	.long SYMBOL_NAME(sys_swapoff)		/* 115 */
-	.long SYMBOL_NAME(sys_sysinfo)
-	.long SYMBOL_NAME(sys_ipc)
-	.long SYMBOL_NAME(sys_fsync)
-	.long SYMBOL_NAME(sys_sigreturn)
-	.long SYMBOL_NAME(sys_clone)		/* 120 */
-	.long SYMBOL_NAME(sys_setdomainname)
-	.long SYMBOL_NAME(sys_newuname)
-	.long SYMBOL_NAME(sys_modify_ldt)
-	.long SYMBOL_NAME(sys_adjtimex)
-	.long SYMBOL_NAME(sys_mprotect)		/* 125 */
-	.long SYMBOL_NAME(sys_sigprocmask)
-	.long SYMBOL_NAME(sys_create_module)
-	.long SYMBOL_NAME(sys_init_module)
-	.long SYMBOL_NAME(sys_delete_module)
-	.long SYMBOL_NAME(sys_get_kernel_syms)	/* 130 */
-	.long SYMBOL_NAME(sys_quotactl)
-	.long SYMBOL_NAME(sys_getpgid)
-	.long SYMBOL_NAME(sys_fchdir)
-	.long SYMBOL_NAME(sys_bdflush)
-	.long SYMBOL_NAME(sys_sysfs)		/* 135 */
-	.long SYMBOL_NAME(sys_personality)
-	.long 0					/* for afs_syscall */
-	.long SYMBOL_NAME(sys_setfsuid)
-	.long SYMBOL_NAME(sys_setfsgid)
-	.long SYMBOL_NAME(sys_llseek)		/* 140 */
-	.long SYMBOL_NAME(sys_getdents)
-	.long SYMBOL_NAME(sys_select)
-	.long SYMBOL_NAME(sys_flock)
-	.long SYMBOL_NAME(sys_msync)
-	.long SYMBOL_NAME(sys_readv)		/* 145 */
-	.long SYMBOL_NAME(sys_writev)
-	.long SYMBOL_NAME(sys_getsid)
-	.long SYMBOL_NAME(sys_fdatasync)
-	.long SYMBOL_NAME(sys_sysctl)
-	.long SYMBOL_NAME(sys_mlock)		/* 150 */
-	.long SYMBOL_NAME(sys_munlock)
-	.long SYMBOL_NAME(sys_mlockall)
-	.long SYMBOL_NAME(sys_munlockall)
-	.long SYMBOL_NAME(sys_sched_setparam)
-	.long SYMBOL_NAME(sys_sched_getparam)   /* 155 */
-	.long SYMBOL_NAME(sys_sched_setscheduler)
-	.long SYMBOL_NAME(sys_sched_getscheduler)
-	.long SYMBOL_NAME(sys_sched_yield)
-	.long SYMBOL_NAME(sys_sched_get_priority_max)
-	.long SYMBOL_NAME(sys_sched_get_priority_min)  /* 160 */
-	.long SYMBOL_NAME(sys_sched_rr_get_interval)
-	.long SYMBOL_NAME(sys_nanosleep)
-	.long SYMBOL_NAME(sys_mremap)
-	.long 0,0
-	.long SYMBOL_NAME(sys_vm86)
-	.long 0,0,0,0					/* 170 */
-	.long 0,0,0,0,0,0,0,0,0,0			/* 180 */
-	.long 0,0,0,0,0,0,0
-	.long SYMBOL_NAME(sys_table)
-	.space (NR_syscalls-188)*4

kernel/table20/kernel.patch

@@ -1,51 +0,0 @@
-diff -ur linux-2.0.32/Makefile linux-hacked/Makefile
---- linux-2.0.32/Makefile	Fri Nov  7 19:51:05 1997
-+++ linux-hacked/Makefile	Thu Jun 11 20:41:12 1998
-@@ -87,7 +87,7 @@
- # standard CFLAGS
- #
- 
--CFLAGS = -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer -fno-strength-reduce
-+CFLAGS = -Wall -Wstrict-prototypes -g -O2 -fomit-frame-pointer -fno-strength-reduce
- 
- ifdef CONFIG_CPP
- CFLAGS := $(CFLAGS) -x c++
-@@ -113,12 +113,12 @@
- # Include the make variables (CC, etc...)
- #
- 
--ARCHIVES	=kernel/kernel.o mm/mm.o fs/fs.o ipc/ipc.o net/network.a
-+ARCHIVES	=kernel/kernel.o mm/mm.o fs/fs.o ipc/ipc.o net/network.a table/table.o
- FILESYSTEMS	=fs/filesystems.a
- DRIVERS		=drivers/block/block.a \
- 		 drivers/char/char.a
- LIBS		=$(TOPDIR)/lib/lib.a
--SUBDIRS		=kernel drivers mm fs net ipc lib
-+SUBDIRS		=kernel drivers mm fs net ipc lib table
- 
- ifeq ($(CONFIG_ISDN),y)
- DRIVERS := $(DRIVERS) drivers/isdn/isdn.a
-diff -ur linux-2.0.32/arch/i386/kernel/entry.S linux-hacked/arch/i386/kernel/entry.S
---- linux-2.0.32/arch/i386/kernel/entry.S	Tue Sep 16 23:42:45 1997
-+++ linux-hacked/arch/i386/kernel/entry.S	Thu Jun 11 21:37:20 1998
-@@ -699,4 +699,8 @@
- 	.long SYMBOL_NAME(sys_mremap)
- 	.long 0,0
- 	.long SYMBOL_NAME(sys_vm86)
--	.space (NR_syscalls-166)*4
-+	.long 0,0,0,0					/* 170 */
-+	.long 0,0,0,0,0,0,0,0,0,0			/* 180 */
-+	.long 0,0,0,0,0,0,0
-+	.long SYMBOL_NAME(sys_table)
-+	.space (NR_syscalls-188)*4
-diff -ur linux-2.0.32/include/asm-i386/unistd.h linux-hacked/include/asm-i386/unistd.h
---- linux-2.0.32/include/asm-i386/unistd.h	Fri Mar 22 07:34:02 1996
-+++ linux-hacked/include/asm-i386/unistd.h	Thu Jun 11 21:37:03 1998
-@@ -169,6 +169,7 @@
- #define __NR_sched_rr_get_interval	161
- #define __NR_nanosleep		162
- #define __NR_mremap		163
-+#define __NR_table		188
- 
- /* XXX - _foo needs to be __foo, while __NR_bar could be _NR_bar. */
- #define _syscall0(type,name) \

kernel/table20/main.c

@@ -1,468 +0,0 @@
-/*
- * linux/table/table_impl.c
- * Copyright (C) 1998 Martin Baulig
- */
-
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <linux/sched.h>
-#include <linux/kernel.h>
-#include <linux/kernel_stat.h>
-#include <linux/tty.h>
-#include <linux/user.h>
-#include <linux/a.out.h>
-#include <linux/string.h>
-#include <linux/mman.h>
-#include <linux/proc_fs.h>
-#include <linux/ioport.h>
-#include <linux/config.h>
-#include <linux/mm.h>
-#include <linux/pagemap.h>
-#include <linux/swap.h>
-
-#include <asm/segment.h>
-#include <asm/pgtable.h>
-#include <asm/io.h>
-
-#include <linux/table.h>
-
-#include "version.h"
-
-#if defined(__i386__)
-# define KSTK_EIP(tsk)	(((unsigned long *)tsk->kernel_stack_page)[1019])
-# define KSTK_ESP(tsk)	(((unsigned long *)tsk->kernel_stack_page)[1022])
-#elif defined(__alpha__)
-  /*
-   * See arch/alpha/kernel/ptrace.c for details.
-   */
-# define PT_REG(reg)		(PAGE_SIZE - sizeof(struct pt_regs)	\
-				 + (long)&((struct pt_regs *)0)->reg)
-# define KSTK_EIP(tsk)	(*(unsigned long *)(tsk->kernel_stack_page + PT_REG(pc)))
-# define KSTK_ESP(tsk)	((tsk) == current ? rdusp() : (tsk)->tss.usp)
-#elif defined(__sparc__)
-# define PT_REG(reg)            (PAGE_SIZE - sizeof(struct pt_regs)     \
-                                 + (long)&((struct pt_regs *)0)->reg)
-# define KSTK_EIP(tsk)  (*(unsigned long *)(tsk->kernel_stack_page + PT_REG(pc)))
-# define KSTK_ESP(tsk)  (*(unsigned long *)(tsk->kernel_stack_page + PT_REG(u_regs[UREG_FP])))
-#endif
-
-static struct task_struct *
-get_task (pid_t pid)
-{
-	struct task_struct ** p;
-	
-	p = task;
-	while (++p < task+NR_TASKS) {
-		if (*p && (*p)->pid == pid)
-			return *p;
-	}
-
-	return NULL;
-}
-
-static inline void statm_pte_range(pmd_t * pmd, unsigned long address, unsigned long size,
-	int * pages, int * shared, int * dirty, int * total)
-{
-	pte_t * pte;
-	unsigned long end;
-
-	if (pmd_none(*pmd))
-		return;
-	if (pmd_bad(*pmd)) {
-		printk("statm_pte_range: bad pmd (%08lx)\n", pmd_val(*pmd));
-		pmd_clear(pmd);
-		return;
-	}
-	pte = pte_offset(pmd, address);
-	address &= ~PMD_MASK;
-	end = address + size;
-	if (end > PMD_SIZE)
-		end = PMD_SIZE;
-	do {
-		pte_t page = *pte;
-
-		address += PAGE_SIZE;
-		pte++;
-		if (pte_none(page))
-			continue;
-		++*total;
-		if (!pte_present(page))
-			continue;
-		++*pages;
-		if (pte_dirty(page))
-			++*dirty;
-		if (pte_page(page) >= high_memory)
-			continue;
-		if (mem_map[MAP_NR(pte_page(page))].count > 1)
-			++*shared;
-	} while (address < end);
-}
-
-static inline void statm_pmd_range(pgd_t * pgd, unsigned long address, unsigned long size,
-	int * pages, int * shared, int * dirty, int * total)
-{
-	pmd_t * pmd;
-	unsigned long end;
-
-	if (pgd_none(*pgd))
-		return;
-	if (pgd_bad(*pgd)) {
-		printk("statm_pmd_range: bad pgd (%08lx)\n", pgd_val(*pgd));
-		pgd_clear(pgd);
-		return;
-	}
-	pmd = pmd_offset(pgd, address);
-	address &= ~PGDIR_MASK;
-	end = address + size;
-	if (end > PGDIR_SIZE)
-		end = PGDIR_SIZE;
-	do {
-		statm_pte_range(pmd, address, end - address, pages, shared, dirty, total);
-		address = (address + PMD_SIZE) & PMD_MASK;
-		pmd++;
-	} while (address < end);
-}
-
-static void statm_pgd_range(pgd_t * pgd, unsigned long address, unsigned long end,
-	int * pages, int * shared, int * dirty, int * total)
-{
-	while (address < end) {
-		statm_pmd_range(pgd, address, end - address, pages, shared, dirty, total);
-		address = (address + PGDIR_SIZE) & PGDIR_MASK;
-		pgd++;
-	}
-}
-
-static unsigned long
-get_wchan (struct task_struct *p)
-{
-	if (!p || p == current || p->state == TASK_RUNNING)
-		return 0;
-#if defined(__i386__)
-	{
-		unsigned long ebp, eip;
-		unsigned long stack_page;
-		int count = 0;
-
-		stack_page = p->kernel_stack_page;
-		if (!stack_page)
-			return 0;
-		ebp = p->tss.ebp;
-		do {
-			if (ebp < stack_page || ebp >= 4092+stack_page)
-				return 0;
-			eip = *(unsigned long *) (ebp+4);
-			if (eip < (unsigned long) interruptible_sleep_on
-			    || eip >= (unsigned long) add_timer)
-				return eip;
-			ebp = *(unsigned long *) ebp;
-		} while (count++ < 16);
-	}
-#elif defined(__alpha__)
-	/*
-	 * This one depends on the frame size of schedule().  Do a
-	 * "disass schedule" in gdb to find the frame size.  Also, the
-	 * code assumes that sleep_on() follows immediately after
-	 * interruptible_sleep_on() and that add_timer() follows
-	 * immediately after interruptible_sleep().  Ugly, isn't it?
-	 * Maybe adding a wchan field to task_struct would be better,
-	 * after all...
-	 */
-	{
-		unsigned long schedule_frame;
-		unsigned long pc;
-		
-		pc = thread_saved_pc(&p->tss);
-		if (pc >= (unsigned long) interruptible_sleep_on && pc < (unsigned long) add_timer) {
-			schedule_frame = ((unsigned long *)p->tss.ksp)[6];
-			return ((unsigned long *)schedule_frame)[12];
-		}
-		return pc;
-	}
-#endif
-	return 0;
-}
-
-asmlinkage int
-sys_table (int type, union table *buf, const void *param)
-{
-	union table tbl;
-	struct sysinfo i;
-	struct task_struct *tsk = NULL;
-	struct ip_chain *chain;
-	struct ip_fwkernel *rule;
-	char devname [9];
-	int index, err;
-	pid_t pid;
-
-	if (type == TABLE_VERSION)
-		return _TABLE_VERSION;
-
-	if (!buf)
-		return -EFAULT;
-
-	memset (&tbl, 0, sizeof (union table));
-
-	/* For TABLE_PROC_*, read pid and get task_struct */
-
-	switch (type) {
-	case TABLE_PROC_UID:
-	case TABLE_PROC_MEM:
-	case TABLE_PROC_SEGMENT:
-	case TABLE_PROC_TIME:
-	case TABLE_PROC_STATE:
-	case TABLE_PROC_SIGNAL:
-	case TABLE_PROC_KERNEL:
-	  err = verify_area (VERIFY_READ, param, sizeof (pid_t));
-		if (err)
-			return err;
-		memcpy_fromfs (&pid, param, sizeof (pid_t));
-
-		tsk = get_task (pid);
-		if (tsk == NULL)
-			return -ESRCH;
-		break;
-	case TABLE_NETACCT:
-		err = verify_area (VERIFY_READ, param, 5);
-		if (err)
-			return err;
-		copy_from_user (devname, param, 5);
-		devname [5] = 0;
-
-		break;
-	}
-
-	/* Main function dispatcher */
-
-	switch (type) {
-	case TABLE_PROCLIST:
-		tsk = task [0];
-		for (index = 0; index < nr_tasks; index++) {
-			tbl.proclist.pids [index] = tsk->pid;
-			tsk = tsk->next_task;
-		}
-		tbl.proclist.nr_running = nr_running;
-		tbl.proclist.nr_tasks = nr_tasks;
-		tbl.proclist.last_pid = last_pid;
-		break;
-	case TABLE_CPU:
-		tbl.cpu.total = jiffies;    
-		tbl.cpu.user  = kstat.cpu_user;
-		tbl.cpu.nice  = kstat.cpu_nice;
-		tbl.cpu.sys   = kstat.cpu_system;
-		tbl.cpu.idle  = tbl.cpu.total -
-			(tbl.cpu.user + tbl.cpu.nice + tbl.cpu.sys);
-		tbl.cpu.frequency = HZ;
-		break;
-	case TABLE_MEM:
-		si_meminfo (&i);
-		tbl.mem.total  = i.totalram;
-		tbl.mem.used   = i.totalram - i.freeram;
-		tbl.mem.free   = i.freeram;
-		tbl.mem.shared = i.sharedram;
-		tbl.mem.buffer = i.bufferram;
-		tbl.mem.cached = page_cache_size << PAGE_SHIFT;
-		break;
-	case TABLE_SWAP:
-		si_swapinfo (&i);
-		tbl.swap.total = i.totalswap;
-		tbl.swap.used  = i.totalswap - i.freeswap;
-		tbl.swap.free  = i.freeswap;
-		tbl.swap.pagein = kstat.pswpin;
-		tbl.swap.pageout = kstat.pswpout;
-		break;
-	case TABLE_LOADAVG:
-		tbl.loadavg.loadavg [0] = (double) avenrun [0] / (1 << FSHIFT);
-		tbl.loadavg.loadavg [1] = (double) avenrun [1] / (1 << FSHIFT);
-		tbl.loadavg.loadavg [2] = (double) avenrun [2] / (1 << FSHIFT);
-		tbl.loadavg.nr_running = nr_running;
-		tbl.loadavg.nr_tasks = nr_tasks;
-		tbl.loadavg.last_pid = last_pid;
-		break;
-	case TABLE_UPTIME:
-		tbl.uptime.uptime = jiffies;
-		tbl.uptime.idle   = task[0]->utime + task[0]->stime;
-		break;
-	case TABLE_PROC_STATE:
-		tbl.proc_state.state = tsk->state;
-		tbl.proc_state.flags = tsk->flags;
-		memcpy (tbl.proc_state.comm, tsk->comm,
-			sizeof (tbl.proc_state.comm));
-		break;
-	case TABLE_PROC_UID:
-		tbl.proc_uid.uid = tsk->uid;
-		tbl.proc_uid.euid = tsk->euid;
-		tbl.proc_uid.suid = tsk->suid;
-		tbl.proc_uid.fsuid = tsk->fsuid;
-		
-		tbl.proc_uid.gid = tsk->gid;
-		tbl.proc_uid.egid = tsk->egid;
-		tbl.proc_uid.sgid = tsk->sgid;
-		tbl.proc_uid.fsgid = tsk->fsgid;
-		
-		tbl.proc_uid.pid = tsk->pid;
-		tbl.proc_uid.pgrp = tsk->pgrp;
-		tbl.proc_uid.ppid = tsk->p_pptr->pid;
-		
-		tbl.proc_uid.session = tsk->session;
-	        tbl.proc_uid.tty = tsk->tty ?
-			kdev_t_to_nr (tsk->tty->device) : 0;
-		tbl.proc_uid.tpgid = tsk->tty ? tsk->tty->pgrp : -1;
-		
-		tbl.proc_uid.priority = tsk->priority;
-		tbl.proc_uid.counter = tsk->counter;
-		tbl.proc_uid.def_priority = DEF_PRIORITY;
-		break;
-	case TABLE_PROC_SIGNAL:
-		tbl.proc_signal.signal = tsk->signal;
-		tbl.proc_signal.blocked = tsk->blocked;
-
-		if (tsk->sig) {
-			struct sigaction * action = tsk->sig->action;
-			unsigned long sig_ign = 0, sig_caught = 0;
-			unsigned long bit = 1;
-			int i;
-			
-			for (i = 0; i < 32; i++) {
-				switch((unsigned long) action->sa_handler) {
-				case 0:
-					break;
-				case 1:
-					sig_ign |= bit;
-					break;
-				default:
-					sig_caught |= bit;
-				}
-				bit <<= 1;
-				action++;
-			}
-
-			tbl.proc_signal.ignored = sig_ign;
-			tbl.proc_signal.caught  = sig_caught;
-		} else {
-			tbl.proc_signal.ignored = 0;
-			tbl.proc_signal.caught  = 0;
-		}
-		break;
-	case TABLE_PROC_MEM:
-		if (tsk->mm && tsk->mm != &init_mm) {
-			tbl.proc_mem.context = tsk->mm->context;
-			tbl.proc_mem.start_code = tsk->mm->start_code;
-			tbl.proc_mem.end_code = tsk->mm->end_code;
-			tbl.proc_mem.start_data = tsk->mm-> start_data;
-			tbl.proc_mem.end_data = tsk->mm->end_data;
-			tbl.proc_mem.start_brk = tsk->mm->start_brk;
-			tbl.proc_mem.brk = tsk->mm->brk;
-			tbl.proc_mem.start_stack = tsk->mm->start_stack;
-			tbl.proc_mem.start_mmap = tsk->mm->start_mmap;
-			tbl.proc_mem.arg_start = tsk->mm->arg_start;
-			tbl.proc_mem.arg_end = tsk->mm->arg_end;
-			tbl.proc_mem.env_start = tsk->mm->env_start;
-			tbl.proc_mem.env_end = tsk->mm->env_end;
-			tbl.proc_mem.rss = tsk->mm->rss;
-			tbl.proc_mem.total_vm = tsk->mm->total_vm;
-			tbl.proc_mem.locked_vm = tsk->mm->locked_vm;
-		}
-		tbl.proc_mem.rlim = tsk->rlim ?
-			tsk->rlim[RLIMIT_RSS].rlim_cur : 0;
-		break;
-	case TABLE_PROC_SEGMENT:
-		if (tsk->mm && tsk->mm != &init_mm) {
-			unsigned long vsize = 0;
-			int size = 0, resident = 0, share = 0;
-			int trs = 0, lrs = 0, drs = 0, dt = 0;
-			struct vm_area_struct * vma = tsk->mm->mmap;
-
-			while (vma) {
-				pgd_t *pgd = pgd_offset(tsk->mm, vma->vm_start);
-				int pages = 0, shared = 0, dirty = 0, total = 0;
-				
-				vsize += vma->vm_end - vma->vm_start;
-
-				statm_pgd_range (pgd, vma->vm_start, vma->vm_end,
-						 &pages, &shared, &dirty, &total);
-				resident += pages;
-				share += shared;
-				dt += dirty;
-				size += total;
-				if (vma->vm_flags & VM_EXECUTABLE)
-					trs += pages;	/* text */
-				else if (vma->vm_flags & VM_GROWSDOWN)
-					drs += pages;	/* stack */
-				else if (vma->vm_end > 0x60000000)
-					lrs += pages;	/* library */
-				else
-					drs += pages;
-				vma = vma->vm_next;
-			}
-
-			tbl.proc_segment.vsize = vsize;
-			tbl.proc_segment.size = size;
-			tbl.proc_segment.resident = resident;
-			tbl.proc_segment.shared = share;
-			tbl.proc_segment.trs = trs;
-			tbl.proc_segment.lrs = lrs;
-			tbl.proc_segment.dt = dt;
-		}
-		break;
-	case TABLE_PROC_TIME:
-		tbl.proc_time.utime = tsk->utime;
-		tbl.proc_time.stime = tsk->stime;
-		tbl.proc_time.cutime = tsk->cutime;
-		tbl.proc_time.cstime = tsk->cstime;
-
-		tbl.proc_time.start_time = tsk->start_time;
-		tbl.proc_time.timeout = tsk->timeout;
-		tbl.proc_time.policy = tsk->policy;
-		tbl.proc_time.rt_priority = tsk->rt_priority;
-
-		tbl.proc_time.it_real_value = tsk->it_real_value;
-		tbl.proc_time.it_prof_value = tsk->it_prof_value;
-		tbl.proc_time.it_virt_value = tsk->it_virt_value;
-		tbl.proc_time.it_real_incr = tsk->it_real_incr;
-		tbl.proc_time.it_prof_incr = tsk->it_prof_incr;
-		tbl.proc_time.it_virt_incr = tsk->it_virt_incr;
-		break;
-	case TABLE_PROC_KERNEL:
-		tbl.proc_kernel.min_flt = tsk->min_flt;
-		tbl.proc_kernel.cmin_flt = tsk->cmin_flt;
-		tbl.proc_kernel.maj_flt = tsk->maj_flt;
-		tbl.proc_kernel.cmaj_flt = tsk->cmaj_flt;
-		
-		tbl.proc_kernel.kesp = tsk->kernel_stack_page ? KSTK_EIP(tsk) : 0;
-		tbl.proc_kernel.keip = tsk->kernel_stack_page ? KSTK_ESP(tsk) : 0;
-		
-		tbl.proc_kernel.nswap = tsk->nswap;
-		tbl.proc_kernel.cnswap = tsk->cnswap;
-
-		tbl.proc_kernel.wchan = get_wchan (tsk);
-		break;
-	case TABLE_NETACCT:
-		for (chain = ip_fw_chains; chain; chain = chain->next) {
-			for (rule = chain->chain; rule; rule = rule->next) {
-				const char *name = rule->ipfw.fw_vianame;
-				int k;
-				
-				if (name [0] && !strncmp (param, name, 5))
-					continue;
-				
-				for (k = 0; k < NUM_SLOTS; k++) {
-					tbl.netacct.packets +=
-						rule->counters[k].pcnt;
-					tbl.netacct.bytes +=
-						rule->counters[k].bcnt;
-				}
-			}
-		}
-		break;
-	default:
-		return -EINVAL;
-	}
-
-	err = verify_area (VERIFY_WRITE, buf, sizeof (struct table));
-	if (err)
-		return err;
-
-	memcpy_tofs (buf, &tbl, sizeof (union table));
-	return 0;
-}

kernel/table20/unistd-i386.h

@@ -1,324 +0,0 @@
-#ifndef _ASM_I386_UNISTD_H_
-#define _ASM_I386_UNISTD_H_
-
-/*
- * This file contains the system call numbers.
- */
-
-#define __NR_setup		  0	/* used only by init, to get system going */
-#define __NR_exit		  1
-#define __NR_fork		  2
-#define __NR_read		  3
-#define __NR_write		  4
-#define __NR_open		  5
-#define __NR_close		  6
-#define __NR_waitpid		  7
-#define __NR_creat		  8
-#define __NR_link		  9
-#define __NR_unlink		 10
-#define __NR_execve		 11
-#define __NR_chdir		 12
-#define __NR_time		 13
-#define __NR_mknod		 14
-#define __NR_chmod		 15
-#define __NR_chown		 16
-#define __NR_break		 17
-#define __NR_oldstat		 18
-#define __NR_lseek		 19
-#define __NR_getpid		 20
-#define __NR_mount		 21
-#define __NR_umount		 22
-#define __NR_setuid		 23
-#define __NR_getuid		 24
-#define __NR_stime		 25
-#define __NR_ptrace		 26
-#define __NR_alarm		 27
-#define __NR_oldfstat		 28
-#define __NR_pause		 29
-#define __NR_utime		 30
-#define __NR_stty		 31
-#define __NR_gtty		 32
-#define __NR_access		 33
-#define __NR_nice		 34
-#define __NR_ftime		 35
-#define __NR_sync		 36
-#define __NR_kill		 37
-#define __NR_rename		 38
-#define __NR_mkdir		 39
-#define __NR_rmdir		 40
-#define __NR_dup		 41
-#define __NR_pipe		 42
-#define __NR_times		 43
-#define __NR_prof		 44
-#define __NR_brk		 45
-#define __NR_setgid		 46
-#define __NR_getgid		 47
-#define __NR_signal		 48
-#define __NR_geteuid		 49
-#define __NR_getegid		 50
-#define __NR_acct		 51
-#define __NR_phys		 52
-#define __NR_lock		 53
-#define __NR_ioctl		 54
-#define __NR_fcntl		 55
-#define __NR_mpx		 56
-#define __NR_setpgid		 57
-#define __NR_ulimit		 58
-#define __NR_oldolduname	 59
-#define __NR_umask		 60
-#define __NR_chroot		 61
-#define __NR_ustat		 62
-#define __NR_dup2		 63
-#define __NR_getppid		 64
-#define __NR_getpgrp		 65
-#define __NR_setsid		 66
-#define __NR_sigaction		 67
-#define __NR_sgetmask		 68
-#define __NR_ssetmask		 69
-#define __NR_setreuid		 70
-#define __NR_setregid		 71
-#define __NR_sigsuspend		 72
-#define __NR_sigpending		 73
-#define __NR_sethostname	 74
-#define __NR_setrlimit		 75
-#define __NR_getrlimit		 76
-#define __NR_getrusage		 77
-#define __NR_gettimeofday	 78
-#define __NR_settimeofday	 79
-#define __NR_getgroups		 80
-#define __NR_setgroups		 81
-#define __NR_select		 82
-#define __NR_symlink		 83
-#define __NR_oldlstat		 84
-#define __NR_readlink		 85
-#define __NR_uselib		 86
-#define __NR_swapon		 87
-#define __NR_reboot		 88
-#define __NR_readdir		 89
-#define __NR_mmap		 90
-#define __NR_munmap		 91
-#define __NR_truncate		 92
-#define __NR_ftruncate		 93
-#define __NR_fchmod		 94
-#define __NR_fchown		 95
-#define __NR_getpriority	 96
-#define __NR_setpriority	 97
-#define __NR_profil		 98
-#define __NR_statfs		 99
-#define __NR_fstatfs		100
-#define __NR_ioperm		101
-#define __NR_socketcall		102
-#define __NR_syslog		103
-#define __NR_setitimer		104
-#define __NR_getitimer		105
-#define __NR_stat		106
-#define __NR_lstat		107
-#define __NR_fstat		108
-#define __NR_olduname		109
-#define __NR_iopl		110
-#define __NR_vhangup		111
-#define __NR_idle		112
-#define __NR_vm86		113
-#define __NR_wait4		114
-#define __NR_swapoff		115
-#define __NR_sysinfo		116
-#define __NR_ipc		117
-#define __NR_fsync		118
-#define __NR_sigreturn		119
-#define __NR_clone		120
-#define __NR_setdomainname	121
-#define __NR_uname		122
-#define __NR_modify_ldt		123
-#define __NR_adjtimex		124
-#define __NR_mprotect		125
-#define __NR_sigprocmask	126
-#define __NR_create_module	127
-#define __NR_init_module	128
-#define __NR_delete_module	129
-#define __NR_get_kernel_syms	130
-#define __NR_quotactl		131
-#define __NR_getpgid		132
-#define __NR_fchdir		133
-#define __NR_bdflush		134
-#define __NR_sysfs		135
-#define __NR_personality	136
-#define __NR_afs_syscall	137 /* Syscall for Andrew File System */
-#define __NR_setfsuid		138
-#define __NR_setfsgid		139
-#define __NR__llseek		140
-#define __NR_getdents		141
-#define __NR__newselect		142
-#define __NR_flock		143
-#define __NR_msync		144
-#define __NR_readv		145
-#define __NR_writev		146
-#define __NR_getsid		147
-#define __NR_fdatasync		148
-#define __NR__sysctl		149
-#define __NR_mlock		150
-#define __NR_munlock		151
-#define __NR_mlockall		152
-#define __NR_munlockall		153
-#define __NR_sched_setparam		154
-#define __NR_sched_getparam		155
-#define __NR_sched_setscheduler		156
-#define __NR_sched_getscheduler		157
-#define __NR_sched_yield		158
-#define __NR_sched_get_priority_max	159
-#define __NR_sched_get_priority_min	160
-#define __NR_sched_rr_get_interval	161
-#define __NR_nanosleep		162
-#define __NR_mremap		163
-#define __NR_table		188
-
-/* XXX - _foo needs to be __foo, while __NR_bar could be _NR_bar. */
-#define _syscall0(type,name) \
-type name(void) \
-{ \
-long __res; \
-__asm__ volatile ("int $0x80" \
-	: "=a" (__res) \
-	: "0" (__NR_##name)); \
-if (__res >= 0) \
-	return (type) __res; \
-errno = -__res; \
-return -1; \
-}
-
-#define _syscall1(type,name,type1,arg1) \
-type name(type1 arg1) \
-{ \
-long __res; \
-__asm__ volatile ("int $0x80" \
-	: "=a" (__res) \
-	: "0" (__NR_##name),"b" ((long)(arg1))); \
-if (__res >= 0) \
-	return (type) __res; \
-errno = -__res; \
-return -1; \
-}
-
-#define _syscall2(type,name,type1,arg1,type2,arg2) \
-type name(type1 arg1,type2 arg2) \
-{ \
-long __res; \
-__asm__ volatile ("int $0x80" \
-	: "=a" (__res) \
-	: "0" (__NR_##name),"b" ((long)(arg1)),"c" ((long)(arg2))); \
-if (__res >= 0) \
-	return (type) __res; \
-errno = -__res; \
-return -1; \
-}
-
-#define _syscall3(type,name,type1,arg1,type2,arg2,type3,arg3) \
-type name(type1 arg1,type2 arg2,type3 arg3) \
-{ \
-long __res; \
-__asm__ volatile ("int $0x80" \
-	: "=a" (__res) \
-	: "0" (__NR_##name),"b" ((long)(arg1)),"c" ((long)(arg2)), \
-		  "d" ((long)(arg3))); \
-if (__res>=0) \
-	return (type) __res; \
-errno=-__res; \
-return -1; \
-}
-
-#define _syscall4(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4) \
-type name (type1 arg1, type2 arg2, type3 arg3, type4 arg4) \
-{ \
-long __res; \
-__asm__ volatile ("int $0x80" \
-	: "=a" (__res) \
-	: "0" (__NR_##name),"b" ((long)(arg1)),"c" ((long)(arg2)), \
-	  "d" ((long)(arg3)),"S" ((long)(arg4))); \
-if (__res>=0) \
-	return (type) __res; \
-errno=-__res; \
-return -1; \
-} 
-
-#define _syscall5(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4, \
-	  type5,arg5) \
-type name (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5) \
-{ \
-long __res; \
-__asm__ volatile ("int $0x80" \
-	: "=a" (__res) \
-	: "0" (__NR_##name),"b" ((long)(arg1)),"c" ((long)(arg2)), \
-	  "d" ((long)(arg3)),"S" ((long)(arg4)),"D" ((long)(arg5))); \
-if (__res>=0) \
-	return (type) __res; \
-errno=-__res; \
-return -1; \
-}
-
-#ifdef __KERNEL_SYSCALLS__
-
-/*
- * we need this inline - forking from kernel space will result
- * in NO COPY ON WRITE (!!!), until an execve is executed. This
- * is no problem, but for the stack. This is handled by not letting
- * main() use the stack at all after fork(). Thus, no function
- * calls - which means inline code for fork too, as otherwise we
- * would use the stack upon exit from 'fork()'.
- *
- * Actually only pause and fork are needed inline, so that there
- * won't be any messing with the stack from main(), but we define
- * some others too.
- */
-#define __NR__exit __NR_exit
-static inline _syscall0(int,idle)
-static inline _syscall0(int,fork)
-static inline _syscall2(int,clone,unsigned long,flags,char *,esp)
-static inline _syscall0(int,pause)
-static inline _syscall0(int,setup)
-static inline _syscall0(int,sync)
-static inline _syscall0(pid_t,setsid)
-static inline _syscall3(int,write,int,fd,const char *,buf,off_t,count)
-static inline _syscall1(int,dup,int,fd)
-static inline _syscall3(int,execve,const char *,file,char **,argv,char **,envp)
-static inline _syscall3(int,open,const char *,file,int,flag,int,mode)
-static inline _syscall1(int,close,int,fd)
-static inline _syscall1(int,_exit,int,exitcode)
-static inline _syscall3(pid_t,waitpid,pid_t,pid,int *,wait_stat,int,options)
-
-static inline pid_t wait(int * wait_stat)
-{
-	return waitpid(-1,wait_stat,0);
-}
-
-/*
- * This is the mechanism for creating a new kernel thread.
- *
- * NOTE! Only a kernel-only process(ie the swapper or direct descendants
- * who haven't done an "execve()") should use this: it will work within
- * a system call from a "real" process, but the process memory space will
- * not be free'd until both the parent and the child have exited.
- */
-static inline pid_t kernel_thread(int (*fn)(void *), void * arg, unsigned long flags)
-{
-	long retval;
-
-	__asm__ __volatile__(
-		"movl %%esp,%%esi\n\t"
-		"int $0x80\n\t"		/* Linux/i386 system call */
-		"cmpl %%esp,%%esi\n\t"	/* child or parent? */
-		"je 1f\n\t"		/* parent - jump */
-		"pushl %3\n\t"		/* push argument */
-		"call *%4\n\t"		/* call fn */
-		"movl %2,%0\n\t"	/* exit */
-		"int $0x80\n"
-		"1:\t"
-		:"=a" (retval)
-		:"0" (__NR_clone), "i" (__NR_exit),
-		 "r" (arg), "r" (fn),
-		 "b" (flags | CLONE_VM)
-		:"si");
-	return retval;
-}
-
-#endif
-
-#endif /* _ASM_I386_UNISTD_H_ */

kernel/table20/version.h

@@ -1 +0,0 @@
-#define _TABLE_VERSION	1

kernel/table21/.cvsignore

@@ -1,4 +0,0 @@
-kernel.patch
-.main.o.flags
-.table.o.flags
-.module.o.flags

kernel/table21/Makefile

@@ -1,16 +0,0 @@
-#
-# Makefile for the linux system information tables.
-#
-# Note! Dependencies are done automagically by 'make dep', which also
-# removes any old dependencies. DON'T put your own dependencies here
-# unless it's something special (ie not a .c file).
-#
-# Note 2! The CFLAGS definition is now in the main makefile...
-
-O_TARGET := table.o
-OX_OBJS  := main.o
-
-M_TARGET := table_mod.o
-MX_OBJS  := module.o
-
-include $(TOPDIR)/Rules.make

kernel/table21/README

@@ -1,21 +0,0 @@
-This is a new system call `table ()' for the Linux table. It is faster
-than reading from /proc and can be used to fetch all information required
-for libgtop until whe have some other function (extended sysctl, ...) in
-standard kernels.
-
-I didn't want to change sysctl or some other function myself cause this may
-cause other applications relying upon those function to fail. This is
-something for the ``real'' kernel gurus ...
-
-To use this new system call for libgtop, do the following:
-
-* Copy this directory to /usr/src/linux/table
-* Make /usr/src/linux/include/linux/table.h symlink to /usr/src/linux/table/table.h
-* Apply the patch `kernel.patch' to the kernel, compile, install and reboot
-* Recompile libgtop (remove `config.cache' and run the `autogen.sh' again).
-
-If you want to change and/or add something - feel free to do so !
-
-Have fun,
-
-Martin

kernel/table21/entry-i386.S

@@ -1,571 +0,0 @@
-/*
- *  linux/arch/i386/entry.S
- *
- *  Copyright (C) 1991, 1992  Linus Torvalds
- */
-
-/*
- * entry.S contains the system-call and fault low-level handling routines.
- * This also contains the timer-interrupt handler, as well as all interrupts
- * and faults that can result in a task-switch.
- *
- * NOTE: This code handles signal-recognition, which happens every time
- * after a timer-interrupt and after each system call.
- *
- * I changed all the .align's to 4 (16 byte alignment), as that's faster
- * on a 486.
- *
- * Stack layout in 'ret_from_system_call':
- * 	ptrace needs to have all regs on the stack.
- *	if the order here is changed, it needs to be
- *	updated in fork.c:copy_process, signal.c:do_signal,
- *	ptrace.c and ptrace.h
- *
- *	 0(%esp) - %ebx
- *	 4(%esp) - %ecx
- *	 8(%esp) - %edx
- *       C(%esp) - %esi
- *	10(%esp) - %edi
- *	14(%esp) - %ebp
- *	18(%esp) - %eax
- *	1C(%esp) - %ds
- *	20(%esp) - %es
- *	24(%esp) - orig_eax
- *	28(%esp) - %eip
- *	2C(%esp) - %cs
- *	30(%esp) - %eflags
- *	34(%esp) - %oldesp
- *	38(%esp) - %oldss
- *
- * "current" is in register %ebx during any slow entries.
- */
-
-#include <linux/sys.h>
-#include <linux/linkage.h>
-#include <asm/segment.h>
-#define ASSEMBLY
-#include <asm/smp.h>
-
-EBX		= 0x00
-ECX		= 0x04
-EDX		= 0x08
-ESI		= 0x0C
-EDI		= 0x10
-EBP		= 0x14
-EAX		= 0x18
-DS		= 0x1C
-ES		= 0x20
-ORIG_EAX	= 0x24
-EIP		= 0x28
-CS		= 0x2C
-EFLAGS		= 0x30
-OLDESP		= 0x34
-OLDSS		= 0x38
-
-CF_MASK		= 0x00000001
-IF_MASK		= 0x00000200
-NT_MASK		= 0x00004000
-VM_MASK		= 0x00020000
-
-/*
- * these are offsets into the task-struct.
- */
-state		=  0
-flags		=  4
-sigpending	=  8
-addr_limit	= 12
-exec_domain	= 16
-need_resched	= 20
-
-ENOSYS = 38
-
-
-#define SAVE_ALL \
-	cld; \
-	pushl %es; \
-	pushl %ds; \
-	pushl %eax; \
-	pushl %ebp; \
-	pushl %edi; \
-	pushl %esi; \
-	pushl %edx; \
-	pushl %ecx; \
-	pushl %ebx; \
-	movl $(__KERNEL_DS),%edx; \
-	movl %dx,%ds; \
-	movl %dx,%es;
-
-#define RESTORE_ALL	\
-	popl %ebx;	\
-	popl %ecx;	\
-	popl %edx;	\
-	popl %esi;	\
-	popl %edi;	\
-	popl %ebp;	\
-	popl %eax;	\
-1:	popl %ds;	\
-2:	popl %es;	\
-3:	addl $4,%esp;	\
-	iret;		\
-.section fixup,"ax";	\
-4:	pushl $0;	\
-	popl %ds;	\
-	jmp 2b;		\
-5:	pushl $0;	\
-	popl %es;	\
-	jmp 3b;		\
-.previous;		\
-.section __ex_table,"a";\
-	.align 4;	\
-	.long 1b,4b;	\
-	.long 2b,5b;	\
-.previous
-
-#define GET_CURRENT(reg) \
-	movl %esp, reg; \
-	andl $-8192, reg;
-
-ENTRY(lcall7)
-	pushfl			# We get a different stack layout with call gates,
-	pushl %eax		# which has to be cleaned up later..
-	SAVE_ALL
-	movl EIP(%esp),%eax	# due to call gates, this is eflags, not eip..
-	movl CS(%esp),%edx	# this is eip..
-	movl EFLAGS(%esp),%ecx	# and this is cs..
-	movl %eax,EFLAGS(%esp)	#
-	movl %edx,EIP(%esp)	# Now we move them to their "normal" places
-	movl %ecx,CS(%esp)	#
-	movl %esp,%ebx
-	pushl %ebx
-	andl $-8192,%ebx	# GET_CURRENT
-	movl exec_domain(%ebx),%edx	# Get the execution domain
-	movl 4(%edx),%edx	# Get the lcall7 handler for the domain
-	call *%edx
-	popl %eax
-	jmp ret_from_sys_call
-
-
-#ifdef __SMP__
-	ALIGN
-	.globl	ret_from_smpfork
-ret_from_smpfork:
-	GET_CURRENT(%ebx)
-	btrl	$0, SYMBOL_NAME(scheduler_lock)
-	jmp	ret_from_sys_call
-#endif /* __SMP__ */
-
-/*
- * Return to user mode is not as complex as all this looks,
- * but we want the default path for a system call return to
- * go as quickly as possible which is why some of this is
- * less clear than it otherwise should be.
- */
-
-ENTRY(system_call)
-	pushl %eax			# save orig_eax
-	SAVE_ALL
-	GET_CURRENT(%ebx)
-	cmpl $(NR_syscalls),%eax
-	jae badsys
-	testb $0x20,flags(%ebx)		# PF_TRACESYS
-	jne tracesys
-	call *SYMBOL_NAME(sys_call_table)(,%eax,4)
-	movl %eax,EAX(%esp)		# save the return value
-	ALIGN
-	.globl ret_from_sys_call
-	.globl ret_from_intr
-ret_from_sys_call:
-	movl SYMBOL_NAME(bh_mask),%eax
-	andl SYMBOL_NAME(bh_active),%eax
-	jne handle_bottom_half
-ret_with_reschedule:
-	cmpl $0,need_resched(%ebx)
-	jne reschedule
-	cmpl $0,sigpending(%ebx)
-	jne signal_return
-	RESTORE_ALL
-	ALIGN
-signal_return:
-	testl $(VM_MASK),EFLAGS(%esp)
-	pushl %esp
-	jne v86_signal_return
-	pushl $0
-	call SYMBOL_NAME(do_signal)
-	addl $8,%esp
-	RESTORE_ALL
-	ALIGN
-v86_signal_return:
-	call SYMBOL_NAME(save_v86_state)
-	movl %eax,%esp
-	pushl %eax
-	pushl $0
-	call SYMBOL_NAME(do_signal)
-	addl $8,%esp
-	RESTORE_ALL
-	ALIGN
-tracesys:
-	movl $-ENOSYS,EAX(%esp)
-	call SYMBOL_NAME(syscall_trace)
-	movl ORIG_EAX(%esp),%eax
-	call *SYMBOL_NAME(sys_call_table)(,%eax,4)
-	movl %eax,EAX(%esp)		# save the return value
-	call SYMBOL_NAME(syscall_trace)
-	jmp ret_from_sys_call
-badsys:
-	movl $-ENOSYS,EAX(%esp)
-	jmp ret_from_sys_call
-
-	ALIGN
-ret_from_exception:
-	movl SYMBOL_NAME(bh_mask),%eax
-	andl SYMBOL_NAME(bh_active),%eax
-	jne handle_bottom_half
-	ALIGN
-ret_from_intr:
-	GET_CURRENT(%ebx)
-	movl EFLAGS(%esp),%eax		# mix EFLAGS and CS
-	movb CS(%esp),%al
-	testl $(VM_MASK | 3),%eax	# return to VM86 mode or non-supervisor?
-	jne ret_with_reschedule
-	RESTORE_ALL
-
-	ALIGN
-handle_bottom_half:
-	pushl $ret_from_intr
-	jmp SYMBOL_NAME(do_bottom_half)
-
-	ALIGN
-reschedule:
-	pushl $ret_from_sys_call
-	jmp SYMBOL_NAME(schedule)    # test
-
-
-ENTRY(divide_error)
-	pushl $0		# no error code
-	pushl $ SYMBOL_NAME(do_divide_error)
-	ALIGN
-error_code:
-	pushl %ds
-	pushl %eax
-	xorl %eax,%eax
-	pushl %ebp
-	pushl %edi
-	pushl %esi
-	pushl %edx
-	decl %eax			# eax = -1
-	pushl %ecx
-	pushl %ebx
-#if 1
-	xorl %ecx,%ecx			# zero ecx
-	cld
-	mov %es,%cx			# get the lower order bits of es
-#else
-	cld
-# Some older processors leave the top 16 bits of the 32 bit destination
-# register undefined, rather than zeroed in the following instruction.
-# This won't matter when restoring or loading a segment register from the
-# stack.  It may be a problem if any code reads the full 32 bit value.
-# dosemu? kernel?  Would somebody like to verify that this way is really OK?
-	movl %es,%cx
-#endif
-	xchgl %eax, ORIG_EAX(%esp)	# orig_eax (get the error code. )
-	movl %esp,%edx
-	xchgl %ecx, ES(%esp)		# get the address and save es.
-	pushl %eax			# push the error code
-	pushl %edx
-	movl $(__KERNEL_DS),%edx
-	movl %dx,%ds
-	movl %dx,%es
-	GET_CURRENT(%ebx)
-	call *%ecx
-	addl $8,%esp
-	jmp ret_from_exception
-
-ENTRY(coprocessor_error)
-	pushl $0
-	pushl $ SYMBOL_NAME(do_coprocessor_error)
-	jmp error_code
-
-ENTRY(device_not_available)
-	pushl $-1		# mark this as an int
-	SAVE_ALL
-	GET_CURRENT(%ebx)
-	pushl $ret_from_exception
-	movl %cr0,%eax
-	testl $0x4,%eax			# EM (math emulation bit)
-	je SYMBOL_NAME(math_state_restore)
-	pushl $0		# temporary storage for ORIG_EIP
-	call  SYMBOL_NAME(math_emulate)
-	addl $4,%esp
-	ret
-
-ENTRY(debug)
-	pushl $0
-	pushl $ SYMBOL_NAME(do_debug)
-	jmp error_code
-
-ENTRY(nmi)
-	pushl $0
-	pushl $ SYMBOL_NAME(do_nmi)
-	jmp error_code
-
-ENTRY(int3)
-	pushl $0
-	pushl $ SYMBOL_NAME(do_int3)
-	jmp error_code
-
-ENTRY(overflow)
-	pushl $0
-	pushl $ SYMBOL_NAME(do_overflow)
-	jmp error_code
-
-ENTRY(bounds)
-	pushl $0
-	pushl $ SYMBOL_NAME(do_bounds)
-	jmp error_code
-
-ENTRY(invalid_op)
-	pushl $0
-	pushl $ SYMBOL_NAME(do_invalid_op)
-	jmp error_code
-
-ENTRY(coprocessor_segment_overrun)
-	pushl $0
-	pushl $ SYMBOL_NAME(do_coprocessor_segment_overrun)
-	jmp error_code
-
-ENTRY(reserved)
-	pushl $0
-	pushl $ SYMBOL_NAME(do_reserved)
-	jmp error_code
-
-ENTRY(double_fault)
-	pushl $ SYMBOL_NAME(do_double_fault)
-	jmp error_code
-
-ENTRY(invalid_TSS)
-	pushl $ SYMBOL_NAME(do_invalid_TSS)
-	jmp error_code
-
-ENTRY(segment_not_present)
-	pushl $ SYMBOL_NAME(do_segment_not_present)
-	jmp error_code
-
-ENTRY(stack_segment)
-	pushl $ SYMBOL_NAME(do_stack_segment)
-	jmp error_code
-
-ENTRY(general_protection)
-	pushl $ SYMBOL_NAME(do_general_protection)
-	jmp error_code
-
-ENTRY(alignment_check)
-	pushl $ SYMBOL_NAME(do_alignment_check)
-	jmp error_code
-
-ENTRY(page_fault)
-	pushl $ SYMBOL_NAME(do_page_fault)
-	jmp error_code
-
-ENTRY(spurious_interrupt_bug)
-	pushl $0
-	pushl $ SYMBOL_NAME(do_spurious_interrupt_bug)
-	jmp error_code
-
-.data
-ENTRY(sys_call_table)
-	.long SYMBOL_NAME(sys_setup)		/* 0 */
-	.long SYMBOL_NAME(sys_exit)
-	.long SYMBOL_NAME(sys_fork)
-	.long SYMBOL_NAME(sys_read)
-	.long SYMBOL_NAME(sys_write)
-	.long SYMBOL_NAME(sys_open)		/* 5 */
-	.long SYMBOL_NAME(sys_close)
-	.long SYMBOL_NAME(sys_waitpid)
-	.long SYMBOL_NAME(sys_creat)
-	.long SYMBOL_NAME(sys_link)
-	.long SYMBOL_NAME(sys_unlink)		/* 10 */
-	.long SYMBOL_NAME(sys_execve)
-	.long SYMBOL_NAME(sys_chdir)
-	.long SYMBOL_NAME(sys_time)
-	.long SYMBOL_NAME(sys_mknod)
-	.long SYMBOL_NAME(sys_chmod)		/* 15 */
-	.long SYMBOL_NAME(sys_lchown)
-	.long SYMBOL_NAME(sys_ni_syscall)				/* old break syscall holder */
-	.long SYMBOL_NAME(sys_stat)
-	.long SYMBOL_NAME(sys_lseek)
-	.long SYMBOL_NAME(sys_getpid)		/* 20 */
-	.long SYMBOL_NAME(sys_mount)
-	.long SYMBOL_NAME(sys_umount)
-	.long SYMBOL_NAME(sys_setuid)
-	.long SYMBOL_NAME(sys_getuid)
-	.long SYMBOL_NAME(sys_stime)		/* 25 */
-	.long SYMBOL_NAME(sys_ptrace)
-	.long SYMBOL_NAME(sys_alarm)
-	.long SYMBOL_NAME(sys_fstat)
-	.long SYMBOL_NAME(sys_pause)
-	.long SYMBOL_NAME(sys_utime)		/* 30 */
-	.long SYMBOL_NAME(sys_ni_syscall)				/* old stty syscall holder */
-	.long SYMBOL_NAME(sys_ni_syscall)				/* old gtty syscall holder */
-	.long SYMBOL_NAME(sys_access)
-	.long SYMBOL_NAME(sys_nice)
-	.long SYMBOL_NAME(sys_ni_syscall)	/* 35 */		/* old ftime syscall holder */
-	.long SYMBOL_NAME(sys_sync)
-	.long SYMBOL_NAME(sys_kill)
-	.long SYMBOL_NAME(sys_rename)
-	.long SYMBOL_NAME(sys_mkdir)
-	.long SYMBOL_NAME(sys_rmdir)		/* 40 */
-	.long SYMBOL_NAME(sys_dup)
-	.long SYMBOL_NAME(sys_pipe)
-	.long SYMBOL_NAME(sys_times)
-	.long SYMBOL_NAME(sys_ni_syscall)				/* old prof syscall holder */
-	.long SYMBOL_NAME(sys_brk)		/* 45 */
-	.long SYMBOL_NAME(sys_setgid)
-	.long SYMBOL_NAME(sys_getgid)
-	.long SYMBOL_NAME(sys_signal)
-	.long SYMBOL_NAME(sys_geteuid)
-	.long SYMBOL_NAME(sys_getegid)		/* 50 */
-	.long SYMBOL_NAME(sys_acct)
-	.long SYMBOL_NAME(sys_ni_syscall)				/* old phys syscall holder */
-	.long SYMBOL_NAME(sys_ni_syscall)				/* old lock syscall holder */
-	.long SYMBOL_NAME(sys_ioctl)
-	.long SYMBOL_NAME(sys_fcntl)		/* 55 */
-	.long SYMBOL_NAME(sys_ni_syscall)				/* old mpx syscall holder */
-	.long SYMBOL_NAME(sys_setpgid)
-	.long SYMBOL_NAME(sys_ni_syscall)				/* old ulimit syscall holder */
-	.long SYMBOL_NAME(sys_olduname)
-	.long SYMBOL_NAME(sys_umask)		/* 60 */
-	.long SYMBOL_NAME(sys_chroot)
-	.long SYMBOL_NAME(sys_ustat)
-	.long SYMBOL_NAME(sys_dup2)
-	.long SYMBOL_NAME(sys_getppid)
-	.long SYMBOL_NAME(sys_getpgrp)		/* 65 */
-	.long SYMBOL_NAME(sys_setsid)
-	.long SYMBOL_NAME(sys_sigaction)
-	.long SYMBOL_NAME(sys_sgetmask)
-	.long SYMBOL_NAME(sys_ssetmask)
-	.long SYMBOL_NAME(sys_setreuid)		/* 70 */
-	.long SYMBOL_NAME(sys_setregid)
-	.long SYMBOL_NAME(sys_sigsuspend)
-	.long SYMBOL_NAME(sys_sigpending)
-	.long SYMBOL_NAME(sys_sethostname)
-	.long SYMBOL_NAME(sys_setrlimit)	/* 75 */
-	.long SYMBOL_NAME(sys_getrlimit)
-	.long SYMBOL_NAME(sys_getrusage)
-	.long SYMBOL_NAME(sys_gettimeofday)
-	.long SYMBOL_NAME(sys_settimeofday)
-	.long SYMBOL_NAME(sys_getgroups)	/* 80 */
-	.long SYMBOL_NAME(sys_setgroups)
-	.long SYMBOL_NAME(old_select)
-	.long SYMBOL_NAME(sys_symlink)
-	.long SYMBOL_NAME(sys_lstat)
-	.long SYMBOL_NAME(sys_readlink)		/* 85 */
-	.long SYMBOL_NAME(sys_uselib)
-	.long SYMBOL_NAME(sys_swapon)
-	.long SYMBOL_NAME(sys_reboot)
-	.long SYMBOL_NAME(old_readdir)
-	.long SYMBOL_NAME(old_mmap)		/* 90 */
-	.long SYMBOL_NAME(sys_munmap)
-	.long SYMBOL_NAME(sys_truncate)
-	.long SYMBOL_NAME(sys_ftruncate)
-	.long SYMBOL_NAME(sys_fchmod)
-	.long SYMBOL_NAME(sys_fchown)		/* 95 */
-	.long SYMBOL_NAME(sys_getpriority)
-	.long SYMBOL_NAME(sys_setpriority)
-	.long SYMBOL_NAME(sys_ni_syscall)				/* old profil syscall holder */
-	.long SYMBOL_NAME(sys_statfs)
-	.long SYMBOL_NAME(sys_fstatfs)		/* 100 */
-	.long SYMBOL_NAME(sys_ioperm)
-	.long SYMBOL_NAME(sys_socketcall)
-	.long SYMBOL_NAME(sys_syslog)
-	.long SYMBOL_NAME(sys_setitimer)
-	.long SYMBOL_NAME(sys_getitimer)	/* 105 */
-	.long SYMBOL_NAME(sys_newstat)
-	.long SYMBOL_NAME(sys_newlstat)
-	.long SYMBOL_NAME(sys_newfstat)
-	.long SYMBOL_NAME(sys_uname)
-	.long SYMBOL_NAME(sys_iopl)		/* 110 */
-	.long SYMBOL_NAME(sys_vhangup)
-	.long SYMBOL_NAME(sys_idle)
-	.long SYMBOL_NAME(sys_vm86old)
-	.long SYMBOL_NAME(sys_wait4)
-	.long SYMBOL_NAME(sys_swapoff)		/* 115 */
-	.long SYMBOL_NAME(sys_sysinfo)
-	.long SYMBOL_NAME(sys_ipc)
-	.long SYMBOL_NAME(sys_fsync)
-	.long SYMBOL_NAME(sys_sigreturn)
-	.long SYMBOL_NAME(sys_clone)		/* 120 */
-	.long SYMBOL_NAME(sys_setdomainname)
-	.long SYMBOL_NAME(sys_newuname)
-	.long SYMBOL_NAME(sys_modify_ldt)
-	.long SYMBOL_NAME(sys_adjtimex)
-	.long SYMBOL_NAME(sys_mprotect)		/* 125 */
-	.long SYMBOL_NAME(sys_sigprocmask)
-	.long SYMBOL_NAME(sys_create_module)
-	.long SYMBOL_NAME(sys_init_module)
-	.long SYMBOL_NAME(sys_delete_module)
-	.long SYMBOL_NAME(sys_get_kernel_syms)	/* 130 */
-	.long SYMBOL_NAME(sys_quotactl)
-	.long SYMBOL_NAME(sys_getpgid)
-	.long SYMBOL_NAME(sys_fchdir)
-	.long SYMBOL_NAME(sys_bdflush)
-	.long SYMBOL_NAME(sys_sysfs)		/* 135 */
-	.long SYMBOL_NAME(sys_personality)
-	.long SYMBOL_NAME(sys_ni_syscall)	/* for afs_syscall */
-	.long SYMBOL_NAME(sys_setfsuid)
-	.long SYMBOL_NAME(sys_setfsgid)
-	.long SYMBOL_NAME(sys_llseek)		/* 140 */
-	.long SYMBOL_NAME(sys_getdents)
-	.long SYMBOL_NAME(sys_select)
-	.long SYMBOL_NAME(sys_flock)
-	.long SYMBOL_NAME(sys_msync)
-	.long SYMBOL_NAME(sys_readv)		/* 145 */
-	.long SYMBOL_NAME(sys_writev)
-	.long SYMBOL_NAME(sys_getsid)
-	.long SYMBOL_NAME(sys_fdatasync)
-	.long SYMBOL_NAME(sys_sysctl)
-	.long SYMBOL_NAME(sys_mlock)		/* 150 */
-	.long SYMBOL_NAME(sys_munlock)
-	.long SYMBOL_NAME(sys_mlockall)
-	.long SYMBOL_NAME(sys_munlockall)
-	.long SYMBOL_NAME(sys_sched_setparam)
-	.long SYMBOL_NAME(sys_sched_getparam)   /* 155 */
-	.long SYMBOL_NAME(sys_sched_setscheduler)
-	.long SYMBOL_NAME(sys_sched_getscheduler)
-	.long SYMBOL_NAME(sys_sched_yield)
-	.long SYMBOL_NAME(sys_sched_get_priority_max)
-	.long SYMBOL_NAME(sys_sched_get_priority_min)  /* 160 */
-	.long SYMBOL_NAME(sys_sched_rr_get_interval)
-	.long SYMBOL_NAME(sys_nanosleep)
-	.long SYMBOL_NAME(sys_mremap)
-	.long SYMBOL_NAME(sys_setresuid)
-	.long SYMBOL_NAME(sys_getresuid)	/* 165 */
-	.long SYMBOL_NAME(sys_vm86)
-	.long SYMBOL_NAME(sys_query_module)
-	.long SYMBOL_NAME(sys_poll)
-	.long SYMBOL_NAME(sys_nfsservctl)
-	.long SYMBOL_NAME(sys_setresgid)	/* 170 */
-	.long SYMBOL_NAME(sys_getresgid)
-	.long SYMBOL_NAME(sys_prctl)
-	.long SYMBOL_NAME(sys_rt_sigreturn)
-	.long SYMBOL_NAME(sys_rt_sigaction)
-	.long SYMBOL_NAME(sys_rt_sigprocmask)	/* 175 */
-	.long SYMBOL_NAME(sys_rt_sigpending)
-	.long SYMBOL_NAME(sys_rt_sigtimedwait)
-	.long SYMBOL_NAME(sys_rt_sigqueueinfo)
-	.long SYMBOL_NAME(sys_rt_sigsuspend)
-	.long SYMBOL_NAME(sys_pread)		/* 180 */
-	.long SYMBOL_NAME(sys_pwrite)
-	.long SYMBOL_NAME(sys_chown)
-	.long SYMBOL_NAME(sys_getcwd)
-	.long SYMBOL_NAME(sys_capget)
-	.long SYMBOL_NAME(sys_capset)           /* 185 */
-	.long SYMBOL_NAME(sys_sigaltstack)
-	.long SYMBOL_NAME(sys_sendfile)
-	.long SYMBOL_NAME(sys_ni_syscall)		/* streams1 */
-	.long SYMBOL_NAME(sys_ni_syscall)		/* streams2 */
-	.long SYMBOL_NAME(sys_table)		/* 190 */
-	
-	.rept NR_syscalls-190
-		.long SYMBOL_NAME(sys_ni_syscall)
-	.endr

kernel/table21/main.c

@@ -1,61 +0,0 @@
-/*
- * linux/table/table_impl.c
- * Copyright (C) 1998 Martin Baulig
- */
-
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <linux/sched.h>
-#include <linux/kernel.h>
-#include <linux/kernel_stat.h>
-#include <linux/tty.h>
-#include <linux/user.h>
-#include <linux/a.out.h>
-#include <linux/string.h>
-#include <linux/mman.h>
-#include <linux/proc_fs.h>
-#include <linux/ioport.h>
-#include <linux/config.h>
-#include <linux/mm.h>
-#include <linux/pagemap.h>
-#include <linux/swap.h>
-#include <linux/slab.h>
-#include <linux/smp.h>
-#include <linux/signal.h>
-
-#include <asm/uaccess.h>
-#include <asm/pgtable.h>
-#include <asm/io.h>
-
-#include <linux/module.h>
-#include <linux/table.h>
-
-#include "version.h"
-
-extern void scheduling_functions_start_here(void);
-extern void scheduling_functions_end_here(void);
-
-int (*table_function_ptr) (int, union table *, const void *) = 0;
-
-EXPORT_SYMBOL(table_function_ptr);
-
-EXPORT_SYMBOL(nr_running);
-EXPORT_SYMBOL(pidhash);
-EXPORT_SYMBOL(task);
-EXPORT_SYMBOL(si_swapinfo);
-EXPORT_SYMBOL(scheduling_functions_start_here);
-EXPORT_SYMBOL(scheduling_functions_end_here);
-EXPORT_SYMBOL(avenrun);
-EXPORT_SYMBOL(nr_tasks);
-EXPORT_SYMBOL(last_pid);
-EXPORT_SYMBOL(page_cache_size);
-EXPORT_SYMBOL(init_mm);
-
-asmlinkage int
-sys_table (int type, union table *buf, const void *param)
-{
-	if (table_function_ptr == 0)
-		return -ENOSYS;
-
-	return (*table_function_ptr) (type, buf, param);
-}

kernel/table21/module.c

@@ -1,607 +0,0 @@
-/*
- * linux/table/table_impl.c
- * Copyright (C) 1998 Martin Baulig
- */
-
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <linux/sched.h>
-#include <linux/kernel.h>
-#include <linux/kernel_stat.h>
-#include <linux/tty.h>
-#include <linux/user.h>
-#include <linux/a.out.h>
-#include <linux/string.h>
-#include <linux/mman.h>
-#include <linux/proc_fs.h>
-#include <linux/ioport.h>
-#include <linux/config.h>
-#include <linux/mm.h>
-#include <linux/pagemap.h>
-#include <linux/swap.h>
-#include <linux/slab.h>
-#include <linux/smp.h>
-#include <linux/signal.h>
-
-#include <asm/uaccess.h>
-#include <asm/pgtable.h>
-#include <asm/io.h>
-
-#include <linux/module.h>
-#include <linux/table.h>
-
-#include "version.h"
-
-extern int (*table_function_ptr) (int, union table *, const void *);
-
-int table_fkt (int, union table *, const void *);
-
-EXPORT_NO_SYMBOLS;
-
-int
-init_module(void)
-{
-	printk ("init_module () = %p - %d, %d\n",
-		table_fkt, sizeof (union table), sizeof (sigset_t));
-	table_function_ptr = table_fkt;
-	return 0;
-}
-
-void
-cleanup_module(void)
-{
-	table_function_ptr = 0;
-}
-
-#define LOAD_INT(x) ((x) >> FSHIFT)
-#define LOAD_FRAC(x) LOAD_INT(((x) & (FIXED_1-1)) * 100)
-
-#ifdef CONFIG_DEBUG_MALLOC
-int get_malloc(char * buffer);
-#endif
-
-static void collect_sigign_sigcatch(struct task_struct *p, sigset_t *ign,
-				    sigset_t *catch)
-{
-	struct k_sigaction *k;
-	int i;
-
-	sigemptyset(ign);
-	sigemptyset(catch);
-
-#if 0
-	printk ("collect_sigign_sigcatch: %p - %p\n",
-		p, p->sig);
-#endif
-
-	if (p->sig) {
-		k = p->sig->action;
-		for (i = 1; i <= _NSIG; ++i, ++k) {
-#if 0
-			printk ("signal: %d - %p (%p, %p)\n",
-				i, k->sa.sa_handler, SIG_IGN, SIG_DFL);
-#endif
-			if (k->sa.sa_handler == SIG_IGN)
-				sigaddset(ign, i);
-			else if (k->sa.sa_handler != SIG_DFL)
-				sigaddset(catch, i);
-		}
-	}
-}
-
-/*
- * These bracket the sleeping functions..
- */
-extern void scheduling_functions_start_here(void);
-extern void scheduling_functions_end_here(void);
-#define first_sched	((unsigned long) scheduling_functions_start_here)
-#define last_sched	((unsigned long) scheduling_functions_end_here)
-
-static unsigned long get_wchan(struct task_struct *p)
-{
-	if (!p || p == current || p->state == TASK_RUNNING)
-		return 0;
-#if defined(__i386__)
-	{
-		unsigned long ebp, eip;
-		unsigned long stack_page;
-		int count = 0;
-
-		stack_page = 4096 + (unsigned long)p;
-		if (!stack_page)
-			return 0;
-		ebp = p->tss.ebp;
-		do {
-			if (ebp < stack_page || ebp >= 4092+stack_page)
-				return 0;
-			eip = *(unsigned long *) (ebp+4);
-			if (eip < first_sched || eip >= last_sched)
-				return eip;
-			ebp = *(unsigned long *) ebp;
-		} while (count++ < 16);
-	}
-#elif defined(__alpha__)
-	/*
-	 * This one depends on the frame size of schedule().  Do a
-	 * "disass schedule" in gdb to find the frame size.  Also, the
-	 * code assumes that sleep_on() follows immediately after
-	 * interruptible_sleep_on() and that add_timer() follows
-	 * immediately after interruptible_sleep().  Ugly, isn't it?
-	 * Maybe adding a wchan field to task_struct would be better,
-	 * after all...
-	 */
-	{
-	    unsigned long schedule_frame;
-	    unsigned long pc;
-
-	    pc = thread_saved_pc(&p->tss);
-	    if (pc >= first_sched && pc < last_sched) {
-		schedule_frame = ((unsigned long *)p->tss.ksp)[6];
-		return ((unsigned long *)schedule_frame)[12];
-	    }
-	    return pc;
-	}	
-#elif defined(__mc68000__)
-	{
-	    unsigned long fp, pc;
-	    unsigned long stack_page;
-	    int count = 0;
-	    extern int sys_pause (void);
-
-	    stack_page = p->kernel_stack_page;
-	    if (!stack_page)
-		    return 0;
-	    fp = ((struct switch_stack *)p->tss.ksp)->a6;
-	    do {
-		    if (fp < stack_page || fp >= 4088+stack_page)
-			    return 0;
-		    pc = ((unsigned long *)fp)[1];
-		/* FIXME: This depends on the order of these functions. */
-		    if (pc < first_sched || pc >= last_sched)
-		      return pc;
-		    fp = *(unsigned long *) fp;
-	    } while (count++ < 16);
-	}
-#elif defined(__powerpc__)
-	return (p->tss.wchan);
-#elif defined (CONFIG_ARM)
-	{
-		unsigned long fp, lr;
-		unsigned long stack_page;
-		int count = 0;
-
-		stack_page = 4096 + (unsigned long)p;
-		fp = get_css_fp (&p->tss);
-		do {
-			if (fp < stack_page || fp > 4092+stack_page)
-				return 0;
-			lr = pc_pointer (((unsigned long *)fp)[-1]);
-			if (lr < first_sched || lr > last_sched)
-				return lr;
-			fp = *(unsigned long *) (fp - 12);
-		} while (count ++ < 16);
-	}
-#endif
-	return 0;
-}
-
-#if defined(__i386__)
-# define KSTK_EIP(tsk)	(((unsigned long *)(4096+(unsigned long)(tsk)))[1019])
-# define KSTK_ESP(tsk)	(((unsigned long *)(4096+(unsigned long)(tsk)))[1022])
-#elif defined(__alpha__)
-  /*
-   * See arch/alpha/kernel/ptrace.c for details.
-   */
-# define PT_REG(reg)		(PAGE_SIZE - sizeof(struct pt_regs)	\
-				 + (long)&((struct pt_regs *)0)->reg)
-# define KSTK_EIP(tsk) \
-    (*(unsigned long *)(PT_REG(pc) + PAGE_SIZE + (unsigned long)(tsk)))
-# define KSTK_ESP(tsk)	((tsk) == current ? rdusp() : (tsk)->tss.usp)
-#elif defined(CONFIG_ARM)
-# define KSTK_EIP(tsk)	(((unsigned long *)(4096+(unsigned long)(tsk)))[1022])
-# define KSTK_ESP(tsk)	(((unsigned long *)(4096+(unsigned long)(tsk)))[1020])
-#elif defined(__mc68000__)
-#define	KSTK_EIP(tsk)	\
-    ({			\
-	unsigned long eip = 0;	 \
- 	if ((tsk)->tss.esp0 > PAGE_SIZE && \
-	    MAP_NR((tsk)->tss.esp0) < max_mapnr) \
-	      eip = ((struct pt_regs *) (tsk)->tss.esp0)->pc;	 \
-        eip; })
-#define	KSTK_ESP(tsk)	((tsk) == current ? rdusp() : (tsk)->tss.usp)
-#elif defined(__powerpc__)
-#define KSTK_EIP(tsk)	((tsk)->tss.regs->nip)
-#define KSTK_ESP(tsk)	((tsk)->tss.regs->gpr[1])
-#elif defined (__sparc_v9__)
-# define KSTK_EIP(tsk)  ((tsk)->tss.kregs->tpc)
-# define KSTK_ESP(tsk)  ((tsk)->tss.kregs->u_regs[UREG_FP])
-#elif defined(__sparc__)
-# define KSTK_EIP(tsk)  ((tsk)->tss.kregs->pc)
-# define KSTK_ESP(tsk)  ((tsk)->tss.kregs->u_regs[UREG_FP])
-#endif
-
-/* Gcc optimizes away "strlen(x)" for constant x */
-#define ADDBUF(buffer, string) \
-do { memcpy(buffer, string, strlen(string)); \
-     buffer += strlen(string); } while (0)
-
-static inline void statm_pte_range(pmd_t * pmd, unsigned long address, unsigned long size,
-	int * pages, int * shared, int * dirty, int * total)
-{
-	pte_t * pte;
-	unsigned long end;
-
-	if (pmd_none(*pmd))
-		return;
-	if (pmd_bad(*pmd)) {
-		printk("statm_pte_range: bad pmd (%08lx)\n", pmd_val(*pmd));
-		pmd_clear(pmd);
-		return;
-	}
-	pte = pte_offset(pmd, address);
-	address &= ~PMD_MASK;
-	end = address + size;
-	if (end > PMD_SIZE)
-		end = PMD_SIZE;
-	do {
-		pte_t page = *pte;
-
-		address += PAGE_SIZE;
-		pte++;
-		if (pte_none(page))
-			continue;
-		++*total;
-		if (!pte_present(page))
-			continue;
-		++*pages;
-		if (pte_dirty(page))
-			++*dirty;
-		if (MAP_NR(pte_page(page)) >= max_mapnr)
-			continue;
-		if (atomic_read(&mem_map[MAP_NR(pte_page(page))].count) > 1)
-			++*shared;
-	} while (address < end);
-}
-
-static inline void statm_pmd_range(pgd_t * pgd, unsigned long address, unsigned long size,
-	int * pages, int * shared, int * dirty, int * total)
-{
-	pmd_t * pmd;
-	unsigned long end;
-
-	if (pgd_none(*pgd))
-		return;
-	if (pgd_bad(*pgd)) {
-		printk("statm_pmd_range: bad pgd (%08lx)\n", pgd_val(*pgd));
-		pgd_clear(pgd);
-		return;
-	}
-	pmd = pmd_offset(pgd, address);
-	address &= ~PGDIR_MASK;
-	end = address + size;
-	if (end > PGDIR_SIZE)
-		end = PGDIR_SIZE;
-	do {
-		statm_pte_range(pmd, address, end - address, pages, shared, dirty, total);
-		address = (address + PMD_SIZE) & PMD_MASK;
-		pmd++;
-	} while (address < end);
-}
-
-static void statm_pgd_range(pgd_t * pgd, unsigned long address, unsigned long end,
-	int * pages, int * shared, int * dirty, int * total)
-{
-	while (address < end) {
-		statm_pmd_range(pgd, address, end - address, pages, shared, dirty, total);
-		address = (address + PGDIR_SIZE) & PGDIR_MASK;
-		pgd++;
-	}
-}
-
-int
-table_fkt (int type, union table *buf, const void *param)
-{
-	union table tbl;
-	struct sysinfo i;
-	struct task_struct *tsk = NULL;
-	struct proclist_args plistargs;
-	int index, tindex, err, tty;
-	sigset_t sigign, sigcatch;
-	pid_t pid;
-
-	if (type == TABLE_VERSION)
-		return _TABLE_VERSION;
-
-	if (!buf)
-		return -EFAULT;
-
-	memset (&tbl, 0, sizeof (union table));
-
-	/* For TABLE_PROC_*, read pid and get task_struct */
-
-	switch (type) {
-	case TABLE_PROC_UID:
-	case TABLE_PROC_MEM:
-	case TABLE_PROC_SEGMENT:
-	case TABLE_PROC_TIME:
-	case TABLE_PROC_STATE:
-	case TABLE_PROC_SIGNAL:
-	case TABLE_PROC_KERNEL:
-		err = verify_area (VERIFY_READ, param, sizeof (pid_t));
-		if (err)
-			return err;
-		copy_from_user (&pid, param, sizeof (pid_t));
-
-		read_lock (&tasklist_lock);
-		tsk = find_task_by_pid (pid);
-		/* FIXME!! This should be done after the last use */
-		read_unlock(&tasklist_lock);
-
-		if (tsk == NULL)
-			return -ESRCH;
-		break;
-	case TABLE_PROCLIST:
-		err = verify_area (VERIFY_READ, param,
-				   sizeof (struct proclist_args));
-		if (err)
-			return err;
-		copy_from_user (&plistargs, param,
-				sizeof (struct proclist_args));
-		break;
-	}
-
-	/* Main function dispatcher */
-
-	switch (type) {
-	case TABLE_PROCLIST:
-		tsk = task [0];
-		read_lock (&tasklist_lock);
-		for (index = tindex = 0; index < nr_tasks;
-		     index++, tsk = tsk->next_task) {
-			if (tsk->pid == 0) continue;
-			switch (plistargs.which & TABLE_KERN_PROC_MASK) {
-			case TABLE_KERN_PROC_PID:
-				if (tsk->pid != plistargs.arg) continue;
-				break;
-			case TABLE_KERN_PROC_PGRP:
-				if (tsk->pgrp != plistargs.arg) continue;
-				break;
-			case TABLE_KERN_PROC_SESSION:
-				if (tsk->session != plistargs.arg) continue;
-			case TABLE_KERN_PROC_TTY:
-				tty = tsk->tty ?
-					kdev_t_to_nr (tsk->tty->device) : 0;
-				if (tty != plistargs.arg) continue;
-				break;
-			case TABLE_KERN_PROC_UID:
-				if (tsk->uid != plistargs.arg) continue;
-				break;
-			case TABLE_KERN_PROC_RUID:
-				if (tsk->euid != plistargs.arg) continue;
-				break;
-			}
-
-			if ((plistargs.which & TABLE_EXCLUDE_IDLE) &&
-			    (tsk->state != 0))
-				continue;
-
-			if ((plistargs.which & TABLE_EXCLUDE_NOTTY) &&
-			    (tsk->tty == NULL))
-				continue;
-			
-			tbl.proclist.pids [tindex++] = tsk->pid;
-		}
-		tbl.proclist.nr_running = nr_running;
-		tbl.proclist.last_pid = last_pid;
-		tbl.proclist.nr_tasks = tindex;
-		read_unlock(&tasklist_lock);
-		break;
-	case TABLE_CPU:
-		tbl.cpu.total = jiffies;    
-		tbl.cpu.user  = kstat.cpu_user;
-		tbl.cpu.nice  = kstat.cpu_nice;
-		tbl.cpu.sys   = kstat.cpu_system;
-		tbl.cpu.idle  = tbl.cpu.total -
-			(tbl.cpu.user + tbl.cpu.nice + tbl.cpu.sys);
-		tbl.cpu.frequency = HZ;
-		break;
-	case TABLE_MEM:
-		si_meminfo (&i);
-		tbl.mem.total  = i.totalram;
-		tbl.mem.used   = i.totalram - i.freeram;
-		tbl.mem.free   = i.freeram;
-		tbl.mem.shared = i.sharedram;
-		tbl.mem.buffer = i.bufferram;
-		tbl.mem.cached = page_cache_size << PAGE_SHIFT;
-		break;
-	case TABLE_SWAP:
-		si_swapinfo (&i);
-		tbl.swap.total = i.totalswap;
-		tbl.swap.used  = i.totalswap - i.freeswap;
-		tbl.swap.free  = i.freeswap;
-		break;
-	case TABLE_LOADAVG:
-		tbl.loadavg.loadavg [0] = (double) avenrun [0] / (1 << FSHIFT);
-		tbl.loadavg.loadavg [1] = (double) avenrun [1] / (1 << FSHIFT);
-		tbl.loadavg.loadavg [2] = (double) avenrun [2] / (1 << FSHIFT);
-		tbl.loadavg.nr_running = nr_running;
-		tbl.loadavg.nr_tasks = nr_tasks;
-		tbl.loadavg.last_pid = last_pid;
-		break;
-	case TABLE_UPTIME:
-		tbl.uptime.uptime = jiffies;
-		tbl.uptime.idle   = task[0]->times.tms_utime +
-			task[0]->times.tms_stime;
-		break;
-	case TABLE_PROC_STATE:
-		tbl.proc_state.uid = tsk->uid;
-		tbl.proc_state.gid = tsk->gid;
-		tbl.proc_state.state = tsk->state;
-		tbl.proc_state.flags = tsk->flags;
-		memcpy (tbl.proc_state.comm, tsk->comm,
-			sizeof (tbl.proc_state.comm));
-		break;
-	case TABLE_PROC_UID:
-		tbl.proc_uid.uid = tsk->uid;
-		tbl.proc_uid.euid = tsk->euid;
-		tbl.proc_uid.suid = tsk->suid;
-		tbl.proc_uid.fsuid = tsk->fsuid;
-		
-		tbl.proc_uid.gid = tsk->gid;
-		tbl.proc_uid.egid = tsk->egid;
-		tbl.proc_uid.sgid = tsk->sgid;
-		tbl.proc_uid.fsgid = tsk->fsgid;
-		
-		tbl.proc_uid.pid = tsk->pid;
-		tbl.proc_uid.pgrp = tsk->pgrp;
-		tbl.proc_uid.ppid = tsk->p_pptr->pid;
-		
-		tbl.proc_uid.session = tsk->session;
-	        tbl.proc_uid.tty = tsk->tty ?
-			kdev_t_to_nr (tsk->tty->device) : 0;
-		tbl.proc_uid.tpgid = tsk->tty ? tsk->tty->pgrp : -1;
-		
-		tbl.proc_uid.priority = tsk->priority;
-		tbl.proc_uid.counter = tsk->counter;
-		tbl.proc_uid.def_priority = DEF_PRIORITY;
-		break;
-	case TABLE_PROC_SIGNAL:
-		memcpy (&tbl.proc_signal.signal, &tsk->signal,
-			sizeof (tbl.proc_signal.signal));
-
-		memcpy (&tbl.proc_signal.blocked, &tsk->blocked,
-			sizeof (tbl.proc_signal.blocked));
-
-		collect_sigign_sigcatch (tsk, &sigign, &sigcatch);
-
-		memcpy (&tbl.proc_signal.ignored, &sigign,
-			sizeof (tbl.proc_signal.ignored));
-
-		memcpy (&tbl.proc_signal.caught, &sigcatch,
-			sizeof (tbl.proc_signal.caught));
-
-#if 0
-		printk ("PROC_SIGNAL: (%lu, %lu) - (%lu, %lu)\n",
-			tbl.proc_signal.ignored.sig [0],
-			tbl.proc_signal.ignored.sig [1],
-			tbl.proc_signal.caught.sig [0],
-			tbl.proc_signal.caught.sig [1]);
-#endif
-		break;
-	case TABLE_PROC_MEM:
-		if (tsk->mm && tsk->mm != &init_mm) {
-			tbl.proc_mem.context = tsk->mm->context;
-			tbl.proc_mem.start_code = tsk->mm->start_code;
-			tbl.proc_mem.end_code = tsk->mm->end_code;
-			tbl.proc_mem.start_data = tsk->mm-> start_data;
-			tbl.proc_mem.end_data = tsk->mm->end_data;
-			tbl.proc_mem.start_brk = tsk->mm->start_brk;
-			tbl.proc_mem.brk = tsk->mm->brk;
-			tbl.proc_mem.start_stack = tsk->mm->start_stack;
-			tbl.proc_mem.start_mmap = tsk->mm->mmap ?
-				tsk->mm->mmap->vm_start : 0;
-			tbl.proc_mem.arg_start = tsk->mm->arg_start;
-			tbl.proc_mem.arg_end = tsk->mm->arg_end;
-			tbl.proc_mem.env_start = tsk->mm->env_start;
-			tbl.proc_mem.env_end = tsk->mm->env_end;
-			tbl.proc_mem.rss = tsk->mm->rss << PAGE_SHIFT;
-			tbl.proc_mem.total_vm = tsk->mm->total_vm;
-			tbl.proc_mem.locked_vm = tsk->mm->locked_vm;
-		}
-		tbl.proc_mem.rlim = tsk->rlim ? tsk->rlim[RLIMIT_RSS].rlim_cur : 0;
-		break;
-	case TABLE_PROC_SEGMENT:
-		if (tsk->mm && tsk->mm != &init_mm) {
-			unsigned long vsize = 0;
-			int size = 0, resident = 0, share = 0;
-			int trs = 0, lrs = 0, drs = 0, srs = 0, dt = 0;
-			struct vm_area_struct * vma = tsk->mm->mmap;
-
-			while (vma) {
-				pgd_t *pgd = pgd_offset(tsk->mm, vma->vm_start);
-				int pages = 0, shared = 0, dirty = 0, total = 0;
-				
-				vsize += vma->vm_end - vma->vm_start;
-
-				statm_pgd_range (pgd, vma->vm_start, vma->vm_end,
-
-						 &pages, &shared, &dirty, &total);
-
-				resident += pages;
-				share += shared;
-				dt += dirty;
-				size += total;
-
-				/* Well, shared library seem to get mapped
-				 * above 0x40000000 and are executable,
-				 * so I use this hack to get their size.
-				 */
-
-				if (vma->vm_flags & VM_GROWSDOWN)
-					srs += pages;	/* stack */
-				else if ((vma->vm_flags & VM_EXEC) &&
-					 (vma->vm_start > 0x40000000))
-					lrs += pages;	/* library */
-				else if (vma->vm_flags & VM_EXECUTABLE)
-					trs += pages;	/* text */
-				else
-					drs += pages;
-
-				vma = vma->vm_next;
-			}
-
-			tbl.proc_segment.vsize = vsize;
-			tbl.proc_segment.size = size << PAGE_SHIFT;
-			tbl.proc_segment.resident = resident << PAGE_SHIFT;
-			tbl.proc_segment.shared = share << PAGE_SHIFT;
-			tbl.proc_segment.trs = trs << PAGE_SHIFT;
-			tbl.proc_segment.lrs = lrs << PAGE_SHIFT;
-			tbl.proc_segment.drs = drs << PAGE_SHIFT;
-			tbl.proc_segment.srs = srs << PAGE_SHIFT;
-			tbl.proc_segment.dt = dt << PAGE_SHIFT;
-		}
-		break;
-	case TABLE_PROC_TIME:
-		tbl.proc_time.utime = tsk->times.tms_utime;
-		tbl.proc_time.stime = tsk->times.tms_stime;
-		tbl.proc_time.cutime = tsk->times.tms_cutime;
-		tbl.proc_time.cstime = tsk->times.tms_cstime;
-
-		tbl.proc_time.start_time = tsk->start_time;
-		tbl.proc_time.timeout = tsk->timeout;
-		tbl.proc_time.policy = tsk->policy;
-		tbl.proc_time.rt_priority = tsk->rt_priority;
-
-		tbl.proc_time.it_real_value = tsk->it_real_value;
-		tbl.proc_time.it_prof_value = tsk->it_prof_value;
-		tbl.proc_time.it_virt_value = tsk->it_virt_value;
-		tbl.proc_time.it_real_incr = tsk->it_real_incr;
-		tbl.proc_time.it_prof_incr = tsk->it_prof_incr;
-		tbl.proc_time.it_virt_incr = tsk->it_virt_incr;
-		break;
-	case TABLE_PROC_KERNEL:
-		tbl.proc_kernel.min_flt = tsk->min_flt;
-		tbl.proc_kernel.cmin_flt = tsk->cmin_flt;
-		tbl.proc_kernel.maj_flt = tsk->maj_flt;
-		tbl.proc_kernel.cmaj_flt = tsk->cmaj_flt;
-		
-		tbl.proc_kernel.kesp = KSTK_ESP(tsk);
-		tbl.proc_kernel.keip = KSTK_EIP(tsk);
-		
-		tbl.proc_kernel.nswap = tsk->nswap;
-		tbl.proc_kernel.cnswap = tsk->cnswap;
-
-		tbl.proc_kernel.wchan = get_wchan (tsk);
-		break;
-	default:
-		return -EINVAL;
-	}
-
-	err = verify_area (VERIFY_WRITE, buf, sizeof (struct table));
-	if (err)
-		return err;
-
-	copy_to_user (buf, &tbl, sizeof (union table));
-
-	return 0;
-}

kernel/table21/unistd-i386.h

@@ -1,344 +0,0 @@
-#ifndef _ASM_I386_UNISTD_H_
-#define _ASM_I386_UNISTD_H_
-
-/*
- * This file contains the system call numbers.
- */
-
-#define __NR_setup		  0	/* used only by init, to get system going */
-#define __NR_exit		  1
-#define __NR_fork		  2
-#define __NR_read		  3
-#define __NR_write		  4
-#define __NR_open		  5
-#define __NR_close		  6
-#define __NR_waitpid		  7
-#define __NR_creat		  8
-#define __NR_link		  9
-#define __NR_unlink		 10
-#define __NR_execve		 11
-#define __NR_chdir		 12
-#define __NR_time		 13
-#define __NR_mknod		 14
-#define __NR_chmod		 15
-#define __NR_lchown		 16
-#define __NR_break		 17
-#define __NR_oldstat		 18
-#define __NR_lseek		 19
-#define __NR_getpid		 20
-#define __NR_mount		 21
-#define __NR_umount		 22
-#define __NR_setuid		 23
-#define __NR_getuid		 24
-#define __NR_stime		 25
-#define __NR_ptrace		 26
-#define __NR_alarm		 27
-#define __NR_oldfstat		 28
-#define __NR_pause		 29
-#define __NR_utime		 30
-#define __NR_stty		 31
-#define __NR_gtty		 32
-#define __NR_access		 33
-#define __NR_nice		 34
-#define __NR_ftime		 35
-#define __NR_sync		 36
-#define __NR_kill		 37
-#define __NR_rename		 38
-#define __NR_mkdir		 39
-#define __NR_rmdir		 40
-#define __NR_dup		 41
-#define __NR_pipe		 42
-#define __NR_times		 43
-#define __NR_prof		 44
-#define __NR_brk		 45
-#define __NR_setgid		 46
-#define __NR_getgid		 47
-#define __NR_signal		 48
-#define __NR_geteuid		 49
-#define __NR_getegid		 50
-#define __NR_acct		 51
-#define __NR_phys		 52
-#define __NR_lock		 53
-#define __NR_ioctl		 54
-#define __NR_fcntl		 55
-#define __NR_mpx		 56
-#define __NR_setpgid		 57
-#define __NR_ulimit		 58
-#define __NR_oldolduname	 59
-#define __NR_umask		 60
-#define __NR_chroot		 61
-#define __NR_ustat		 62
-#define __NR_dup2		 63
-#define __NR_getppid		 64
-#define __NR_getpgrp		 65
-#define __NR_setsid		 66
-#define __NR_sigaction		 67
-#define __NR_sgetmask		 68
-#define __NR_ssetmask		 69
-#define __NR_setreuid		 70
-#define __NR_setregid		 71
-#define __NR_sigsuspend		 72
-#define __NR_sigpending		 73
-#define __NR_sethostname	 74
-#define __NR_setrlimit		 75
-#define __NR_getrlimit		 76
-#define __NR_getrusage		 77
-#define __NR_gettimeofday	 78
-#define __NR_settimeofday	 79
-#define __NR_getgroups		 80
-#define __NR_setgroups		 81
-#define __NR_select		 82
-#define __NR_symlink		 83
-#define __NR_oldlstat		 84
-#define __NR_readlink		 85
-#define __NR_uselib		 86
-#define __NR_swapon		 87
-#define __NR_reboot		 88
-#define __NR_readdir		 89
-#define __NR_mmap		 90
-#define __NR_munmap		 91
-#define __NR_truncate		 92
-#define __NR_ftruncate		 93
-#define __NR_fchmod		 94
-#define __NR_fchown		 95
-#define __NR_getpriority	 96
-#define __NR_setpriority	 97
-#define __NR_profil		 98
-#define __NR_statfs		 99
-#define __NR_fstatfs		100
-#define __NR_ioperm		101
-#define __NR_socketcall		102
-#define __NR_syslog		103
-#define __NR_setitimer		104
-#define __NR_getitimer		105
-#define __NR_stat		106
-#define __NR_lstat		107
-#define __NR_fstat		108
-#define __NR_olduname		109
-#define __NR_iopl		110
-#define __NR_vhangup		111
-#define __NR_idle		112
-#define __NR_vm86old		113
-#define __NR_wait4		114
-#define __NR_swapoff		115
-#define __NR_sysinfo		116
-#define __NR_ipc		117
-#define __NR_fsync		118
-#define __NR_sigreturn		119
-#define __NR_clone		120
-#define __NR_setdomainname	121
-#define __NR_uname		122
-#define __NR_modify_ldt		123
-#define __NR_adjtimex		124
-#define __NR_mprotect		125
-#define __NR_sigprocmask	126
-#define __NR_create_module	127
-#define __NR_init_module	128
-#define __NR_delete_module	129
-#define __NR_get_kernel_syms	130
-#define __NR_quotactl		131
-#define __NR_getpgid		132
-#define __NR_fchdir		133
-#define __NR_bdflush		134
-#define __NR_sysfs		135
-#define __NR_personality	136
-#define __NR_afs_syscall	137 /* Syscall for Andrew File System */
-#define __NR_setfsuid		138
-#define __NR_setfsgid		139
-#define __NR__llseek		140
-#define __NR_getdents		141
-#define __NR__newselect		142
-#define __NR_flock		143
-#define __NR_msync		144
-#define __NR_readv		145
-#define __NR_writev		146
-#define __NR_getsid		147
-#define __NR_fdatasync		148
-#define __NR__sysctl		149
-#define __NR_mlock		150
-#define __NR_munlock		151
-#define __NR_mlockall		152
-#define __NR_munlockall		153
-#define __NR_sched_setparam		154
-#define __NR_sched_getparam		155
-#define __NR_sched_setscheduler		156
-#define __NR_sched_getscheduler		157
-#define __NR_sched_yield		158
-#define __NR_sched_get_priority_max	159
-#define __NR_sched_get_priority_min	160
-#define __NR_sched_rr_get_interval	161
-#define __NR_nanosleep		162
-#define __NR_mremap		163
-#define __NR_setresuid		164
-#define __NR_getresuid		165
-#define __NR_vm86		166
-#define __NR_query_module	167
-#define __NR_poll		168
-#define __NR_nfsservctl		169
-#define __NR_setresgid		170
-#define __NR_getresgid		171
-#define __NR_prctl              172
-#define __NR_rt_sigreturn	173
-#define __NR_rt_sigaction	174
-#define __NR_rt_sigprocmask	175
-#define __NR_rt_sigpending	176
-#define __NR_rt_sigtimedwait	177
-#define __NR_rt_sigqueueinfo	178
-#define __NR_rt_sigsuspend	179
-#define __NR_pread		180
-#define __NR_pwrite		181
-#define __NR_chown		182
-#define __NR_getcwd		183
-#define __NR_capget		184
-#define __NR_capset		185
-#define __NR_sigaltstack	186
-#define __NR_sendfile		187
-#define __NR_streams1		188	/* some people actually want it */
-#define __NR_streams2		189	/* some people actually want it */
-#define __NR_table		190
-
-/* user-visible error numbers are in the range -1 - -122: see <asm-i386/errno.h> */
-
-#define __syscall_return(type, res) \
-do { \
-	if ((unsigned long)(res) >= (unsigned long)(-125)) { \
-		errno = -(res); \
-		res = -1; \
-	} \
-	return (type) (res); \
-} while (0)
-
-/* XXX - _foo needs to be __foo, while __NR_bar could be _NR_bar. */
-#define _syscall0(type,name) \
-type name(void) \
-{ \
-long __res; \
-__asm__ volatile ("int $0x80" \
-	: "=a" (__res) \
-	: "0" (__NR_##name)); \
-__syscall_return(type,__res); \
-}
-
-#define _syscall1(type,name,type1,arg1) \
-type name(type1 arg1) \
-{ \
-long __res; \
-__asm__ volatile ("int $0x80" \
-	: "=a" (__res) \
-	: "0" (__NR_##name),"b" ((long)(arg1))); \
-__syscall_return(type,__res); \
-}
-
-#define _syscall2(type,name,type1,arg1,type2,arg2) \
-type name(type1 arg1,type2 arg2) \
-{ \
-long __res; \
-__asm__ volatile ("int $0x80" \
-	: "=a" (__res) \
-	: "0" (__NR_##name),"b" ((long)(arg1)),"c" ((long)(arg2))); \
-__syscall_return(type,__res); \
-}
-
-#define _syscall3(type,name,type1,arg1,type2,arg2,type3,arg3) \
-type name(type1 arg1,type2 arg2,type3 arg3) \
-{ \
-long __res; \
-__asm__ volatile ("int $0x80" \
-	: "=a" (__res) \
-	: "0" (__NR_##name),"b" ((long)(arg1)),"c" ((long)(arg2)), \
-		  "d" ((long)(arg3))); \
-__syscall_return(type,__res); \
-}
-
-#define _syscall4(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4) \
-type name (type1 arg1, type2 arg2, type3 arg3, type4 arg4) \
-{ \
-long __res; \
-__asm__ volatile ("int $0x80" \
-	: "=a" (__res) \
-	: "0" (__NR_##name),"b" ((long)(arg1)),"c" ((long)(arg2)), \
-	  "d" ((long)(arg3)),"S" ((long)(arg4))); \
-__syscall_return(type,__res); \
-} 
-
-#define _syscall5(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4, \
-	  type5,arg5) \
-type name (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5) \
-{ \
-long __res; \
-__asm__ volatile ("int $0x80" \
-	: "=a" (__res) \
-	: "0" (__NR_##name),"b" ((long)(arg1)),"c" ((long)(arg2)), \
-	  "d" ((long)(arg3)),"S" ((long)(arg4)),"D" ((long)(arg5))); \
-__syscall_return(type,__res); \
-}
-
-#ifdef __KERNEL_SYSCALLS__
-
-/*
- * we need this inline - forking from kernel space will result
- * in NO COPY ON WRITE (!!!), until an execve is executed. This
- * is no problem, but for the stack. This is handled by not letting
- * main() use the stack at all after fork(). Thus, no function
- * calls - which means inline code for fork too, as otherwise we
- * would use the stack upon exit from 'fork()'.
- *
- * Actually only pause and fork are needed inline, so that there
- * won't be any messing with the stack from main(), but we define
- * some others too.
- */
-#define __NR__exit __NR_exit
-static inline _syscall0(int,idle)
-static inline _syscall0(int,pause)
-static inline _syscall1(int,setup,int,magic)
-static inline _syscall0(int,sync)
-static inline _syscall0(pid_t,setsid)
-static inline _syscall3(int,write,int,fd,const char *,buf,off_t,count)
-static inline _syscall3(int,read,int,fd,char *,buf,off_t,count)
-static inline _syscall3(off_t,lseek,int,fd,off_t,offset,int,count)
-static inline _syscall1(int,dup,int,fd)
-static inline _syscall3(int,execve,const char *,file,char **,argv,char **,envp)
-static inline _syscall3(int,open,const char *,file,int,flag,int,mode)
-static inline _syscall1(int,close,int,fd)
-static inline _syscall1(int,_exit,int,exitcode)
-static inline _syscall3(pid_t,waitpid,pid_t,pid,int *,wait_stat,int,options)
-static inline _syscall1(int,delete_module,const char *,name)
-
-static inline pid_t wait(int * wait_stat)
-{
-	return waitpid(-1,wait_stat,0);
-}
-
-/*
- * This is the mechanism for creating a new kernel thread.
- *
- * NOTE! Only a kernel-only process(ie the swapper or direct descendants
- * who haven't done an "execve()") should use this: it will work within
- * a system call from a "real" process, but the process memory space will
- * not be free'd until both the parent and the child have exited.
- */
-static inline pid_t kernel_thread(int (*fn)(void *), void * arg, unsigned long flags)
-{
-	long retval;
-
-	__asm__ __volatile__(
-		"movl %%esp,%%esi\n\t"
-		"int $0x80\n\t"		/* Linux/i386 system call */
-		"cmpl %%esp,%%esi\n\t"	/* child or parent? */
-		"je 1f\n\t"		/* parent - jump */
-		"pushl %3\n\t"		/* push argument */
-		"call *%4\n\t"		/* call fn */
-		"movl %2,%0\n\t"	/* exit */
-		"int $0x80\n"
-		"1:\t"
-		:"=a" (retval)
-		:"0" (__NR_clone), "i" (__NR_exit),
-		 "r" (arg), "r" (fn),
-		 "b" (flags | CLONE_VM)
-		:"si");
-	return retval;
-}
-
-#endif
-
-#endif /* _ASM_I386_UNISTD_H_ */

kernel/table21/version.h

@@ -1 +0,0 @@
-#define _TABLE_VERSION	1

kernel/version.h

@@ -1 +0,0 @@
-#define _TABLE_VERSION	1

lib/lib.pl

@@ -46,16 +46,14 @@ print "\t\t*required &= present;";
 print "\tcase GLIBTOP_ERROR_METHOD_WARN:";
 print "\t\tglibtop_warn_r (server,";
 print "\t\t\t\t_(\"glibtop_get_%s (): Client requested \"";
-print "\t\t\t\t  \"field mask %05lx, but only have %05lx.\"),";
+print "\t\t\t\t  \"field mask %05Lx, but only have %05Lx.\"),";
-print "\t\t\t\t feature, (unsigned long) old_required,";
+print "\t\t\t\t feature, old_required, present);";
-print "\t\t\t\t (unsigned long) present);";
 print "\t\tbreak;";
 print "\tcase GLIBTOP_ERROR_METHOD_ABORT:";
 print "\t\tglibtop_error_r (server,";
 print "\t\t\t\t _(\"glibtop_get_%s (): Client requested \"";
-print "\t\t\t\t  \"field mask %05lx, but only have %05lx.\"),";
+print "\t\t\t\t   \"field mask %05x, but only have %05x.\"),";
-print "\t\t\t\t feature, (unsigned long) old_required,";
+print "\t\t\t\t feature, old_required, present);";
-print "\t\t\t\t (unsigned long) present);";
 print "\t\tbreak;";
 print "\t}";
 print '}';

lib/read.c

@@ -30,7 +30,6 @@ do_read (int s, void *ptr, size_t total_size)
 {
 	int nread;
 	size_t already_read = 0, remaining = total_size;
-	char *tmp_ptr;
 	
 	while (already_read < total_size) {
 		nread = recv (s, ptr, remaining, 0);
@@ -47,10 +46,7 @@ do_read (int s, void *ptr, size_t total_size)
 		
 		already_read += nread;
 		remaining -= nread;
-		/* (char *) ptr += nread; */
+		(char *) ptr += nread;
-		tmp_ptr = ptr;
-		tmp_ptr += nread;
-		ptr = tmp_ptr;
 	}
 }
 

lib/sysdeps.c

@@ -40,7 +40,6 @@ GLIBTOP_SUID_PROC_TIME +
 GLIBTOP_SUID_PROC_SIGNAL +
 GLIBTOP_SUID_PROC_KERNEL +
 GLIBTOP_SUID_PROC_SEGMENT +
-GLIBTOP_SUID_PROC_ARGS +
 GLIBTOP_SUID_PROC_MAP +
 GLIBTOP_SUID_NETLOAD +
 GLIBTOP_SUID_PPP;

libgtop-config.in

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 usage="\
-Usage: libgtop-config [--version] [--config] [--features-def-file] [--cflags] [--libs] [--extra-libs]"
+    Usage: libgtop-config [--version] [--config] [--features-def-file]"
 
 config_file="@LIBGTOP_LIBDIR@/libgtopConf.sh"
 . $config_file
@@ -29,15 +29,6 @@ while test $# -gt 0; do
     --features-def-file)
       echo $features_def_file
       ;;
-    --cflags)
-      echo $LIBGTOP_INCS
-      ;;
-    --libs)
-      echo $LIBGTOP_LIBS
-      ;;
-    --extra-libs)
-      echo $LIBGTOP_EXTRA_LIBS
-      ;;
     *)
       echo "${usage}" 1>&2
       exit 1

libgtop-sysdeps.m4

@@ -15,45 +15,44 @@ AC_DEFUN([LIBGTOP_HACKER_TESTS],[
 
 	case "$host_os" in
 	linux*)
-	  AC_ARG_WITH(linux-table,
+	  AC_ARG_WITH(linux-sysctl,
-	  [  --with-linux-table      Use the table () function from Martin Baulig],[
+	  [  --with-linux-sysctl      Use the sysctl () interface from Martin Baulig],[
-	  linux_table="$withval"],[linux_table=auto])
+	  linux_sysctl="$withval"],[linux_sysctl=auto])
-	  if test $linux_table = yes ; then
+	  if test $linux_sysctl = yes ; then
-	    AC_CHECK_HEADER(linux/table.h, linux_table=yes, linux_table=no)
+	    AC_CHECK_HEADER(linux/libgtop.h, linux_sysctl=yes, linux_sysctl=no)
-	  elif test $linux_table = auto ; then
+	  elif test $linux_sysctl = auto ; then
-	    AC_MSG_CHECKING(for table function in Linux Kernel)
+	    AC_MSG_CHECKING(for LibGTop sysctl support in Linux Kernel)
 	    AC_TRY_RUN([
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <unistd.h>
+#include <sys/sysctl.h>
-#include <linux/unistd.h>
+#include <linux/libgtop.h>
-#include <linux/table.h>
 
-#include <syscall.h>
+#define SIZE(x) sizeof(x)/sizeof(x[0])
 
-static inline _syscall3 (int, table, int, type, union table *, tbl, const void *, param);
+int name[2] = { CTL_LIBGTOP, LIBGTOP_VERSION };
 
 int
 main (void)
 {
-	union table tbl;
+    unsigned version;
-	int ret;
+    size_t size = sizeof (version);
 
-	ret = table (TABLE_VERSION, NULL, NULL);
+    if (sysctl (name, SIZE (name), &version, &size, NULL, 0))
-
+	exit (1);
-	if (ret == -1)
+    else if (version < 1)
-		exit (-errno);
+	exit (2);
-
+    else
-	exit (ret < 1 ? ret : 0);
+	exit (0);
 }
-], linux_table=yes, linux_table=no, linux_table=no)
+], linux_sysctl=yes, linux_sysctl=no, linux_sysctl=no)
-	    AC_MSG_RESULT($linux_table)
+	    AC_MSG_RESULT($linux_sysctl)
 	  fi
-	  if test $linux_table = yes ; then
+	  if test $linux_sysctl = yes ; then
-	    AC_DEFINE(HAVE_LINUX_TABLE)
+	    AC_DEFINE(HAVE_LINUX_SYSCTL)
 	  fi
-	  AM_CONDITIONAL(LINUX_TABLE, test $linux_table = yes)
+	  AM_CONDITIONAL(LINUX_SYSCTL, test $linux_sysctl = yes)
 	  ;;
 	esac
 ])
@@ -73,7 +72,7 @@ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[
 
 	AC_ARG_ENABLE(hacker-mode,
 	[  --enable-hacker-mode    Enable building of unstable sysdeps],
-	[hacker_mode="$enableval"], [hacker_mode=no])
+	[hacker_mode="$withval"], [hacker_mode=no])
 
 	AM_CONDITIONAL(HACKER_MODE, test x"$hacker_mode" = xyes)
 
@@ -108,34 +107,37 @@ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[
 
 	case "$host_os" in
 	linux*)
-	  if test x$linux_table = xyes ; then
+	  if test x$linux_sysctl = 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_have_sysinfo=yes
 	  libgtop_need_server=no
 	  ;;
-	freebsd*|netbsd*|openbsd*|bsdi*)
+	freebsd*|netbsd*|openbsd*)
 	  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
+            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=no
+	      ;;
 	    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
@@ -185,7 +187,7 @@ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[
 #include <net/netisr.h>
 #include <net/route.h>
 
-#if defined(__FreeBSD__) || defined(__NetBSD__)
+#ifdef __FreeBSD__
 #include <net/if_sppp.h>
 #else
 #include <i4b/sppp/if_sppp.h>
@@ -211,7 +213,7 @@ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[
 #include <net/netisr.h>
 #include <net/route.h>
 
-#if defined(__FreeBSD__) || defined(__NetBSD__)
+#ifdef __FreeBSD__
 #include <net/if_sppp.h>
 #else
 #include <i4b/sppp/if_sppp.h>
@@ -257,18 +259,6 @@ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[
 	  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)

libgtop.spec.in

@@ -1,7 +1,6 @@
 # Note that this is NOT a relocatable package
 %define ver      @VERSION@
-%define  RELEASE SNAP
+%define rel      SNAP
-%define  rel     %{?CUSTOM_RELEASE} %{!?CUSTOM_RELEASE:%RELEASE}
 %define prefix   /usr
 
 Summary: LibGTop library
@@ -123,4 +122,4 @@ rm -rf $RPM_BUILD_ROOT
 %files examples
 %defattr(-,root,root)
 
-%{prefix}/libexec/libgtop
+%{prefix}/libexec/libgtop/*

libgtopConf.sh.in

@@ -31,8 +31,6 @@ LIBGTOP_MICRO_VERSION="@LIBGTOP_MICRO_VERSION@"
 LIBGTOP_VERSION="@LIBGTOP_VERSION@"
 LIBGTOP_VERSION_CODE="@LIBGTOP_VERSION_CODE@"
 
-MODULE_VERSION="libgtop-@LIBGTOP_VERSION@"
-
 LIBGTOP_SERVER_VERSION="@LIBGTOP_SERVER_VERSION@"
 
 libgtop_sysdeps_dir="@libgtop_sysdeps_dir@"

misc/timings/timings.linux-proc

@@ -1,26 +0,0 @@
-This statistics were made on a PPRO 200 running Linux 2.2.1
-reading everything from /proc while the system was idle.
-
-
-Feature      (Flags     ):   Count -     utime -     stime
-----------------------------------------------------------
-CPU          (0x000007ff):  100000 -     13.90 -    181.80
-Memory       (0x0000007f):   10000 -     32.00 -   8061.00
-Swap         (0x0000001f):   10000 -     46.00 -   8130.00
-Uptime       (0x00000003):  100000 -     19.60 -     72.20
-Loadavg      (0x0000000f):  100000 -     32.40 -     77.10
-
-Proclist     (0x00000007):   10000 -   2250.00 -   4419.00
-
-Proc_State   (0x0000000f):  100000 -     40.70 -    221.00
-Proc_Uid     (0x00000fff):  100000 -     72.40 -    327.30
-Proc_Mem     (0x0000003f):  100000 -     65.70 -    283.90
-Proc_Segment (0x000000f5):  100000 -     76.50 -    281.10
-Proc_Time    (0x000001ff):  100000 -     37.00 -    160.90
-Proc_Signal  (0x0000000f):  100000 -     52.50 -    148.50
-Proc_Kernel  (0x0000017f):  100000 -     56.70 -    153.50
-----------------------------------------------------------
-TOTAL                                 70030000 - 396830000
-
-All timings are in clock ticks (1000000 ticks per second).
-

misc/timings/timings.linux-sysctl

@@ -1,27 +0,0 @@
-This statistics were made on a PPRO 200 running Linux 2.2.1
-(the same machine I made the timings.linux-proc on) with my
-new sysctl () based kernel module.
-
-
-Feature      (Flags     ):   Count -     utime -     stime
-----------------------------------------------------------
-CPU          (0x0000003f):  100000 -      3.50 -      5.40
-Memory       (0x0000003f):   10000 -      3.00 -      6.00
-Swap         (0x0000001f):   10000 -     10.00 -      7.00
-Uptime       (0x00000003):  100000 -      2.30 -      7.00
-Loadavg      (0x00000001):  100000 -      3.00 -      5.60
-
-Proclist     (0x00000007):   10000 -     13.00 -     46.00
-
-Proc_State   (0x0000000d):  100000 -      3.20 -      7.70
-Proc_Uid     (0x00000fff):  100000 -      3.60 -      7.40
-Proc_Mem     (0x0000003f):  100000 -      4.10 -     34.30
-Proc_Segment (0x000000ff):  100000 -      5.90 -     41.50
-Proc_Time    (0x0000013d):  100000 -      3.50 -      7.50
-Proc_Signal  (0x0000000f):  100000 -      2.70 -      8.80
-Proc_Kernel  (0x000000fe):  100000 -      4.00 -     13.30
-----------------------------------------------------------
-TOTAL                                  3840000 -  14440000
-
-All timings are in clock ticks (1000000 ticks per second).
-

po/.cvsignore

@@ -2,8 +2,6 @@ Makefile
 Makefile.in
 POTFILES
 cat-id-tbl.c
-*.gmo
+*.gmo *.mo
-*.mo
 libgtop.pot
 Makefile.in.in
-messages

po/ChangeLog

@@ -1,239 +1,3 @@
-2003-05-13  Marcel Telka  <marcel@telka.sk>
-
-	* sk.po: Updated Slovak translation.
-
-2003-05-13  Abel Cheung  <maddog@linux.org.hk>
-
-	* zh_TW.po: Updated traditional Chinese translation.
-
-2002-12-14  Christophe Merlet  <redfox@redfoxcenter.org>
-
-	* 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.
-
-2001-10-30  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* pl.po: Updated Polish translation by
-	GNOME PL Team <translators@gnome.pl>.
-
-2001-10-17  Carlos Perell<6C> Mar<61>n <carlos@gnome-db.org>
-
-	* pt.po: Added by Duarte Loreto <happyguy_pt@hotmail.com>
-
-2001-09-16  Abel Cheung  <maddog@linux.org.hk>
-
-	* zh_TW.po: Added traditoinal Chinese translation.
-
-2001-07-16  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* nn.po: Added Norwegian (nynorsk) translation.
-	
-2001-03-25  Fatih Demir <kabalak@gtranslator.org>
-
-	* tr.po: %100'ification.
-
-2001-03-23  Fatih Demir <kabalak@gtranslator.org>
-
-	* tr.po: Updated Turkish translation by G<>rkem.
-
-2001-03-15  Valek Filippov  <frob@df.ru>
-
-	* ru.po: Updated russian translation.
-
-2001-03-09  Pablo Saratxaga  <pablo@mandrakesoft.com>
-
-	* az.po: converted to 8bit encoding as requested for Gnome 1.4
-
-2001-02-25  Simos Xenitellis  <simos@hellug.gr>
-
-	* el.po: Updated Greek translation.
-
-2001-02-23  Simos Xenitellis  <simos@hellug.gr>
-
-	* el.po: Some more strings.
-
-2001-02-19  Simos Xenitellis  <simos@hellug.gr>
-
-	* el.po: Update of Greek translation.
-
-2001-02-15  Christian Meyer  <cm@ggtt.de>
-
-	* de.po: Some minor changes.
-
-2001-02-14  Jarkko Ranta  <jjranta@cc.joensuu.fi>
-
-	* fi.po: Updated Finnish translation
-
-2001-02-14  Stanislav Visnovsky  <visnovsky@nenya.ms.mff.cuni.cz>
-
-	* sk.po: Updated Slovak translation from Marcel Telka <marcel@telka.sk>
-
-2001-02-13  Szabolcs Ban  <shooby@gnome.hu>
-
-	* hu.po: Updated Hungarian translation from Robert Vanyi
-
-2001-02-13  Stanislav Visnovsky  <visnovsky@nenya.ms.mff.cuni.cz>
-
-	* sk.po: Added Slovak translation from Marcel Telka <marcel@telka.sk>
-
-2001-02-13  Martin Baulig  <baulig@suse.de>
-
-	* fi.po: Reverted Jarkko Ranta's change; please do
-	not commit any compressed files in future.
-
-2001-02-10  Christophe Merlet  <christophe@merlet.net>
-
-	* fr.po: Updated French translation.
-
-2001-02-09  Gustavo Maciel Dias Vieira  <gdvieira@zaz.com.br>
-
-	* pt_BR.po: Updated Brazilian Portuguese translation.
-
-2001-02-08  Jarkko Ranta  <jjranta@cc.joensuu.fi>
-
-	* fi.po: Updated Finnish translation by Pauli Virtanen
-
-2001-02-08  Valek Filippov  <frob@df.ru>
-
-	* ru.po: Updated russian translation.
-
-2001-02-05  Christophe Merlet  <christophe@merlet.net>
-
-	* fr.po: Updated French translation.
-
-2001-01-05  Pablo Saratxaga <pablo@mandrakesoft.com>
-
-	* az.po: Added Azeri file
-	* ja.po: fixed a syntax error (missing %c )
-
-2000-10-15  Yukihiro Nakai  <nakai@gnome.gr.jp>
-
-	* ja.po: Update Japanese translation.
-
-2000-10-11  Yukihiro Nakai  <nakai@gnome.gr.jp>
-
-	* ja.po: Update Japanese translation.
-
-2000-09-19  Christian Meyer  <linux@chrisime.de>
-
-	* de.po: Minor fix.
-	
-2000-09-19  Christian Meyer  <linux@chrisime.de>
-
-	* de.po: Updated German translation.
-	
-2000-09-10  Christian Meyer  <linux@chrisime.de>
-
-	* de.po: Updated German translation.
-	* update.pl: Added update.pl from menesis.
-	* README.tools: Added text file.
-
-2000-08-16  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian translation.
-	
-2000-06-25  Takayuki KUSANO  <AE5T-KSN@asahi-net.or.jp>
-
-	* ja.po: Updated Japanese translation.
-
-2000-05-26  Yuri Syrota <rasta@renome.rovno.ua>
-
-	* uk.po: Updated Ukrainian translation.
-
-2000-05-20  Manuel de Vega Barreiro <barreiro@arrakis.es>
-
-	* es.po: Updated Spanish translation.
-
-2000-05-18  Martin Norb<72>ck  <d95mback@dtek.chalmers.se>
-
-	* sv.po: Updated Swedish translation.
-
-2000-05-18  Jesus Bravo Alvarez  <jba@pobox.com>
-
-	* gl.po: Updated Galician translation.
-
-2000-05-17  Kjartan Maraas  <kmaraas@online.no>
-
-	* no.po: Updated translation.
-	
-2000-05-16  Kenneth Christiansen  <kenneth@gnome.org>
-
-        * POTFILES.in: New strings added
-
-2000-05-16  Kenneth Christiansen  <kenneth@gnome.org>
-
-        * da.po: New da translation
-	* update.sh: New update.sh script
-
-2000-05-16  Jesus Bravo Alvarez  <jba@pobox.com>
-
-	* *.po: Added and merged ca, el, ga, pt_BR, ru, uk and zh_CN
-		from HEAD branch
-
-2000-05-09  Andreas Hyden  <a.hyden@cyberpoint.se>
-
-	* update.sh: Added update.sh script.
-
-2000-04-01  Jesus Bravo Alvarez  <jba@pobox.com>
-
-	* gl.po: Updated Galician translation.
-
-1999-10-09  Jesus Bravo Alvarez  <jba@pobox.com>
-
-	* gl.po: Added Galician translation.
-
-1999-09-29  Kenneth ll<6C>phaane Christiansen  <kenneth@ripen.dk>
-
-	* da.po: Updated.
-
-1999-09-27  Zbigniew Chyla  <chyla@alice.ci.pwr.wroc.pl>
-
-	* pl.po: Added translation.
-
-1999-09-22  Kjartan Maraas  <kmaraas@online.no>
-
-	* da.po: Added Danish translation from Kenneth
-	Christiansen <kenneth@ripen.dk>.
-
-1999-09-20  Vincent Renardias <vincent@ldsol.com>
-
-	* fr.po: 100% complete. removed ~40 old translations.
-
-1999-09-17  Zbigniew Chyla  <chyla@alice.ci.pwr.wroc.pl>
-
-	* pl.po: Added translation.
-
-1999-09-16  Tomas Ogren  <stric@ing.umu.se>
-
-	* sv.po: Synced
-
-1999-07-11  Kjartan Maraas  <kmaraas@online.no>
-
-	* no.po: Updated translation.
-	
-1999-07-11  Tomas Ogren  <stric@ing.umu.se>
-
-	* sv.po: New file
-
 1999-01-27  Kjartan Maraas  <kmaraas@fib.hl.no>
 
 	* no.po: Updated translation

po/POTFILES.ignore

@@ -1,6 +0,0 @@
-#Please remember + in front of the files that should be ignored
-#Please keep these files in alphabetic order
-
-#Shouldn't be translated according to Martin:
-+kernel/table20/unistd-i386.h
-+kernel/table21/unistd-i386.h

po/POTFILES.in

@@ -1,4 +1,36 @@
-examples/smp.c
+sysdeps/names/cpu.c
+sysdeps/names/fsusage.c
+sysdeps/names/loadavg.c
+sysdeps/names/mem.c
+sysdeps/names/mountlist.c
+sysdeps/names/msg_limits.c
+sysdeps/names/prockernel.c
+sysdeps/names/proclist.c
+sysdeps/names/procmap.c
+sysdeps/names/procmem.c
+sysdeps/names/procsegment.c
+sysdeps/names/procsignal.c
+sysdeps/names/procstate.c
+sysdeps/names/proctime.c
+sysdeps/names/procuid.c
+sysdeps/names/sem_limits.c
+sysdeps/names/shm_limits.c
+sysdeps/names/swap.c
+sysdeps/names/sysdeps.c
+sysdeps/names/uptime.c
+support/easy-vsnprintf.c
+support/error.c
+support/error.h
+support/getopt.c
+lib/close.c
+lib/command.c
+lib/init.c
+lib/open.c
+lib/parameter.c
+lib/read.c
+lib/read_data.c
+lib/sysdeps.c
+lib/write.c
 include/glibtop/close.h
 include/glibtop/command.h
 include/glibtop/cpu.h
@@ -36,42 +68,25 @@ include/glibtop/uptime.h
 include/glibtop/version.h
 include/glibtop/write.h
 include/glibtop/xmalloc.h
-lib/close.c
+src/inodedb/file_by_inode.c
-lib/command.c
+src/inodedb/mkinodedb.c
-lib/init.c
-lib/open.c
-lib/parameter.c
-lib/read.c
-lib/read_data.c
-lib/sysdeps.c
-lib/write.c
 src/daemon/gnuserv.c
 src/daemon/io.c
 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
-support/easy-vsnprintf.c
-support/error.c
-support/error.h
-support/getopt.c
-support/popt.c
-support/popthelp.c
 sysdeps/common/error.c
 sysdeps/common/fsusage.c
-sysdeps/common/fsusage.h
 sysdeps/common/gnuslib.c
 sysdeps/common/inodedb.c
 sysdeps/common/mountlist.c
-sysdeps/common/mountlist.h
 sysdeps/common/sysdeps_suid.c
 sysdeps/common/xmalloc.c
+sysdeps/common/fsusage.h
+sysdeps/common/mountlist.h
 sysdeps/linux/close.c
 sysdeps/linux/cpu.c
-sysdeps/linux/glibtop_machine.h
-sysdeps/linux/glibtop_server.h
 sysdeps/linux/loadavg.c
 sysdeps/linux/mem.c
 sysdeps/linux/msg_limits.c
@@ -91,28 +106,5 @@ sysdeps/linux/siglist.c
 sysdeps/linux/swap.c
 sysdeps/linux/sysinfo.c
 sysdeps/linux/uptime.c
-sysdeps/names/cpu.c
+sysdeps/linux/glibtop_machine.h
-sysdeps/names/fsusage.c
+sysdeps/linux/glibtop_server.h
-sysdeps/names/loadavg.c
-sysdeps/names/mem.c
-sysdeps/names/mountlist.c
-sysdeps/names/msg_limits.c
-sysdeps/names/netload.c
-sysdeps/names/ppp.c
-sysdeps/names/procargs.c
-sysdeps/names/prockernel.c
-sysdeps/names/proclist.c
-sysdeps/names/procmap.c
-sysdeps/names/procmem.c
-sysdeps/names/procsegment.c
-sysdeps/names/procsignal.c
-sysdeps/names/procstate.c
-sysdeps/names/proctime.c
-sysdeps/names/procuid.c
-sysdeps/names/sem_limits.c
-sysdeps/names/shm_limits.c
-sysdeps/names/swap.c
-sysdeps/names/sysdeps.c
-sysdeps/names/uptime.c
-sysdeps/osf1/siglist.c
-sysdeps/sun4/siglist.c

po/README.tools

@@ -1,58 +0,0 @@
-The po/ directory includes two perlscripts, which is done to help 
-making the translations fully uptodate.
-
-The first script is called update.pl and is supposed to be run like this:
-
-	./update.pl [OPTIONS] ...LANGCODE
-
-This will updates the pot file (the po template, generated from the source code) 
-and merge them with the translations po files.
-
-For instance to do this for Danish, type the following
-
-	./update.pl da
-
-
-The update.pl script also supports other options, they are:
-
-  -V, --version                shows the version
-  -H, --help                   shows this help page
-  -P, --pot                    only generates the potfile
-  -M, --maintain               search for missing files in POTFILES.in
-
-Especially the --maintain option is very handy for package maintainer, to check
-if you included all the files that have marked strings in the POTFILES.in, so
-they will be in the generated po template, the socalled pot file.
-
-There is though one thing to take notice of with this option, please check the 
-configure.in file to make sure that the files you add to POTFILES.in are being
-build, otherwise this can leed to "make dist" throuble.
-
-
-The other utility is the desk.pl script, which will check the cvs module for
-missing translation in files like *.desktop, *.directory, *.soundlist and so on.
-
-Run the script like this:
-
-	./desk.pl [OPTIONS] ...LANGCODE ENTRY
-
-An example use could be.
-
-	./desk.pl da
-
-which will check all the files for missing Name[da] entries, or 
-
-	./desk.pl no Comment
-
-which will check all the files for missing Comment[no] entries. "Comment" can
-here be replaced with whatever you like
-
-All scripts support the --help option for further help, though it's not very
-extensive for the moment.
-
-Kenneth Christiansen
-
-kenneth@gnu.org  
-kenneth@gnome.org
-
-Both scripts are copyright 2000 The Free Software Foundation and me.

po/es.po

@@ -1,221 +1,58 @@
-# Translation into spanish of glibtop
-#
-# FIXME: the strings still left empty are the ones I've no idea how
-#	to translate them; if anyone has a suggestion...
-#
 msgid ""
 msgstr ""
-"Project-Id-Version: glibtop 1.1.1\n"
+"Project-Id-Version: glibtop 1.0.0\n"
-"POT-Creation-Date: 2001-02-13 13:30+0100\n"
+"POT-Creation-Date: 1999-03-01 22:58+0100\n"
-"PO-Revision-Date: 2000-05-20 04:38+0100\n"
+"PO-Revision-Date: 1998-12-13 04:38+0100\n"
-"Last-Translator: Manuel de Vega Barreiro <barreiro@arrakis.es>\n"
+"Last-Translator: Pablo Saratxaga <srtxg@chanae.alphanet.ch>\n"
-"Language-Team: Spanish <es@li.org>\n"
+"Language-Team: Pablo Saratxaga <srtxg@chanae.alphanet.ch>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Date: 1998-12-13 01:56:01+0100\n"
-
+"From: Pablo Saratxaga <srtxg@chanae.alphanet.ch>\n"
-#: examples/smp.c:68
+"Xgettext-Options: --default-domain=libgtop --directory=.. --add-comments "
-#, c-format
+"--keyword=_ --keyword=N_ --files-from=./POTFILES.in\n"
-msgid "Ticks (%ld per second):"
+"Files: sysdeps/names/cpu.c sysdeps/names/fsusage.c sysdeps/names/loadavg.c "
-msgstr "Ticks (%ld por segundos)"
+"sysdeps/names/mem.c sysdeps/names/mountlist.c sysdeps/names/msg_limits.c "
-
+"sysdeps/names/prockernel.c sysdeps/names/proclist.c sysdeps/names/procmap.c "
-#: examples/smp.c:71
+"sysdeps/names/procmem.c sysdeps/names/procsegment.c "
-msgid "Total"
+"sysdeps/names/procsignal.c sysdeps/names/procstate.c "
-msgstr "Total"
+"sysdeps/names/proctime.c sysdeps/names/procuid.c sysdeps/names/sem_limits.c "
-
+"sysdeps/names/shm_limits.c sysdeps/names/swap.c sysdeps/names/sysdeps.c "
-#: examples/smp.c:71 sysdeps/names/mem.c:47
+"sysdeps/names/uptime.c support/argp-fmtstream.h support/argp-parse.c "
-msgid "User"
+"support/argp.h support/easy-vsnprintf.c support/error.c support/error.h "
-msgstr "Usuario"
+"support/getopt.c lib/close.c lib/command.c lib/init.c lib/open.c "
-
+"lib/parameter.c lib/read.c lib/read_data.c lib/sysdeps.c lib/write.c "
-#: examples/smp.c:71 sysdeps/names/procuid.c:58
+"include/glibtop/close.h include/glibtop/command.h include/glibtop/cpu.h "
-msgid "Nice"
+"include/glibtop/error.h include/glibtop/fsusage.h include/glibtop/global.h "
-msgstr "Prioridad (\"Nice\")"
+"include/glibtop/gnuserv.h include/glibtop/inodedb.h "
-
+"include/glibtop/loadavg.h include/glibtop/mem.h include/glibtop/mountlist.h "
-#: examples/smp.c:71
+"include/glibtop/msg_limits.h include/glibtop/open.h "
-msgid "Sys"
+"include/glibtop/parameter.h include/glibtop/prockernel.h "
-msgstr "Sys"
+"include/glibtop/proclist.h include/glibtop/procmap.h "
-
+"include/glibtop/procmem.h include/glibtop/procsegment.h "
-#: examples/smp.c:71
+"include/glibtop/procsignal.h include/glibtop/procstate.h "
-msgid "Idle"
+"include/glibtop/proctime.h include/glibtop/procuid.h include/glibtop/read.h "
-msgstr "Inactivo"
+"include/glibtop/read_data.h include/glibtop/sem_limits.h "
-
+"include/glibtop/shm_limits.h include/glibtop/signal.h include/glibtop/swap.h "
-#: examples/smp.c:73
+"include/glibtop/sysdeps.h include/glibtop/sysinfo.h include/glibtop/types.h "
-#, c-format
+"include/glibtop/union.h include/glibtop/uptime.h include/glibtop/version.h "
-msgid ""
+"include/glibtop/write.h include/glibtop/xmalloc.h "
-"CPU          (0x%08lx): %12.0f %12.0f %12.0f %12.0f %12.0f\n"
+"src/inodedb/file_by_inode.c src/inodedb/mkinodedb.c src/daemon/gnuserv.c "
-"\n"
+"src/daemon/io.c src/daemon/main.c src/daemon/server.c src/daemon/slave.c "
-msgstr ""
+"src/daemon/version.c sysdeps/common/error.c sysdeps/common/fsusage.c "
-"CPU          (0x%08lx): %12.0f %12.0f %12.0f %12.0f %12.0f\n"
+"sysdeps/common/gnuslib.c sysdeps/common/inodedb.c sysdeps/common/mountlist.c "
-"\n"
+"sysdeps/common/sysdeps_suid.c sysdeps/common/xmalloc.c "
-
+"sysdeps/common/fsusage.h sysdeps/common/mountlist.h sysdeps/linux/close.c "
-#: examples/smp.c:77
+"sysdeps/linux/cpu.c sysdeps/linux/loadavg.c sysdeps/linux/mem.c "
-#, c-format
+"sysdeps/linux/msg_limits.c sysdeps/linux/open.c sysdeps/linux/prockernel.c "
-msgid "CPU %3d      (0x%08lx): %12lu %12lu %12lu %12lu %12lu\n"
+"sysdeps/linux/proclist.c sysdeps/linux/procmap.c sysdeps/linux/procmem.c "
-msgstr "CPU %3d      (0x%08lx): %12lu %12lu %12lu %12lu %12lu\n"
+"sysdeps/linux/procsegment.c sysdeps/linux/procsignal.c "
-
+"sysdeps/linux/procstate.c sysdeps/linux/proctime.c sysdeps/linux/procuid.c "
-#: examples/smp.c:94
+"sysdeps/linux/sem_limits.c sysdeps/linux/shm_limits.c "
-msgid "Percent:"
+"sysdeps/linux/siglist.c sysdeps/linux/swap.c sysdeps/linux/sysinfo.c "
-msgstr "Porcentaje:"
+"sysdeps/linux/uptime.c sysdeps/linux/glibtop_machine.h "
-
+"sysdeps/linux/glibtop_server.h\n"
-#: examples/smp.c:95
-msgid "Total (%)"
-msgstr "Total (%)"
-
-#: examples/smp.c:95
-msgid "User (%)"
-msgstr "Usuario (%)"
-
-#: examples/smp.c:95
-msgid "Nice (%)"
-msgstr "Prioridad (%)"
-
-#: examples/smp.c:95
-msgid "Sys (%)"
-msgstr "Sys (%)"
-
-#: examples/smp.c:96
-msgid "Idle (%)"
-msgstr "Inactivo (%)"
-
-#: examples/smp.c:98
-#, c-format
-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"
-
-#: 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"
-
-#: examples/smp.c:120
-msgid "Spin:"
-msgstr "Spin:"
-
-#: lib/read.c:75
-#, c-format
-msgid "read %d bytes"
-msgstr "le<6C>dos %d bytes"
-
-#: lib/read_data.c:49
-msgid "read data size"
-msgstr "le<6C>do tama<6D>o de datos"
-
-#: lib/read_data.c:66
-#, c-format
-msgid "read data %d bytes"
-msgstr "le<6C>dos %d bytes de datos"
-
-#: lib/write.c:48
-#, c-format
-msgid "write %d bytes"
-msgstr "escritos %d bytes"
-
-#: src/daemon/gnuserv.c:448
-msgid "Enable debugging"
-msgstr "Activar depuraci<63>n"
-
-#: src/daemon/gnuserv.c:448
-msgid "DEBUG"
-msgstr "Depurar"
-
-#: src/daemon/gnuserv.c:450
-msgid "Enable verbose output"
-msgstr "Activar salida detallada"
-
-#: src/daemon/gnuserv.c:450
-msgid "VERBOSE"
-msgstr "Detallado"
-
-#: src/daemon/gnuserv.c:452
-msgid "Don't fork into background"
-msgstr "No abrir el proceso en segundo plano"
-
-#: src/daemon/gnuserv.c:452
-msgid "NO-DAEMON"
-msgstr "no es un demonio"
-
-#: src/daemon/gnuserv.c:454
-msgid "Invoked from inetd"
-msgstr "Invocado desde inetd"
-
-#: src/daemon/gnuserv.c:454
-msgid "INETD"
-msgstr "Inetd"
-
-#: src/daemon/gnuserv.c:488
-#, c-format
-msgid ""
-"Error on option %s: %s.\n"
-"Run '%s --help' to see a full list of available command line options.\n"
-msgstr ""
-"Error con la opci<63>n %s: %s.\n"
-"Lance '%s --help' para ver una lista completa de las opciones disponibles.\n"
-
-#: support/error.c:109
-msgid "Unknown system error"
-msgstr "Error de sistema desconocido"
-
-#: support/getopt.c:669
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: la opci<63>n `%s' es ambigua\n"
-
-#: support/getopt.c:693
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s: la opci<63>n `--%s' no admite un argumento\n"
-
-#: support/getopt.c:698
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr "%s: la opci<63>n `%c%s' no admite un argumento\n"
-
-#: support/getopt.c:715 support/getopt.c:888
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: la opci<63>n `%s' requiere un argumento\n"
-
-#. --option
-#: support/getopt.c:744
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: opci<63>n no reconocida `--%s'\n"
-
-#. +option or -option
-#: support/getopt.c:748
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: opci<63>n no reconocida `%c%s'\n"
-
-#. 1003.2 specifies the format of this message.
-#: support/getopt.c:774
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: opci<63>n ilegal -- %c\n"
-
-#: support/getopt.c:777
-#, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr "%s: opci<63>n no v<>lida -- %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: la opci<63>n requiere un argumento -- %c\n"
-
-#: support/getopt.c:854
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: la opci<63>n `-W %s' es ambigua\n"
-
-#: support/getopt.c:872
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr "%s: la opci<63>n `-W %s' no admite argumentos\n"
 
 #: sysdeps/names/cpu.c:43
 msgid "Total CPU Time"
@@ -283,11 +120,11 @@ msgstr "Cantidad de ticks pasados en tareas detenidas"
 
 #: sysdeps/names/cpu.c:63
 msgid "Tick frequency (default is 100)"
-msgstr "Frecuencia del tick (la frecuencia de base es 100)"
+msgstr "Frecuencia del tick (frecuencia de base es 100)"
 
 #: sysdeps/names/fsusage.c:39 sysdeps/names/fsusage.c:48
 msgid "Total blocks"
-msgstr "Bloques totales"
+msgstr "Total de bloques"
 
 #: sysdeps/names/fsusage.c:40
 msgid "Free blocks"
@@ -332,7 +169,7 @@ msgstr "
 #: sysdeps/names/loadavg.c:47
 msgid "Number of jobs running simultaneously averaged over 1, 5 and 15 minutes"
 msgstr ""
-"Cantidad de procesos corriendo simult<EFBFBD>neamente, media de los <20>ltimos 1, 5 y "
+"Cantidad de procesos corriendo simultaneamente, media de los <20>ltimos 1, 5 y "
 "15 minutos"
 
 #: sysdeps/names/loadavg.c:48
@@ -367,6 +204,10 @@ msgstr "Buffers"
 msgid "Cached"
 msgstr "Cach<63>"
 
+#: sysdeps/names/mem.c:47
+msgid "User"
+msgstr "Usuario"
+
 #: sysdeps/names/mem.c:48
 msgid "Locked"
 msgstr "Bloqueada"
@@ -397,7 +238,7 @@ msgstr "Tama
 
 #: sysdeps/names/mem.c:59
 msgid "Memory used from user processes in kB"
-msgstr "Memoria usada por procesos de usuario (en KB)"
+msgstr "Memoria usada por procesos usuario (en KB)"
 
 #: sysdeps/names/mem.c:60
 msgid "Memory in locked pages in kB"
@@ -449,129 +290,41 @@ msgstr "Tama
 msgid "Number of system message headers"
 msgstr "Cantidad de cabeceras de mensajes sistema"
 
-#: sysdeps/names/netload.c:45 sysdeps/names/netload.c:63
-msgid "Interface Flags"
-msgstr "Banderas de la interfaz"
-
-#: sysdeps/names/netload.c:46
-msgid "MTU"
-msgstr "Mtu"
-
-#: sysdeps/names/netload.c:47 sysdeps/names/netload.c:65
-msgid "Subnet"
-msgstr "Subred"
-
-#: sysdeps/names/netload.c:48 sysdeps/names/netload.c:66
-msgid "Address"
-msgstr "Direcci<63>n"
-
-#: sysdeps/names/netload.c:49 sysdeps/names/netload.c:67
-msgid "Packets In"
-msgstr "Paquetes recibidos"
-
-#: sysdeps/names/netload.c:50 sysdeps/names/netload.c:68
-msgid "Packets Out"
-msgstr "Paquetes enviados"
-
-#: sysdeps/names/netload.c:51 sysdeps/names/netload.c:69
-msgid "Packets Total"
-msgstr "Paquetes totales"
-
-#: sysdeps/names/netload.c:52 sysdeps/names/netload.c:70
-msgid "Bytes In"
-msgstr "Bytes recibidos"
-
-#: sysdeps/names/netload.c:53 sysdeps/names/netload.c:71
-msgid "Bytes Out"
-msgstr "Bytes enviados"
-
-#: sysdeps/names/netload.c:54 sysdeps/names/netload.c:72
-msgid "Bytes Total"
-msgstr "Bytes totales"
-
-#: sysdeps/names/netload.c:55 sysdeps/names/netload.c:73
-msgid "Errors In"
-msgstr "Errores en recepci<63>n"
-
-#: sysdeps/names/netload.c:56 sysdeps/names/netload.c:74
-msgid "Errors Out"
-msgstr "Errores al enviar"
-
-#: sysdeps/names/netload.c:57 sysdeps/names/netload.c:75
-msgid "Errors Total"
-msgstr "Errores totales"
-
-#: sysdeps/names/netload.c:58 sysdeps/names/netload.c:76
-msgid "Collisions"
-msgstr "Colisiones"
-
-#: sysdeps/names/netload.c:64
-msgid "Maximum Transfer Unit"
-msgstr "Unidad de transferencia m<>xima"
-
-#: sysdeps/names/ppp.c:38 sysdeps/names/ppp.c:45
-msgid "PPP State"
-msgstr "Estado PPP"
-
-#: sysdeps/names/ppp.c:39
-msgid "Input bytes"
-msgstr "bytes recibidos"
-
-#: sysdeps/names/ppp.c:40
-msgid "Output bytes"
-msgstr "bytes enviados"
-
-#: sysdeps/names/ppp.c:46
-msgid "Number of input bytes"
-msgstr "Numero de Bytes recibidos"
-
-#: sysdeps/names/ppp.c:47
-msgid "Number of output bytes"
-msgstr "Numero de paquetes enviados"
-
-#: sysdeps/names/procargs.c:38 sysdeps/names/procmem.c:47
-msgid "Size"
-msgstr "Tama<6D>o"
-
-#: sysdeps/names/procargs.c:43
-msgid "Length in bytes of the returned string."
-msgstr "Longitud en bytes de la cadena de texto devuelta"
-
 #: sysdeps/names/prockernel.c:42
 msgid "K_Flags"
-msgstr "K_Flags"
+msgstr ""
 
 #: sysdeps/names/prockernel.c:42
 msgid "Min_Flt"
-msgstr "Min_Flt"
+msgstr ""
 
 #: sysdeps/names/prockernel.c:42
 msgid "Maj_Flt"
-msgstr "Maj_Flt"
+msgstr ""
 
 #: sysdeps/names/prockernel.c:42
 msgid "CMin_Flt"
-msgstr "CMin_Flt"
+msgstr ""
 
 #: sysdeps/names/prockernel.c:43
 msgid "CMaj_Flt"
-msgstr "CMaj_Flt"
+msgstr ""
 
 #: sysdeps/names/prockernel.c:43
 msgid "KStk_ESP"
-msgstr "KStk_ESP"
+msgstr ""
 
 #: sysdeps/names/prockernel.c:43
 msgid "KStk_EIP"
-msgstr "KStk_EIP"
+msgstr ""
 
 #: sysdeps/names/prockernel.c:43
 msgid "NWChan"
-msgstr "NWChan"
+msgstr ""
 
 #: sysdeps/names/prockernel.c:44
 msgid "WChan"
-msgstr "WChan"
+msgstr ""
 
 #. K_Flags
 #: sysdeps/names/prockernel.c:50
@@ -603,7 +356,7 @@ msgid ""
 "required loading a memory page from disk."
 msgstr ""
 "La cantidad de faltas menores que hizo el proceso, aquellas que no "
-"requirieron cargar una p<>gina desde el disco."
+"requisieron cargar una p<>gina desde el disco."
 
 #. Maj_Flt
 #: sysdeps/names/prockernel.c:62
@@ -611,7 +364,7 @@ msgid ""
 "The number of major faults the process has made, those which have required "
 "loading a memory page from disk."
 msgstr ""
-"La cantidad de faltas menores que hizo el proceso, aquellas que requirieron "
+"La cantidad de faltas menores que hizo el proceso, aquellas que requisieron "
 "cargar una p<>gina desde el disco."
 
 #. CMin_Flt
@@ -656,6 +409,10 @@ msgstr ""
 msgid "This is the textual name of the `nwchan' field."
 msgstr "Este es el nombre textual del campo `nwchan'."
 
+#: sysdeps/names/procmem.c:47
+msgid "Size"
+msgstr "Tama<6D>o"
+
 #: sysdeps/names/procmem.c:47
 msgid "Virtual"
 msgstr "Virtual"
@@ -685,8 +442,8 @@ msgid "Number of pages of virtual memory"
 msgstr "Cantidad de p<>ginas de memoria virtual"
 
 #: sysdeps/names/procmem.c:55
-msgid "Number of resident set (non-swapped) pages"
+msgid "Number of residnet set (non-swapped) pages"
-msgstr "Cantidad de p<>ginas de conjuntos residentes (que no est<EFBFBD>n en swap)"
+msgstr "Cantidad de p<>ginas de conjuntos compartidos (que no estan en swap)"
 
 #: sysdeps/names/procmem.c:56
 msgid "Number of pages of shared (mmap'd) memory"
@@ -713,35 +470,35 @@ 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"
-msgstr "tama<EFBFBD>o err<72>neo (\"dirty\")"
+msgstr ""
 
 #: sysdeps/names/procsegment.c:43
 msgid "Start_Code"
-msgstr "Inicio_C<EFBFBD>digo"
+msgstr ""
 
 #: sysdeps/names/procsegment.c:43
 msgid "End_Code"
-msgstr "Fin_C<EFBFBD>digo"
+msgstr ""
 
 #: sysdeps/names/procsegment.c:43
 msgid "Start_Stack"
-msgstr "Inicio_Pila"
+msgstr ""
 
 #: sysdeps/names/procsegment.c:48
 msgid "Text resident set size"
@@ -785,11 +542,11 @@ msgstr "Bloqueado"
 
 #: sysdeps/names/procsignal.c:40
 msgid "SigIgnore"
-msgstr "Ignorar la se<73>al"
+msgstr ""
 
 #: sysdeps/names/procsignal.c:40
 msgid "SigCatch"
-msgstr "Capturar la se<73>al"
+msgstr ""
 
 #: sysdeps/names/procsignal.c:45
 msgid "Mask of pending signals"
@@ -805,11 +562,11 @@ msgstr "M
 
 #: sysdeps/names/procsignal.c:48
 msgid "Mask of caught signals"
-msgstr "M<>scara de se<73>ales recogidos"
+msgstr "M<>scar de se<73>ales recogidos"
 
 #: sysdeps/names/procstate.c:40
 msgid "Cmd"
-msgstr "Cmd"
+msgstr ""
 
 #: sysdeps/names/procstate.c:40
 msgid "State"
@@ -817,11 +574,11 @@ msgstr "Estado"
 
 #: sysdeps/names/procstate.c:40
 msgid "UID"
-msgstr "UID"
+msgstr ""
 
 #: sysdeps/names/procstate.c:40
 msgid "GID"
-msgstr "GID"
+msgstr ""
 
 #: sysdeps/names/procstate.c:45
 msgid "Basename of executable file in call to exec()"
@@ -841,35 +598,35 @@ msgstr "GID del proceso"
 
 #: sysdeps/names/proctime.c:44
 msgid "Start_Time"
-msgstr "Tiempo_inicio"
+msgstr ""
 
 #: sysdeps/names/proctime.c:44
 msgid "RTime"
-msgstr "Tiempo RT"
+msgstr ""
 
 #: sysdeps/names/proctime.c:44
 msgid "UTime"
-msgstr "Tiempo U"
+msgstr ""
 
 #: sysdeps/names/proctime.c:44
 msgid "STime"
-msgstr "Tiempo S"
+msgstr ""
 
 #: sysdeps/names/proctime.c:45
 msgid "CUTime"
-msgstr "Tiempo CU"
+msgstr ""
 
 #: sysdeps/names/proctime.c:45
 msgid "CSTime"
-msgstr "Tiempo CS"
+msgstr ""
 
 #: sysdeps/names/proctime.c:45
 msgid "TimeOut"
-msgstr "Temporizador"
+msgstr ""
 
 #: sysdeps/names/proctime.c:45
 msgid "It_Real_Value"
-msgstr "Valor real It"
+msgstr ""
 
 #: sysdeps/names/proctime.c:46
 msgid "Frequency"
@@ -877,11 +634,11 @@ msgstr "Frecuencia"
 
 #: sysdeps/names/proctime.c:46
 msgid "XCPU_UTime"
-msgstr "Tiempo XCPU_S"
+msgstr ""
 
 #: sysdeps/names/proctime.c:46
 msgid "XCPU_STime"
-msgstr "Tiempo XCPU_S"
+msgstr ""
 
 #: sysdeps/names/proctime.c:51
 msgid "Start time of process in seconds since the epoch"
@@ -957,7 +714,7 @@ msgstr "PPid"
 
 #: sysdeps/names/procuid.c:57
 msgid "PGrp"
-msgstr "PGrp"
+msgstr ""
 
 #: sysdeps/names/procuid.c:57
 msgid "Session"
@@ -969,12 +726,16 @@ msgstr "Tty"
 
 #: sysdeps/names/procuid.c:58
 msgid "TPGid"
-msgstr "TPGid"
+msgstr ""
 
 #: sysdeps/names/procuid.c:58
 msgid "Priority"
 msgstr "Prioridad"
 
+#: sysdeps/names/procuid.c:58
+msgid "Nice"
+msgstr ""
+
 #: sysdeps/names/procuid.c:63
 msgid "User ID"
 msgstr "ID de usuario"
@@ -1045,7 +806,7 @@ msgstr "Cantidad m
 
 #: sysdeps/names/sem_limits.c:47 sysdeps/names/sem_limits.c:61
 msgid "Max ops per semop call"
-msgstr "Cantidad m<>xima de ops por llamada semop"
+msgstr ""
 
 #: sysdeps/names/sem_limits.c:48 sysdeps/names/sem_limits.c:62
 msgid "Max number of undo entries per process"
@@ -1053,7 +814,7 @@ msgstr "Cantidad m
 
 #: sysdeps/names/sem_limits.c:49 sysdeps/names/sem_limits.c:63
 msgid "sizeof struct sem_undo"
-msgstr "Tama<EFBFBD>o de la estructura sem_undo"
+msgstr ""
 
 #: sysdeps/names/sem_limits.c:50 sysdeps/names/sem_limits.c:64
 msgid "Semaphore max value"
@@ -1221,7 +982,7 @@ msgstr "Uptime"
 
 #: sysdeps/names/uptime.c:39
 msgid "Idletime"
-msgstr "Tiempo inactivo"
+msgstr ""
 
 #: sysdeps/names/uptime.c:44
 msgid "Time in seconds since system boot"
@@ -1233,126 +994,149 @@ msgstr ""
 "Tiempo en segundos pasado por el sistema desocupado, desde el inicio del "
 "sistema"
 
-#: sysdeps/osf1/siglist.c:28 sysdeps/sun4/siglist.c:28
+#: support/error.c:109
-msgid "Hangup"
+msgid "Unknown system error"
-msgstr "Colgar"
+msgstr "Error sistema desconocido"
 
-#: sysdeps/osf1/siglist.c:29 sysdeps/sun4/siglist.c:29
+#: support/getopt.c:669
-msgid "Interrupt"
+#, c-format
-msgstr "Interumpir"
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: la opci<63>n `%s' es ambigua\n"
 
-#: sysdeps/osf1/siglist.c:30 sysdeps/sun4/siglist.c:30
+#: support/getopt.c:693
-msgid "Quit"
+#, c-format
-msgstr "Salir"
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr "%s: la opci<63>n `--%s' no admite un argumento\n"
 
-#: sysdeps/osf1/siglist.c:31 sysdeps/sun4/siglist.c:31
+#: support/getopt.c:698
-msgid "Illegal instruction"
+#, c-format
-msgstr "Instrucci<63>n ilegal"
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr "%s: la opci<63>n `%c%s' no admite un argumento\n"
 
-#: sysdeps/osf1/siglist.c:32 sysdeps/sun4/siglist.c:32
+#: support/getopt.c:715 support/getopt.c:888
-msgid "Trace trap"
+#, c-format
-msgstr "Traza de los \"trap\""
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: la opci<63>n `%s' requiere un argumento\n"
 
-#: sysdeps/osf1/siglist.c:33 sysdeps/sun4/siglist.c:33
+#. --option
-msgid "Abort"
+#: support/getopt.c:744
-msgstr "Abortar"
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: opci<63>n no reconocida `--%s'\n"
 
-#: sysdeps/osf1/siglist.c:34 sysdeps/sun4/siglist.c:34
+#. +option or -option
-msgid "EMT error"
+#: support/getopt.c:748
-msgstr "Error Emt"
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s: opci<63>n no reconocida `%c%s'\n"
 
-#: sysdeps/osf1/siglist.c:35 sysdeps/sun4/siglist.c:35
+#. 1003.2 specifies the format of this message.
-msgid "Floating-point exception"
+#: support/getopt.c:774
-msgstr "Excepci<63>n de coma flotante"
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: opci<63>n ilegal -- %c\n"
 
-#: sysdeps/osf1/siglist.c:36 sysdeps/sun4/siglist.c:36
+#: support/getopt.c:777
-msgid "Kill"
+#, c-format
-msgstr "Matar"
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: opci<63>n no v<>lida -- %c\n"
 
-#: sysdeps/osf1/siglist.c:37 sysdeps/sun4/siglist.c:37
+#. 1003.2 specifies the format of this message.
-msgid "Bus error"
+#: support/getopt.c:807 support/getopt.c:937
-msgstr "Error de bus"
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: la opci<63>n require un argumento -- %c\n"
 
-#: sysdeps/osf1/siglist.c:38 sysdeps/sun4/siglist.c:38
+#: support/getopt.c:854
-msgid "Segmentation violation"
+#, c-format
-msgstr "Violaci<63>n de acceso a segmento de memoria"
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: la opci<63>n `-W %s' es ambigua\n"
 
-#: sysdeps/osf1/siglist.c:39 sysdeps/sun4/siglist.c:39
+#: support/getopt.c:872
-msgid "Bad argument to system call"
+#, c-format
-msgstr "Argumento erroneo en la llamada al sistema"
+msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgstr "%s: la opci<63>n `-W %s' no admite argumentos\n"
 
-#: sysdeps/osf1/siglist.c:40 sysdeps/sun4/siglist.c:40
+#: lib/read.c:71
-msgid "Broken pipe"
+#, c-format
-msgstr "Tuber<65>a (\"pipe\") rota"
+msgid "read %d bytes"
+msgstr "le<6C>dos %d bytes"
 
-#: sysdeps/osf1/siglist.c:41 sysdeps/sun4/siglist.c:41
+#: lib/read_data.c:49
-msgid "Alarm clock"
+msgid "read data size"
-msgstr "Alarma de reloj"
+msgstr "le<EFBFBD>do tama<6D>o de datos"
 
-#: sysdeps/osf1/siglist.c:42 sysdeps/sun4/siglist.c:42
+#: lib/read_data.c:66
-msgid "Termination"
+#, c-format
-msgstr "Terminaci<63>n"
+msgid "read data %d bytes"
+msgstr "le<6C>dos %d bytes de datos"
 
-#: sysdeps/osf1/siglist.c:43 sysdeps/sun4/siglist.c:43
+#: lib/write.c:48
-msgid "Urgent condition on socket"
+#, c-format
-msgstr "Condici<63>n urgente en el socket"
+msgid "write %d bytes"
+msgstr "escritos %d bytes"
 
-#: sysdeps/osf1/siglist.c:44 sysdeps/sun4/siglist.c:44
+#: src/daemon/gnuserv.c:445
-msgid "Stop"
+msgid "Enable debugging"
-msgstr "Parar"
+msgstr "Activar depuraci<63>n"
 
-#: sysdeps/osf1/siglist.c:45 sysdeps/sun4/siglist.c:45
+#: src/daemon/gnuserv.c:445
-msgid "Keyboard stop"
+msgid "DEBUG"
-msgstr "Parada de teclado"
+msgstr "DEPURACI<EFBFBD>N"
 
-#: sysdeps/osf1/siglist.c:46 sysdeps/sun4/siglist.c:46
+#: src/daemon/gnuserv.c:447
-msgid "Continue"
+msgid "Enable verbose output"
-msgstr "Continuar"
+msgstr "Activa salida detallada"
 
-#: sysdeps/osf1/siglist.c:47 sysdeps/sun4/siglist.c:47
+#: src/daemon/gnuserv.c:447
-msgid "Child status has changed"
+msgid "VERBOSE"
-msgstr "Es estado del hijo ha cambiado"
+msgstr ""
 
-#: sysdeps/osf1/siglist.c:48 sysdeps/sun4/siglist.c:48
+#: src/daemon/gnuserv.c:449
-msgid "Background read from tty"
+msgid "Don't fork into background"
-msgstr "El programa en segundo plano ha le<6C>do del tty"
+msgstr "No abrir un proceso de fondo"
 
-#: sysdeps/osf1/siglist.c:49 sysdeps/sun4/siglist.c:49
+#: src/daemon/gnuserv.c:449
-msgid "Background write to tty"
+msgid "NO-DAEMON"
-msgstr "El programa en segundo plano ha escrito en el tty"
+msgstr ""
 
-#: sysdeps/osf1/siglist.c:50 sysdeps/sun4/siglist.c:50
+#: src/daemon/gnuserv.c:451
-msgid "I/O now possible"
+msgid "Invoked from inetd"
-msgstr "Ahora es posible E/S"
+msgstr "Invocado desde inetd"
 
-#: sysdeps/osf1/siglist.c:51 sysdeps/sun4/siglist.c:51
+#: src/daemon/gnuserv.c:451
-msgid "CPU limit exceeded"
+msgid "INETD"
-msgstr "Limite de Cpu excedido"
+msgstr "INETD"
 
-#: sysdeps/osf1/siglist.c:52 sysdeps/sun4/siglist.c:52
+#: src/daemon/gnuserv.c:485
-msgid "File size limit exceeded"
+#, c-format
-msgstr "Limite de tama<6D>o de fichero excedido"
+msgid ""
+"Error on option %s: %s.\n"
+"Run '%s --help' to see a full list of available command line options.\n"
+msgstr ""
+"Error con la opci<63>n %s: %s.\n"
+"Lance '%s --help' para ver una lista completa de las opciones disponibles.\n"
 
-#: sysdeps/osf1/siglist.c:53 sysdeps/sun4/siglist.c:53
+#~ msgid "(PROGRAM ERROR) Option should have been recognized!?"
-msgid "Virtual alarm clock"
+#~ msgstr "(ERROR PROGRAMA) <20><>La opci<63>n deber<65>a haber sido reconocida!?"
-msgstr "Alarma virtual de reloj"
 
-#: sysdeps/osf1/siglist.c:54 sysdeps/sun4/siglist.c:54
+#~ msgid "%s: Too many arguments\n"
-msgid "Profiling alarm clock"
+#~ msgstr "%s: Demasiados argumentos\n"
-msgstr "perfil de la alarma de reloj "
 
-#: sysdeps/osf1/siglist.c:55 sysdeps/sun4/siglist.c:55
+#~ msgid "(PROGRAM ERROR) No version known!?"
-msgid "Window size change"
+#~ msgstr "(ERROR PROGRAMA) <20><> Sin versi<73>n !?"
-msgstr "Cambio del tama<6D>o de ventana"
 
-#: sysdeps/osf1/siglist.c:56 sysdeps/sun4/siglist.c:56
+#~ msgid "Print program version"
-msgid "Information request"
+#~ msgstr "Muestra la versi<73>n del programa"
-msgstr "Solicitud de informaci<63>n"
 
-#: sysdeps/osf1/siglist.c:57 sysdeps/sun4/siglist.c:57
+#~ msgid "Hang for SECS seconds (default 3600)"
-msgid "User defined signal 1"
+#~ msgstr "Colgar por SECS segundos (3600 por omisi<73>n)"
-msgstr "1<> se<73>al, definida por le usuario"
 
-#: sysdeps/osf1/siglist.c:58 sysdeps/sun4/siglist.c:58
+#~ msgid "Set the program name"
-msgid "User defined signal 2"
+#~ msgstr "Define el nombre del programa"
-msgstr "2<> se<73>al definida por el usuario"
+
+#~ msgid "Give a short usage message"
+#~ msgstr "Muestra una s<>ntesis del uso de la memoria"
+
+#~ msgid "Give this help list"
+#~ msgstr "Muestra esta lista de ayuda"

po/es_DO.po

@@ -2,214 +2,17 @@
 # Copyright (C) YEAR Free Software Foundation, Inc.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: glibtop cvs\n"
+"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2001-02-13 13:30+0100\n"
+"POT-Creation-Date: 1999-03-01 22:58+0100\n"
-"PO-Revision-Date: 1998-12-13 04:38+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Pablo Saratxaga <srtxg@chanae.alphanet.ch>\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Pablo Saratxaga <srtxg@chanae.alphanet.ch>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
+"Content-Transfer-Encoding: ENCODING\n"
-
-#: examples/smp.c:68
-#, c-format
-msgid "Ticks (%ld per second):"
-msgstr ""
-
-#: examples/smp.c:71
-msgid "Total"
-msgstr ""
-
-#: examples/smp.c:71 sysdeps/names/mem.c:47
-msgid "User"
-msgstr ""
-
-#: examples/smp.c:71 sysdeps/names/procuid.c:58
-msgid "Nice"
-msgstr ""
-
-#: examples/smp.c:71
-msgid "Sys"
-msgstr ""
-
-#: examples/smp.c:71
-msgid "Idle"
-msgstr ""
-
-#: examples/smp.c:73
-#, c-format
-msgid ""
-"CPU          (0x%08lx): %12.0f %12.0f %12.0f %12.0f %12.0f\n"
-"\n"
-msgstr ""
-
-#: examples/smp.c:77
-#, c-format
-msgid "CPU %3d      (0x%08lx): %12lu %12lu %12lu %12lu %12lu\n"
-msgstr ""
-
-#: examples/smp.c:94
-msgid "Percent:"
-msgstr ""
-
-#: examples/smp.c:95
-msgid "Total (%)"
-msgstr ""
-
-#: examples/smp.c:95
-msgid "User (%)"
-msgstr ""
-
-#: examples/smp.c:95
-msgid "Nice (%)"
-msgstr ""
-
-#: examples/smp.c:95
-msgid "Sys (%)"
-msgstr ""
-
-#: examples/smp.c:96
-msgid "Idle (%)"
-msgstr ""
-
-#: examples/smp.c:98
-#, c-format
-msgid ""
-"CPU          (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
-"\n"
-msgstr ""
-
-#: examples/smp.c:114
-#, c-format
-msgid "CPU %3d      (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
-msgstr ""
-
-#: examples/smp.c:120
-msgid "Spin:"
-msgstr ""
-
-#: lib/read.c:75
-#, c-format
-msgid "read %d bytes"
-msgstr ""
-
-#: lib/read_data.c:49
-msgid "read data size"
-msgstr ""
-
-#: lib/read_data.c:66
-#, c-format
-msgid "read data %d bytes"
-msgstr ""
-
-#: lib/write.c:48
-#, c-format
-msgid "write %d bytes"
-msgstr ""
-
-#: src/daemon/gnuserv.c:448
-msgid "Enable debugging"
-msgstr ""
-
-#: src/daemon/gnuserv.c:448
-msgid "DEBUG"
-msgstr ""
-
-#: src/daemon/gnuserv.c:450
-msgid "Enable verbose output"
-msgstr ""
-
-#: src/daemon/gnuserv.c:450
-msgid "VERBOSE"
-msgstr ""
-
-#: src/daemon/gnuserv.c:452
-msgid "Don't fork into background"
-msgstr ""
-
-#: src/daemon/gnuserv.c:452
-msgid "NO-DAEMON"
-msgstr ""
-
-#: src/daemon/gnuserv.c:454
-msgid "Invoked from inetd"
-msgstr ""
-
-#: src/daemon/gnuserv.c:454
-msgid "INETD"
-msgstr ""
-
-#: src/daemon/gnuserv.c:488
-#, c-format
-msgid ""
-"Error on option %s: %s.\n"
-"Run '%s --help' to see a full list of available command line options.\n"
-msgstr ""
-
-#: support/error.c:109
-msgid "Unknown system error"
-msgstr ""
-
-#: support/getopt.c:669
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr ""
-
-#: support/getopt.c:693
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr ""
-
-#: support/getopt.c:698
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr ""
-
-#: support/getopt.c:715 support/getopt.c:888
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr ""
-
-#. --option
-#: support/getopt.c:744
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr ""
-
-#. +option or -option
-#: support/getopt.c:748
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr ""
-
-#. 1003.2 specifies the format of this message.
-#: support/getopt.c:774
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr ""
-
-#: support/getopt.c:777
-#, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr ""
-
-#. 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 ""
-
-#: support/getopt.c:854
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr ""
-
-#: support/getopt.c:872
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr ""
 
 #: sysdeps/names/cpu.c:43
 msgid "Total CPU Time"
@@ -359,6 +162,10 @@ msgstr ""
 msgid "Cached"
 msgstr ""
 
+#: sysdeps/names/mem.c:47
+msgid "User"
+msgstr ""
+
 #: sysdeps/names/mem.c:48
 msgid "Locked"
 msgstr ""
@@ -441,94 +248,6 @@ msgstr ""
 msgid "Number of system message headers"
 msgstr ""
 
-#: sysdeps/names/netload.c:45 sysdeps/names/netload.c:63
-msgid "Interface Flags"
-msgstr ""
-
-#: sysdeps/names/netload.c:46
-msgid "MTU"
-msgstr ""
-
-#: sysdeps/names/netload.c:47 sysdeps/names/netload.c:65
-msgid "Subnet"
-msgstr ""
-
-#: sysdeps/names/netload.c:48 sysdeps/names/netload.c:66
-msgid "Address"
-msgstr ""
-
-#: sysdeps/names/netload.c:49 sysdeps/names/netload.c:67
-msgid "Packets In"
-msgstr ""
-
-#: sysdeps/names/netload.c:50 sysdeps/names/netload.c:68
-msgid "Packets Out"
-msgstr ""
-
-#: sysdeps/names/netload.c:51 sysdeps/names/netload.c:69
-msgid "Packets Total"
-msgstr ""
-
-#: sysdeps/names/netload.c:52 sysdeps/names/netload.c:70
-msgid "Bytes In"
-msgstr ""
-
-#: sysdeps/names/netload.c:53 sysdeps/names/netload.c:71
-msgid "Bytes Out"
-msgstr ""
-
-#: sysdeps/names/netload.c:54 sysdeps/names/netload.c:72
-msgid "Bytes Total"
-msgstr ""
-
-#: sysdeps/names/netload.c:55 sysdeps/names/netload.c:73
-msgid "Errors In"
-msgstr ""
-
-#: sysdeps/names/netload.c:56 sysdeps/names/netload.c:74
-msgid "Errors Out"
-msgstr ""
-
-#: sysdeps/names/netload.c:57 sysdeps/names/netload.c:75
-msgid "Errors Total"
-msgstr ""
-
-#: sysdeps/names/netload.c:58 sysdeps/names/netload.c:76
-msgid "Collisions"
-msgstr ""
-
-#: sysdeps/names/netload.c:64
-msgid "Maximum Transfer Unit"
-msgstr ""
-
-#: sysdeps/names/ppp.c:38 sysdeps/names/ppp.c:45
-msgid "PPP State"
-msgstr ""
-
-#: sysdeps/names/ppp.c:39
-msgid "Input bytes"
-msgstr ""
-
-#: sysdeps/names/ppp.c:40
-msgid "Output bytes"
-msgstr ""
-
-#: sysdeps/names/ppp.c:46
-msgid "Number of input bytes"
-msgstr ""
-
-#: sysdeps/names/ppp.c:47
-msgid "Number of output bytes"
-msgstr ""
-
-#: sysdeps/names/procargs.c:38 sysdeps/names/procmem.c:47
-msgid "Size"
-msgstr ""
-
-#: sysdeps/names/procargs.c:43
-msgid "Length in bytes of the returned string."
-msgstr ""
-
 #: sysdeps/names/prockernel.c:42
 msgid "K_Flags"
 msgstr ""
@@ -628,6 +347,10 @@ msgstr ""
 msgid "This is the textual name of the `nwchan' field."
 msgstr ""
 
+#: sysdeps/names/procmem.c:47
+msgid "Size"
+msgstr ""
+
 #: sysdeps/names/procmem.c:47
 msgid "Virtual"
 msgstr ""
@@ -657,7 +380,7 @@ msgid "Number of pages of virtual memory"
 msgstr ""
 
 #: sysdeps/names/procmem.c:55
-msgid "Number of resident set (non-swapped) pages"
+msgid "Number of residnet set (non-swapped) pages"
 msgstr ""
 
 #: sysdeps/names/procmem.c:56
@@ -950,6 +673,10 @@ msgstr ""
 msgid "Priority"
 msgstr ""
 
+#: sysdeps/names/procuid.c:58
+msgid "Nice"
+msgstr ""
+
 #: sysdeps/names/procuid.c:63
 msgid "User ID"
 msgstr ""
@@ -1202,126 +929,123 @@ msgstr ""
 msgid "Time in seconds the system spent in the idle task since system boot"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:28 sysdeps/sun4/siglist.c:28
+#: support/error.c:109
-msgid "Hangup"
+msgid "Unknown system error"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:29 sysdeps/sun4/siglist.c:29
+#: support/getopt.c:669
-msgid "Interrupt"
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:30 sysdeps/sun4/siglist.c:30
+#: support/getopt.c:693
-msgid "Quit"
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:31 sysdeps/sun4/siglist.c:31
+#: support/getopt.c:698
-msgid "Illegal instruction"
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:32 sysdeps/sun4/siglist.c:32
+#: support/getopt.c:715 support/getopt.c:888
-msgid "Trace trap"
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:33 sysdeps/sun4/siglist.c:33
+#. --option
-msgid "Abort"
+#: support/getopt.c:744
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:34 sysdeps/sun4/siglist.c:34
+#. +option or -option
-msgid "EMT error"
+#: support/getopt.c:748
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:35 sysdeps/sun4/siglist.c:35
+#. 1003.2 specifies the format of this message.
-msgid "Floating-point exception"
+#: support/getopt.c:774
+#, c-format
+msgid "%s: illegal option -- %c\n"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:36 sysdeps/sun4/siglist.c:36
+#: support/getopt.c:777
-msgid "Kill"
+#, c-format
+msgid "%s: invalid option -- %c\n"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:37 sysdeps/sun4/siglist.c:37
+#. 1003.2 specifies the format of this message.
-msgid "Bus error"
+#: support/getopt.c:807 support/getopt.c:937
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:38 sysdeps/sun4/siglist.c:38
+#: support/getopt.c:854
-msgid "Segmentation violation"
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:39 sysdeps/sun4/siglist.c:39
+#: support/getopt.c:872
-msgid "Bad argument to system call"
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:40 sysdeps/sun4/siglist.c:40
+#: lib/read.c:71
-msgid "Broken pipe"
+#, c-format
+msgid "read %d bytes"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:41 sysdeps/sun4/siglist.c:41
+#: lib/read_data.c:49
-msgid "Alarm clock"
+msgid "read data size"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:42 sysdeps/sun4/siglist.c:42
+#: lib/read_data.c:66
-msgid "Termination"
+#, c-format
+msgid "read data %d bytes"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:43 sysdeps/sun4/siglist.c:43
+#: lib/write.c:48
-msgid "Urgent condition on socket"
+#, c-format
+msgid "write %d bytes"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:44 sysdeps/sun4/siglist.c:44
+#: src/daemon/gnuserv.c:445
-msgid "Stop"
+msgid "Enable debugging"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:45 sysdeps/sun4/siglist.c:45
+#: src/daemon/gnuserv.c:445
-msgid "Keyboard stop"
+msgid "DEBUG"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:46 sysdeps/sun4/siglist.c:46
+#: src/daemon/gnuserv.c:447
-msgid "Continue"
+msgid "Enable verbose output"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:47 sysdeps/sun4/siglist.c:47
+#: src/daemon/gnuserv.c:447
-msgid "Child status has changed"
+msgid "VERBOSE"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:48 sysdeps/sun4/siglist.c:48
+#: src/daemon/gnuserv.c:449
-msgid "Background read from tty"
+msgid "Don't fork into background"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:49 sysdeps/sun4/siglist.c:49
+#: src/daemon/gnuserv.c:449
-msgid "Background write to tty"
+msgid "NO-DAEMON"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:50 sysdeps/sun4/siglist.c:50
+#: src/daemon/gnuserv.c:451
-msgid "I/O now possible"
+msgid "Invoked from inetd"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:51 sysdeps/sun4/siglist.c:51
+#: src/daemon/gnuserv.c:451
-msgid "CPU limit exceeded"
+msgid "INETD"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:52 sysdeps/sun4/siglist.c:52
+#: src/daemon/gnuserv.c:485
-msgid "File size limit exceeded"
+#, c-format
-msgstr ""
+msgid ""
-
+"Error on option %s: %s.\n"
-#: sysdeps/osf1/siglist.c:53 sysdeps/sun4/siglist.c:53
+"Run '%s --help' to see a full list of available command line options.\n"
-msgid "Virtual alarm clock"
-msgstr ""
-
-#: 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
-msgid "Window size change"
-msgstr ""
-
-#: sysdeps/osf1/siglist.c:56 sysdeps/sun4/siglist.c:56
-msgid "Information request"
-msgstr ""
-
-#: sysdeps/osf1/siglist.c:57 sysdeps/sun4/siglist.c:57
-msgid "User defined signal 1"
-msgstr ""
-
-#: sysdeps/osf1/siglist.c:58 sysdeps/sun4/siglist.c:58
-msgid "User defined signal 2"
 msgstr ""

po/es_GT.po

@@ -2,214 +2,17 @@
 # Copyright (C) YEAR Free Software Foundation, Inc.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: glibtop cvs\n"
+"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2001-02-13 13:30+0100\n"
+"POT-Creation-Date: 1999-03-01 22:58+0100\n"
-"PO-Revision-Date: 1998-12-13 04:38+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Pablo Saratxaga <srtxg@chanae.alphanet.ch>\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Pablo Saratxaga <srtxg@chanae.alphanet.ch>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
+"Content-Transfer-Encoding: ENCODING\n"
-
-#: examples/smp.c:68
-#, c-format
-msgid "Ticks (%ld per second):"
-msgstr ""
-
-#: examples/smp.c:71
-msgid "Total"
-msgstr ""
-
-#: examples/smp.c:71 sysdeps/names/mem.c:47
-msgid "User"
-msgstr ""
-
-#: examples/smp.c:71 sysdeps/names/procuid.c:58
-msgid "Nice"
-msgstr ""
-
-#: examples/smp.c:71
-msgid "Sys"
-msgstr ""
-
-#: examples/smp.c:71
-msgid "Idle"
-msgstr ""
-
-#: examples/smp.c:73
-#, c-format
-msgid ""
-"CPU          (0x%08lx): %12.0f %12.0f %12.0f %12.0f %12.0f\n"
-"\n"
-msgstr ""
-
-#: examples/smp.c:77
-#, c-format
-msgid "CPU %3d      (0x%08lx): %12lu %12lu %12lu %12lu %12lu\n"
-msgstr ""
-
-#: examples/smp.c:94
-msgid "Percent:"
-msgstr ""
-
-#: examples/smp.c:95
-msgid "Total (%)"
-msgstr ""
-
-#: examples/smp.c:95
-msgid "User (%)"
-msgstr ""
-
-#: examples/smp.c:95
-msgid "Nice (%)"
-msgstr ""
-
-#: examples/smp.c:95
-msgid "Sys (%)"
-msgstr ""
-
-#: examples/smp.c:96
-msgid "Idle (%)"
-msgstr ""
-
-#: examples/smp.c:98
-#, c-format
-msgid ""
-"CPU          (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
-"\n"
-msgstr ""
-
-#: examples/smp.c:114
-#, c-format
-msgid "CPU %3d      (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
-msgstr ""
-
-#: examples/smp.c:120
-msgid "Spin:"
-msgstr ""
-
-#: lib/read.c:75
-#, c-format
-msgid "read %d bytes"
-msgstr ""
-
-#: lib/read_data.c:49
-msgid "read data size"
-msgstr ""
-
-#: lib/read_data.c:66
-#, c-format
-msgid "read data %d bytes"
-msgstr ""
-
-#: lib/write.c:48
-#, c-format
-msgid "write %d bytes"
-msgstr ""
-
-#: src/daemon/gnuserv.c:448
-msgid "Enable debugging"
-msgstr ""
-
-#: src/daemon/gnuserv.c:448
-msgid "DEBUG"
-msgstr ""
-
-#: src/daemon/gnuserv.c:450
-msgid "Enable verbose output"
-msgstr ""
-
-#: src/daemon/gnuserv.c:450
-msgid "VERBOSE"
-msgstr ""
-
-#: src/daemon/gnuserv.c:452
-msgid "Don't fork into background"
-msgstr ""
-
-#: src/daemon/gnuserv.c:452
-msgid "NO-DAEMON"
-msgstr ""
-
-#: src/daemon/gnuserv.c:454
-msgid "Invoked from inetd"
-msgstr ""
-
-#: src/daemon/gnuserv.c:454
-msgid "INETD"
-msgstr ""
-
-#: src/daemon/gnuserv.c:488
-#, c-format
-msgid ""
-"Error on option %s: %s.\n"
-"Run '%s --help' to see a full list of available command line options.\n"
-msgstr ""
-
-#: support/error.c:109
-msgid "Unknown system error"
-msgstr ""
-
-#: support/getopt.c:669
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr ""
-
-#: support/getopt.c:693
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr ""
-
-#: support/getopt.c:698
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr ""
-
-#: support/getopt.c:715 support/getopt.c:888
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr ""
-
-#. --option
-#: support/getopt.c:744
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr ""
-
-#. +option or -option
-#: support/getopt.c:748
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr ""
-
-#. 1003.2 specifies the format of this message.
-#: support/getopt.c:774
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr ""
-
-#: support/getopt.c:777
-#, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr ""
-
-#. 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 ""
-
-#: support/getopt.c:854
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr ""
-
-#: support/getopt.c:872
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr ""
 
 #: sysdeps/names/cpu.c:43
 msgid "Total CPU Time"
@@ -359,6 +162,10 @@ msgstr ""
 msgid "Cached"
 msgstr ""
 
+#: sysdeps/names/mem.c:47
+msgid "User"
+msgstr ""
+
 #: sysdeps/names/mem.c:48
 msgid "Locked"
 msgstr ""
@@ -441,94 +248,6 @@ msgstr ""
 msgid "Number of system message headers"
 msgstr ""
 
-#: sysdeps/names/netload.c:45 sysdeps/names/netload.c:63
-msgid "Interface Flags"
-msgstr ""
-
-#: sysdeps/names/netload.c:46
-msgid "MTU"
-msgstr ""
-
-#: sysdeps/names/netload.c:47 sysdeps/names/netload.c:65
-msgid "Subnet"
-msgstr ""
-
-#: sysdeps/names/netload.c:48 sysdeps/names/netload.c:66
-msgid "Address"
-msgstr ""
-
-#: sysdeps/names/netload.c:49 sysdeps/names/netload.c:67
-msgid "Packets In"
-msgstr ""
-
-#: sysdeps/names/netload.c:50 sysdeps/names/netload.c:68
-msgid "Packets Out"
-msgstr ""
-
-#: sysdeps/names/netload.c:51 sysdeps/names/netload.c:69
-msgid "Packets Total"
-msgstr ""
-
-#: sysdeps/names/netload.c:52 sysdeps/names/netload.c:70
-msgid "Bytes In"
-msgstr ""
-
-#: sysdeps/names/netload.c:53 sysdeps/names/netload.c:71
-msgid "Bytes Out"
-msgstr ""
-
-#: sysdeps/names/netload.c:54 sysdeps/names/netload.c:72
-msgid "Bytes Total"
-msgstr ""
-
-#: sysdeps/names/netload.c:55 sysdeps/names/netload.c:73
-msgid "Errors In"
-msgstr ""
-
-#: sysdeps/names/netload.c:56 sysdeps/names/netload.c:74
-msgid "Errors Out"
-msgstr ""
-
-#: sysdeps/names/netload.c:57 sysdeps/names/netload.c:75
-msgid "Errors Total"
-msgstr ""
-
-#: sysdeps/names/netload.c:58 sysdeps/names/netload.c:76
-msgid "Collisions"
-msgstr ""
-
-#: sysdeps/names/netload.c:64
-msgid "Maximum Transfer Unit"
-msgstr ""
-
-#: sysdeps/names/ppp.c:38 sysdeps/names/ppp.c:45
-msgid "PPP State"
-msgstr ""
-
-#: sysdeps/names/ppp.c:39
-msgid "Input bytes"
-msgstr ""
-
-#: sysdeps/names/ppp.c:40
-msgid "Output bytes"
-msgstr ""
-
-#: sysdeps/names/ppp.c:46
-msgid "Number of input bytes"
-msgstr ""
-
-#: sysdeps/names/ppp.c:47
-msgid "Number of output bytes"
-msgstr ""
-
-#: sysdeps/names/procargs.c:38 sysdeps/names/procmem.c:47
-msgid "Size"
-msgstr ""
-
-#: sysdeps/names/procargs.c:43
-msgid "Length in bytes of the returned string."
-msgstr ""
-
 #: sysdeps/names/prockernel.c:42
 msgid "K_Flags"
 msgstr ""
@@ -628,6 +347,10 @@ msgstr ""
 msgid "This is the textual name of the `nwchan' field."
 msgstr ""
 
+#: sysdeps/names/procmem.c:47
+msgid "Size"
+msgstr ""
+
 #: sysdeps/names/procmem.c:47
 msgid "Virtual"
 msgstr ""
@@ -657,7 +380,7 @@ msgid "Number of pages of virtual memory"
 msgstr ""
 
 #: sysdeps/names/procmem.c:55
-msgid "Number of resident set (non-swapped) pages"
+msgid "Number of residnet set (non-swapped) pages"
 msgstr ""
 
 #: sysdeps/names/procmem.c:56
@@ -950,6 +673,10 @@ msgstr ""
 msgid "Priority"
 msgstr ""
 
+#: sysdeps/names/procuid.c:58
+msgid "Nice"
+msgstr ""
+
 #: sysdeps/names/procuid.c:63
 msgid "User ID"
 msgstr ""
@@ -1202,126 +929,123 @@ msgstr ""
 msgid "Time in seconds the system spent in the idle task since system boot"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:28 sysdeps/sun4/siglist.c:28
+#: support/error.c:109
-msgid "Hangup"
+msgid "Unknown system error"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:29 sysdeps/sun4/siglist.c:29
+#: support/getopt.c:669
-msgid "Interrupt"
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:30 sysdeps/sun4/siglist.c:30
+#: support/getopt.c:693
-msgid "Quit"
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:31 sysdeps/sun4/siglist.c:31
+#: support/getopt.c:698
-msgid "Illegal instruction"
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:32 sysdeps/sun4/siglist.c:32
+#: support/getopt.c:715 support/getopt.c:888
-msgid "Trace trap"
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:33 sysdeps/sun4/siglist.c:33
+#. --option
-msgid "Abort"
+#: support/getopt.c:744
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:34 sysdeps/sun4/siglist.c:34
+#. +option or -option
-msgid "EMT error"
+#: support/getopt.c:748
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:35 sysdeps/sun4/siglist.c:35
+#. 1003.2 specifies the format of this message.
-msgid "Floating-point exception"
+#: support/getopt.c:774
+#, c-format
+msgid "%s: illegal option -- %c\n"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:36 sysdeps/sun4/siglist.c:36
+#: support/getopt.c:777
-msgid "Kill"
+#, c-format
+msgid "%s: invalid option -- %c\n"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:37 sysdeps/sun4/siglist.c:37
+#. 1003.2 specifies the format of this message.
-msgid "Bus error"
+#: support/getopt.c:807 support/getopt.c:937
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:38 sysdeps/sun4/siglist.c:38
+#: support/getopt.c:854
-msgid "Segmentation violation"
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:39 sysdeps/sun4/siglist.c:39
+#: support/getopt.c:872
-msgid "Bad argument to system call"
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:40 sysdeps/sun4/siglist.c:40
+#: lib/read.c:71
-msgid "Broken pipe"
+#, c-format
+msgid "read %d bytes"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:41 sysdeps/sun4/siglist.c:41
+#: lib/read_data.c:49
-msgid "Alarm clock"
+msgid "read data size"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:42 sysdeps/sun4/siglist.c:42
+#: lib/read_data.c:66
-msgid "Termination"
+#, c-format
+msgid "read data %d bytes"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:43 sysdeps/sun4/siglist.c:43
+#: lib/write.c:48
-msgid "Urgent condition on socket"
+#, c-format
+msgid "write %d bytes"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:44 sysdeps/sun4/siglist.c:44
+#: src/daemon/gnuserv.c:445
-msgid "Stop"
+msgid "Enable debugging"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:45 sysdeps/sun4/siglist.c:45
+#: src/daemon/gnuserv.c:445
-msgid "Keyboard stop"
+msgid "DEBUG"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:46 sysdeps/sun4/siglist.c:46
+#: src/daemon/gnuserv.c:447
-msgid "Continue"
+msgid "Enable verbose output"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:47 sysdeps/sun4/siglist.c:47
+#: src/daemon/gnuserv.c:447
-msgid "Child status has changed"
+msgid "VERBOSE"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:48 sysdeps/sun4/siglist.c:48
+#: src/daemon/gnuserv.c:449
-msgid "Background read from tty"
+msgid "Don't fork into background"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:49 sysdeps/sun4/siglist.c:49
+#: src/daemon/gnuserv.c:449
-msgid "Background write to tty"
+msgid "NO-DAEMON"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:50 sysdeps/sun4/siglist.c:50
+#: src/daemon/gnuserv.c:451
-msgid "I/O now possible"
+msgid "Invoked from inetd"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:51 sysdeps/sun4/siglist.c:51
+#: src/daemon/gnuserv.c:451
-msgid "CPU limit exceeded"
+msgid "INETD"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:52 sysdeps/sun4/siglist.c:52
+#: src/daemon/gnuserv.c:485
-msgid "File size limit exceeded"
+#, c-format
-msgstr ""
+msgid ""
-
+"Error on option %s: %s.\n"
-#: sysdeps/osf1/siglist.c:53 sysdeps/sun4/siglist.c:53
+"Run '%s --help' to see a full list of available command line options.\n"
-msgid "Virtual alarm clock"
-msgstr ""
-
-#: 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
-msgid "Window size change"
-msgstr ""
-
-#: sysdeps/osf1/siglist.c:56 sysdeps/sun4/siglist.c:56
-msgid "Information request"
-msgstr ""
-
-#: sysdeps/osf1/siglist.c:57 sysdeps/sun4/siglist.c:57
-msgid "User defined signal 1"
-msgstr ""
-
-#: sysdeps/osf1/siglist.c:58 sysdeps/sun4/siglist.c:58
-msgid "User defined signal 2"
 msgstr ""

po/es_HN.po

@@ -2,214 +2,17 @@
 # Copyright (C) YEAR Free Software Foundation, Inc.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: glibtop cvs\n"
+"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2001-02-13 13:30+0100\n"
+"POT-Creation-Date: 1999-03-01 22:58+0100\n"
-"PO-Revision-Date: 1998-12-13 04:38+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Pablo Saratxaga <srtxg@chanae.alphanet.ch>\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Pablo Saratxaga <srtxg@chanae.alphanet.ch>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
+"Content-Transfer-Encoding: ENCODING\n"
-
-#: examples/smp.c:68
-#, c-format
-msgid "Ticks (%ld per second):"
-msgstr ""
-
-#: examples/smp.c:71
-msgid "Total"
-msgstr ""
-
-#: examples/smp.c:71 sysdeps/names/mem.c:47
-msgid "User"
-msgstr ""
-
-#: examples/smp.c:71 sysdeps/names/procuid.c:58
-msgid "Nice"
-msgstr ""
-
-#: examples/smp.c:71
-msgid "Sys"
-msgstr ""
-
-#: examples/smp.c:71
-msgid "Idle"
-msgstr ""
-
-#: examples/smp.c:73
-#, c-format
-msgid ""
-"CPU          (0x%08lx): %12.0f %12.0f %12.0f %12.0f %12.0f\n"
-"\n"
-msgstr ""
-
-#: examples/smp.c:77
-#, c-format
-msgid "CPU %3d      (0x%08lx): %12lu %12lu %12lu %12lu %12lu\n"
-msgstr ""
-
-#: examples/smp.c:94
-msgid "Percent:"
-msgstr ""
-
-#: examples/smp.c:95
-msgid "Total (%)"
-msgstr ""
-
-#: examples/smp.c:95
-msgid "User (%)"
-msgstr ""
-
-#: examples/smp.c:95
-msgid "Nice (%)"
-msgstr ""
-
-#: examples/smp.c:95
-msgid "Sys (%)"
-msgstr ""
-
-#: examples/smp.c:96
-msgid "Idle (%)"
-msgstr ""
-
-#: examples/smp.c:98
-#, c-format
-msgid ""
-"CPU          (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
-"\n"
-msgstr ""
-
-#: examples/smp.c:114
-#, c-format
-msgid "CPU %3d      (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
-msgstr ""
-
-#: examples/smp.c:120
-msgid "Spin:"
-msgstr ""
-
-#: lib/read.c:75
-#, c-format
-msgid "read %d bytes"
-msgstr ""
-
-#: lib/read_data.c:49
-msgid "read data size"
-msgstr ""
-
-#: lib/read_data.c:66
-#, c-format
-msgid "read data %d bytes"
-msgstr ""
-
-#: lib/write.c:48
-#, c-format
-msgid "write %d bytes"
-msgstr ""
-
-#: src/daemon/gnuserv.c:448
-msgid "Enable debugging"
-msgstr ""
-
-#: src/daemon/gnuserv.c:448
-msgid "DEBUG"
-msgstr ""
-
-#: src/daemon/gnuserv.c:450
-msgid "Enable verbose output"
-msgstr ""
-
-#: src/daemon/gnuserv.c:450
-msgid "VERBOSE"
-msgstr ""
-
-#: src/daemon/gnuserv.c:452
-msgid "Don't fork into background"
-msgstr ""
-
-#: src/daemon/gnuserv.c:452
-msgid "NO-DAEMON"
-msgstr ""
-
-#: src/daemon/gnuserv.c:454
-msgid "Invoked from inetd"
-msgstr ""
-
-#: src/daemon/gnuserv.c:454
-msgid "INETD"
-msgstr ""
-
-#: src/daemon/gnuserv.c:488
-#, c-format
-msgid ""
-"Error on option %s: %s.\n"
-"Run '%s --help' to see a full list of available command line options.\n"
-msgstr ""
-
-#: support/error.c:109
-msgid "Unknown system error"
-msgstr ""
-
-#: support/getopt.c:669
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr ""
-
-#: support/getopt.c:693
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr ""
-
-#: support/getopt.c:698
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr ""
-
-#: support/getopt.c:715 support/getopt.c:888
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr ""
-
-#. --option
-#: support/getopt.c:744
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr ""
-
-#. +option or -option
-#: support/getopt.c:748
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr ""
-
-#. 1003.2 specifies the format of this message.
-#: support/getopt.c:774
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr ""
-
-#: support/getopt.c:777
-#, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr ""
-
-#. 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 ""
-
-#: support/getopt.c:854
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr ""
-
-#: support/getopt.c:872
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr ""
 
 #: sysdeps/names/cpu.c:43
 msgid "Total CPU Time"
@@ -359,6 +162,10 @@ msgstr ""
 msgid "Cached"
 msgstr ""
 
+#: sysdeps/names/mem.c:47
+msgid "User"
+msgstr ""
+
 #: sysdeps/names/mem.c:48
 msgid "Locked"
 msgstr ""
@@ -441,94 +248,6 @@ msgstr ""
 msgid "Number of system message headers"
 msgstr ""
 
-#: sysdeps/names/netload.c:45 sysdeps/names/netload.c:63
-msgid "Interface Flags"
-msgstr ""
-
-#: sysdeps/names/netload.c:46
-msgid "MTU"
-msgstr ""
-
-#: sysdeps/names/netload.c:47 sysdeps/names/netload.c:65
-msgid "Subnet"
-msgstr ""
-
-#: sysdeps/names/netload.c:48 sysdeps/names/netload.c:66
-msgid "Address"
-msgstr ""
-
-#: sysdeps/names/netload.c:49 sysdeps/names/netload.c:67
-msgid "Packets In"
-msgstr ""
-
-#: sysdeps/names/netload.c:50 sysdeps/names/netload.c:68
-msgid "Packets Out"
-msgstr ""
-
-#: sysdeps/names/netload.c:51 sysdeps/names/netload.c:69
-msgid "Packets Total"
-msgstr ""
-
-#: sysdeps/names/netload.c:52 sysdeps/names/netload.c:70
-msgid "Bytes In"
-msgstr ""
-
-#: sysdeps/names/netload.c:53 sysdeps/names/netload.c:71
-msgid "Bytes Out"
-msgstr ""
-
-#: sysdeps/names/netload.c:54 sysdeps/names/netload.c:72
-msgid "Bytes Total"
-msgstr ""
-
-#: sysdeps/names/netload.c:55 sysdeps/names/netload.c:73
-msgid "Errors In"
-msgstr ""
-
-#: sysdeps/names/netload.c:56 sysdeps/names/netload.c:74
-msgid "Errors Out"
-msgstr ""
-
-#: sysdeps/names/netload.c:57 sysdeps/names/netload.c:75
-msgid "Errors Total"
-msgstr ""
-
-#: sysdeps/names/netload.c:58 sysdeps/names/netload.c:76
-msgid "Collisions"
-msgstr ""
-
-#: sysdeps/names/netload.c:64
-msgid "Maximum Transfer Unit"
-msgstr ""
-
-#: sysdeps/names/ppp.c:38 sysdeps/names/ppp.c:45
-msgid "PPP State"
-msgstr ""
-
-#: sysdeps/names/ppp.c:39
-msgid "Input bytes"
-msgstr ""
-
-#: sysdeps/names/ppp.c:40
-msgid "Output bytes"
-msgstr ""
-
-#: sysdeps/names/ppp.c:46
-msgid "Number of input bytes"
-msgstr ""
-
-#: sysdeps/names/ppp.c:47
-msgid "Number of output bytes"
-msgstr ""
-
-#: sysdeps/names/procargs.c:38 sysdeps/names/procmem.c:47
-msgid "Size"
-msgstr ""
-
-#: sysdeps/names/procargs.c:43
-msgid "Length in bytes of the returned string."
-msgstr ""
-
 #: sysdeps/names/prockernel.c:42
 msgid "K_Flags"
 msgstr ""
@@ -628,6 +347,10 @@ msgstr ""
 msgid "This is the textual name of the `nwchan' field."
 msgstr ""
 
+#: sysdeps/names/procmem.c:47
+msgid "Size"
+msgstr ""
+
 #: sysdeps/names/procmem.c:47
 msgid "Virtual"
 msgstr ""
@@ -657,7 +380,7 @@ msgid "Number of pages of virtual memory"
 msgstr ""
 
 #: sysdeps/names/procmem.c:55
-msgid "Number of resident set (non-swapped) pages"
+msgid "Number of residnet set (non-swapped) pages"
 msgstr ""
 
 #: sysdeps/names/procmem.c:56
@@ -950,6 +673,10 @@ msgstr ""
 msgid "Priority"
 msgstr ""
 
+#: sysdeps/names/procuid.c:58
+msgid "Nice"
+msgstr ""
+
 #: sysdeps/names/procuid.c:63
 msgid "User ID"
 msgstr ""
@@ -1202,126 +929,123 @@ msgstr ""
 msgid "Time in seconds the system spent in the idle task since system boot"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:28 sysdeps/sun4/siglist.c:28
+#: support/error.c:109
-msgid "Hangup"
+msgid "Unknown system error"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:29 sysdeps/sun4/siglist.c:29
+#: support/getopt.c:669
-msgid "Interrupt"
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:30 sysdeps/sun4/siglist.c:30
+#: support/getopt.c:693
-msgid "Quit"
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:31 sysdeps/sun4/siglist.c:31
+#: support/getopt.c:698
-msgid "Illegal instruction"
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:32 sysdeps/sun4/siglist.c:32
+#: support/getopt.c:715 support/getopt.c:888
-msgid "Trace trap"
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:33 sysdeps/sun4/siglist.c:33
+#. --option
-msgid "Abort"
+#: support/getopt.c:744
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:34 sysdeps/sun4/siglist.c:34
+#. +option or -option
-msgid "EMT error"
+#: support/getopt.c:748
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:35 sysdeps/sun4/siglist.c:35
+#. 1003.2 specifies the format of this message.
-msgid "Floating-point exception"
+#: support/getopt.c:774
+#, c-format
+msgid "%s: illegal option -- %c\n"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:36 sysdeps/sun4/siglist.c:36
+#: support/getopt.c:777
-msgid "Kill"
+#, c-format
+msgid "%s: invalid option -- %c\n"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:37 sysdeps/sun4/siglist.c:37
+#. 1003.2 specifies the format of this message.
-msgid "Bus error"
+#: support/getopt.c:807 support/getopt.c:937
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:38 sysdeps/sun4/siglist.c:38
+#: support/getopt.c:854
-msgid "Segmentation violation"
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:39 sysdeps/sun4/siglist.c:39
+#: support/getopt.c:872
-msgid "Bad argument to system call"
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:40 sysdeps/sun4/siglist.c:40
+#: lib/read.c:71
-msgid "Broken pipe"
+#, c-format
+msgid "read %d bytes"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:41 sysdeps/sun4/siglist.c:41
+#: lib/read_data.c:49
-msgid "Alarm clock"
+msgid "read data size"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:42 sysdeps/sun4/siglist.c:42
+#: lib/read_data.c:66
-msgid "Termination"
+#, c-format
+msgid "read data %d bytes"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:43 sysdeps/sun4/siglist.c:43
+#: lib/write.c:48
-msgid "Urgent condition on socket"
+#, c-format
+msgid "write %d bytes"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:44 sysdeps/sun4/siglist.c:44
+#: src/daemon/gnuserv.c:445
-msgid "Stop"
+msgid "Enable debugging"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:45 sysdeps/sun4/siglist.c:45
+#: src/daemon/gnuserv.c:445
-msgid "Keyboard stop"
+msgid "DEBUG"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:46 sysdeps/sun4/siglist.c:46
+#: src/daemon/gnuserv.c:447
-msgid "Continue"
+msgid "Enable verbose output"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:47 sysdeps/sun4/siglist.c:47
+#: src/daemon/gnuserv.c:447
-msgid "Child status has changed"
+msgid "VERBOSE"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:48 sysdeps/sun4/siglist.c:48
+#: src/daemon/gnuserv.c:449
-msgid "Background read from tty"
+msgid "Don't fork into background"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:49 sysdeps/sun4/siglist.c:49
+#: src/daemon/gnuserv.c:449
-msgid "Background write to tty"
+msgid "NO-DAEMON"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:50 sysdeps/sun4/siglist.c:50
+#: src/daemon/gnuserv.c:451
-msgid "I/O now possible"
+msgid "Invoked from inetd"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:51 sysdeps/sun4/siglist.c:51
+#: src/daemon/gnuserv.c:451
-msgid "CPU limit exceeded"
+msgid "INETD"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:52 sysdeps/sun4/siglist.c:52
+#: src/daemon/gnuserv.c:485
-msgid "File size limit exceeded"
+#, c-format
-msgstr ""
+msgid ""
-
+"Error on option %s: %s.\n"
-#: sysdeps/osf1/siglist.c:53 sysdeps/sun4/siglist.c:53
+"Run '%s --help' to see a full list of available command line options.\n"
-msgid "Virtual alarm clock"
-msgstr ""
-
-#: 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
-msgid "Window size change"
-msgstr ""
-
-#: sysdeps/osf1/siglist.c:56 sysdeps/sun4/siglist.c:56
-msgid "Information request"
-msgstr ""
-
-#: sysdeps/osf1/siglist.c:57 sysdeps/sun4/siglist.c:57
-msgid "User defined signal 1"
-msgstr ""
-
-#: sysdeps/osf1/siglist.c:58 sysdeps/sun4/siglist.c:58
-msgid "User defined signal 2"
 msgstr ""

po/es_MX.po

@@ -2,214 +2,17 @@
 # Copyright (C) YEAR Free Software Foundation, Inc.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: glibtop cvs\n"
+"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2001-02-13 13:30+0100\n"
+"POT-Creation-Date: 1999-03-01 22:58+0100\n"
-"PO-Revision-Date: 1998-12-13 04:38+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Pablo Saratxaga <srtxg@chanae.alphanet.ch>\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Pablo Saratxaga <srtxg@chanae.alphanet.ch>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
+"Content-Transfer-Encoding: ENCODING\n"
-
-#: examples/smp.c:68
-#, c-format
-msgid "Ticks (%ld per second):"
-msgstr ""
-
-#: examples/smp.c:71
-msgid "Total"
-msgstr ""
-
-#: examples/smp.c:71 sysdeps/names/mem.c:47
-msgid "User"
-msgstr ""
-
-#: examples/smp.c:71 sysdeps/names/procuid.c:58
-msgid "Nice"
-msgstr ""
-
-#: examples/smp.c:71
-msgid "Sys"
-msgstr ""
-
-#: examples/smp.c:71
-msgid "Idle"
-msgstr ""
-
-#: examples/smp.c:73
-#, c-format
-msgid ""
-"CPU          (0x%08lx): %12.0f %12.0f %12.0f %12.0f %12.0f\n"
-"\n"
-msgstr ""
-
-#: examples/smp.c:77
-#, c-format
-msgid "CPU %3d      (0x%08lx): %12lu %12lu %12lu %12lu %12lu\n"
-msgstr ""
-
-#: examples/smp.c:94
-msgid "Percent:"
-msgstr ""
-
-#: examples/smp.c:95
-msgid "Total (%)"
-msgstr ""
-
-#: examples/smp.c:95
-msgid "User (%)"
-msgstr ""
-
-#: examples/smp.c:95
-msgid "Nice (%)"
-msgstr ""
-
-#: examples/smp.c:95
-msgid "Sys (%)"
-msgstr ""
-
-#: examples/smp.c:96
-msgid "Idle (%)"
-msgstr ""
-
-#: examples/smp.c:98
-#, c-format
-msgid ""
-"CPU          (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
-"\n"
-msgstr ""
-
-#: examples/smp.c:114
-#, c-format
-msgid "CPU %3d      (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
-msgstr ""
-
-#: examples/smp.c:120
-msgid "Spin:"
-msgstr ""
-
-#: lib/read.c:75
-#, c-format
-msgid "read %d bytes"
-msgstr ""
-
-#: lib/read_data.c:49
-msgid "read data size"
-msgstr ""
-
-#: lib/read_data.c:66
-#, c-format
-msgid "read data %d bytes"
-msgstr ""
-
-#: lib/write.c:48
-#, c-format
-msgid "write %d bytes"
-msgstr ""
-
-#: src/daemon/gnuserv.c:448
-msgid "Enable debugging"
-msgstr ""
-
-#: src/daemon/gnuserv.c:448
-msgid "DEBUG"
-msgstr ""
-
-#: src/daemon/gnuserv.c:450
-msgid "Enable verbose output"
-msgstr ""
-
-#: src/daemon/gnuserv.c:450
-msgid "VERBOSE"
-msgstr ""
-
-#: src/daemon/gnuserv.c:452
-msgid "Don't fork into background"
-msgstr ""
-
-#: src/daemon/gnuserv.c:452
-msgid "NO-DAEMON"
-msgstr ""
-
-#: src/daemon/gnuserv.c:454
-msgid "Invoked from inetd"
-msgstr ""
-
-#: src/daemon/gnuserv.c:454
-msgid "INETD"
-msgstr ""
-
-#: src/daemon/gnuserv.c:488
-#, c-format
-msgid ""
-"Error on option %s: %s.\n"
-"Run '%s --help' to see a full list of available command line options.\n"
-msgstr ""
-
-#: support/error.c:109
-msgid "Unknown system error"
-msgstr ""
-
-#: support/getopt.c:669
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr ""
-
-#: support/getopt.c:693
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr ""
-
-#: support/getopt.c:698
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr ""
-
-#: support/getopt.c:715 support/getopt.c:888
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr ""
-
-#. --option
-#: support/getopt.c:744
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr ""
-
-#. +option or -option
-#: support/getopt.c:748
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr ""
-
-#. 1003.2 specifies the format of this message.
-#: support/getopt.c:774
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr ""
-
-#: support/getopt.c:777
-#, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr ""
-
-#. 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 ""
-
-#: support/getopt.c:854
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr ""
-
-#: support/getopt.c:872
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr ""
 
 #: sysdeps/names/cpu.c:43
 msgid "Total CPU Time"
@@ -359,6 +162,10 @@ msgstr ""
 msgid "Cached"
 msgstr ""
 
+#: sysdeps/names/mem.c:47
+msgid "User"
+msgstr ""
+
 #: sysdeps/names/mem.c:48
 msgid "Locked"
 msgstr ""
@@ -441,94 +248,6 @@ msgstr ""
 msgid "Number of system message headers"
 msgstr ""
 
-#: sysdeps/names/netload.c:45 sysdeps/names/netload.c:63
-msgid "Interface Flags"
-msgstr ""
-
-#: sysdeps/names/netload.c:46
-msgid "MTU"
-msgstr ""
-
-#: sysdeps/names/netload.c:47 sysdeps/names/netload.c:65
-msgid "Subnet"
-msgstr ""
-
-#: sysdeps/names/netload.c:48 sysdeps/names/netload.c:66
-msgid "Address"
-msgstr ""
-
-#: sysdeps/names/netload.c:49 sysdeps/names/netload.c:67
-msgid "Packets In"
-msgstr ""
-
-#: sysdeps/names/netload.c:50 sysdeps/names/netload.c:68
-msgid "Packets Out"
-msgstr ""
-
-#: sysdeps/names/netload.c:51 sysdeps/names/netload.c:69
-msgid "Packets Total"
-msgstr ""
-
-#: sysdeps/names/netload.c:52 sysdeps/names/netload.c:70
-msgid "Bytes In"
-msgstr ""
-
-#: sysdeps/names/netload.c:53 sysdeps/names/netload.c:71
-msgid "Bytes Out"
-msgstr ""
-
-#: sysdeps/names/netload.c:54 sysdeps/names/netload.c:72
-msgid "Bytes Total"
-msgstr ""
-
-#: sysdeps/names/netload.c:55 sysdeps/names/netload.c:73
-msgid "Errors In"
-msgstr ""
-
-#: sysdeps/names/netload.c:56 sysdeps/names/netload.c:74
-msgid "Errors Out"
-msgstr ""
-
-#: sysdeps/names/netload.c:57 sysdeps/names/netload.c:75
-msgid "Errors Total"
-msgstr ""
-
-#: sysdeps/names/netload.c:58 sysdeps/names/netload.c:76
-msgid "Collisions"
-msgstr ""
-
-#: sysdeps/names/netload.c:64
-msgid "Maximum Transfer Unit"
-msgstr ""
-
-#: sysdeps/names/ppp.c:38 sysdeps/names/ppp.c:45
-msgid "PPP State"
-msgstr ""
-
-#: sysdeps/names/ppp.c:39
-msgid "Input bytes"
-msgstr ""
-
-#: sysdeps/names/ppp.c:40
-msgid "Output bytes"
-msgstr ""
-
-#: sysdeps/names/ppp.c:46
-msgid "Number of input bytes"
-msgstr ""
-
-#: sysdeps/names/ppp.c:47
-msgid "Number of output bytes"
-msgstr ""
-
-#: sysdeps/names/procargs.c:38 sysdeps/names/procmem.c:47
-msgid "Size"
-msgstr ""
-
-#: sysdeps/names/procargs.c:43
-msgid "Length in bytes of the returned string."
-msgstr ""
-
 #: sysdeps/names/prockernel.c:42
 msgid "K_Flags"
 msgstr ""
@@ -628,6 +347,10 @@ msgstr ""
 msgid "This is the textual name of the `nwchan' field."
 msgstr ""
 
+#: sysdeps/names/procmem.c:47
+msgid "Size"
+msgstr ""
+
 #: sysdeps/names/procmem.c:47
 msgid "Virtual"
 msgstr ""
@@ -657,7 +380,7 @@ msgid "Number of pages of virtual memory"
 msgstr ""
 
 #: sysdeps/names/procmem.c:55
-msgid "Number of resident set (non-swapped) pages"
+msgid "Number of residnet set (non-swapped) pages"
 msgstr ""
 
 #: sysdeps/names/procmem.c:56
@@ -950,6 +673,10 @@ msgstr ""
 msgid "Priority"
 msgstr ""
 
+#: sysdeps/names/procuid.c:58
+msgid "Nice"
+msgstr ""
+
 #: sysdeps/names/procuid.c:63
 msgid "User ID"
 msgstr ""
@@ -1202,126 +929,123 @@ msgstr ""
 msgid "Time in seconds the system spent in the idle task since system boot"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:28 sysdeps/sun4/siglist.c:28
+#: support/error.c:109
-msgid "Hangup"
+msgid "Unknown system error"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:29 sysdeps/sun4/siglist.c:29
+#: support/getopt.c:669
-msgid "Interrupt"
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:30 sysdeps/sun4/siglist.c:30
+#: support/getopt.c:693
-msgid "Quit"
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:31 sysdeps/sun4/siglist.c:31
+#: support/getopt.c:698
-msgid "Illegal instruction"
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:32 sysdeps/sun4/siglist.c:32
+#: support/getopt.c:715 support/getopt.c:888
-msgid "Trace trap"
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:33 sysdeps/sun4/siglist.c:33
+#. --option
-msgid "Abort"
+#: support/getopt.c:744
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:34 sysdeps/sun4/siglist.c:34
+#. +option or -option
-msgid "EMT error"
+#: support/getopt.c:748
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:35 sysdeps/sun4/siglist.c:35
+#. 1003.2 specifies the format of this message.
-msgid "Floating-point exception"
+#: support/getopt.c:774
+#, c-format
+msgid "%s: illegal option -- %c\n"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:36 sysdeps/sun4/siglist.c:36
+#: support/getopt.c:777
-msgid "Kill"
+#, c-format
+msgid "%s: invalid option -- %c\n"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:37 sysdeps/sun4/siglist.c:37
+#. 1003.2 specifies the format of this message.
-msgid "Bus error"
+#: support/getopt.c:807 support/getopt.c:937
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:38 sysdeps/sun4/siglist.c:38
+#: support/getopt.c:854
-msgid "Segmentation violation"
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:39 sysdeps/sun4/siglist.c:39
+#: support/getopt.c:872
-msgid "Bad argument to system call"
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:40 sysdeps/sun4/siglist.c:40
+#: lib/read.c:71
-msgid "Broken pipe"
+#, c-format
+msgid "read %d bytes"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:41 sysdeps/sun4/siglist.c:41
+#: lib/read_data.c:49
-msgid "Alarm clock"
+msgid "read data size"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:42 sysdeps/sun4/siglist.c:42
+#: lib/read_data.c:66
-msgid "Termination"
+#, c-format
+msgid "read data %d bytes"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:43 sysdeps/sun4/siglist.c:43
+#: lib/write.c:48
-msgid "Urgent condition on socket"
+#, c-format
+msgid "write %d bytes"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:44 sysdeps/sun4/siglist.c:44
+#: src/daemon/gnuserv.c:445
-msgid "Stop"
+msgid "Enable debugging"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:45 sysdeps/sun4/siglist.c:45
+#: src/daemon/gnuserv.c:445
-msgid "Keyboard stop"
+msgid "DEBUG"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:46 sysdeps/sun4/siglist.c:46
+#: src/daemon/gnuserv.c:447
-msgid "Continue"
+msgid "Enable verbose output"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:47 sysdeps/sun4/siglist.c:47
+#: src/daemon/gnuserv.c:447
-msgid "Child status has changed"
+msgid "VERBOSE"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:48 sysdeps/sun4/siglist.c:48
+#: src/daemon/gnuserv.c:449
-msgid "Background read from tty"
+msgid "Don't fork into background"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:49 sysdeps/sun4/siglist.c:49
+#: src/daemon/gnuserv.c:449
-msgid "Background write to tty"
+msgid "NO-DAEMON"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:50 sysdeps/sun4/siglist.c:50
+#: src/daemon/gnuserv.c:451
-msgid "I/O now possible"
+msgid "Invoked from inetd"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:51 sysdeps/sun4/siglist.c:51
+#: src/daemon/gnuserv.c:451
-msgid "CPU limit exceeded"
+msgid "INETD"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:52 sysdeps/sun4/siglist.c:52
+#: src/daemon/gnuserv.c:485
-msgid "File size limit exceeded"
+#, c-format
-msgstr ""
+msgid ""
-
+"Error on option %s: %s.\n"
-#: sysdeps/osf1/siglist.c:53 sysdeps/sun4/siglist.c:53
+"Run '%s --help' to see a full list of available command line options.\n"
-msgid "Virtual alarm clock"
-msgstr ""
-
-#: 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
-msgid "Window size change"
-msgstr ""
-
-#: sysdeps/osf1/siglist.c:56 sysdeps/sun4/siglist.c:56
-msgid "Information request"
-msgstr ""
-
-#: sysdeps/osf1/siglist.c:57 sysdeps/sun4/siglist.c:57
-msgid "User defined signal 1"
-msgstr ""
-
-#: sysdeps/osf1/siglist.c:58 sysdeps/sun4/siglist.c:58
-msgid "User defined signal 2"
 msgstr ""

po/es_PA.po

@@ -2,214 +2,17 @@
 # Copyright (C) YEAR Free Software Foundation, Inc.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: glibtop cvs\n"
+"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2001-02-13 13:30+0100\n"
+"POT-Creation-Date: 1999-03-01 22:58+0100\n"
-"PO-Revision-Date: 1998-12-13 04:38+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Pablo Saratxaga <srtxg@chanae.alphanet.ch>\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Pablo Saratxaga <srtxg@chanae.alphanet.ch>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
+"Content-Transfer-Encoding: ENCODING\n"
-
-#: examples/smp.c:68
-#, c-format
-msgid "Ticks (%ld per second):"
-msgstr ""
-
-#: examples/smp.c:71
-msgid "Total"
-msgstr ""
-
-#: examples/smp.c:71 sysdeps/names/mem.c:47
-msgid "User"
-msgstr ""
-
-#: examples/smp.c:71 sysdeps/names/procuid.c:58
-msgid "Nice"
-msgstr ""
-
-#: examples/smp.c:71
-msgid "Sys"
-msgstr ""
-
-#: examples/smp.c:71
-msgid "Idle"
-msgstr ""
-
-#: examples/smp.c:73
-#, c-format
-msgid ""
-"CPU          (0x%08lx): %12.0f %12.0f %12.0f %12.0f %12.0f\n"
-"\n"
-msgstr ""
-
-#: examples/smp.c:77
-#, c-format
-msgid "CPU %3d      (0x%08lx): %12lu %12lu %12lu %12lu %12lu\n"
-msgstr ""
-
-#: examples/smp.c:94
-msgid "Percent:"
-msgstr ""
-
-#: examples/smp.c:95
-msgid "Total (%)"
-msgstr ""
-
-#: examples/smp.c:95
-msgid "User (%)"
-msgstr ""
-
-#: examples/smp.c:95
-msgid "Nice (%)"
-msgstr ""
-
-#: examples/smp.c:95
-msgid "Sys (%)"
-msgstr ""
-
-#: examples/smp.c:96
-msgid "Idle (%)"
-msgstr ""
-
-#: examples/smp.c:98
-#, c-format
-msgid ""
-"CPU          (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
-"\n"
-msgstr ""
-
-#: examples/smp.c:114
-#, c-format
-msgid "CPU %3d      (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
-msgstr ""
-
-#: examples/smp.c:120
-msgid "Spin:"
-msgstr ""
-
-#: lib/read.c:75
-#, c-format
-msgid "read %d bytes"
-msgstr ""
-
-#: lib/read_data.c:49
-msgid "read data size"
-msgstr ""
-
-#: lib/read_data.c:66
-#, c-format
-msgid "read data %d bytes"
-msgstr ""
-
-#: lib/write.c:48
-#, c-format
-msgid "write %d bytes"
-msgstr ""
-
-#: src/daemon/gnuserv.c:448
-msgid "Enable debugging"
-msgstr ""
-
-#: src/daemon/gnuserv.c:448
-msgid "DEBUG"
-msgstr ""
-
-#: src/daemon/gnuserv.c:450
-msgid "Enable verbose output"
-msgstr ""
-
-#: src/daemon/gnuserv.c:450
-msgid "VERBOSE"
-msgstr ""
-
-#: src/daemon/gnuserv.c:452
-msgid "Don't fork into background"
-msgstr ""
-
-#: src/daemon/gnuserv.c:452
-msgid "NO-DAEMON"
-msgstr ""
-
-#: src/daemon/gnuserv.c:454
-msgid "Invoked from inetd"
-msgstr ""
-
-#: src/daemon/gnuserv.c:454
-msgid "INETD"
-msgstr ""
-
-#: src/daemon/gnuserv.c:488
-#, c-format
-msgid ""
-"Error on option %s: %s.\n"
-"Run '%s --help' to see a full list of available command line options.\n"
-msgstr ""
-
-#: support/error.c:109
-msgid "Unknown system error"
-msgstr ""
-
-#: support/getopt.c:669
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr ""
-
-#: support/getopt.c:693
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr ""
-
-#: support/getopt.c:698
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr ""
-
-#: support/getopt.c:715 support/getopt.c:888
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr ""
-
-#. --option
-#: support/getopt.c:744
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr ""
-
-#. +option or -option
-#: support/getopt.c:748
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr ""
-
-#. 1003.2 specifies the format of this message.
-#: support/getopt.c:774
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr ""
-
-#: support/getopt.c:777
-#, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr ""
-
-#. 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 ""
-
-#: support/getopt.c:854
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr ""
-
-#: support/getopt.c:872
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr ""
 
 #: sysdeps/names/cpu.c:43
 msgid "Total CPU Time"
@@ -359,6 +162,10 @@ msgstr ""
 msgid "Cached"
 msgstr ""
 
+#: sysdeps/names/mem.c:47
+msgid "User"
+msgstr ""
+
 #: sysdeps/names/mem.c:48
 msgid "Locked"
 msgstr ""
@@ -441,94 +248,6 @@ msgstr ""
 msgid "Number of system message headers"
 msgstr ""
 
-#: sysdeps/names/netload.c:45 sysdeps/names/netload.c:63
-msgid "Interface Flags"
-msgstr ""
-
-#: sysdeps/names/netload.c:46
-msgid "MTU"
-msgstr ""
-
-#: sysdeps/names/netload.c:47 sysdeps/names/netload.c:65
-msgid "Subnet"
-msgstr ""
-
-#: sysdeps/names/netload.c:48 sysdeps/names/netload.c:66
-msgid "Address"
-msgstr ""
-
-#: sysdeps/names/netload.c:49 sysdeps/names/netload.c:67
-msgid "Packets In"
-msgstr ""
-
-#: sysdeps/names/netload.c:50 sysdeps/names/netload.c:68
-msgid "Packets Out"
-msgstr ""
-
-#: sysdeps/names/netload.c:51 sysdeps/names/netload.c:69
-msgid "Packets Total"
-msgstr ""
-
-#: sysdeps/names/netload.c:52 sysdeps/names/netload.c:70
-msgid "Bytes In"
-msgstr ""
-
-#: sysdeps/names/netload.c:53 sysdeps/names/netload.c:71
-msgid "Bytes Out"
-msgstr ""
-
-#: sysdeps/names/netload.c:54 sysdeps/names/netload.c:72
-msgid "Bytes Total"
-msgstr ""
-
-#: sysdeps/names/netload.c:55 sysdeps/names/netload.c:73
-msgid "Errors In"
-msgstr ""
-
-#: sysdeps/names/netload.c:56 sysdeps/names/netload.c:74
-msgid "Errors Out"
-msgstr ""
-
-#: sysdeps/names/netload.c:57 sysdeps/names/netload.c:75
-msgid "Errors Total"
-msgstr ""
-
-#: sysdeps/names/netload.c:58 sysdeps/names/netload.c:76
-msgid "Collisions"
-msgstr ""
-
-#: sysdeps/names/netload.c:64
-msgid "Maximum Transfer Unit"
-msgstr ""
-
-#: sysdeps/names/ppp.c:38 sysdeps/names/ppp.c:45
-msgid "PPP State"
-msgstr ""
-
-#: sysdeps/names/ppp.c:39
-msgid "Input bytes"
-msgstr ""
-
-#: sysdeps/names/ppp.c:40
-msgid "Output bytes"
-msgstr ""
-
-#: sysdeps/names/ppp.c:46
-msgid "Number of input bytes"
-msgstr ""
-
-#: sysdeps/names/ppp.c:47
-msgid "Number of output bytes"
-msgstr ""
-
-#: sysdeps/names/procargs.c:38 sysdeps/names/procmem.c:47
-msgid "Size"
-msgstr ""
-
-#: sysdeps/names/procargs.c:43
-msgid "Length in bytes of the returned string."
-msgstr ""
-
 #: sysdeps/names/prockernel.c:42
 msgid "K_Flags"
 msgstr ""
@@ -628,6 +347,10 @@ msgstr ""
 msgid "This is the textual name of the `nwchan' field."
 msgstr ""
 
+#: sysdeps/names/procmem.c:47
+msgid "Size"
+msgstr ""
+
 #: sysdeps/names/procmem.c:47
 msgid "Virtual"
 msgstr ""
@@ -657,7 +380,7 @@ msgid "Number of pages of virtual memory"
 msgstr ""
 
 #: sysdeps/names/procmem.c:55
-msgid "Number of resident set (non-swapped) pages"
+msgid "Number of residnet set (non-swapped) pages"
 msgstr ""
 
 #: sysdeps/names/procmem.c:56
@@ -950,6 +673,10 @@ msgstr ""
 msgid "Priority"
 msgstr ""
 
+#: sysdeps/names/procuid.c:58
+msgid "Nice"
+msgstr ""
+
 #: sysdeps/names/procuid.c:63
 msgid "User ID"
 msgstr ""
@@ -1202,126 +929,123 @@ msgstr ""
 msgid "Time in seconds the system spent in the idle task since system boot"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:28 sysdeps/sun4/siglist.c:28
+#: support/error.c:109
-msgid "Hangup"
+msgid "Unknown system error"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:29 sysdeps/sun4/siglist.c:29
+#: support/getopt.c:669
-msgid "Interrupt"
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:30 sysdeps/sun4/siglist.c:30
+#: support/getopt.c:693
-msgid "Quit"
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:31 sysdeps/sun4/siglist.c:31
+#: support/getopt.c:698
-msgid "Illegal instruction"
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:32 sysdeps/sun4/siglist.c:32
+#: support/getopt.c:715 support/getopt.c:888
-msgid "Trace trap"
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:33 sysdeps/sun4/siglist.c:33
+#. --option
-msgid "Abort"
+#: support/getopt.c:744
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:34 sysdeps/sun4/siglist.c:34
+#. +option or -option
-msgid "EMT error"
+#: support/getopt.c:748
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:35 sysdeps/sun4/siglist.c:35
+#. 1003.2 specifies the format of this message.
-msgid "Floating-point exception"
+#: support/getopt.c:774
+#, c-format
+msgid "%s: illegal option -- %c\n"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:36 sysdeps/sun4/siglist.c:36
+#: support/getopt.c:777
-msgid "Kill"
+#, c-format
+msgid "%s: invalid option -- %c\n"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:37 sysdeps/sun4/siglist.c:37
+#. 1003.2 specifies the format of this message.
-msgid "Bus error"
+#: support/getopt.c:807 support/getopt.c:937
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:38 sysdeps/sun4/siglist.c:38
+#: support/getopt.c:854
-msgid "Segmentation violation"
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:39 sysdeps/sun4/siglist.c:39
+#: support/getopt.c:872
-msgid "Bad argument to system call"
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:40 sysdeps/sun4/siglist.c:40
+#: lib/read.c:71
-msgid "Broken pipe"
+#, c-format
+msgid "read %d bytes"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:41 sysdeps/sun4/siglist.c:41
+#: lib/read_data.c:49
-msgid "Alarm clock"
+msgid "read data size"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:42 sysdeps/sun4/siglist.c:42
+#: lib/read_data.c:66
-msgid "Termination"
+#, c-format
+msgid "read data %d bytes"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:43 sysdeps/sun4/siglist.c:43
+#: lib/write.c:48
-msgid "Urgent condition on socket"
+#, c-format
+msgid "write %d bytes"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:44 sysdeps/sun4/siglist.c:44
+#: src/daemon/gnuserv.c:445
-msgid "Stop"
+msgid "Enable debugging"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:45 sysdeps/sun4/siglist.c:45
+#: src/daemon/gnuserv.c:445
-msgid "Keyboard stop"
+msgid "DEBUG"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:46 sysdeps/sun4/siglist.c:46
+#: src/daemon/gnuserv.c:447
-msgid "Continue"
+msgid "Enable verbose output"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:47 sysdeps/sun4/siglist.c:47
+#: src/daemon/gnuserv.c:447
-msgid "Child status has changed"
+msgid "VERBOSE"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:48 sysdeps/sun4/siglist.c:48
+#: src/daemon/gnuserv.c:449
-msgid "Background read from tty"
+msgid "Don't fork into background"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:49 sysdeps/sun4/siglist.c:49
+#: src/daemon/gnuserv.c:449
-msgid "Background write to tty"
+msgid "NO-DAEMON"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:50 sysdeps/sun4/siglist.c:50
+#: src/daemon/gnuserv.c:451
-msgid "I/O now possible"
+msgid "Invoked from inetd"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:51 sysdeps/sun4/siglist.c:51
+#: src/daemon/gnuserv.c:451
-msgid "CPU limit exceeded"
+msgid "INETD"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:52 sysdeps/sun4/siglist.c:52
+#: src/daemon/gnuserv.c:485
-msgid "File size limit exceeded"
+#, c-format
-msgstr ""
+msgid ""
-
+"Error on option %s: %s.\n"
-#: sysdeps/osf1/siglist.c:53 sysdeps/sun4/siglist.c:53
+"Run '%s --help' to see a full list of available command line options.\n"
-msgid "Virtual alarm clock"
-msgstr ""
-
-#: 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
-msgid "Window size change"
-msgstr ""
-
-#: sysdeps/osf1/siglist.c:56 sysdeps/sun4/siglist.c:56
-msgid "Information request"
-msgstr ""
-
-#: sysdeps/osf1/siglist.c:57 sysdeps/sun4/siglist.c:57
-msgid "User defined signal 1"
-msgstr ""
-
-#: sysdeps/osf1/siglist.c:58 sysdeps/sun4/siglist.c:58
-msgid "User defined signal 2"
 msgstr ""

po/es_PE.po

@@ -2,214 +2,17 @@
 # Copyright (C) YEAR Free Software Foundation, Inc.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: glibtop cvs\n"
+"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2001-02-13 13:30+0100\n"
+"POT-Creation-Date: 1999-03-01 22:58+0100\n"
-"PO-Revision-Date: 1998-12-13 04:38+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Pablo Saratxaga <srtxg@chanae.alphanet.ch>\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Pablo Saratxaga <srtxg@chanae.alphanet.ch>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
+"Content-Transfer-Encoding: ENCODING\n"
-
-#: examples/smp.c:68
-#, c-format
-msgid "Ticks (%ld per second):"
-msgstr ""
-
-#: examples/smp.c:71
-msgid "Total"
-msgstr ""
-
-#: examples/smp.c:71 sysdeps/names/mem.c:47
-msgid "User"
-msgstr ""
-
-#: examples/smp.c:71 sysdeps/names/procuid.c:58
-msgid "Nice"
-msgstr ""
-
-#: examples/smp.c:71
-msgid "Sys"
-msgstr ""
-
-#: examples/smp.c:71
-msgid "Idle"
-msgstr ""
-
-#: examples/smp.c:73
-#, c-format
-msgid ""
-"CPU          (0x%08lx): %12.0f %12.0f %12.0f %12.0f %12.0f\n"
-"\n"
-msgstr ""
-
-#: examples/smp.c:77
-#, c-format
-msgid "CPU %3d      (0x%08lx): %12lu %12lu %12lu %12lu %12lu\n"
-msgstr ""
-
-#: examples/smp.c:94
-msgid "Percent:"
-msgstr ""
-
-#: examples/smp.c:95
-msgid "Total (%)"
-msgstr ""
-
-#: examples/smp.c:95
-msgid "User (%)"
-msgstr ""
-
-#: examples/smp.c:95
-msgid "Nice (%)"
-msgstr ""
-
-#: examples/smp.c:95
-msgid "Sys (%)"
-msgstr ""
-
-#: examples/smp.c:96
-msgid "Idle (%)"
-msgstr ""
-
-#: examples/smp.c:98
-#, c-format
-msgid ""
-"CPU          (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
-"\n"
-msgstr ""
-
-#: examples/smp.c:114
-#, c-format
-msgid "CPU %3d      (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
-msgstr ""
-
-#: examples/smp.c:120
-msgid "Spin:"
-msgstr ""
-
-#: lib/read.c:75
-#, c-format
-msgid "read %d bytes"
-msgstr ""
-
-#: lib/read_data.c:49
-msgid "read data size"
-msgstr ""
-
-#: lib/read_data.c:66
-#, c-format
-msgid "read data %d bytes"
-msgstr ""
-
-#: lib/write.c:48
-#, c-format
-msgid "write %d bytes"
-msgstr ""
-
-#: src/daemon/gnuserv.c:448
-msgid "Enable debugging"
-msgstr ""
-
-#: src/daemon/gnuserv.c:448
-msgid "DEBUG"
-msgstr ""
-
-#: src/daemon/gnuserv.c:450
-msgid "Enable verbose output"
-msgstr ""
-
-#: src/daemon/gnuserv.c:450
-msgid "VERBOSE"
-msgstr ""
-
-#: src/daemon/gnuserv.c:452
-msgid "Don't fork into background"
-msgstr ""
-
-#: src/daemon/gnuserv.c:452
-msgid "NO-DAEMON"
-msgstr ""
-
-#: src/daemon/gnuserv.c:454
-msgid "Invoked from inetd"
-msgstr ""
-
-#: src/daemon/gnuserv.c:454
-msgid "INETD"
-msgstr ""
-
-#: src/daemon/gnuserv.c:488
-#, c-format
-msgid ""
-"Error on option %s: %s.\n"
-"Run '%s --help' to see a full list of available command line options.\n"
-msgstr ""
-
-#: support/error.c:109
-msgid "Unknown system error"
-msgstr ""
-
-#: support/getopt.c:669
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr ""
-
-#: support/getopt.c:693
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr ""
-
-#: support/getopt.c:698
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr ""
-
-#: support/getopt.c:715 support/getopt.c:888
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr ""
-
-#. --option
-#: support/getopt.c:744
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr ""
-
-#. +option or -option
-#: support/getopt.c:748
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr ""
-
-#. 1003.2 specifies the format of this message.
-#: support/getopt.c:774
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr ""
-
-#: support/getopt.c:777
-#, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr ""
-
-#. 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 ""
-
-#: support/getopt.c:854
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr ""
-
-#: support/getopt.c:872
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr ""
 
 #: sysdeps/names/cpu.c:43
 msgid "Total CPU Time"
@@ -359,6 +162,10 @@ msgstr ""
 msgid "Cached"
 msgstr ""
 
+#: sysdeps/names/mem.c:47
+msgid "User"
+msgstr ""
+
 #: sysdeps/names/mem.c:48
 msgid "Locked"
 msgstr ""
@@ -441,94 +248,6 @@ msgstr ""
 msgid "Number of system message headers"
 msgstr ""
 
-#: sysdeps/names/netload.c:45 sysdeps/names/netload.c:63
-msgid "Interface Flags"
-msgstr ""
-
-#: sysdeps/names/netload.c:46
-msgid "MTU"
-msgstr ""
-
-#: sysdeps/names/netload.c:47 sysdeps/names/netload.c:65
-msgid "Subnet"
-msgstr ""
-
-#: sysdeps/names/netload.c:48 sysdeps/names/netload.c:66
-msgid "Address"
-msgstr ""
-
-#: sysdeps/names/netload.c:49 sysdeps/names/netload.c:67
-msgid "Packets In"
-msgstr ""
-
-#: sysdeps/names/netload.c:50 sysdeps/names/netload.c:68
-msgid "Packets Out"
-msgstr ""
-
-#: sysdeps/names/netload.c:51 sysdeps/names/netload.c:69
-msgid "Packets Total"
-msgstr ""
-
-#: sysdeps/names/netload.c:52 sysdeps/names/netload.c:70
-msgid "Bytes In"
-msgstr ""
-
-#: sysdeps/names/netload.c:53 sysdeps/names/netload.c:71
-msgid "Bytes Out"
-msgstr ""
-
-#: sysdeps/names/netload.c:54 sysdeps/names/netload.c:72
-msgid "Bytes Total"
-msgstr ""
-
-#: sysdeps/names/netload.c:55 sysdeps/names/netload.c:73
-msgid "Errors In"
-msgstr ""
-
-#: sysdeps/names/netload.c:56 sysdeps/names/netload.c:74
-msgid "Errors Out"
-msgstr ""
-
-#: sysdeps/names/netload.c:57 sysdeps/names/netload.c:75
-msgid "Errors Total"
-msgstr ""
-
-#: sysdeps/names/netload.c:58 sysdeps/names/netload.c:76
-msgid "Collisions"
-msgstr ""
-
-#: sysdeps/names/netload.c:64
-msgid "Maximum Transfer Unit"
-msgstr ""
-
-#: sysdeps/names/ppp.c:38 sysdeps/names/ppp.c:45
-msgid "PPP State"
-msgstr ""
-
-#: sysdeps/names/ppp.c:39
-msgid "Input bytes"
-msgstr ""
-
-#: sysdeps/names/ppp.c:40
-msgid "Output bytes"
-msgstr ""
-
-#: sysdeps/names/ppp.c:46
-msgid "Number of input bytes"
-msgstr ""
-
-#: sysdeps/names/ppp.c:47
-msgid "Number of output bytes"
-msgstr ""
-
-#: sysdeps/names/procargs.c:38 sysdeps/names/procmem.c:47
-msgid "Size"
-msgstr ""
-
-#: sysdeps/names/procargs.c:43
-msgid "Length in bytes of the returned string."
-msgstr ""
-
 #: sysdeps/names/prockernel.c:42
 msgid "K_Flags"
 msgstr ""
@@ -628,6 +347,10 @@ msgstr ""
 msgid "This is the textual name of the `nwchan' field."
 msgstr ""
 
+#: sysdeps/names/procmem.c:47
+msgid "Size"
+msgstr ""
+
 #: sysdeps/names/procmem.c:47
 msgid "Virtual"
 msgstr ""
@@ -657,7 +380,7 @@ msgid "Number of pages of virtual memory"
 msgstr ""
 
 #: sysdeps/names/procmem.c:55
-msgid "Number of resident set (non-swapped) pages"
+msgid "Number of residnet set (non-swapped) pages"
 msgstr ""
 
 #: sysdeps/names/procmem.c:56
@@ -950,6 +673,10 @@ msgstr ""
 msgid "Priority"
 msgstr ""
 
+#: sysdeps/names/procuid.c:58
+msgid "Nice"
+msgstr ""
+
 #: sysdeps/names/procuid.c:63
 msgid "User ID"
 msgstr ""
@@ -1202,126 +929,123 @@ msgstr ""
 msgid "Time in seconds the system spent in the idle task since system boot"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:28 sysdeps/sun4/siglist.c:28
+#: support/error.c:109
-msgid "Hangup"
+msgid "Unknown system error"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:29 sysdeps/sun4/siglist.c:29
+#: support/getopt.c:669
-msgid "Interrupt"
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:30 sysdeps/sun4/siglist.c:30
+#: support/getopt.c:693
-msgid "Quit"
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:31 sysdeps/sun4/siglist.c:31
+#: support/getopt.c:698
-msgid "Illegal instruction"
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:32 sysdeps/sun4/siglist.c:32
+#: support/getopt.c:715 support/getopt.c:888
-msgid "Trace trap"
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:33 sysdeps/sun4/siglist.c:33
+#. --option
-msgid "Abort"
+#: support/getopt.c:744
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:34 sysdeps/sun4/siglist.c:34
+#. +option or -option
-msgid "EMT error"
+#: support/getopt.c:748
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:35 sysdeps/sun4/siglist.c:35
+#. 1003.2 specifies the format of this message.
-msgid "Floating-point exception"
+#: support/getopt.c:774
+#, c-format
+msgid "%s: illegal option -- %c\n"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:36 sysdeps/sun4/siglist.c:36
+#: support/getopt.c:777
-msgid "Kill"
+#, c-format
+msgid "%s: invalid option -- %c\n"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:37 sysdeps/sun4/siglist.c:37
+#. 1003.2 specifies the format of this message.
-msgid "Bus error"
+#: support/getopt.c:807 support/getopt.c:937
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:38 sysdeps/sun4/siglist.c:38
+#: support/getopt.c:854
-msgid "Segmentation violation"
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:39 sysdeps/sun4/siglist.c:39
+#: support/getopt.c:872
-msgid "Bad argument to system call"
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:40 sysdeps/sun4/siglist.c:40
+#: lib/read.c:71
-msgid "Broken pipe"
+#, c-format
+msgid "read %d bytes"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:41 sysdeps/sun4/siglist.c:41
+#: lib/read_data.c:49
-msgid "Alarm clock"
+msgid "read data size"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:42 sysdeps/sun4/siglist.c:42
+#: lib/read_data.c:66
-msgid "Termination"
+#, c-format
+msgid "read data %d bytes"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:43 sysdeps/sun4/siglist.c:43
+#: lib/write.c:48
-msgid "Urgent condition on socket"
+#, c-format
+msgid "write %d bytes"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:44 sysdeps/sun4/siglist.c:44
+#: src/daemon/gnuserv.c:445
-msgid "Stop"
+msgid "Enable debugging"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:45 sysdeps/sun4/siglist.c:45
+#: src/daemon/gnuserv.c:445
-msgid "Keyboard stop"
+msgid "DEBUG"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:46 sysdeps/sun4/siglist.c:46
+#: src/daemon/gnuserv.c:447
-msgid "Continue"
+msgid "Enable verbose output"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:47 sysdeps/sun4/siglist.c:47
+#: src/daemon/gnuserv.c:447
-msgid "Child status has changed"
+msgid "VERBOSE"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:48 sysdeps/sun4/siglist.c:48
+#: src/daemon/gnuserv.c:449
-msgid "Background read from tty"
+msgid "Don't fork into background"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:49 sysdeps/sun4/siglist.c:49
+#: src/daemon/gnuserv.c:449
-msgid "Background write to tty"
+msgid "NO-DAEMON"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:50 sysdeps/sun4/siglist.c:50
+#: src/daemon/gnuserv.c:451
-msgid "I/O now possible"
+msgid "Invoked from inetd"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:51 sysdeps/sun4/siglist.c:51
+#: src/daemon/gnuserv.c:451
-msgid "CPU limit exceeded"
+msgid "INETD"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:52 sysdeps/sun4/siglist.c:52
+#: src/daemon/gnuserv.c:485
-msgid "File size limit exceeded"
+#, c-format
-msgstr ""
+msgid ""
-
+"Error on option %s: %s.\n"
-#: sysdeps/osf1/siglist.c:53 sysdeps/sun4/siglist.c:53
+"Run '%s --help' to see a full list of available command line options.\n"
-msgid "Virtual alarm clock"
-msgstr ""
-
-#: 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
-msgid "Window size change"
-msgstr ""
-
-#: sysdeps/osf1/siglist.c:56 sysdeps/sun4/siglist.c:56
-msgid "Information request"
-msgstr ""
-
-#: sysdeps/osf1/siglist.c:57 sysdeps/sun4/siglist.c:57
-msgid "User defined signal 1"
-msgstr ""
-
-#: sysdeps/osf1/siglist.c:58 sysdeps/sun4/siglist.c:58
-msgid "User defined signal 2"
 msgstr ""

po/es_SV.po

@@ -2,214 +2,17 @@
 # Copyright (C) YEAR Free Software Foundation, Inc.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: glibtop cvs\n"
+"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2001-02-13 13:30+0100\n"
+"POT-Creation-Date: 1999-03-01 22:58+0100\n"
-"PO-Revision-Date: 1998-12-13 04:38+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Pablo Saratxaga <srtxg@chanae.alphanet.ch>\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Pablo Saratxaga <srtxg@chanae.alphanet.ch>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
+"Content-Transfer-Encoding: ENCODING\n"
-
-#: examples/smp.c:68
-#, c-format
-msgid "Ticks (%ld per second):"
-msgstr ""
-
-#: examples/smp.c:71
-msgid "Total"
-msgstr ""
-
-#: examples/smp.c:71 sysdeps/names/mem.c:47
-msgid "User"
-msgstr ""
-
-#: examples/smp.c:71 sysdeps/names/procuid.c:58
-msgid "Nice"
-msgstr ""
-
-#: examples/smp.c:71
-msgid "Sys"
-msgstr ""
-
-#: examples/smp.c:71
-msgid "Idle"
-msgstr ""
-
-#: examples/smp.c:73
-#, c-format
-msgid ""
-"CPU          (0x%08lx): %12.0f %12.0f %12.0f %12.0f %12.0f\n"
-"\n"
-msgstr ""
-
-#: examples/smp.c:77
-#, c-format
-msgid "CPU %3d      (0x%08lx): %12lu %12lu %12lu %12lu %12lu\n"
-msgstr ""
-
-#: examples/smp.c:94
-msgid "Percent:"
-msgstr ""
-
-#: examples/smp.c:95
-msgid "Total (%)"
-msgstr ""
-
-#: examples/smp.c:95
-msgid "User (%)"
-msgstr ""
-
-#: examples/smp.c:95
-msgid "Nice (%)"
-msgstr ""
-
-#: examples/smp.c:95
-msgid "Sys (%)"
-msgstr ""
-
-#: examples/smp.c:96
-msgid "Idle (%)"
-msgstr ""
-
-#: examples/smp.c:98
-#, c-format
-msgid ""
-"CPU          (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
-"\n"
-msgstr ""
-
-#: examples/smp.c:114
-#, c-format
-msgid "CPU %3d      (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
-msgstr ""
-
-#: examples/smp.c:120
-msgid "Spin:"
-msgstr ""
-
-#: lib/read.c:75
-#, c-format
-msgid "read %d bytes"
-msgstr ""
-
-#: lib/read_data.c:49
-msgid "read data size"
-msgstr ""
-
-#: lib/read_data.c:66
-#, c-format
-msgid "read data %d bytes"
-msgstr ""
-
-#: lib/write.c:48
-#, c-format
-msgid "write %d bytes"
-msgstr ""
-
-#: src/daemon/gnuserv.c:448
-msgid "Enable debugging"
-msgstr ""
-
-#: src/daemon/gnuserv.c:448
-msgid "DEBUG"
-msgstr ""
-
-#: src/daemon/gnuserv.c:450
-msgid "Enable verbose output"
-msgstr ""
-
-#: src/daemon/gnuserv.c:450
-msgid "VERBOSE"
-msgstr ""
-
-#: src/daemon/gnuserv.c:452
-msgid "Don't fork into background"
-msgstr ""
-
-#: src/daemon/gnuserv.c:452
-msgid "NO-DAEMON"
-msgstr ""
-
-#: src/daemon/gnuserv.c:454
-msgid "Invoked from inetd"
-msgstr ""
-
-#: src/daemon/gnuserv.c:454
-msgid "INETD"
-msgstr ""
-
-#: src/daemon/gnuserv.c:488
-#, c-format
-msgid ""
-"Error on option %s: %s.\n"
-"Run '%s --help' to see a full list of available command line options.\n"
-msgstr ""
-
-#: support/error.c:109
-msgid "Unknown system error"
-msgstr ""
-
-#: support/getopt.c:669
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr ""
-
-#: support/getopt.c:693
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr ""
-
-#: support/getopt.c:698
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr ""
-
-#: support/getopt.c:715 support/getopt.c:888
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr ""
-
-#. --option
-#: support/getopt.c:744
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr ""
-
-#. +option or -option
-#: support/getopt.c:748
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr ""
-
-#. 1003.2 specifies the format of this message.
-#: support/getopt.c:774
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr ""
-
-#: support/getopt.c:777
-#, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr ""
-
-#. 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 ""
-
-#: support/getopt.c:854
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr ""
-
-#: support/getopt.c:872
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr ""
 
 #: sysdeps/names/cpu.c:43
 msgid "Total CPU Time"
@@ -359,6 +162,10 @@ msgstr ""
 msgid "Cached"
 msgstr ""
 
+#: sysdeps/names/mem.c:47
+msgid "User"
+msgstr ""
+
 #: sysdeps/names/mem.c:48
 msgid "Locked"
 msgstr ""
@@ -441,94 +248,6 @@ msgstr ""
 msgid "Number of system message headers"
 msgstr ""
 
-#: sysdeps/names/netload.c:45 sysdeps/names/netload.c:63
-msgid "Interface Flags"
-msgstr ""
-
-#: sysdeps/names/netload.c:46
-msgid "MTU"
-msgstr ""
-
-#: sysdeps/names/netload.c:47 sysdeps/names/netload.c:65
-msgid "Subnet"
-msgstr ""
-
-#: sysdeps/names/netload.c:48 sysdeps/names/netload.c:66
-msgid "Address"
-msgstr ""
-
-#: sysdeps/names/netload.c:49 sysdeps/names/netload.c:67
-msgid "Packets In"
-msgstr ""
-
-#: sysdeps/names/netload.c:50 sysdeps/names/netload.c:68
-msgid "Packets Out"
-msgstr ""
-
-#: sysdeps/names/netload.c:51 sysdeps/names/netload.c:69
-msgid "Packets Total"
-msgstr ""
-
-#: sysdeps/names/netload.c:52 sysdeps/names/netload.c:70
-msgid "Bytes In"
-msgstr ""
-
-#: sysdeps/names/netload.c:53 sysdeps/names/netload.c:71
-msgid "Bytes Out"
-msgstr ""
-
-#: sysdeps/names/netload.c:54 sysdeps/names/netload.c:72
-msgid "Bytes Total"
-msgstr ""
-
-#: sysdeps/names/netload.c:55 sysdeps/names/netload.c:73
-msgid "Errors In"
-msgstr ""
-
-#: sysdeps/names/netload.c:56 sysdeps/names/netload.c:74
-msgid "Errors Out"
-msgstr ""
-
-#: sysdeps/names/netload.c:57 sysdeps/names/netload.c:75
-msgid "Errors Total"
-msgstr ""
-
-#: sysdeps/names/netload.c:58 sysdeps/names/netload.c:76
-msgid "Collisions"
-msgstr ""
-
-#: sysdeps/names/netload.c:64
-msgid "Maximum Transfer Unit"
-msgstr ""
-
-#: sysdeps/names/ppp.c:38 sysdeps/names/ppp.c:45
-msgid "PPP State"
-msgstr ""
-
-#: sysdeps/names/ppp.c:39
-msgid "Input bytes"
-msgstr ""
-
-#: sysdeps/names/ppp.c:40
-msgid "Output bytes"
-msgstr ""
-
-#: sysdeps/names/ppp.c:46
-msgid "Number of input bytes"
-msgstr ""
-
-#: sysdeps/names/ppp.c:47
-msgid "Number of output bytes"
-msgstr ""
-
-#: sysdeps/names/procargs.c:38 sysdeps/names/procmem.c:47
-msgid "Size"
-msgstr ""
-
-#: sysdeps/names/procargs.c:43
-msgid "Length in bytes of the returned string."
-msgstr ""
-
 #: sysdeps/names/prockernel.c:42
 msgid "K_Flags"
 msgstr ""
@@ -628,6 +347,10 @@ msgstr ""
 msgid "This is the textual name of the `nwchan' field."
 msgstr ""
 
+#: sysdeps/names/procmem.c:47
+msgid "Size"
+msgstr ""
+
 #: sysdeps/names/procmem.c:47
 msgid "Virtual"
 msgstr ""
@@ -657,7 +380,7 @@ msgid "Number of pages of virtual memory"
 msgstr ""
 
 #: sysdeps/names/procmem.c:55
-msgid "Number of resident set (non-swapped) pages"
+msgid "Number of residnet set (non-swapped) pages"
 msgstr ""
 
 #: sysdeps/names/procmem.c:56
@@ -950,6 +673,10 @@ msgstr ""
 msgid "Priority"
 msgstr ""
 
+#: sysdeps/names/procuid.c:58
+msgid "Nice"
+msgstr ""
+
 #: sysdeps/names/procuid.c:63
 msgid "User ID"
 msgstr ""
@@ -1202,126 +929,123 @@ msgstr ""
 msgid "Time in seconds the system spent in the idle task since system boot"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:28 sysdeps/sun4/siglist.c:28
+#: support/error.c:109
-msgid "Hangup"
+msgid "Unknown system error"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:29 sysdeps/sun4/siglist.c:29
+#: support/getopt.c:669
-msgid "Interrupt"
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:30 sysdeps/sun4/siglist.c:30
+#: support/getopt.c:693
-msgid "Quit"
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:31 sysdeps/sun4/siglist.c:31
+#: support/getopt.c:698
-msgid "Illegal instruction"
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:32 sysdeps/sun4/siglist.c:32
+#: support/getopt.c:715 support/getopt.c:888
-msgid "Trace trap"
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:33 sysdeps/sun4/siglist.c:33
+#. --option
-msgid "Abort"
+#: support/getopt.c:744
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:34 sysdeps/sun4/siglist.c:34
+#. +option or -option
-msgid "EMT error"
+#: support/getopt.c:748
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:35 sysdeps/sun4/siglist.c:35
+#. 1003.2 specifies the format of this message.
-msgid "Floating-point exception"
+#: support/getopt.c:774
+#, c-format
+msgid "%s: illegal option -- %c\n"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:36 sysdeps/sun4/siglist.c:36
+#: support/getopt.c:777
-msgid "Kill"
+#, c-format
+msgid "%s: invalid option -- %c\n"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:37 sysdeps/sun4/siglist.c:37
+#. 1003.2 specifies the format of this message.
-msgid "Bus error"
+#: support/getopt.c:807 support/getopt.c:937
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:38 sysdeps/sun4/siglist.c:38
+#: support/getopt.c:854
-msgid "Segmentation violation"
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:39 sysdeps/sun4/siglist.c:39
+#: support/getopt.c:872
-msgid "Bad argument to system call"
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:40 sysdeps/sun4/siglist.c:40
+#: lib/read.c:71
-msgid "Broken pipe"
+#, c-format
+msgid "read %d bytes"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:41 sysdeps/sun4/siglist.c:41
+#: lib/read_data.c:49
-msgid "Alarm clock"
+msgid "read data size"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:42 sysdeps/sun4/siglist.c:42
+#: lib/read_data.c:66
-msgid "Termination"
+#, c-format
+msgid "read data %d bytes"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:43 sysdeps/sun4/siglist.c:43
+#: lib/write.c:48
-msgid "Urgent condition on socket"
+#, c-format
+msgid "write %d bytes"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:44 sysdeps/sun4/siglist.c:44
+#: src/daemon/gnuserv.c:445
-msgid "Stop"
+msgid "Enable debugging"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:45 sysdeps/sun4/siglist.c:45
+#: src/daemon/gnuserv.c:445
-msgid "Keyboard stop"
+msgid "DEBUG"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:46 sysdeps/sun4/siglist.c:46
+#: src/daemon/gnuserv.c:447
-msgid "Continue"
+msgid "Enable verbose output"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:47 sysdeps/sun4/siglist.c:47
+#: src/daemon/gnuserv.c:447
-msgid "Child status has changed"
+msgid "VERBOSE"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:48 sysdeps/sun4/siglist.c:48
+#: src/daemon/gnuserv.c:449
-msgid "Background read from tty"
+msgid "Don't fork into background"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:49 sysdeps/sun4/siglist.c:49
+#: src/daemon/gnuserv.c:449
-msgid "Background write to tty"
+msgid "NO-DAEMON"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:50 sysdeps/sun4/siglist.c:50
+#: src/daemon/gnuserv.c:451
-msgid "I/O now possible"
+msgid "Invoked from inetd"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:51 sysdeps/sun4/siglist.c:51
+#: src/daemon/gnuserv.c:451
-msgid "CPU limit exceeded"
+msgid "INETD"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:52 sysdeps/sun4/siglist.c:52
+#: src/daemon/gnuserv.c:485
-msgid "File size limit exceeded"
+#, c-format
-msgstr ""
+msgid ""
-
+"Error on option %s: %s.\n"
-#: sysdeps/osf1/siglist.c:53 sysdeps/sun4/siglist.c:53
+"Run '%s --help' to see a full list of available command line options.\n"
-msgid "Virtual alarm clock"
-msgstr ""
-
-#: 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
-msgid "Window size change"
-msgstr ""
-
-#: sysdeps/osf1/siglist.c:56 sysdeps/sun4/siglist.c:56
-msgid "Information request"
-msgstr ""
-
-#: sysdeps/osf1/siglist.c:57 sysdeps/sun4/siglist.c:57
-msgid "User defined signal 1"
-msgstr ""
-
-#: sysdeps/osf1/siglist.c:58 sysdeps/sun4/siglist.c:58
-msgid "User defined signal 2"
 msgstr ""

po/ja.po

@@ -1,225 +1,17 @@
-# libgtop ja.po.
+# Copyright (C) 1998 Free Software Foundation, Inc.
-# Copyright (C) 1998,2000 Free Software Foundation, Inc.
 # Eiichiro ITANI <emu@ceres.dti.ne.jp>, 1998
-# Takayuki KUSANO <AE5T-KSN@asahi-net.or.jp>, 2000.
-# Yukihiro Nakai <nakai@gnome.gr.jp>, 2000.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: libgtop 1.0.10\n"
+"Project-Id-Version: libgtop VERSION\n"
-"POT-Creation-Date: 2001-02-13 13:30+0100\n"
+"POT-Creation-Date: 1999-03-01 22:58+0100\n"
-"PO-Revision-Date: 2000-10-15 03:24+0900\n"
+"PO-Revision-Date: 1998-12-11 06:53+09:00\n"
-"Last-Translator: Yukihiro Nakai <nakai@gnome.gr.jp>\n"
+"Last-Translator: Eiichiro ITANI <emu@ceres.dti.ne.jp>\n"
-"Language-Team: Japanese <translation@gnome.gr.jp>\n"
+"Language-Team: <gnome@lists.hypercore.co.jp>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=euc-jp\n"
+"Content-Type: text/plain; charset=euc-japan\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: examples/smp.c:68
-#, c-format
-msgid "Ticks (%ld per second):"
-msgstr "<22><> (<28><><EFBFBD>ä<EFBFBD>%ld):"
-
-#: examples/smp.c:71
-msgid "Total"
-msgstr "<22>ȡ<EFBFBD><C8A1><EFBFBD><EFBFBD><EFBFBD>"
-
-#: examples/smp.c:71 sysdeps/names/mem.c:47
-msgid "User"
-msgstr "<22>桼<EFBFBD><E6A1BC>"
-
-#: examples/smp.c:71 sysdeps/names/procuid.c:58
-msgid "Nice"
-msgstr "<22>ʥ<EFBFBD><CAA5><EFBFBD><EFBFBD><EFBFBD>"
-
-#: examples/smp.c:71
-msgid "Sys"
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD>ƥ<EFBFBD>"
-
-#: examples/smp.c:71
-msgid "Idle"
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD>ɥ<EFBFBD>"
-
-#: examples/smp.c:73
-#, c-format
-msgid ""
-"CPU          (0x%08lx): %12.0f %12.0f %12.0f %12.0f %12.0f\n"
-"\n"
-msgstr ""
-"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): %12lu %12lu %12lu %12lu %12lu\n"
-
-#: examples/smp.c:94
-msgid "Percent:"
-msgstr "<22>ѡ<EFBFBD><D1A1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:"
-
-#: examples/smp.c:95
-msgid "Total (%)"
-msgstr "<22>ȡ<EFBFBD><C8A1><EFBFBD><EFBFBD><EFBFBD> (%)"
-
-#: examples/smp.c:95
-msgid "User (%)"
-msgstr "<22>桼<EFBFBD><E6A1BC> (%)"
-
-#: examples/smp.c:95
-msgid "Nice (%)"
-msgstr "<22>ʥ<EFBFBD><CAA5><EFBFBD><EFBFBD><EFBFBD> (%)"
-
-#: examples/smp.c:95
-msgid "Sys (%)"
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD>ƥ<EFBFBD> (%)"
-
-#: examples/smp.c:96
-msgid "Idle (%)"
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD>ɥ<EFBFBD> (%)"
-
-#: examples/smp.c:98
-#, c-format
-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"
-
-#: examples/smp.c:120
-msgid "Spin:"
-msgstr "<22><><EFBFBD>ԥ<EFBFBD>:"
-
-#: lib/read.c:75
-#, c-format
-msgid "read %d bytes"
-msgstr "%d <20>Х<EFBFBD><D0A5><EFBFBD><EFBFBD>ɤ߹<C9A4><DFB9><EFBFBD>"
-
-#: lib/read_data.c:49
-msgid "read data size"
-msgstr "<22>ǡ<EFBFBD><C7A1><EFBFBD><EFBFBD>ɤߤ<C9A4><DFA4>ߤΥ<DFA4><CEA5><EFBFBD><EFBFBD><EFBFBD>"
-
-#: lib/read_data.c:66
-#, c-format
-msgid "read data %d bytes"
-msgstr "<22>ǡ<EFBFBD><C7A1><EFBFBD> %d <20>Х<EFBFBD><D0A5><EFBFBD><EFBFBD>ɤ߹<C9A4><DFB9><EFBFBD>"
-
-#: lib/write.c:48
-#, c-format
-msgid "write %d bytes"
-msgstr "%d <20>Х<EFBFBD><D0A5>Ƚ<EFBFBD><C8BD><EFBFBD>"
-
-#: src/daemon/gnuserv.c:448
-msgid "Enable debugging"
-msgstr "<22>ǥХå<D0A5><C3A5><EFBFBD>ͭ<EFBFBD><CDAD><EFBFBD>ˤ<EFBFBD><CBA4><EFBFBD>"
-
-#: src/daemon/gnuserv.c:448
-msgid "DEBUG"
-msgstr "<22>ǥХå<D0A5>"
-
-#: src/daemon/gnuserv.c:450
-msgid "Enable verbose output"
-msgstr "<22><>Ĺ<EFBFBD><C4B9><EFBFBD><EFBFBD>ͭ<EFBFBD><CDAD>"
-
-#: src/daemon/gnuserv.c:450
-msgid "VERBOSE"
-msgstr "<22>С<EFBFBD><D0A1>Х<EFBFBD>"
-
-#: src/daemon/gnuserv.c:452
-msgid "Don't fork into background"
-msgstr "<22>Хå<D0A5><C3A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ư<EFBFBD><EFBFBD>ʤ<EFBFBD>"
-
-#: src/daemon/gnuserv.c:452
-msgid "NO-DAEMON"
-msgstr "<22>ǡ<EFBFBD><C7A1><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʤ<EFBFBD>"
-
-#: src/daemon/gnuserv.c:454
-msgid "Invoked from inetd"
-msgstr "inetd <20><><EFBFBD>鵯ư"
-
-#: src/daemon/gnuserv.c:454
-msgid "INETD"
-msgstr "INETD"
-
-#: src/daemon/gnuserv.c:488
-#, c-format
-msgid ""
-"Error on option %s: %s.\n"
-"Run '%s --help' to see a full list of available command line options.\n"
-msgstr ""
-"<22><><EFBFBD>ץ<EFBFBD><D7A5><EFBFBD><EFBFBD><EFBFBD>%s<>ǥ<EFBFBD><C7A5>顼: %s\n"
-"<22><><EFBFBD>ޥ<EFBFBD><DEA5>ɥ饤<C9A5>󥪥ץ<F3A5AAA5><D7A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD>˻Ȥ<CBBB><C8A4><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ΰ<EFBFBD><CEB0><EFBFBD><EFBFBD>򸫤<EFBFBD><F2B8ABA4>ˤ<EFBFBD>'%s "
-"--help'<27><><EFBFBD>¹Ԥ<C2B9><D4A4>Ƥ<EFBFBD><C6A4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"
-
-#: support/error.c:109
-msgid "Unknown system error"
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD>ʥ<EFBFBD><CAA5><EFBFBD><EFBFBD>ƥ२<C6A5>顼"
-
-#: support/getopt.c:669
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: <20><><EFBFBD>ץ<EFBFBD><D7A5><EFBFBD><EFBFBD><EFBFBD>`%s'<27>Ϥ<EFBFBD><CFA4><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4>Ǥ<EFBFBD>\n"
-
-#: support/getopt.c:693
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s: <20><><EFBFBD>ץ<EFBFBD><D7A5><EFBFBD><EFBFBD><EFBFBD>`--%s'<27>ˤϰ<CBA4><CFB0><EFBFBD><EFBFBD>ϻ<EFBFBD><CFBB><EFBFBD><EFBFBD>Ǥ<EFBFBD><C7A4>ޤ<EFBFBD><DEA4><EFBFBD>\n"
-
-#: support/getopt.c:698
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr "%s: <20><><EFBFBD>ץ<EFBFBD><D7A5><EFBFBD><EFBFBD><EFBFBD>`%c%s'<27>ˤϰ<CBA4><CFB0><EFBFBD><EFBFBD>ϻ<EFBFBD><CFBB><EFBFBD><EFBFBD>Ǥ<EFBFBD><C7A4>ޤ<EFBFBD><DEA4><EFBFBD>\n"
-
-#: support/getopt.c:715 support/getopt.c:888
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: <20><><EFBFBD>ץ<EFBFBD><D7A5><EFBFBD><EFBFBD><EFBFBD>`%s'<27>ˤϰ<CBA4><CFB0><EFBFBD><EFBFBD><EFBFBD>ɬ<EFBFBD>פǤ<D7A4>\n"
-
-#. --option
-#: support/getopt.c:744
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: ǧ<><C7A7><EFBFBD>Ǥ<EFBFBD><C7A4>ʤ<EFBFBD><CAA4><EFBFBD><EFBFBD>ץ<EFBFBD><D7A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ǥ<EFBFBD> `--%s'\n"
-
-#. +option or -option
-#: support/getopt.c:748
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: ǧ<><C7A7><EFBFBD>Ǥ<EFBFBD><C7A4>ʤ<EFBFBD><CAA4><EFBFBD><EFBFBD>ץ<EFBFBD><D7A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ǥ<EFBFBD> `%c%s'\n"
-
-#. 1003.2 specifies the format of this message.
-#: support/getopt.c:774
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: <20><><EFBFBD><EFBFBD><EFBFBD>ʥ<EFBFBD><CAA5>ץ<EFBFBD><D7A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ǥ<EFBFBD>-- %c\n"
-
-#: support/getopt.c:777
-#, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr "%s: <20><>Ŭ<EFBFBD>ڤʥ<DAA4><CAA5>ץ<EFBFBD><D7A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ǥ<EFBFBD> -- %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: <20><><EFBFBD>ץ<EFBFBD><D7A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ˤϰ<CBA4><CFB0><EFBFBD><EFBFBD><EFBFBD>ɬ<EFBFBD>פǤ<D7A4> -- %c\n"
-
-#: support/getopt.c:854
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: <20><><EFBFBD>ץ<EFBFBD><D7A5><EFBFBD><EFBFBD><EFBFBD> `-W %s'<27>Ϥ<EFBFBD><CFA4><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4>Ǥ<EFBFBD>\n"
-
-#: support/getopt.c:872
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr "%s: <20><><EFBFBD>ץ<EFBFBD><D7A5><EFBFBD><EFBFBD><EFBFBD> `-W %s' <20>ϰ<EFBFBD><CFB0><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ȥ<EFBFBD><C8A4>ޤ<EFBFBD><DEA4><EFBFBD>\n"
-
 #: sysdeps/names/cpu.c:43
 msgid "Total CPU Time"
 msgstr "<22><><EFBFBD><EFBFBD>CPU<50><55><EFBFBD><EFBFBD>"
@@ -368,6 +160,10 @@ msgstr "
 msgid "Cached"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD>å<EFBFBD><C3A5><EFBFBD><EFBFBD><EFBFBD>"
 
+#: sysdeps/names/mem.c:47
+msgid "User"
+msgstr "<22>桼<EFBFBD><E6A1BC>"
+
 #: sysdeps/names/mem.c:48
 msgid "Locked"
 msgstr "<22><><EFBFBD>å<EFBFBD><C3A5><EFBFBD>"
@@ -450,129 +246,41 @@ msgstr "
 msgid "Number of system message headers"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD>ƥ<EFBFBD><C6A5><EFBFBD><EFBFBD>å<EFBFBD><C3A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD>إå<D8A5><C3A5>ο<EFBFBD>"
 
-#: sysdeps/names/netload.c:45 sysdeps/names/netload.c:63
-msgid "Interface Flags"
-msgstr "<22><><EFBFBD>󥿥ե<F3A5BFA5><D5A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ե饰"
-
-#: sysdeps/names/netload.c:46
-msgid "MTU"
-msgstr "MTU"
-
-#: sysdeps/names/netload.c:47 sysdeps/names/netload.c:65
-msgid "Subnet"
-msgstr "<22><><EFBFBD>֥ͥå<CDA5>"
-
-#: sysdeps/names/netload.c:48 sysdeps/names/netload.c:66
-msgid "Address"
-msgstr "<22><><EFBFBD>ɥ쥹"
-
-#: sysdeps/names/netload.c:49 sysdeps/names/netload.c:67
-msgid "Packets In"
-msgstr "<22>ѥ<EFBFBD><D1A5>åȤ<C3A5><C8A4><EFBFBD><EFBFBD><EFBFBD>"
-
-#: sysdeps/names/netload.c:50 sysdeps/names/netload.c:68
-msgid "Packets Out"
-msgstr "<22>ѥ<EFBFBD><D1A5>åȤν<C8A4><CEBD><EFBFBD>"
-
-#: sysdeps/names/netload.c:51 sysdeps/names/netload.c:69
-msgid "Packets Total"
-msgstr "<22>ѥ<EFBFBD><D1A5>å<EFBFBD>(<28>ȡ<EFBFBD><C8A1><EFBFBD><EFBFBD><EFBFBD>)"
-
-#: sysdeps/names/netload.c:52 sysdeps/names/netload.c:70
-msgid "Bytes In"
-msgstr "<22>Х<EFBFBD><D0A5>Ȥ<EFBFBD><C8A4><EFBFBD><EFBFBD><EFBFBD>"
-
-#: sysdeps/names/netload.c:53 sysdeps/names/netload.c:71
-msgid "Bytes Out"
-msgstr "<22>Х<EFBFBD><D0A5>Ȥν<C8A4><CEBD><EFBFBD>"
-
-#: sysdeps/names/netload.c:54 sysdeps/names/netload.c:72
-msgid "Bytes Total"
-msgstr "<22>Х<EFBFBD><D0A5><EFBFBD>(<28>ȡ<EFBFBD><C8A1><EFBFBD><EFBFBD><EFBFBD>)"
-
-#: sysdeps/names/netload.c:55 sysdeps/names/netload.c:73
-msgid "Errors In"
-msgstr "<22><><EFBFBD>顼(<28><><EFBFBD><EFBFBD>)"
-
-#: sysdeps/names/netload.c:56 sysdeps/names/netload.c:74
-msgid "Errors Out"
-msgstr "<22><><EFBFBD>顼(<28><><EFBFBD><EFBFBD>)"
-
-#: sysdeps/names/netload.c:57 sysdeps/names/netload.c:75
-msgid "Errors Total"
-msgstr "<22><><EFBFBD>顼(<28>ȡ<EFBFBD><C8A1><EFBFBD><EFBFBD><EFBFBD>)"
-
-#: sysdeps/names/netload.c:58 sysdeps/names/netload.c:76
-msgid "Collisions"
-msgstr "<22><><EFBFBD>ꥸ<EFBFBD><EAA5B8><EFBFBD><EFBFBD>"
-
-#: sysdeps/names/netload.c:64
-msgid "Maximum Transfer Unit"
-msgstr "<22><><EFBFBD><EFBFBD>ž<EFBFBD><C5BE><EFBFBD><EFBFBD><EFBFBD>˥å<CBA5>"
-
-#: sysdeps/names/ppp.c:38 sysdeps/names/ppp.c:45
-msgid "PPP State"
-msgstr "PPP<50><50><EFBFBD><EFBFBD>"
-
-#: sysdeps/names/ppp.c:39
-msgid "Input bytes"
-msgstr "<22><><EFBFBD>ϥХ<CFA5><D0A5><EFBFBD>"
-
-#: sysdeps/names/ppp.c:40
-msgid "Output bytes"
-msgstr "<22><><EFBFBD>ϥХ<CFA5><D0A5><EFBFBD>"
-
-#: sysdeps/names/ppp.c:46
-msgid "Number of input bytes"
-msgstr "<22><><EFBFBD>ϤΥХ<CEA5><D0A5>ȿ<EFBFBD>"
-
-#: sysdeps/names/ppp.c:47
-msgid "Number of output bytes"
-msgstr "<22><><EFBFBD>ϤΥХ<CEA5><D0A5>ȿ<EFBFBD>"
-
-#: sysdeps/names/procargs.c:38 sysdeps/names/procmem.c:47
-msgid "Size"
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-
-#: sysdeps/names/procargs.c:43
-msgid "Length in bytes of the returned string."
-msgstr "<22>֤äƤ<C3A4><C6A4><EFBFBD>ʸ<EFBFBD><CAB8><EFBFBD>ΥХ<CEA5><D0A5><EFBFBD>Ĺ"
-
 #: sysdeps/names/prockernel.c:42
 msgid "K_Flags"
-msgstr "K<EFBFBD>ե饰(_F)"
+msgstr ""
 
 #: sysdeps/names/prockernel.c:42
 msgid "Min_Flt"
-msgstr "Min_Flt"
+msgstr ""
 
 #: sysdeps/names/prockernel.c:42
 msgid "Maj_Flt"
-msgstr "Maj_Flt"
+msgstr ""
 
 #: sysdeps/names/prockernel.c:42
 msgid "CMin_Flt"
-msgstr "CMin_Flt"
+msgstr ""
 
 #: sysdeps/names/prockernel.c:43
 msgid "CMaj_Flt"
-msgstr "CMaj_Flt"
+msgstr ""
 
 #: sysdeps/names/prockernel.c:43
 msgid "KStk_ESP"
-msgstr "KStk_ESP"
+msgstr ""
 
 #: sysdeps/names/prockernel.c:43
 msgid "KStk_EIP"
-msgstr "KStk_EIP"
+msgstr ""
 
 #: sysdeps/names/prockernel.c:43
 msgid "NWChan"
-msgstr "NWChan"
+msgstr ""
 
 #: sysdeps/names/prockernel.c:44
 msgid "WChan"
-msgstr "WChan"
+msgstr ""
 
 #. K_Flags
 #: sysdeps/names/prockernel.c:50
@@ -655,6 +363,10 @@ msgstr ""
 msgid "This is the textual name of the `nwchan' field."
 msgstr "`nwchan' <20>ե<EFBFBD><D5A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɤ<EFBFBD>ʸ<EFBFBD><CAB8>ɽ<EFBFBD><C9BD><EFBFBD><EFBFBD>̾<EFBFBD><CCBE><EFBFBD>Ǥ<EFBFBD><C7A4><EFBFBD>"
 
+#: sysdeps/names/procmem.c:47
+msgid "Size"
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+
 #: sysdeps/names/procmem.c:47
 msgid "Virtual"
 msgstr "<22><><EFBFBD><EFBFBD>"
@@ -684,8 +396,8 @@ msgid "Number of pages of virtual memory"
 msgstr "<22><><EFBFBD>ۥ<EFBFBD><DBA5><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Υڡ<CEA5><DAA1><EFBFBD><EFBFBD><EFBFBD>"
 
 #: sysdeps/names/procmem.c:55
-msgid "Number of resident set (non-swapped) pages"
+msgid "Number of residnet set (non-swapped) pages"
-msgstr "<22><><EFBFBD>󥻥å<F3A5BBA5>(<28><><EFBFBD><EFBFBD><EFBFBD>åפ<C3A5><D7A4><EFBFBD><EFBFBD>Ƥʤ<EFBFBD>)<29>ڡ<EFBFBD><DAA1><EFBFBD><EFBFBD><EFBFBD>"
+msgstr "<22><><EFBFBD>󥻥å<F3A5BBA5>(<28><><EFBFBD><EFBFBD><EFBFBD>åפ<C3A5><D7A4><EFBFBD><EFBFBD>ʤ<EFBFBD>)<29>ڡ<EFBFBD><DAA1><EFBFBD><EFBFBD><EFBFBD>"
 
 #: sysdeps/names/procmem.c:56
 msgid "Number of pages of shared (mmap'd) memory"
@@ -699,8 +411,9 @@ msgid ""
 "which are swapped out."
 msgstr ""
 "<22>¥<EFBFBD><C2A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>¸<EFBFBD>ߤ<EFBFBD><DFA4>볺<EFBFBD><EBB3BA><EFBFBD>ץ<EFBFBD><D7A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Υڡ<CEA5><DAA1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>顢<EFBFBD><E9A1A2><EFBFBD><EFBFBD><EFBFBD>Ѥ<EFBFBD>3<EFBFBD>Ĥ<EFBFBD><C4A4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ρ<EFBFBD> "
-"ñ<>˥ƥ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ȡ<EFBFBD><EFBFBD>ǡ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ȥ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>å<EFBFBD><EFBFBD><EFBFBD><EFBFBD>֤˿<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ƥ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ڡ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ǥ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD><EFBFBD>ɤ<EFBFBD> "
+"ñ<><EFBFBD> <20>ƥ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ȡ<EFBFBD><EFBFBD>ǡ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ȥ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>å<EFBFBD><EFBFBD><EFBFBD><EFBFBD>֤<EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ƥ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ڡ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ǥ<EFBFBD><EFBFBD><EFBFBD> "
-"<22><><EFBFBD><EFBFBD>ɬ<EFBFBD>פ<EFBFBD><D7A4><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ƥ<EFBFBD><C6A4>ʤ<EFBFBD><CAA4><EFBFBD>ʬ<EFBFBD>䡢<EFBFBD><E4A1A2><EFBFBD><EFBFBD><EFBFBD>åץ<C3A5><D7A5><EFBFBD><EFBFBD>Ȥ<EFBFBD><C8A4><EFBFBD><EFBFBD>Ƥ<EFBFBD><C6A4><EFBFBD><EFBFBD>ڡ<EFBFBD><DAA1><EFBFBD><EFBFBD>ϴޤߤޤ<EFBFBD><EFBFBD><EFBFBD>"
+"<22>ޤ<EFBFBD><EFBFBD>ɤ߹<EFBFBD><EFBFBD><EFBFBD>ɬ<EFBFBD>פ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ƥ<EFBFBD><EFBFBD>ʤ<EFBFBD><EFBFBD><EFBFBD>ʬ<EFBFBD>䡢<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>åץ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ȥ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ƥ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ڡ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ϴޤߤޤ"
+"<22><><EFBFBD><EFBFBD><EFBFBD>"
 
 #: sysdeps/names/procmem.c:62
 msgid ""
@@ -710,35 +423,35 @@ 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"
-msgstr "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ƥ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+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"
@@ -782,11 +495,11 @@ msgstr "
 
 #: sysdeps/names/procsignal.c:40
 msgid "SigIgnore"
-msgstr "SigIgnore"
+msgstr ""
 
 #: sysdeps/names/procsignal.c:40
 msgid "SigCatch"
-msgstr "SigCatch"
+msgstr ""
 
 #: sysdeps/names/procsignal.c:45
 msgid "Mask of pending signals"
@@ -806,19 +519,19 @@ msgstr "
 
 #: sysdeps/names/procstate.c:40
 msgid "Cmd"
-msgstr "Cmd"
+msgstr ""
 
 #: sysdeps/names/procstate.c:40
 msgid "State"
-msgstr "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+msgstr ""
 
 #: sysdeps/names/procstate.c:40
 msgid "UID"
-msgstr "UID"
+msgstr ""
 
 #: sysdeps/names/procstate.c:40
 msgid "GID"
-msgstr "GID"
+msgstr ""
 
 #: sysdeps/names/procstate.c:45
 msgid "Basename of executable file in call to exec()"
@@ -830,11 +543,11 @@ msgstr "
 
 #: sysdeps/names/procstate.c:47
 msgid "UID of process"
-msgstr "<22>ץ<EFBFBD><D7A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>UID"
+msgstr "<22>ץ<EFBFBD><D7A5><EFBFBD><EFBFBD><EFBFBD>UID"
 
 #: sysdeps/names/procstate.c:48
 msgid "GID of process"
-msgstr "<22>ץ<EFBFBD><D7A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>GID"
+msgstr "<22>ץ<EFBFBD><D7A5><EFBFBD><EFBFBD><EFBFBD>GID"
 
 #: sysdeps/names/proctime.c:44
 msgid "Start_Time"
@@ -842,43 +555,43 @@ msgstr "
 
 #: sysdeps/names/proctime.c:44
 msgid "RTime"
-msgstr "RTime"
+msgstr ""
 
 #: sysdeps/names/proctime.c:44
 msgid "UTime"
-msgstr "UTime"
+msgstr ""
 
 #: sysdeps/names/proctime.c:44
 msgid "STime"
-msgstr "STime"
+msgstr ""
 
 #: sysdeps/names/proctime.c:45
 msgid "CUTime"
-msgstr "CUTime"
+msgstr ""
 
 #: sysdeps/names/proctime.c:45
 msgid "CSTime"
-msgstr "CSTime"
+msgstr ""
 
 #: sysdeps/names/proctime.c:45
 msgid "TimeOut"
-msgstr "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ॢ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+msgstr ""
 
 #: sysdeps/names/proctime.c:45
 msgid "It_Real_Value"
-msgstr "It_Real_Value"
+msgstr ""
 
 #: sysdeps/names/proctime.c:46
 msgid "Frequency"
-msgstr "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+msgstr ""
 
 #: sysdeps/names/proctime.c:46
 msgid "XCPU_UTime"
-msgstr "XCPU_UTime"
+msgstr ""
 
 #: sysdeps/names/proctime.c:46
 msgid "XCPU_STime"
-msgstr "XCPU_STime"
+msgstr ""
 
 #: sysdeps/names/proctime.c:51
 msgid "Start time of process in seconds since the epoch"
@@ -930,47 +643,51 @@ msgstr "
 
 #: sysdeps/names/procuid.c:56
 msgid "Uid"
-msgstr "Uid"
+msgstr ""
 
 #: sysdeps/names/procuid.c:56
 msgid "EUid"
-msgstr "EUid"
+msgstr ""
 
 #: sysdeps/names/procuid.c:56
 msgid "Gid"
-msgstr "Gid"
+msgstr ""
 
 #: sysdeps/names/procuid.c:56
 msgid "EGid"
-msgstr "EGid"
+msgstr ""
 
 #: sysdeps/names/procuid.c:56
 msgid "Pid"
-msgstr "Pid"
+msgstr ""
 
 #: sysdeps/names/procuid.c:57
 msgid "PPid"
-msgstr "PPid"
+msgstr ""
 
 #: sysdeps/names/procuid.c:57
 msgid "PGrp"
-msgstr "PGrp"
+msgstr ""
 
 #: sysdeps/names/procuid.c:57
 msgid "Session"
-msgstr "<EFBFBD><EFBFBD><EFBFBD>å<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+msgstr ""
 
 #: sysdeps/names/procuid.c:57
 msgid "Tty"
-msgstr "TTY"
+msgstr ""
 
 #: sysdeps/names/procuid.c:58
 msgid "TPGid"
-msgstr "TPGid"
+msgstr ""
 
 #: sysdeps/names/procuid.c:58
 msgid "Priority"
-msgstr "ͥ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+msgstr ""
+
+#: sysdeps/names/procuid.c:58
+msgid "Nice"
+msgstr ""
 
 #: sysdeps/names/procuid.c:63
 msgid "User ID"
@@ -1058,7 +775,7 @@ msgstr "
 
 #: sysdeps/names/sem_limits.c:51 sysdeps/names/sem_limits.c:65
 msgid "Adjust on exit max value"
-msgstr "<EFBFBD><EFBFBD>λ<EFBFBD><EFBFBD><EFBFBD>κ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ͤ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+msgstr ""
 
 #: sysdeps/names/shm_limits.c:39 sysdeps/names/shm_limits.c:48
 msgid "Max segment size"
@@ -1224,126 +941,123 @@ msgstr "
 msgid "Time in seconds the system spent in the idle task since system boot"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD>ƥ൯ư<E0B5AF>ʸ<EFBFBD><CAB8><EFBFBD>̲<EFBFBD><CCB2><EFBFBD>Υ<EFBFBD><CEA5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>䤷<EFBFBD><E4A4B7><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(<28><>)"
 
-#: sysdeps/osf1/siglist.c:28 sysdeps/sun4/siglist.c:28
+#: support/error.c:109
-msgid "Hangup"
+msgid "Unknown system error"
-msgstr "<22>ϥ󥰥<EFBFBD><EFBFBD>å<EFBFBD>"
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD>ʥ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ƥ२<EFBFBD>顼"
 
-#: sysdeps/osf1/siglist.c:29 sysdeps/sun4/siglist.c:29
+#: support/getopt.c:669
-msgid "Interrupt"
+#, c-format
-msgstr "<22><><EFBFBD>󥿥<EFBFBD><F3A5BFA5>ץ<EFBFBD>"
+msgid "%s: option `%s' is ambiguous\n"
+msgstr ""
 
-#: sysdeps/osf1/siglist.c:30 sysdeps/sun4/siglist.c:30
+#: support/getopt.c:693
-msgid "Quit"
+#, c-format
-msgstr "<22><>λ"
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr ""
 
-#: sysdeps/osf1/siglist.c:31 sysdeps/sun4/siglist.c:31
+#: support/getopt.c:698
-msgid "Illegal instruction"
+#, c-format
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD>ʥ<EFBFBD><CAA5>󥹥ȥ饯<C8A5><E9A5AF><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr ""
 
-#: sysdeps/osf1/siglist.c:32 sysdeps/sun4/siglist.c:32
+#: support/getopt.c:715 support/getopt.c:888
-msgid "Trace trap"
+#, c-format
-msgstr "<22>ȥ졼<C8A5><ECA1BC><EFBFBD>ȥ<EFBFBD><C8A5>å<EFBFBD>"
+msgid "%s: option `%s' requires an argument\n"
+msgstr ""
 
-#: sysdeps/osf1/siglist.c:33 sysdeps/sun4/siglist.c:33
+#. --option
-msgid "Abort"
+#: support/getopt.c:744
-msgstr "<22><>λ"
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr ""
 
-#: sysdeps/osf1/siglist.c:34 sysdeps/sun4/siglist.c:34
+#. +option or -option
-msgid "EMT error"
+#: support/getopt.c:748
-msgstr "EMT<4D><54><EFBFBD>顼"
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr ""
 
-#: sysdeps/osf1/siglist.c:35 sysdeps/sun4/siglist.c:35
+#. 1003.2 specifies the format of this message.
-msgid "Floating-point exception"
+#: support/getopt.c:774
-msgstr "<22><>ư<EFBFBD><C6B0><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>㳰"
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr ""
 
-#: sysdeps/osf1/siglist.c:36 sysdeps/sun4/siglist.c:36
+#: support/getopt.c:777
-msgid "Kill"
+#, c-format
-msgstr "kill"
+msgid "%s: invalid option -- %c\n"
+msgstr ""
 
-#: sysdeps/osf1/siglist.c:37 sysdeps/sun4/siglist.c:37
+#. 1003.2 specifies the format of this message.
-msgid "Bus error"
+#: support/getopt.c:807 support/getopt.c:937
-msgstr "<22>Х<EFBFBD><D0A5><EFBFBD><EFBFBD>顼"
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr ""
 
-#: sysdeps/osf1/siglist.c:38 sysdeps/sun4/siglist.c:38
+#: support/getopt.c:854
-msgid "Segmentation violation"
+#, c-format
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ơ<EFBFBD><C6A1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Х<EFBFBD><D0A5><EFBFBD><EFBFBD>졼<EFBFBD><ECA1BC><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr ""
 
-#: sysdeps/osf1/siglist.c:39 sysdeps/sun4/siglist.c:39
+#: support/getopt.c:872
-msgid "Bad argument to system call"
+#, c-format
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD>ƥॳ<C6A5><E0A5B3><EFBFBD><EFBFBD><EFBFBD>ΰ<EFBFBD><CEB0><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>äƤ<C3A4><C6A4>ޤ<EFBFBD>"
+msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgstr ""
 
-#: sysdeps/osf1/siglist.c:40 sysdeps/sun4/siglist.c:40
+#: lib/read.c:71
-msgid "Broken pipe"
+#, c-format
-msgstr "<22>ѥ<EFBFBD><D1A5><EFBFBD><EFBFBD>˲<EFBFBD>"
+msgid "read %d bytes"
+msgstr ""
 
-#: sysdeps/osf1/siglist.c:41 sysdeps/sun4/siglist.c:41
+#: lib/read_data.c:49
-msgid "Alarm clock"
+msgid "read data size"
-msgstr "<EFBFBD><EFBFBD><EFBFBD>顼<EFBFBD>९<EFBFBD><EFBFBD><EFBFBD>å<EFBFBD>"
+msgstr ""
 
-#: sysdeps/osf1/siglist.c:42 sysdeps/sun4/siglist.c:42
+#: lib/read_data.c:66
-msgid "Termination"
+#, c-format
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD>ߥ͡<DFA5><CDA1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+msgid "read data %d bytes"
+msgstr ""
 
-#: sysdeps/osf1/siglist.c:43 sysdeps/sun4/siglist.c:43
+#: lib/write.c:48
-msgid "Urgent condition on socket"
+#, c-format
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD>åȤζ۵޾<DBB5><DEBE><EFBFBD>"
+msgid "write %d bytes"
+msgstr ""
 
-#: sysdeps/osf1/siglist.c:44 sysdeps/sun4/siglist.c:44
+#: src/daemon/gnuserv.c:445
-msgid "Stop"
+msgid "Enable debugging"
-msgstr "<EFBFBD><EFBFBD><EFBFBD>ȥå<EFBFBD>"
+msgstr ""
 
-#: sysdeps/osf1/siglist.c:45 sysdeps/sun4/siglist.c:45
+#: src/daemon/gnuserv.c:445
-msgid "Keyboard stop"
+msgid "DEBUG"
-msgstr "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ܡ<EFBFBD><EFBFBD>ɥ<EFBFBD><EFBFBD>ȥå<EFBFBD>"
+msgstr ""
 
-#: sysdeps/osf1/siglist.c:46 sysdeps/sun4/siglist.c:46
+#: src/daemon/gnuserv.c:447
-msgid "Continue"
+msgid "Enable verbose output"
-msgstr "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ƥ<EFBFBD><EFBFBD>˥塼"
+msgstr ""
 
-#: sysdeps/osf1/siglist.c:47 sysdeps/sun4/siglist.c:47
+#: src/daemon/gnuserv.c:447
-msgid "Child status has changed"
+msgid "VERBOSE"
-msgstr "<EFBFBD>ҥץ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>֤<EFBFBD><EFBFBD>ѹ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>줿"
+msgstr ""
 
-#: sysdeps/osf1/siglist.c:48 sysdeps/sun4/siglist.c:48
+#: src/daemon/gnuserv.c:449
-msgid "Background read from tty"
+msgid "Don't fork into background"
-msgstr "tty<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ΥХå<EFBFBD><EFBFBD><EFBFBD><EFBFBD>饦<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɤ߹<EFBFBD><EFBFBD><EFBFBD>"
+msgstr ""
 
-#: sysdeps/osf1/siglist.c:49 sysdeps/sun4/siglist.c:49
+#: src/daemon/gnuserv.c:449
-msgid "Background write to tty"
+msgid "NO-DAEMON"
-msgstr "tty<EFBFBD>ؤΥХå<EFBFBD><EFBFBD><EFBFBD><EFBFBD>饦<EFBFBD><EFBFBD><EFBFBD>ɽ񤭹<EFBFBD><EFBFBD><EFBFBD>"
+msgstr ""
 
-#: sysdeps/osf1/siglist.c:50 sysdeps/sun4/siglist.c:50
+#: src/daemon/gnuserv.c:451
-msgid "I/O now possible"
+msgid "Invoked from inetd"
-msgstr "I/O<><4F><EFBFBD><EFBFBD><EFBFBD>Ѳ<EFBFBD>ǽ"
+msgstr ""
 
-#: sysdeps/osf1/siglist.c:51 sysdeps/sun4/siglist.c:51
+#: src/daemon/gnuserv.c:451
-msgid "CPU limit exceeded"
+msgid "INETD"
-msgstr "CPU<EFBFBD>³<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ۤ<EFBFBD><EFBFBD><EFBFBD>"
+msgstr ""
 
-#: sysdeps/osf1/siglist.c:52 sysdeps/sun4/siglist.c:52
+#: src/daemon/gnuserv.c:485
-msgid "File size limit exceeded"
+#, c-format
-msgstr "<22>ե<EFBFBD><D5A5><EFBFBD><EFBFBD>륵<EFBFBD><EBA5B5><EFBFBD><EFBFBD><EFBFBD>³<EFBFBD><C2B3><EFBFBD><EFBFBD>ۤ<EFBFBD><DBA4><EFBFBD>"
+msgid ""
-
+"Error on option %s: %s.\n"
-#: sysdeps/osf1/siglist.c:53 sysdeps/sun4/siglist.c:53
+"Run '%s --help' to see a full list of available command line options.\n"
-msgid "Virtual alarm clock"
+msgstr ""
-msgstr "<22><><EFBFBD>ۥ<EFBFBD><DBA5>顼<EFBFBD>९<EFBFBD><E0A5AF><EFBFBD>å<EFBFBD>"
-
-#: sysdeps/osf1/siglist.c:54 sysdeps/sun4/siglist.c:54
-msgid "Profiling alarm clock"
-msgstr "<22><><EFBFBD>顼<EFBFBD>९<EFBFBD><E0A5AF><EFBFBD>å<EFBFBD><C3A5>Υץ<CEA5><D7A5>ե<EFBFBD><D5A5><EFBFBD><EFBFBD><EFBFBD>"
-
-#: sysdeps/osf1/siglist.c:55 sysdeps/sun4/siglist.c:55
-msgid "Window size change"
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɥ<EFBFBD><C9A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ѹ<EFBFBD>"
-
-#: sysdeps/osf1/siglist.c:56 sysdeps/sun4/siglist.c:56
-msgid "Information request"
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD>ꥯ<EFBFBD><EAA5AF><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-
-#: sysdeps/osf1/siglist.c:57 sysdeps/sun4/siglist.c:57
-msgid "User defined signal 1"
-msgstr "<22>桼<EFBFBD><E6A1BC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʥ<EFBFBD> 1"
-
-#: sysdeps/osf1/siglist.c:58 sysdeps/sun4/siglist.c:58
-msgid "User defined signal 2"
-msgstr "<22>桼<EFBFBD><E6A1BC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʥ<EFBFBD> 2"

po/no.po

@@ -1,223 +1,18 @@
 # Norwegian translation for Libgtop (bokm<6B>l dialect)
-# Copyright (C) 1998-2000 Free Software Foundation, Inc.
+# Copyright (C) 1998 Free Software Foundation, Inc.
-# Kjartan Maraas <kmaraas@gnome.org>, 1998-2000.
+# Kjartan Maraas <kmaraas@fib.hl.no>, 1998,1999.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: libgtop 1.0.8\n"
+"Project-Id-Version: libgtop 0.99.3\n"
-"POT-Creation-Date: 2001-02-13 13:30+0100\n"
+"POT-Creation-Date: 1999-03-01 22:58+0100\n"
-"PO-Revision-Date: 2000-08-16 14:00+0200\n"
+"PO-Revision-Date: 1999-01-27 23:22+0100\n"
-"Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
+"Last-Translator: Kjartan Maraas <kmaraas@fib.hl.no>\n"
 "Language-Team: Norwegian <no@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: examples/smp.c:68
-#, c-format
-msgid "Ticks (%ld per second):"
-msgstr "Tikk (%ld per sekund):"
-
-#: examples/smp.c:71
-msgid "Total"
-msgstr "Totalt"
-
-#: examples/smp.c:71 sysdeps/names/mem.c:47
-msgid "User"
-msgstr "Bruker"
-
-#: examples/smp.c:71 sysdeps/names/procuid.c:58
-msgid "Nice"
-msgstr "Nice"
-
-#: examples/smp.c:71
-msgid "Sys"
-msgstr "Sys"
-
-#: examples/smp.c:71
-msgid "Idle"
-msgstr "Idle"
-
-#: examples/smp.c:73
-#, c-format
-msgid ""
-"CPU          (0x%08lx): %12.0f %12.0f %12.0f %12.0f %12.0f\n"
-"\n"
-msgstr ""
-"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): %12lu %12lu %12lu %12lu %12lu\n"
-
-#: examples/smp.c:94
-msgid "Percent:"
-msgstr "Prosent:"
-
-#: examples/smp.c:95
-msgid "Total (%)"
-msgstr "Total (%)"
-
-#: examples/smp.c:95
-msgid "User (%)"
-msgstr "Bruker (%)"
-
-#: examples/smp.c:95
-msgid "Nice (%)"
-msgstr "Nice (%)"
-
-#: examples/smp.c:95
-msgid "Sys (%)"
-msgstr "Sys (%)"
-
-#: examples/smp.c:96
-msgid "Idle (%)"
-msgstr "Idle (%)"
-
-#: examples/smp.c:98
-#, c-format
-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"
-
-#: examples/smp.c:120
-msgid "Spin:"
-msgstr "Spinn:"
-
-#: lib/read.c:75
-#, c-format
-msgid "read %d bytes"
-msgstr "les %d bytes"
-
-#: lib/read_data.c:49
-msgid "read data size"
-msgstr "les st<73>rrelse p<> data"
-
-#: lib/read_data.c:66
-#, c-format
-msgid "read data %d bytes"
-msgstr "les data %d bytes"
-
-#: lib/write.c:48
-#, c-format
-msgid "write %d bytes"
-msgstr "skriv %d bytes"
-
-#: src/daemon/gnuserv.c:448
-msgid "Enable debugging"
-msgstr "Sl<53> p<> avlusing"
-
-#: src/daemon/gnuserv.c:448
-msgid "DEBUG"
-msgstr "DEBUG"
-
-#: src/daemon/gnuserv.c:450
-msgid "Enable verbose output"
-msgstr "Sl<53> p<> utfyllende utskrift"
-
-#: src/daemon/gnuserv.c:450
-msgid "VERBOSE"
-msgstr "VERBOSE"
-
-#: src/daemon/gnuserv.c:452
-msgid "Don't fork into background"
-msgstr "Ikke forgren til bakgrunnen"
-
-#: src/daemon/gnuserv.c:452
-msgid "NO-DAEMON"
-msgstr "NO-DAEMON"
-
-#: src/daemon/gnuserv.c:454
-msgid "Invoked from inetd"
-msgstr "Kalt fra inetd"
-
-#: src/daemon/gnuserv.c:454
-msgid "INETD"
-msgstr "INETD"
-
-#: src/daemon/gnuserv.c:488
-#, 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 ved flagg %s: %s.\n"
-"Kj<4B>r '%s --help' for <20> se en full liste av tilgjengelige "
-"kommandolinjeflagg.\n"
-
-#: support/error.c:109
-msgid "Unknown system error"
-msgstr "Ukjent systemfeil"
-
-#: support/getopt.c:669
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: flagget `%s' er flertydig\n"
-
-#: support/getopt.c:693
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s: flagget `--%s' tar ikke argumenter\n"
-
-#: support/getopt.c:698
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr "%s: flagget `%c%s' tar ikke argumenter\n"
-
-#: support/getopt.c:715 support/getopt.c:888
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: flagget `%s' krever et argument\n"
-
-#. --option
-#: support/getopt.c:744
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: ukjent flagg `--%s'\n"
-
-#. +option or -option
-#: support/getopt.c:748
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: ukjent flagg `%c%s'\n"
-
-#. 1003.2 specifies the format of this message.
-#: support/getopt.c:774
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: ulovlig flagg -- %c\n"
-
-#: support/getopt.c:777
-#, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr "%s: ugyldig 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: flagget kerver et argument -- %c\n"
-
-#: support/getopt.c:854
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: flagget `-W %s' er flertydig\n"
-
-#: support/getopt.c:872
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr "%s: flagget `-W %s' tar ikke argumenter\n"
-
 #: sysdeps/names/cpu.c:43
 msgid "Total CPU Time"
 msgstr "Total prosessortid"
@@ -366,6 +161,10 @@ msgstr "Buffere"
 msgid "Cached"
 msgstr "Mellomlagret"
 
+#: sysdeps/names/mem.c:47
+msgid "User"
+msgstr "Bruker"
+
 #: sysdeps/names/mem.c:48
 msgid "Locked"
 msgstr "L<>st"
@@ -448,94 +247,6 @@ msgstr "St
 msgid "Number of system message headers"
 msgstr "Antall systemmeldingshoder"
 
-#: sysdeps/names/netload.c:45 sysdeps/names/netload.c:63
-msgid "Interface Flags"
-msgstr "Grensesnittflagg"
-
-#: sysdeps/names/netload.c:46
-msgid "MTU"
-msgstr "MTU"
-
-#: sysdeps/names/netload.c:47 sysdeps/names/netload.c:65
-msgid "Subnet"
-msgstr "Subnett"
-
-#: sysdeps/names/netload.c:48 sysdeps/names/netload.c:66
-msgid "Address"
-msgstr "Adresse"
-
-#: sysdeps/names/netload.c:49 sysdeps/names/netload.c:67
-msgid "Packets In"
-msgstr "Pakker inn"
-
-#: sysdeps/names/netload.c:50 sysdeps/names/netload.c:68
-msgid "Packets Out"
-msgstr "Pakker ut"
-
-#: sysdeps/names/netload.c:51 sysdeps/names/netload.c:69
-msgid "Packets Total"
-msgstr "Pakker totalt"
-
-#: sysdeps/names/netload.c:52 sysdeps/names/netload.c:70
-msgid "Bytes In"
-msgstr "Bytes inn"
-
-#: sysdeps/names/netload.c:53 sysdeps/names/netload.c:71
-msgid "Bytes Out"
-msgstr "Bytes ut"
-
-#: sysdeps/names/netload.c:54 sysdeps/names/netload.c:72
-msgid "Bytes Total"
-msgstr "Bytes totalt"
-
-#: sysdeps/names/netload.c:55 sysdeps/names/netload.c:73
-msgid "Errors In"
-msgstr "Feil inn"
-
-#: sysdeps/names/netload.c:56 sysdeps/names/netload.c:74
-msgid "Errors Out"
-msgstr "Feil ut"
-
-#: sysdeps/names/netload.c:57 sysdeps/names/netload.c:75
-msgid "Errors Total"
-msgstr "Feil totalt"
-
-#: sysdeps/names/netload.c:58 sysdeps/names/netload.c:76
-msgid "Collisions"
-msgstr "Kollisjoner"
-
-#: sysdeps/names/netload.c:64
-msgid "Maximum Transfer Unit"
-msgstr "Maksimum overf<72>ringsenhet (MTU)"
-
-#: sysdeps/names/ppp.c:38 sysdeps/names/ppp.c:45
-msgid "PPP State"
-msgstr "PPP tilstand"
-
-#: sysdeps/names/ppp.c:39
-msgid "Input bytes"
-msgstr "Inn-bytes"
-
-#: sysdeps/names/ppp.c:40
-msgid "Output bytes"
-msgstr "Ut-bytes"
-
-#: sysdeps/names/ppp.c:46
-msgid "Number of input bytes"
-msgstr "Antall bytes inn"
-
-#: sysdeps/names/ppp.c:47
-msgid "Number of output bytes"
-msgstr "Antall bytes ut"
-
-#: sysdeps/names/procargs.c:38 sysdeps/names/procmem.c:47
-msgid "Size"
-msgstr "St<53>rrelse"
-
-#: sysdeps/names/procargs.c:43
-msgid "Length in bytes of the returned string."
-msgstr "Lengde av returnert streng i bytes."
-
 #: sysdeps/names/prockernel.c:42
 msgid "K_Flags"
 msgstr "K_Flags"
@@ -653,6 +364,10 @@ msgstr ""
 msgid "This is the textual name of the `nwchan' field."
 msgstr "Dette er tekstnavnet til `nwchan' feltet."
 
+#: sysdeps/names/procmem.c:47
+msgid "Size"
+msgstr "St<53>rrelse"
+
 #: sysdeps/names/procmem.c:47
 msgid "Virtual"
 msgstr "Virtuell"
@@ -682,7 +397,7 @@ msgid "Number of pages of virtual memory"
 msgstr "Antall sider virtuelt minne"
 
 #: sysdeps/names/procmem.c:55
-msgid "Number of resident set (non-swapped) pages"
+msgid "Number of residnet set (non-swapped) pages"
 msgstr "Antallet resident sett (ikke swappete) sider"
 
 #: sysdeps/names/procmem.c:56
@@ -970,6 +685,10 @@ msgstr "TPGid"
 msgid "Priority"
 msgstr "Prioritet"
 
+#: sysdeps/names/procuid.c:58
+msgid "Nice"
+msgstr "Nice"
+
 #: sysdeps/names/procuid.c:63
 msgid "User ID"
 msgstr "BrukerID"
@@ -1222,126 +941,126 @@ msgstr "Tid siden oppstart i sekunder"
 msgid "Time in seconds the system spent in the idle task since system boot"
 msgstr "Tid systemet har brukt i Idle Task siden oppstart i sekunder"
 
-#: sysdeps/osf1/siglist.c:28 sysdeps/sun4/siglist.c:28
+#: support/error.c:109
-msgid "Hangup"
+msgid "Unknown system error"
-msgstr "Frakobling"
+msgstr "Ukjent systemfeil"
 
-#: sysdeps/osf1/siglist.c:29 sysdeps/sun4/siglist.c:29
+#: support/getopt.c:669
-msgid "Interrupt"
+#, c-format
-msgstr "Avbrudd"
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: flagget `%s' er flertydig\n"
 
-#: sysdeps/osf1/siglist.c:30 sysdeps/sun4/siglist.c:30
+#: support/getopt.c:693
-msgid "Quit"
+#, c-format
-msgstr "Avslutt"
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr "%s: flagget `--%s' tar ikke argumenter\n"
 
-#: sysdeps/osf1/siglist.c:31 sysdeps/sun4/siglist.c:31
+#: support/getopt.c:698
-msgid "Illegal instruction"
+#, c-format
-msgstr "Ugyldig instruksjon"
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr "%s: flagget `%c%s' tar ikke argumenter\n"
 
-#: sysdeps/osf1/siglist.c:32 sysdeps/sun4/siglist.c:32
+#: support/getopt.c:715 support/getopt.c:888
-msgid "Trace trap"
+#, c-format
-msgstr "Spor felle"
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: flagget `%s' krever et argument\n"
 
-#: sysdeps/osf1/siglist.c:33 sysdeps/sun4/siglist.c:33
+#. --option
-msgid "Abort"
+#: support/getopt.c:744
-msgstr "Aborter"
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: ukjent flagg `--%s'\n"
 
-#: sysdeps/osf1/siglist.c:34 sysdeps/sun4/siglist.c:34
+#. +option or -option
-msgid "EMT error"
+#: support/getopt.c:748
-msgstr "EMT-feil"
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s: ukjent flagg `%c%s'\n"
 
-#: sysdeps/osf1/siglist.c:35 sysdeps/sun4/siglist.c:35
+#. 1003.2 specifies the format of this message.
-msgid "Floating-point exception"
+#: support/getopt.c:774
-msgstr "Flyttallsunntak"
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: ulovlig flagg -- %c\n"
 
-#: sysdeps/osf1/siglist.c:36 sysdeps/sun4/siglist.c:36
+#: support/getopt.c:777
-msgid "Kill"
+#, c-format
-msgstr "Drep"
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: ugyldig flagg -- %c\n"
 
-#: sysdeps/osf1/siglist.c:37 sysdeps/sun4/siglist.c:37
+#. 1003.2 specifies the format of this message.
-msgid "Bus error"
+#: support/getopt.c:807 support/getopt.c:937
-msgstr "Buss-feil"
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: flagget kerver et argument -- %c\n"
 
-#: sysdeps/osf1/siglist.c:38 sysdeps/sun4/siglist.c:38
+#: support/getopt.c:854
-msgid "Segmentation violation"
+#, c-format
-msgstr "Segmentoverskridelse"
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: flagget `-W %s' er flertydig\n"
 
-#: sysdeps/osf1/siglist.c:39 sysdeps/sun4/siglist.c:39
+#: support/getopt.c:872
-msgid "Bad argument to system call"
+#, c-format
-msgstr "Ugyldig argument til systemkall"
+msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgstr "%s: flagget `-W %s' tar ikke argumenter\n"
 
-#: sysdeps/osf1/siglist.c:40 sysdeps/sun4/siglist.c:40
+#: lib/read.c:71
-msgid "Broken pipe"
+#, c-format
-msgstr "Brukket r<>r"
+msgid "read %d bytes"
+msgstr "les %d bytes"
 
-#: sysdeps/osf1/siglist.c:41 sysdeps/sun4/siglist.c:41
+#: lib/read_data.c:49
-msgid "Alarm clock"
+msgid "read data size"
-msgstr "Alarmklokke"
+msgstr "les st<73>rrelse p<> data"
 
-#: sysdeps/osf1/siglist.c:42 sysdeps/sun4/siglist.c:42
+#: lib/read_data.c:66
-msgid "Termination"
+#, c-format
-msgstr "Terminering"
+msgid "read data %d bytes"
+msgstr "les data %d bytes"
 
-#: sysdeps/osf1/siglist.c:43 sysdeps/sun4/siglist.c:43
+#: lib/write.c:48
-msgid "Urgent condition on socket"
+#, c-format
-msgstr "Viktig tilstand p<> socket"
+msgid "write %d bytes"
+msgstr "skriv %d bytes"
 
-#: sysdeps/osf1/siglist.c:44 sysdeps/sun4/siglist.c:44
+#: src/daemon/gnuserv.c:445
-msgid "Stop"
+msgid "Enable debugging"
-msgstr "Stopp"
+msgstr "Sl<EFBFBD> p<> avlusing"
 
-#: sysdeps/osf1/siglist.c:45 sysdeps/sun4/siglist.c:45
+#: src/daemon/gnuserv.c:445
-msgid "Keyboard stop"
+msgid "DEBUG"
-msgstr "Tastaturstopp"
+msgstr "DEBUG"
 
-#: sysdeps/osf1/siglist.c:46 sysdeps/sun4/siglist.c:46
+#: src/daemon/gnuserv.c:447
-msgid "Continue"
+msgid "Enable verbose output"
-msgstr "Fortsett"
+msgstr "Sl<EFBFBD> p<> utfyllende utskrift"
 
-#: sysdeps/osf1/siglist.c:47 sysdeps/sun4/siglist.c:47
+#: src/daemon/gnuserv.c:447
-msgid "Child status has changed"
+msgid "VERBOSE"
-msgstr "Barnets status er endret"
+msgstr "VERBOSE"
 
-#: sysdeps/osf1/siglist.c:48 sysdeps/sun4/siglist.c:48
+#: src/daemon/gnuserv.c:449
-msgid "Background read from tty"
+msgid "Don't fork into background"
-msgstr "Lesing fra tty i bakgrunnen"
+msgstr "Ikke forgren til bakgrunnen"
 
-#: sysdeps/osf1/siglist.c:49 sysdeps/sun4/siglist.c:49
+#: src/daemon/gnuserv.c:449
-msgid "Background write to tty"
+msgid "NO-DAEMON"
-msgstr "Skriving til tty i bakgrunnen"
+msgstr "NO-DAEMON"
 
-#: sysdeps/osf1/siglist.c:50 sysdeps/sun4/siglist.c:50
+#: src/daemon/gnuserv.c:451
-msgid "I/O now possible"
+msgid "Invoked from inetd"
-msgstr "I/O n<> mulig"
+msgstr "Kalt fra inetd"
 
-#: sysdeps/osf1/siglist.c:51 sysdeps/sun4/siglist.c:51
+#: src/daemon/gnuserv.c:451
-msgid "CPU limit exceeded"
+msgid "INETD"
-msgstr "CPU-grense oversteget"
+msgstr "INETD"
 
-#: sysdeps/osf1/siglist.c:52 sysdeps/sun4/siglist.c:52
+#: src/daemon/gnuserv.c:485
-msgid "File size limit exceeded"
+#, c-format
-msgstr "Grense for filst<73>rrelse overskredet"
+msgid ""
-
+"Error on option %s: %s.\n"
-#: sysdeps/osf1/siglist.c:53 sysdeps/sun4/siglist.c:53
+"Run '%s --help' to see a full list of available command line options.\n"
-msgid "Virtual alarm clock"
+msgstr ""
-msgstr "Virtuell alarmklokke"
+"Feil ved flagg %s: %s.\n"
-
+"Kj<4B>r '%s --help' for <20> se en full liste av tilgjengelige "
-#: sysdeps/osf1/siglist.c:54 sysdeps/sun4/siglist.c:54
+"kommandolinjeflagg.\n"
-msgid "Profiling alarm clock"
-msgstr "Profilerer alarmklokken"
-
-#: sysdeps/osf1/siglist.c:55 sysdeps/sun4/siglist.c:55
-msgid "Window size change"
-msgstr "Endring i vindusst<73>rrelse"
-
-#: sysdeps/osf1/siglist.c:56 sysdeps/sun4/siglist.c:56
-msgid "Information request"
-msgstr "Informasjonsforesp<73>rsel"
-
-#: sysdeps/osf1/siglist.c:57 sysdeps/sun4/siglist.c:57
-msgid "User defined signal 1"
-msgstr "Brukerdefinert signal 1"
-
-#: sysdeps/osf1/siglist.c:58 sysdeps/sun4/siglist.c:58
-msgid "User defined signal 2"
-msgstr "Brukerdefinert signal 2"