Released 2.24.4.

svn path=/branches/gnome-2-24/; revision=2796

.gitignore

@@ -1,85 +0,0 @@
-*~
-*.bak
-*.o
-*.out
-*.a
-*.gmo
-*.lo
-*.la
-*.core
-*.s
-*.stamp
-.libs
-.deps
-Makefile
-Makefile.in
-src/daemon/libgtop_daemon2
-src/daemon/libgtop_server2
-stamp-h1
-po/stamp-it
-po/POTFILES
-po/Makefile.in.in
-missing
-m4/
-ltmain.sh
-libtool
-libgtopconfig.h
-libgtop.spec
-libgtop-2.0.pc
-lib/lib.c
-lib/GTop-2.0.gir
-lib/GTop-2.0.typelib
-INSTALL
-aclocal.m4
-autom4te.cache/
-config.guess
-config.h
-config.h.in
-config.log
-config.status
-config.sub
-configure
-compile
-depcomp
-doc/libgtop2.info
-doc/mdate-sh
-doc/reference/html/
-doc/reference/libgtop-decl-list.txt
-doc/reference/libgtop-decl.txt
-doc/reference/libgtop-undeclared.txt
-doc/reference/libgtop-undocumented.txt
-doc/reference/libgtop-unused.txt
-doc/reference/libgtop.args
-doc/reference/libgtop.hierarchy
-doc/reference/libgtop.interfaces
-doc/reference/libgtop.prerequisites
-doc/reference/libgtop.signals
-doc/reference/tmpl/
-doc/reference/version.xml
-doc/reference/xml/
-doc/stamp-vti
-doc/texinfo.tex
-doc/version.texi
-examples/affinity
-examples/df
-examples/first
-examples/free
-examples/mountlist
-examples/netlist
-examples/netload
-examples/openfiles
-examples/pprint
-examples/procargs
-examples/proclist
-examples/procmap
-examples/second
-examples/smp
-examples/sysdeps
-examples/timings
-examples/wd
-gtk-doc.make
-install-sh
-intltool-extract.in
-intltool-merge.in
-intltool-update.in
-

COPYING

@@ -1,7 +1,7 @@
 		    GNU GENERAL PUBLIC LICENSE
 		       Version 2, June 1991
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
@@ -15,7 +15,7 @@ software--to make sure the software is free for all its users.  This
 General Public License applies to most of the Free Software
 Foundation's software and to any other program whose authors commit to
 using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
+the GNU Lesser General Public License instead.)  You can apply it to
 your programs, too.
 
   When we speak of free software, we are referring to freedom, not
@@ -55,7 +55,7 @@ patent must be licensed for everyone's free use or not licensed at all.
 
   The precise terms and conditions for copying, distribution and
 modification follow.
-
+
 		    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
@@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions:
     License.  (Exception: if the Program itself is interactive but
     does not normally print such an announcement, your work based on
     the Program is not required to print an announcement.)
-
+
 These requirements apply to the modified work as a whole.  If
 identifiable sections of that work are not derived from the Program,
 and can be reasonably considered independent and separate works in
@@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent
 access to copy the source code from the same place counts as
 distribution of the source code, even though third parties are not
 compelled to copy the source along with the object code.
-
+
   4. You may not copy, modify, sublicense, or distribute the Program
 except as expressly provided under this License.  Any attempt
 otherwise to copy, modify, sublicense or distribute the Program is
@@ -225,7 +225,7 @@ impose that choice.
 
 This section is intended to make thoroughly clear what is believed to
 be a consequence of the rest of this License.
-
+
   8. If the distribution and/or use of the Program is restricted in
 certain countries either by patents or by copyrighted interfaces, the
 original copyright holder who places the Program under this License
@@ -278,7 +278,7 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
 
 		     END OF TERMS AND CONDITIONS
-
+
 	    How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest
@@ -303,10 +303,9 @@ the "copyright" line and a pointer to where the full notice is found.
     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
+    You should have received a copy of the GNU General Public License along
-    along with this program; if not, write to the Free Software
+    with this program; if not, write to the Free Software Foundation, Inc.,
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
 
 Also add information on how to contact you by electronic and paper mail.
 
@@ -336,5 +335,5 @@ necessary.  Here is a sample; alter the names:
 This General Public License does not permit incorporating your program into
 proprietary programs.  If your program is a subroutine library, you may
 consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
+library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.

Makefile.am

@@ -1,4 +1,3 @@
-ACLOCAL_AMFLAGS = -I m4
 
 if EXAMPLES
 EXAMPLES_DIR = examples
@@ -17,9 +16,7 @@ EXTRA_DIST = autogen.sh libgtop.spec.in copyright.txt \
 	 libgtop-2.0.pc.in acinclude.m4 \
 	intltool-extract.in \
 	intltool-merge.in \
-	libgtop.doap \
+	intltool-update.in
-	intltool-update.in \
-	m4/introspection.m4
 
 DISTCLEANFILES = \
 	intltool-extract \
@@ -35,4 +32,4 @@ pkgconfig_DATA = libgtop-2.0.pc
 libgtop-features.def: features.def
 	@LN_S@ $< $@
 
-DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc --enable-introspection
+DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc

NEWS

@@ -1,137 +1,3 @@
-14 December: Overview of changes in 2.33.3
-
-* Fixed borken compilation on OpenBSD 
-* Updated translations.
-
-21 September 2015: Overview of changes in 2.32.0
-
-* Stable release
-
-14 September 2015: Overview of changes in 2.31.91
-================================================
-* Darwin:
-  - Fixed build.
-
-* All
-  - GI docs fixes
-  - include fixes
-  - Updated translations
-
-16 August 2015: Overview of changes in 2.31.90
-=============================================
-* ABI changes:
-  - ABI was inconsistent on platforms like FreeBSD which make use of
-    glibtop_machine. The ABI was actually different between the
-    library and the server. Fixed this by simply always defining
-    glibtop_machine in glibtop struct.
-  - Add Pss and Swap members in glibtop_proc_mem.
-  - This is the second ABI breakage in since 2.28 (the first one was
-    bumping NCPU), there were no release for 2.30.
-
-* FreeBSD:
-  - proclist: exclude the "idle" kernel process when GLIBTOP_EXCLUDE_IDLE.
-  - Remove extraneous glibtop_init() calls.
-
-* Linux:
-  - proc_mem: implement Pss and Swap.
-  - Remove extraneous glibtop_init() calls.
-
-* All:
-  - Propagate the change that machine in struct glibtop is now a
-    pointer. Hope that change doesn't break build on other platforms,
-    I can only test Linux and FreeBSD.
-
-
-5 August 2015: Overview of changes in 2.31.4
-=============================================
-* 71 commits !
-* Implement a proper --enable-debug mode.
-* FreeBSD:
-	- procstate: set process name for kernel (pid=0)
-	- procmap: get dev/inode for ZFS (no filename yet)
-	- mem: rework memory usage to something more meaningful
-	- proclist: don't report threads
-	- proctime: fix CPU times
-* Linux:
-	- mem: use MemAvailable when available
-	- mem: match `free`, report Slab as Cached.
-	- support for x.y versionsmemory to match `free`
-* Fix a lot of GI tags: it now works without crashing.
-* Server and daemon binaries are now dynamically linked against their libgtop.
-* Update a lot of examples/.
-* Clean up some very old code.
-* Updated translations.
-
-Special thanks to Ting-Wei Lan for providing patches and feedback on FreeBSD.
-
-22 June 2015: Overview of changes in 2.31.3
-=============================================
-* Numerous OpenBSD backend fixes.
-* Fixed FreeBSD build issues.
-* Implemented procaffinity support for NetBSD.
-* Updated translations
-
-19 August 2013: Overview of changes in 2.28.5
-=============================================
-* Fix numerous bugs in the OpenBSD backend.
-* Updated translations.
-
-30 August 2011: Overview of changes in 2.28.4
-=============================================
-* Fix numerous bugs in the FreeBSD backend.
-* Split off OpenBSD code in its own backend, and fixes.
-* Updated translations.
-
-25 March 2011: Overview of changes in 2.28.3
-================================================
-* Fix build issue for strict linkers.
-* Add Introspection support
-* Cygwin fixes.
-* FreeBSD: Fix get_mem() on 64-bit systems.
-* Updated translations.
-
-28 September 2010: Overview of changes in 2.28.2
-================================================
-* Updated translations.
-
-30 March 2010: Overview of changes in 2.28.1
-============================================
-* Updated translations.
-
-21 September 2009: Overview of changes in 2.28.0
-================================================
-* Updated translations.
-
-25 May 2009: Overview of changes in 2.27.3
-==========================================
-* linux:
-  - fixed format error.
-
-3 May 2009: Overview of changes in 2.27.2
-=========================================
-* linux:
-  - glibtop_get_proc_map: oops, fixed segfault.
-
-3 May 2009: Overview of changes in 2.27.1
-=========================================
-* linux:
-  - glibtop_get_proc_map is ~40% faster. This should be noticeable
-    in system-monitor.
-* New cygwin support.
-
-13 April 2009: Overview of changes in 2.26.1
-============================================
-* linux:
-  - glibtop_get_mounlist(...): also hide "none" fs.
-
-1 Mars 2009: Overview of changes in 2.26.0
-==========================================
-* Nothing.
-
-17 February 2009: Overview of changes in 2.25.91
-================================================
-* Synced with gnome-2-24.
-
 19 January 2009: Overview of changes in 2.24.4
 ==============================================
 * Fixed license: libgtop is GPL-2.

autogen.sh

@@ -6,7 +6,7 @@ test -z "$srcdir" && srcdir=.
 
 PKG_NAME="Gnome Top Library"
 
-(test -f $srcdir/configure.ac \
+(test -f $srcdir/configure.in \
   && test -f $srcdir/copyright.txt \
   && test -d $srcdir/sysdeps) || {
     echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"

configure.in

@@ -3,12 +3,12 @@ dnl Configure script for the Gnome library
 dnl
 
 m4_define([libgtop_major_version], [2])
-m4_define([libgtop_minor_version], [33])
+m4_define([libgtop_minor_version], [24])
-m4_define([libgtop_micro_version], [3])
+m4_define([libgtop_micro_version], [4])
 m4_define([libgtop_version], [libgtop_major_version.libgtop_minor_version.libgtop_micro_version])
 
 dnl  increment if the interface has additions, changes, removals.
-m4_define([libgtop_current], [10])
+m4_define([libgtop_current], [9])
 
 dnl  increment any time the source changes; set to
 dnl  0 if you increment CURRENT
@@ -17,7 +17,7 @@ m4_define([libgtop_revision], [0])
 dnl  increment if any interfaces have been added; set to 0
 dnl  if any interfaces have been removed. removal has
 dnl  precedence over adding, so set to 0 if both happened.
-m4_define([libgtop_age], [0])
+m4_define([libgtop_age], [2])
 
 # Increase each time you change the client/server protocol.
 m4_define([libgtop_server_version], [5])
@@ -25,19 +25,15 @@ m4_define([libgtop_server_version], [5])
 # Version code calculation
 m4_define([libgtop_version_code], [m4_eval(libgtop_major_version * 1000000 + libgtop_minor_version * 1000 + libgtop_micro_version)])
 
-AC_PREREQ(2.62)
+AC_PREREQ(2.59)
 AC_INIT([libgtop], [libgtop_version],
         [http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop])
 AC_CONFIG_SRCDIR(copyright.txt)
 AC_CONFIG_HEADERS(config.h)
 
-AC_CANONICAL_HOST
+AC_CANONICAL_SYSTEM
-
-AM_INIT_AUTOMAKE([-Wno-portability tar-ustar no-dist-gzip dist-xz])
-AM_SILENT_RULES([yes])
-AC_CONFIG_MACRO_DIR([m4])
-GOBJECT_INTROSPECTION_CHECK([0.6.7])
 
+AM_INIT_AUTOMAKE
 AC_SUBST(ACLOCAL_AMFLAGS, [\${ACLOCAL_FLAGS}])
 
 AC_SUBST(LIBGTOP_MAJOR_VERSION, [libgtop_major_version])
@@ -92,9 +88,8 @@ GNOME_LIBGTOP_SYSDEPS
 GNOME_LIBGTOP_TYPES
 
 GLIB_REQUIRED=2.6.0
-GOBJECT_REQUIRED=2.26.0
 
-PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GOBJECT_REQUIRED)
+PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED)
 AC_SUBST(GLIB_CFLAGS)
 AC_SUBST(GLIB_LIBS)
 
@@ -263,8 +258,7 @@ dnl Debugging
 AC_ARG_ENABLE(debug,
               AS_HELP_STRING([--enable-debug],
                              [Turn on debugging @<:@default=no@:>@]),
-              AC_DEFINE(LIBGTOP_ENABLE_DEBUG, 1, [Define to enable debugging]),
+              AC_DEFINE(LIBGTOP_ENABLE_DEBUG, 1, [Define to enable debugging]))
-              AC_DEFINE(LIBGTOP_ENABLE_DEBUG, 0, [Define to disable debugging]))
 AC_ARG_ENABLE(fatal-warnings,
               AS_HELP_STRING([--enable-fatal-warnings],
                              [Make all warnings fatal @<:@debug=no@:>@]),
@@ -275,6 +269,14 @@ dnl These definitions are expanded in make.
 LIBGTOP_LIBS='-L$(libdir)'
 LIBGTOP_INCS='-I$(includedir)/libgtop-2.0'
 
+if test x$libgtop_use_machine_h = xyes ; then
+  LIBGTOP_INCS="$LIBGTOP_INCS -DHAVE_GLIBTOP_MACHINE_H"
+fi
+
+if test x$libgtop_smp = xyes ; then
+  LIBGTOP_INCS="$LIBGTOP_INCS -DHAVE_LIBGTOP_SMP"
+fi
+
 if test x$libgtop_have_sysinfo = xyes ; then
   LIBGTOP_INCS="$LIBGTOP_INCS -DHAVE_LIBGTOP_SYSINFO"
 fi
@@ -303,17 +305,24 @@ LIBGTOP_EXTRA_LIBS="$GLIB_LIBS $LIBGTOP_EXTRA_LIBS"
 
 LIBGTOP_LIBS="$LIBGTOP_LIBS"
 
+LIBGTOP_LIBS="$LIBGTOP_LIBS" 
+
+machine_incs="-I\$(top_srcdir)/sysdeps/$sysdeps_dir"
+
+AC_SUBST(machine_incs)
+
 if test "$GCC" = "yes" ; then
         CFLAGS="\
 	-Winline \
 	-Wall \
+	-std=gnu89 \
 	-Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes \
 	-Wnested-externs -Wpointer-arith \
 	-Wcast-align -Wsign-compare \
 	$CFLAGS"
 fi
 
-AM_CPPFLAGS="-I\$(top_builddir) -I\$(top_srcdir) -I\$(top_srcdir)/sysdeps/$sysdeps_dir -I\$(top_srcdir)/include $GLIB_CFLAGS $X_CFLAGS"
+INCLUDES="-I\$(top_builddir) -I\$(top_srcdir) -I\$(top_srcdir)/sysdeps/$sysdeps_dir -I\$(top_srcdir)/include $GLIB_CFLAGS $X_CFLAGS"
 
 # Add various defines to the config.h file ...
 AH_VERBATIM([_GNU_SOURCE],
@@ -332,7 +341,7 @@ AC_DEFINE([LIBGTOP_VERSION_CODE], [libgtop_version_code],
 AC_DEFINE_UNQUOTED([LIBGTOP_SERVER], ["$LIBGTOP_SERVER"],
                    [The path to the libgtop server])
 
-AC_SUBST(AM_CPPFLAGS)
+AC_SUBST(INCLUDES)
 
 AC_SUBST(LIBGTOP_EXTRA_LIBS)
 AC_SUBST(GLIB_LIBS)
@@ -372,8 +381,6 @@ sysdeps/solaris/Makefile
 sysdeps/aix/Makefile
 sysdeps/bsd/Makefile
 sysdeps/darwin/Makefile
-sysdeps/cygwin/Makefile
-sysdeps/openbsd/Makefile
 src/Makefile
 src/daemon/Makefile
 lib/Makefile

copyright.txt

@@ -16,7 +16,7 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 

debian/rules.in

@@ -10,7 +10,7 @@
 i=$(shell pwd)/debian/tmp
 b=$(shell pwd)/debian/build
 
-configure: configure.ac
+configure: configure.in
 	@echo "--- Making configure script and configuring"
 	chmod +x autogen.sh
 	./autogen.sh --prefix=/@PREFIX@ --with-gnome=/@GNOMEPREFIX@ \

doc/reference.texi

@@ -743,7 +743,7 @@ The description above is taken from the manual page of the @file{/proc}
 filesystem under Linux and is a little bit confusing, so I make this clear
 here. 
 
-@strong{A word for people porting LibGTop to other systems:}
+@strong{Note for people porting LibGTop to other systems:}
 Every operating system has its own idea about the memory usage of a process
 and also system utilities like @code{ps} show different things on different
 systems.

doc/reference/Makefile.am

@@ -46,9 +46,9 @@ HTML_IMAGES=
 # CFLAGS and LDFLAGS for compiling gtkdoc-scangobj with your library.
 # Only needed if you are using gtkdoc-scangobj to dynamically query widget
 # signals and properties.
-# e.g. AM_CPPFLAGS=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
+# e.g. INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
 # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
-AM_CPPFLAGS=
+INCLUDES=
 GTKDOC_LIBS=
 
 # This includes the standard gtk-doc make rules, copied by gtkdocize.

doc/reference/libgtop-docs.xml

@@ -36,8 +36,8 @@
       Documentation License</citetitle> from the Free Software
       Foundation by visiting <ulink type="http"
       url="http://www.fsf.org">their Web site</ulink> or by writing
-      to: Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+      to: Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-      Boston, MA 02110-1301, USA.</para>
+      Boston, MA 02111-1307, USA.</para>
 
       <para>Many of the names used by companies to distinguish their
       products and services are claimed as trademarks. Where those

doc/reference/libgtop-sections.txt

@@ -219,8 +219,17 @@ glibtop_set_parameter_l
 <INCLUDE>glibtop/procargs.h</INCLUDE>
 <SECTION>
 <FILE>procargs</FILE>
+GLIBTOP_PROC_ARGS_SIZE
+GLIBTOP_MAX_PROC_ARGS
 glibtop_proc_args
+glibtop_get_proc_args_l
 glibtop_get_proc_args
+glibtop_get_proc_args_r
+glibtop_init_proc_args_p
+glibtop_get_proc_args_p
+glibtop_init_proc_args_s
+glibtop_get_proc_args_s
+glibtop_get_proc_argv_l
 glibtop_get_proc_argv
 </SECTION>
 
@@ -411,8 +420,26 @@ glibtop_get_proc_uid_s
 <INCLUDE>glibtop/proctime.h</INCLUDE>
 <SECTION>
 <FILE>proctime</FILE>
+GLIBTOP_PROC_TIME_START_TIME
+GLIBTOP_PROC_TIME_RTIME
+GLIBTOP_PROC_TIME_UTIME
+GLIBTOP_PROC_TIME_STIME
+GLIBTOP_PROC_TIME_CUTIME
+GLIBTOP_PROC_TIME_CSTIME
+GLIBTOP_PROC_TIME_TIMEOUT
+GLIBTOP_PROC_TIME_IT_REAL_VALUE
+GLIBTOP_PROC_TIME_FREQUENCY
+GLIBTOP_PROC_TIME_XCPU_UTIME
+GLIBTOP_PROC_TIME_XCPU_STIME
+GLIBTOP_MAX_PROC_TIME
 glibtop_proc_time
 glibtop_get_proc_time
+glibtop_get_proc_time_r
+glibtop_get_proc_time_l
+glibtop_init_proc_time_p
+glibtop_get_proc_time_p
+glibtop_init_proc_time_s
+glibtop_get_proc_time_s
 </SECTION>
 
 <INCLUDE>glibtop/signal.h</INCLUDE>
@@ -488,6 +515,10 @@ glibtop_send_version
 <INCLUDE>glibtop/proclist.h</INCLUDE>
 <SECTION>
 <FILE>proclist</FILE>
+GLIBTOP_PROCLIST_NUMBER
+GLIBTOP_PROCLIST_TOTAL
+GLIBTOP_PROCLIST_SIZE
+GLIBTOP_MAX_PROCLIST
 GLIBTOP_KERN_PROC_ALL
 GLIBTOP_KERN_PROC_PID
 GLIBTOP_KERN_PROC_PGRP
@@ -501,6 +532,12 @@ GLIBTOP_EXCLUDE_SYSTEM
 GLIBTOP_EXCLUDE_NOTTY
 glibtop_proclist
 glibtop_get_proclist
+glibtop_get_proclist_r
+glibtop_get_proclist_l
+glibtop_init_proclist_p
+glibtop_get_proclist_p
+glibtop_init_proclist_s
+glibtop_get_proclist_s
 </SECTION>
 
 <INCLUDE>glibtop/sem_limits.h</INCLUDE>

examples/Makefile.am

@@ -1,10 +1,14 @@
 ## Process this file with automake to produce Makefile.in
 
-AM_LDFLAGS			= $(LIBGTOP_EXTRA_LIBS)
+LINK			= $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
+
+INCLUDES		= @INCLUDES@
+
+DEFS			= @DEFS@
 
 noinst_PROGRAMS	= 	first second pprint procargs df netlist \
 			  mountlist procmap netload sysdeps timings \
-			  openfiles smp proclist free wd affinity
+			  openfiles smp proclist mem wd affinity
 
 first_SOURCES		= first.c
 first_LDADD		= $(top_builddir)/lib/libgtop-2.0.la
@@ -51,8 +55,8 @@ proclist_LDADD		= $(top_builddir)/lib/libgtop-2.0.la
 wd_SOURCES	= wd.c
 wd_LDADD	= $(top_builddir)/lib/libgtop-2.0.la
 
-free_SOURCE	= mem.c
+mem_SOURCE	= mem.c
-free_LDADD	= $(top_builddir)/lib/libgtop-2.0.la
+mem_LDADD	= $(top_builddir)/lib/libgtop-2.0.la
 
 affinity_SOURCES	= affinity.c
 affinity_LDADD	= $(top_builddir)/lib/libgtop-2.0.la

examples/df.c

@@ -13,45 +13,28 @@ static void print_fsusage(const char *mountpoint)
 {
   glibtop_fsusage buf;
 
-  enum { SIZE, USED, FREE, AVAIL, READ, WRITE, MAX };
-  char **a = g_new0(char*, MAX);
-
   glibtop_get_fsusage(&buf, mountpoint);
 
-
+  printf("%-30s %10llu %10llu %10llu %5.1f %10llu %10llu\n",
-#define I(X) a[(X)]
+	 mountpoint,
-  I(SIZE)  = g_format_size_full(buf.blocks * buf.block_size, G_FORMAT_SIZE_IEC_UNITS);
+	 buf.blocks * buf.block_size >> 20,
-  I(USED)  = g_format_size_full((buf.blocks - buf.bavail)  * buf.block_size, G_FORMAT_SIZE_IEC_UNITS);
+	 (buf.blocks - buf.bavail) * buf.block_size >> 20,
-  I(FREE)  = g_format_size_full(buf.bfree * buf.block_size, G_FORMAT_SIZE_IEC_UNITS);
+	 buf.bavail * buf.block_size >> 20,
-  I(AVAIL) = g_format_size_full(buf.bavail * buf.block_size, G_FORMAT_SIZE_IEC_UNITS);
-  I(READ)  = g_format_size_full(buf.read, G_FORMAT_SIZE_IEC_UNITS);
-  I(WRITE) = g_format_size_full(buf.write, G_FORMAT_SIZE_IEC_UNITS);
-
-  printf("%#7x %10s %10s %10s %10s %5.1f%% %10s %10s %8lu %8lu %s\n",
-    (unsigned)buf.flags,
-    I(SIZE),
-    I(USED),
-    I(FREE),
-    I(AVAIL),
 	 (buf.blocks - buf.bavail) * 100.0 / (buf.blocks ? buf.blocks : 1.0),
-    I(READ),
+	 buf.read,
-    I(WRITE),
+	 buf.write
-    (unsigned long)buf.files,
-    (unsigned long)buf.ffree,
-    mountpoint
 	 );
-
-  g_strfreev(a);
 }
 
+
 int main(int argc, char **argv)
 {
   glibtop_mountlist buf;
 
   glibtop_init();
 
-  printf("%-6s %10s %10s %10s %10s %5s %10s %10s %10s %10s %s\n",
+  printf("%-30s %10s %10s %10s %5s %10s %10s\n",
-	 "(flags)", "Size", "Used", "Free", "Avail", "Use%", "Read", "Write", "Files", "Files Free", "Mountpoint");
+	 "Filesystem", "Size", "Used", "Avail", "Use%", "Read", "Write");
 
   if (argc > 1) {
     while (*++argv)

examples/first.c

@@ -15,8 +15,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #ifdef HAVE_CONFIG_H

examples/free.c

@@ -1,44 +0,0 @@
-#include <glibtop.h>
-#include <glibtop/mem.h>
-#include <glibtop/swap.h>
-
-#include <glib.h>
-#include <unistd.h>
-
-static unsigned mb(guint64 n)
-{
-        return n >> 20;
-}
-
-int main(int argc, char **argv)
-{
-        glibtop_mem mem;
-        glibtop_swap swap;
-
-	glibtop_init();
-
-        glibtop_get_mem(&mem);
-        glibtop_get_swap(&swap);
-
-        printf("              total        used        free      shared  buff/cache   available\n");
-
-        printf("%-7s %11u %11u %11u %11u %11u %11u\n",
-               "Mem:",
-                mb(mem.total),
-                mb(mem.used - mem.buffer - mem.cached),
-                mb(mem.free),
-                mb(mem.shared),
-                mb(mem.buffer + mem.cached),
-                mb(mem.total - mem.user));
-
-        printf("%-7s %11u %11u %11u\n",
-               "Swap:",
-                mb(swap.total),
-                mb(swap.used),
-                mb(swap.free));
-
-	glibtop_close();
-
-	return 0;
-}
-

examples/mem.c

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

examples/mountlist.c

@@ -15,8 +15,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #ifdef HAVE_CONFIG_H

examples/netlist.c

@@ -14,8 +14,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #ifdef HAVE_CONFIG_H

examples/netload.c

@@ -15,8 +15,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #ifdef HAVE_CONFIG_H
@@ -51,7 +51,7 @@ static char* hwaddress_format_for_display(glibtop_netload *buf)
 
 	for(i = 0; i < sizeof buf->hwaddress; ++i)
 		g_string_append_printf(repr, "%02X:",
-				       ((unsigned char*)buf->hwaddress)[i]);
+				       (unsigned) ((char*)buf->hwaddress)[i]);
 
 	repr->str [ repr->len - 1] = ' ';
 	str = g_string_free(repr, FALSE);

examples/pprint.c

@@ -3,7 +3,6 @@
 #endif
 
 #include <glibtop.h>
-#include <glibtop/sysinfo.h>
 
 #include <glibtop/union.h>
 
@@ -22,58 +21,17 @@
 (unsigned long) sizeof buf.DATA, (unsigned long) buf_offsetof(DATA), buf.DATA)
 
 #define PPRINT_ARRAY(ARRAY, SIZE, FORMAT) do { \
-    size_t i;								\
-    printf("\t%4lu B %3lu " #ARRAY "[%lu] = { ",			\
-	   (unsigned long) sizeof buf.ARRAY,				\
-	   (unsigned long) buf_offsetof(ARRAY),				\
-	   (unsigned long) G_N_ELEMENTS(buf.ARRAY));			\
-    for (i = 0; i < (SIZE); ++i) {					\
-      printf(".%u = " FORMAT ", ", i, buf.ARRAY[i]);			\
-      if (!buf.ARRAY[i] && i < (SIZE - 1) && !buf.ARRAY[i + 1]) {	\
-	do { i++; } while (i < SIZE && !buf.ARRAY[i]);			\
-	printf("..., ");						\
-      }									\
-    }									\
-    printf("}\n");							\
-  } while(0)
-
-#define PPRINT_ENTRY_ARRAY(ARRAY, SIZE) do { \
 size_t i; \
 printf("\t%4lu B %3lu " #ARRAY "[%lu] = { ", \
-(unsigned long) sizeof buf->ARRAY, 0,\
+(unsigned long) sizeof buf.ARRAY, (unsigned long) buf_offsetof(ARRAY),\
-(unsigned long) G_N_ELEMENTS(buf->ARRAY)); \
+(unsigned long) G_N_ELEMENTS(buf.ARRAY)); \
-for(i = 0; i < SIZE; ++i) { \
+for(i = 0; i < (SIZE - 1); ++i) printf(".%u = " FORMAT ", ", i, buf.ARRAY[i]); \
-  if (buf->ARRAY[i].values) {			\
+printf(".%u = " FORMAT " }\n", SIZE - 1 , buf.ARRAY[SIZE - 1]); \
-    printf ("[ ");				\
-    PPRINT_HASHTABLE(buf->ARRAY[i].values);	\
-    printf ("]\n");				\
-  }						\
-} \
-printf("} "); \
-} while(0)
-
-#define PPRINT_HASHTABLE(HASHTABLE) do { \
-g_hash_table_foreach (HASHTABLE, (GHFunc)pprint_hashtable_item, NULL); \
 } while(0)
 
 #define FOOTER_PPRINT() putchar('\n');
 
-static void pprint_hashtable_item(gchar* key, gchar* value, gpointer user_data) 
-{
-  printf ("'%s': '%s', ", key, value);
-}
-static void pprint_get_sysinfo(void)
-{
-  const glibtop_sysinfo *buf;
 
-  buf = glibtop_get_sysinfo();
-
-  HEADER_PPRINT(glibtop_get_sysinfo);
-  //PPRINT(flags, "%#llx");
-  //PPRINT(ncpu, "%llu");
-  PPRINT_ENTRY_ARRAY(cpuinfo, 4);
-  FOOTER_PPRINT();
-}
 
 static void pprint_get_cpu(void)
 {
@@ -328,34 +286,11 @@ static void pprint_get_proc_mem(pid_t pid)
 }
 
 
-static void pprint_get_proc_affinity(pid_t pid)
-{
-  glibtop_proc_affinity buf;
-  guint32 i;
-  guint16* cpus;
-
-  cpus = glibtop_get_proc_affinity(&buf, pid);
-
-  HEADER_PPRINT(glibtop_get_proc_affinity);
-  PPRINT(flags, "%#llx");
-  PPRINT(number, "%u");
-  PPRINT(all, "%d");
-
-  printf("\taffinity=");
-  for (i = 0; i < buf.number; i++) {
-    printf("%d, ", cpus[i]);
-  }
-  putchar('\n');
-
-  FOOTER_PPRINT();
-}
-
 
 int main()
 {
   glibtop_init();
 
-  pprint_get_sysinfo();
   pprint_get_cpu();
 
   pprint_get_fsusage("/");
@@ -382,7 +317,6 @@ int main()
 
   pprint_get_proc_kernel(getpid());
   pprint_get_proc_mem(getpid());
-  pprint_get_proc_affinity(getpid());
 
   glibtop_close();
 

examples/proclist.c

@@ -1,8 +1,5 @@
 #include <glibtop.h>
 #include <glibtop/proclist.h>
-#include <glibtop/procstate.h>
-#include <glibtop/proctime.h>
-#include <glibtop/procuid.h>
 
 #include <glib.h>
 
@@ -20,28 +17,14 @@ static void print_pids(guint64 which, guint64 arg)
 
 	pids = glibtop_get_proclist(&buf, which, arg);
 
-	for (i = 0; i < buf.number; ++i) {
+	printf("glibtop_get_proclist(%#llx, %llu) -> %lu processes\n",
-		glibtop_proc_time ptime;
+	       which, arg, (unsigned long)buf.number);
-		glibtop_proc_uid puid;
-		glibtop_proc_state pstate;
 
-		pid_t p = pids[i];
+	for (i = 0; i < buf.number; ++i)
+		printf("%u ", pids[i]);
 
-		glibtop_get_proc_time(&ptime, p);
+	putchar('\n');
-		glibtop_get_proc_uid(&puid, p);
+	putchar('\n');
-		glibtop_get_proc_state(&pstate, p);
-
-		/* almost equivalent to ps -x -o user,pid,time,usertime,systime,start,command */
-		printf("%u pid=%u real=%.2f user=%.2f sys=%.2f start=%lu %s (%lx)\n",
-		       puid.uid,
-		       p,
-		       (double)ptime.rtime / ptime.frequency,
-		       (double)ptime.utime / ptime.frequency,
-		       (double)ptime.stime / ptime.frequency,
-		       (unsigned long)ptime.start_time,
-		       pstate.cmd,
-		       (long)ptime.flags);
-	}
 
 	g_free(pids);
 }
@@ -51,6 +34,7 @@ int main()
 {
 	glibtop_init();
 
+	print_pids(GLIBTOP_KERN_PROC_ALL, 0);
 	print_pids(GLIBTOP_KERN_PROC_UID, getuid());
 
 	glibtop_close();

examples/procmap.c

@@ -15,8 +15,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #ifdef HAVE_CONFIG_H
@@ -39,36 +39,10 @@
 #include <sys/resource.h>
 #include <sys/mman.h>
 
-#include <fcntl.h>
-
 #ifndef PROFILE_COUNT
 #define PROFILE_COUNT	1
 #endif
 
-static void
-try_mmap(const char *path)
-{
-	struct stat buf;
-	int fd;
-
-	if ((fd = open(path, O_RDONLY)) < 0)
-		goto out;
-
-	if (fstat(fd, &buf) < 0)
-		goto out;
-
-	if (mmap(NULL, buf.st_size, PROT_READ, MAP_PRIVATE, fd, 0) == MAP_FAILED)
-		goto out;
-
-	close(fd);
-
-	return;
-
-out:
-	fprintf(stderr, "Failed to test mmap with '%s'\n", path);
-}
-
-
 int
 main (int argc, char *argv [])
 {
@@ -104,18 +78,8 @@ main (int argc, char *argv [])
 
 	glibtop_init_r (&glibtop_global_server, 0, 0);
 
-	if (argc == 1) {
+	if ((argc != 2) || (sscanf (argv [1], "%d", (int *) &pid) != 1))
-		pid = getpid();
+		g_error ("Usage: %s pid", argv [0]);
-	}
-	else if ((argc != 2) || (sscanf (argv [1], "%d", (int *) &pid) != 1))
-		g_error ("Usage: %s [pid]", argv [0]);
-
-	if (pid == getpid()) {
-		/* let's map something for a try */
-		try_mmap("/etc/passwd");
-		try_mmap("/etc/resolv.conf");
-		try_mmap(argv[0]);
-	}
 
 	fprintf (stderr, "Getting memory maps for pid %d.\n\n", (int) pid);
 
@@ -123,7 +87,6 @@ main (int argc, char *argv [])
 
 	for (i = 0; i < procmap.number; i++) {
 		const char *filename = NULL;
-		char * format;
 		unsigned device, device_major, device_minor;
 		char perm [5];
 
@@ -140,27 +103,42 @@ main (int argc, char *argv [])
 		device_minor = (device & 255);
 		device_major = ((device >> 8) & 255);
 
+		if (filename) {
+			char *format;
+
 			if (sizeof (void*) == 8)
-			format = "%016lx-%016lx +%016lx (%8lu bytes mapped) - "
+				format = "%016lx-%016lx %016lx - "
-				 "%02x:%02x % 8lu - %.*s";
+					 "%02x:%02x %08lu - %5.5s - %s\n";
 			else
-			format = "%08lx-%08lx +%08lx (%8lu bytes mapped) - "
+				format = "%08lx-%08lx %08lx - "
-				 "%02x:%02x % 8lu - %.*s";
+					 "%02x:%02x %08lu - %5.5s - %s\n";
 
 			fprintf (stderr, format,
 				 (unsigned long) maps [i].start,
 				 (unsigned long) maps [i].end,
 				 (unsigned long) maps [i].offset,
-			 (unsigned long) (maps [i].end - (maps [i].start + maps [i].offset)),
 				 device_major, device_minor,
 				 (unsigned long) maps [i].inode,
-			 sizeof perm, perm);
+				 perm, filename);
+		} else {
+			char * format;
 
-		if (filename) {
+			if (sizeof (void*) == 8)
-			fprintf(stderr, " - %s", filename);
+				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);
 		}
 
-		fputc('\n', stderr);
 
 		g_print("smaps flags:%#llx size:%lluKiB rss:%lluKiB "
 			"shared_clean:%lluKib shared_dirty:%lluKiB "

examples/second.c

@@ -15,8 +15,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #ifdef HAVE_CONFIG_H
@@ -42,12 +42,14 @@ output (pid_t pid)
 	char *args;
 	unsigned i;
 
+#if HAVE_LIBGTOP_SMP
 	unsigned long total;
 	double p_total, p_utime, p_stime;
 	double b_total, b_utime, b_stime;
 	double s_total, s_utime, s_stime;
 	double my_utime, my_stime;
 	unsigned int ncpu;
+#endif
 
 	printf ("\n");
 
@@ -156,6 +158,7 @@ output (pid_t pid)
 
 	printf ("\n");
 
+#if HAVE_LIBGTOP_SMP
 	ncpu = glibtop_global_server->ncpu;
 
 	glibtop_get_proc_time (&data.proc_time, pid);
@@ -228,6 +231,7 @@ output (pid_t pid)
 		s_utime * 100.0 / my_utime, s_stime * 100.0 / my_stime);
 
 	printf ("\n");
+#endif
 }
 
 int

examples/smp.c

@@ -15,8 +15,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #include <config.h>

examples/sysdeps.c

@@ -15,8 +15,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #ifdef HAVE_CONFIG_H

examples/timings.c

@@ -15,8 +15,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #ifdef HAVE_CONFIG_H
@@ -69,21 +69,6 @@
 		}							\
 	} while (0)
 
-
-static void display_self_times(void)
-{
-	printf("-- Overview using `ps` --------------------"
-	       "---------------\n");
-	printf("-- this client is %8u ----------------"
-	       "---------------\n", (unsigned)getpid());
-	printf("-- this server is %8u ----------------"
-	       "---------------\n", (unsigned)glibtop_global_server->pid);
-	system("ps xjf | egrep 'timings|libgtop_server'");
-	printf("-------------------------------------------"
-	       "---------------\n");
-}
-
-
 int
 main (int argc, char *argv [])
 {
@@ -100,16 +85,13 @@ main (int argc, char *argv [])
 	bindtextdomain (GETTEXT_PACKAGE, GTOPLOCALEDIR);
 	textdomain (GETTEXT_PACKAGE);
 
-
-	glibtop_init_r (&glibtop_global_server, 0, 0);
-
-	display_self_times();
-
 	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);
@@ -429,8 +411,6 @@ main (int argc, char *argv [])
 	printf ("All timings are in clock ticks "
 		"(1000000 ticks per second).\n\n");
 
-	display_self_times();
-
 	glibtop_close ();
 
 	exit (0);

features.def

@@ -1,27 +1,27 @@
-void|cpu
+void|cpu|ulong(total,user,nice,sys,idle,iowait,irq,softirq,frequency,xcpu_total[4],xcpu_user[4],xcpu_nice[4],xcpu_sys[4],xcpu_idle[4],xcpu_iowait[4],xcpu_irq[4],xcpu_softirq[4])
-void|mem
+void|mem|ulong(total,used,free,shared,buffer,cached,user,locked)
-void|swap
+void|swap|ulong(total,used,free,pagein,pageout)
-void|uptime
+void|uptime|double(uptime,idletime)
-void|loadavg
+void|loadavg|double(loadavg[3]):ulong(nr_running,nr_tasks,last_pid)
-void|shm_limits
+void|shm_limits|ulong(shmmax,shmmin,shmmni,shmseg,shmall)
-void|msg_limits
+void|msg_limits|ulong(msgpool,msgmap,msgmax,msgmnb,msgmni,msgssz,msgtql)
-void|sem_limits
+void|sem_limits|ulong(semmap,semmni,semmns,semmnu,semmsl,semopm,semume,semusz,semvmx,semaem)
-pid_t*|proclist|long(which,arg)
+pid_t*|proclist|ulong(number,size,total)|long(which,arg)
-void|proc_state|pid_t(pid)
+void|proc_state|str(cmd):char(state):ulong(uid,gid)|pid_t(pid)
-void|proc_uid|pid_t(pid)
+void|proc_uid|long(uid,euid,gid,egid,pid,ppid,pgrp,session,tty,tpgid,priority,nice)|pid_t(pid)
-void|proc_mem|pid_t(pid)
+void|proc_mem|long(size,vsize,resident,share,rss,rss_rlim)|pid_t(pid)
-void|proc_time|pid_t(pid)
+void|proc_time|long(start_time,rtime,utime,stime,cutime,cstime,timeout,it_real_value,frequency,xcpu_utime[4],xcpu_stime[4])|pid_t(pid)
-void|proc_signal|pid_t(pid)
+void|proc_signal|ulong(signal[2],blocked[2],sigignore[2],sigcatch[2])|pid_t(pid)
-void|proc_kernel|pid_t(pid)
+void|proc_kernel|ulong(k_flags,min_flt,maj_flt,cmin_flt,cmaj_flt,kstk_esp,kstk_eip,nwchan):str(wchan)|pid_t(pid)
-void|proc_segment|pid_t(pid)
+void|proc_segment|ulong(text_rss,shlib_rss,data_rss,stack_rss,dirty_size,start_code,end_code,start_stack)|pid_t(pid)
-char *|proc_args|pid_t(pid):unsigned(max_len)
+char *|proc_args|ulong(size)|pid_t(pid):unsigned(max_len)
-glibtop_map_entry *|proc_map|pid_t(pid)
+glibtop_map_entry *|proc_map|ulong(number,size,total)|pid_t(pid)
-glibtop_open_files_entry *|proc_open_files|pid_t(pid)
+glibtop_open_files_entry *|proc_open_files|ulong(number)|pid_t(pid)
-glibtop_mountentry *|@mountlist|int(all_fs)
+glibtop_mountentry *|@mountlist|ulong(number,size,total)|int(all_fs)
-void|@fsusage|string|mount_dir
+void|@fsusage|ulong(blocks,bfree,bavail,files,ffree)|string|mount_dir
-void|netload|string|interface
+void|netload|ulong(if_flags,mtu,subnet,address,packets_in,packets_out,packets_total,bytes_in,bytes_out,bytes_total,errors_in,errors_out,errors_total,collisions)|string|interface
-void|ppp|ushort(device)
+void|ppp|ulong(state,bytes_in,bytes_out)|ushort(device)
-char **|netlist
+char **|netlist|unsigned(number)
-char **|proc_wd|pid_t(pid)
+char **|proc_wd|ulong(number),str(root),str(exe)|pid_t(pid)
-guint16*|proc_affinity|pid_t(pid)
+guint16*|proc_affinity|ulong(number),int(all)|pid_t(pid)
 

glibtop.h

@@ -15,24 +15,18 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #ifndef __GLIBTOP_H__
 #define __GLIBTOP_H__
 
-/* for pid_t, uid_t, gid_t */
+#include <glib/gmacros.h>
-#include <sys/types.h>
-
-
-#include <glib.h>
-#include <glib-object.h>
 
 G_BEGIN_DECLS
 
 typedef struct _glibtop		glibtop;
-typedef struct _glibtop_machine	glibtop_machine;
 
 /**
  *  LIBGTOP_CHECK_VERSION
@@ -60,6 +54,10 @@ LIBGTOP_MICRO_VERSION >= (micro)))
 
 #include <glibtop_server.h>
 
+#ifdef HAVE_GLIBTOP_MACHINE_H
+#include <glibtop_machine.h>
+#endif
+
 #ifndef GLIBTOP_MOUNTENTRY_LEN
 #define GLIBTOP_MOUNTENTRY_LEN	79
 #endif
@@ -70,6 +68,34 @@ LIBGTOP_MICRO_VERSION >= (micro)))
 #include <glibtop/close.h>
 
 
+#ifdef HAVE_GLIBTOP_MACHINE_H
+
+struct _glibtop
+{
+	unsigned flags;
+	unsigned method;		/* Server Method */
+	unsigned error_method;		/* Error Method */
+	glibtop_machine machine;	/* Machine dependent data */
+	int input [2];			/* Pipe client <- server */
+	int output [2];			/* Pipe client -> server */
+	int socket;			/* Accepted connection of a socket */
+	int ncpu;			/* Number of CPUs, zero if single-processor */
+	int real_ncpu;			/* Real number of CPUs. Only ncpu are monitored */
+	unsigned long os_version_code;	/* Version code of the operating system */
+	const char *name;		/* Program name for error messages */
+	const char *server_command;	/* Command used to invoke server */
+	const char *server_host;	/* Host the server should run on */
+	const char *server_user;	/* Name of the user on the target host */
+	const char *server_rsh;		/* Command used to connect to the target host */
+	unsigned long features;		/* Server is required for this features */
+	unsigned long server_port;	/* Port on which daemon is listening */
+	glibtop_sysdeps sysdeps;	/* Detailed feature list */
+	glibtop_sysdeps required;	/* Required feature list */
+	pid_t pid;			/* PID of the server */
+};
+
+#else /* !HAVE_GLIBTOP_MACHINE_H */
+
 struct _glibtop
 {
 	unsigned flags;
@@ -91,57 +117,27 @@ struct _glibtop
 	glibtop_sysdeps sysdeps;	/* Detailed feature list */
 	glibtop_sysdeps required;	/* Required feature list */
 	pid_t pid;			/* PID of the server */
-
-	uid_t uid;
-	uid_t euid;
-	gid_t gid;
-	gid_t egid;
-
-	glibtop_machine *machine;	/* Machine dependent data */
 };
 
+#endif /* HAVE_GLIBTOP_MACHINE_H */
+
 extern glibtop *glibtop_global_server;
 
 extern const unsigned long glibtop_server_features;
 
-/**
- * glibtop_init:
- *
- * Returns: (transfer none):
- */
 glibtop *
 glibtop_init (void);
 
-
-/**
- * glibtop_init_r:
- * @server_ptr: (out):
- * @features:
- * @flags:
- *
- * Returns: (transfer none):
- */
 glibtop *
 glibtop_init_r (glibtop **server_ptr,
 		unsigned long features,
 		unsigned flags);
 
-
-/**
- * glibtop_init_s:
- * @server_ptr: (out):
- * @features:
- * @flags:
- *
- * Returns: (transfer none):
- */
 glibtop *
 glibtop_init_s (glibtop **server_ptr,
 		unsigned long features,
 		unsigned flags);
 
-GType     glibtop_get_type (void) G_GNUC_CONST;
-
 G_END_DECLS
 
 #endif

include/glibtop/Makefile.am

@@ -2,7 +2,7 @@ glibtopdir		= $(includedir)/libgtop-2.0/glibtop
 
 glibtop_HEADERS		= close.h loadavg.h prockernel.h procstate.h \
 			  sem_limits.h uptime.h command.h mem.h proclist.h \
-			  proctime.h shm_limits.h cpu.h msg_limits.h \
+			  proctime.h shm_limits.h version.h cpu.h msg_limits.h \
 			  procmem.h procuid.h swap.h \
 			  procsegment.h sysdeps.h global.h \
 			  procsignal.h union.h gnuserv.h \
@@ -11,6 +11,4 @@ glibtop_HEADERS		= close.h loadavg.h prockernel.h procstate.h \
 			  procwd.h procaffinity.h \
 			  netlist.h procopenfiles.h open.h
 
-noinst_HEADERS		= error.h write.h read_data.h read.h init_hooks.h machine.h \
+noinst_HEADERS		= error.h write.h read_data.h read.h init_hooks.h
-			  version.h
-

include/glibtop/call-vector.h.in

@@ -19,8 +19,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #ifndef __GLIBTOP_CALL_VECTOR_H__

include/glibtop/close.h

@@ -15,8 +15,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #ifndef __GLIBTOP_CLOSE_H__

include/glibtop/command.h

@@ -15,8 +15,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #ifndef __GLIBTOP_COMMAND_H__

include/glibtop/cpu.h

@@ -15,8 +15,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #ifndef __GLIBTOP_CPU_H__
@@ -54,7 +54,7 @@ G_BEGIN_DECLS
    Yes we are :)
    Nobody should really be using more than 32 processors.
 */
-#define GLIBTOP_NCPU		1024
+#define GLIBTOP_NCPU		32
 
 typedef struct _glibtop_cpu	glibtop_cpu;
 

include/glibtop/error.h

@@ -15,8 +15,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 
@@ -46,18 +46,6 @@ void glibtop_warn (const char *format, ...) G_GNUC_PRINTF(1, 2);
 void glibtop_error_io (const char *format, ...) G_GNUC_PRINTF(1, 2) G_GNUC_NORETURN;
 void glibtop_warn_io (const char *format, ...) G_GNUC_PRINTF(1, 2);
 
-/* FIXME: C99 */
-#define glibtop_debug_r(server, fmt, ...)				\
-	G_STMT_START {							\
-	if (LIBGTOP_ENABLE_DEBUG)					\
-		glibtop_debug_r_real(server, "%s:%d %s(): " fmt, __FILE__, __LINE__, __func__, ##__VA_ARGS__); \
-	} G_STMT_END
-
-#define glibtop_debug(...) glibtop_debug_r(glibtop_global_server, __VA_ARGS__)
-
-void glibtop_debug_vr (glibtop *server, const char *format, va_list args);
-void glibtop_debug_r_real (glibtop *server, const char *format, ...) G_GNUC_PRINTF(2, 3);
-
 G_END_DECLS
 
 #endif

include/glibtop/fsusage.h

@@ -14,8 +14,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #ifndef __GLIBTOP_FSUSAGE_H__

include/glibtop/global.h

@@ -15,8 +15,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #ifndef __GLIBTOP_GLOBAL_H__

include/glibtop/loadavg.h

@@ -15,8 +15,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #ifndef __GLIBTOP_LOADAVG_H__

include/glibtop/machine.h

@@ -1,22 +0,0 @@
-#ifndef GLIBTOP_SYSDEPS_COMMON_MACHINE_H_1437506041
-#define GLIBTOP_SYSDEPS_COMMON_MACHINE_H_1437506041
-
-#include <glib.h>
-#include <glibtop_machine.h>
-
-/* private */
-static inline void
-glibtop_machine_new(glibtop *server)
-{
-	server->machine = g_new0(glibtop_machine, 1);
-}
-
-/* private */
-static inline void
-glibtop_machine_delete(glibtop *server)
-{
-	g_free(server->machine);
-	server->machine = NULL;
-}
-
-#endif /* GLIBTOP_SYSDEPS_COMMON_MACHINE_H_1437506041 */

include/glibtop/mem.h

@@ -15,8 +15,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #ifndef __GLIBTOP_MEM_H__

include/glibtop/mountlist.h

@@ -15,8 +15,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #ifndef __GLIBTOP_MOUNTLIST_H__
@@ -53,38 +53,6 @@ struct _glibtop_mountlist
 	guint64 size;			/* GLIBTOP_MOUNTLIST_SIZE	*/
 };
 
-/**
- * glibtop_get_mountlist:
- * @buf:
- * @all_fs:
- *
- * Returns: (transfer full):
- */
-
-/**
- * glibtop_get_mountlist_r:
- * @buf: (out):
- * @all_fs:
- *
- * Returns: (transfer none):
- */
-
-/**
- * glibtop_get_mountlist_s:
- * @buf: (out):
- * @all_fs:
- *
- * Returns: (transfer none):
- */
-
-/**
- * glibtop_get_mountlist_l:
- * @buf: (out):
- * @all_fs:
- *
- * Returns: (transfer none):
- */
-
 glibtop_mountentry *
 glibtop_get_mountlist(glibtop_mountlist *buf, int all_fs);
 
@@ -96,8 +64,6 @@ glibtop_get_mountlist_l (glibtop *server, glibtop_mountlist *buf, int all_fs);
 glibtop_mountentry *
 glibtop_get_mountlist_s (glibtop *server, glibtop_mountlist *buf, int all_fs);
 
-GType     glibtop_mountlist_get_type (void) G_GNUC_CONST;
-GType     glibtop_mountentry_get_type (void) G_GNUC_CONST;
 
 G_END_DECLS
 

include/glibtop/msg_limits.h

@@ -15,8 +15,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #ifndef __GLIBTOP_MSG_LIMITS_H__

include/glibtop/netlist.h

@@ -13,8 +13,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #ifndef __GLIBTOP_NETLIST_H__
@@ -31,23 +31,12 @@ G_BEGIN_DECLS
 
 typedef struct _glibtop_netlist	glibtop_netlist;
 
-/**
- * glibtop_netlist:
- * @number: Number of entries in the returned list.
- */
 struct _glibtop_netlist
 {
 	guint64 flags;
 	guint32 number;
 };
 
-/**
- * glibtop_get_netlist:
- * @buf: a #glibtop_netlist
- *
- * Returns: (array zero-terminated=1) (transfer none): an array of network
- *          interface names.
- */
 char** glibtop_get_netlist(glibtop_netlist *buf);
 
 #if GLIBTOP_SUID_NETLIST
@@ -56,39 +45,13 @@ char** glibtop_get_netlist(glibtop_netlist *buf);
 #define glibtop_get_netlist_r		glibtop_get_netlist_s
 #endif
 
-/**
- * glibtop_get_netlist_l:
- * @server: a #glibtop server
- * @buf: a #glibtop_netlist
- *
- * Returns: (array zero-terminated=1) (transfer none): an array of network
- *          interface names.
- */
 char** glibtop_get_netlist_l (glibtop *server, glibtop_netlist *buf);
 
 #if GLIBTOP_SUID_NETLIST
 void _glibtop_init_netlist_p (glibtop *server);
-
-/**
- * glibtop_get_netlist_p:
- * @server: a #glibtop server
- * @buf: a #glibtop_netlist
- *
- * Returns: (array zero-terminated=1) (transfer none): an array of network
- *          interface names.
- */
 char** glibtop_get_netlist_p (glibtop *server, glibtop_netlist *buf);
 #else
 void _glibtop_init_netlist_s (glibtop *server);
-
-/**
- * glibtop_get_netlist_s:
- * @server: a #glibtop server
- * @buf: a #glibtop_netlist
- *
- * Returns: (array zero-terminated=1) (transfer none): an array of network
- *          interface names.
- */
 char** glibtop_get_netlist_s (glibtop *server, glibtop_netlist *buf);
 #endif
 

include/glibtop/netload.h

@@ -15,8 +15,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #ifndef __GLIBTOP_NETLOAD_H__

include/glibtop/open.h

@@ -15,8 +15,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #ifndef __GLIBTOP_OPEN_H__

include/glibtop/parameter.h

@@ -15,8 +15,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #ifndef __GLIBTOP_PARAMETER_H__

include/glibtop/ppp.h

@@ -15,8 +15,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #ifndef __GLIBTOP_PPP_H__

include/glibtop/procaffinity.h

@@ -13,8 +13,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #ifndef __GLIBTOP_PROCAFFINITY_H__
@@ -29,7 +29,6 @@ typedef struct _glibtop_proc_affinity	glibtop_proc_affinity;
 
 #define GLIBTOP_PROC_AFFINITY_NUMBER	0
 #define GLIBTOP_PROC_AFFINITY_ALL	1
-#define GLIBTOP_MAX_PROC_AFFINITY	2
 
 struct _glibtop_proc_affinity
 {

include/glibtop/procargs.h

@@ -15,8 +15,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #ifndef __GLIBTOP_PROC_ARGS_H__
@@ -79,15 +79,6 @@ char **
 glibtop_get_proc_argv_l (glibtop *server, glibtop_proc_args *buf,
 			 pid_t pid, unsigned max_len);
 
-/**
- * glibtop_get_proc_argv:
- * @buf:
- * @pid:
- * @max_len:
- *
- * Returns: (transfer full):
- */
-
 char **
 glibtop_get_proc_argv (glibtop_proc_args *buf, pid_t pid, unsigned max_len);
 

include/glibtop/prockernel.h

@@ -15,8 +15,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #ifndef __GLIBTOP_PROCKERNEL_H__

include/glibtop/proclist.h

@@ -15,8 +15,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #ifndef __GLIBTOP_PROCLIST_H__
@@ -36,89 +36,22 @@ G_BEGIN_DECLS
 /* You can use the folowing constants as the `which' member of
  * glibtop_get_proclist () to specify which processes to fetch. */
 
-/**
+#define GLIBTOP_KERN_PROC_ALL		0	/* all processes */
- * GLIBTOP_KERN_PROC_ALL:
- *
- * Return information about all processes
- **/
-#define GLIBTOP_KERN_PROC_ALL		0
-
-/**
- * GLIBTOP_KERN_PROC_PID:
- *
- * Return all processes with the pid which is passed in @arg. You can use this to find out whether some process still exists.
- **/
 #define GLIBTOP_KERN_PROC_PID		1
-
-/**
- * GLIBTOP_KERN_PROC_PGRP:
- *
- * Return all processes in the process group passed in @arg. 
- **/
 #define GLIBTOP_KERN_PROC_PGRP		2
-
-/**
- * GLIBTOP_KERN_PROC_SESSION:
- *
- * Return all processes in the session passed in @arg. 
- **/
 #define GLIBTOP_KERN_PROC_SESSION	3
-
-/**
- * GLIBTOP_KERN_PROC_TTY:
- *
- * Return all processes which have the controlling tty passed in @arg
- * (which is interpreted as the device number). 
- **/
 #define GLIBTOP_KERN_PROC_TTY		4
-
-/**
- * GLIBTOP_KERN_PROC_UID:
- *
- * Return all processes with the effective uid passed in @arg. 
- **/
 #define GLIBTOP_KERN_PROC_UID		5
-
-/**
- * GLIBTOP_KERN_PROC_RUID:
- *
- * Return all processes with the real uid passed in @arg. 
- **/
 #define GLIBTOP_KERN_PROC_RUID		6
 
 #define GLIBTOP_KERN_PROC_MASK		15
 
-
-/**
- * GLIBTOP_EXCLUDE_IDLE:
- *
- * Exclude idle processes. 
- **/
 #define GLIBTOP_EXCLUDE_IDLE		0x1000
-
-/**
- * GLIBTOP_EXCLUDE_SYSTEM:
- *
- * Exclude system (on most UNIXes root's) processes.
- **/
 #define GLIBTOP_EXCLUDE_SYSTEM		0x2000
-
-/**
- * GLIBTOP_EXCLUDE_NOTTY:
- *
- * Exclude processes without a controlling terminal.
- **/
 #define GLIBTOP_EXCLUDE_NOTTY		0x4000
 
 typedef struct _glibtop_proclist	glibtop_proclist;
 
-/**
- * glibtop_proclist:
- * @number: Number of entries in the returned list.
- * @total: Total size of the returned list (this equals @number * @size).
- * @size: Size of a single entry in the returned list 
- * (this equals <type>sizeof(unsigned)</type>).
- */
 struct _glibtop_proclist
 {
 	guint64	flags;
@@ -127,15 +60,6 @@ struct _glibtop_proclist
 	guint64 size;			/* GLIBTOP_PROCLIST_SIZE	*/
 };
 
-/**
- * glibtop_get_proclist:
- * @buf: a #glibtop_proclist
- * @which: a #GLIBTOP_* constant specifying process type
- * @arg: an argument specific for the process type
- *
- * Returns: (array zero-terminated=1) (transfer none): an array of process
- *     ids
- */
 pid_t*
 glibtop_get_proclist(glibtop_proclist *buf, gint64 which, gint64 arg);
 
@@ -145,16 +69,6 @@ glibtop_get_proclist(glibtop_proclist *buf, gint64 which, gint64 arg);
 #define glibtop_get_proclist_r		glibtop_get_proclist_s
 #endif
 
-/**
- * glibtop_get_proclist_l:
- * @server: a #glibtop server
- * @buf: a #glibtop_proclist
- * @which: a #GLIBTOP_* constant specifying process type
- * @arg: an argument specific for the process type
- *
- * Returns: (array zero-terminated=1) (transfer none): an array of process
- *     ids
- */
 pid_t*
 glibtop_get_proclist_l (glibtop *server, glibtop_proclist *buf,
 			gint64 which, gint64 arg);
@@ -162,32 +76,12 @@ glibtop_get_proclist_l (glibtop *server, glibtop_proclist *buf,
 #if GLIBTOP_SUID_PROCLIST
 void _glibtop_init_proclist_p (glibtop *server);
 
-/**
- * glibtop_get_proclist_p:
- * @server: a #glibtop server
- * @buf: a #glibtop_proclist
- * @which: a #GLIBTOP_* constant specifying process type
- * @arg: an argument specific for the process type
- *
- * Returns: (array zero-terminated=1) (transfer none): an array of process
- *     ids
- */
 pid_t*
 glibtop_get_proclist_p (glibtop *server, glibtop_proclist *buf,
 			gint64 which, gint64 arg);
 #else
 void _glibtop_init_proclist_s (glibtop *server);
 
-/**
- * glibtop_get_proclist_s:
- * @server: a #glibtop server
- * @buf: a #glibtop_proclist
- * @which: a #GLIBTOP_* constant specifying process type
- * @arg: an argument specific for the process type
- *
- * Returns: (array zero-terminated=1) (transfer none): an array of process
- *     ids
- */
 pid_t*
 glibtop_get_proclist_s (glibtop *server, glibtop_proclist *buf,
 			gint64 which, gint64 arg);

include/glibtop/procmap.h

@@ -15,8 +15,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #ifndef __GLIBTOP_PROC_MAP_H__
@@ -48,10 +48,8 @@ G_BEGIN_DECLS
 #define GLIBTOP_MAP_ENTRY_SHARED_DIRTY		10
 #define GLIBTOP_MAP_ENTRY_PRIVATE_CLEAN		11
 #define GLIBTOP_MAP_ENTRY_PRIVATE_DIRTY		12
-#define GLIBTOP_MAP_ENTRY_PSS			13
-#define GLIBTOP_MAP_ENTRY_SWAP			14
 
-#define GLIBTOP_MAX_MAP_ENTRY		15
+#define GLIBTOP_MAX_MAP_ENTRY		13
 
 #define GLIBTOP_MAP_FILENAME_LEN	215
 
@@ -80,8 +78,6 @@ struct _glibtop_map_entry
 	guint64 shared_dirty;
 	guint64 private_clean; 
 	guint64 private_dirty;
-	guint64 pss;
-	guint64 swap;
 	char filename [GLIBTOP_MAP_FILENAME_LEN+1];
 };
 
@@ -92,46 +88,10 @@ struct _glibtop_proc_map
 	guint64 total;			/* GLIBTOP_PROC_MAP_TOTAL	*/
 	guint64 size;			/* GLIBTOP_PROC_MAP_SIZE	*/
 };
-
-/**
- * glibtop_get_proc_map:
- * @buf:
- * @pid:
- *
- * Returns: (transfer none):
- */
 glibtop_map_entry *
 glibtop_get_proc_map(glibtop_proc_map *buf, pid_t pid);
 
 
-
-/**
- * glibtop_get_proc_map_l:
- * @server:
- * @buf: (out):
- * @pid:
- *
- * Returns: (transfer none):
- */
-
-/**
- * glibtop_get_proc_map_p:
- * @server:
- * @buf: (out):
- * @pid:
- *
- * Returns: (transfer none):
- */
-
-/**
- * glibtop_get_proc_map_s:
- * @server:
- * @buf: (out):
- * @pid:
- *
- * Returns: (transfer none):
- */
-
 #if GLIBTOP_SUID_PROC_MAP
 #define glibtop_get_proc_map_r		glibtop_get_proc_map_p
 #else
@@ -153,8 +113,6 @@ glibtop_map_entry *
 glibtop_get_proc_map_s (glibtop *server, glibtop_proc_map *buf, pid_t pid);
 #endif
 
-GType     glibtop_map_entry_get_type (void) G_GNUC_CONST;
-GType     glibtop_proc_map_get_type (void) G_GNUC_CONST;
 
 G_END_DECLS
 

include/glibtop/procmem.h

@@ -15,8 +15,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #ifndef __GLIBTOP_PROCMEM_H__
@@ -53,12 +53,6 @@ struct _glibtop_proc_mem
 				 * of the process; usually 2,147,483,647 */
 };
 
-/**
- * glibtop_get_proc_map:
- * @buf:
- * @pid:
- *
- */
 void glibtop_get_proc_mem(glibtop_proc_mem *buf, pid_t pid);
 
 #if GLIBTOP_SUID_PROC_MEM

include/glibtop/procopenfiles.h

@@ -18,8 +18,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #ifndef __GLIBTOP_PROC_OPEN_FILES_H__
@@ -94,14 +94,6 @@ struct _glibtop_proc_open_files
 	guint64 size;			/* GLIBTOP_PROC_OPEN_FILES_SIZE   */
 };
 
-/**
- * glibtop_get_proc_open_files:
- * @buf:
- * @pid:
- *
- * Returns: (transfer none):
- */
-
 glibtop_open_files_entry *
 glibtop_get_proc_open_files(glibtop_proc_open_files *buf, pid_t pid);
 
@@ -111,32 +103,12 @@ glibtop_get_proc_open_files(glibtop_proc_open_files *buf, pid_t pid);
 #define glibtop_get_proc_open_files_r		glibtop_get_proc_open_files_s
 #endif
 
-
-/**
- * glibtop_get_proc_open_files_l:
- * @server:
- * @buf: (out):
- * @pid:
- *
- * Returns: (transfer none):
- */
-
 glibtop_open_files_entry *
 glibtop_get_proc_open_files_l (glibtop *server, glibtop_proc_open_files *buf, pid_t pid);
 
 #if GLIBTOP_SUID_PROC_FILE
 void _glibtop_init_proc_open_files_p (glibtop *server);
 
-
-/**
- * glibtop_get_proc_open_files_p:
- * @server:
- * @buf: (out):
- * @pid:
- *
- * Returns: (transfer none):
- */
-
 glibtop_open_files_entry *
 glibtop_get_proc_open_files_p (glibtop *server, glibtop_proc_open_files *buf, pid_t pid);
 #else
@@ -146,9 +118,6 @@ glibtop_open_files_entry *
 glibtop_get_proc_open_files_s (glibtop *server, glibtop_proc_open_files *buf, pid_t pid);
 #endif
 
-GType     glibtop_open_files_entry_get_type (void) G_GNUC_CONST;
-GType     glibtop_proc_open_files_get_type (void) G_GNUC_CONST;
-
 G_END_DECLS
 
 #endif

include/glibtop/procsegment.h

@@ -15,8 +15,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #ifndef __GLIBTOP_PROCSEGMENT_H__

include/glibtop/procsignal.h

@@ -15,8 +15,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #ifndef __GLIBTOP_PROCSIGNAL_H__

include/glibtop/procstate.h

@@ -15,8 +15,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #ifndef __GLIBTOP_PROCSTATE_H__

include/glibtop/proctime.h

@@ -15,8 +15,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #ifndef __GLIBTOP_PROCTIME_H__
@@ -46,50 +46,26 @@ typedef struct _glibtop_proc_time	glibtop_proc_time;
 
 /* Time section */
 
-/**
- * glibtop_proc_time:
- * @start_time: Start time of process in seconds since the epoch.
- * @rtime: Real time accumulated by process (should be @utime + @stime).
- * @utime: User-mode CPU time accumulated by process.
- * @stime: Kernel-mode CPU time accumulated by process.
- * @cutime: Cumulative utime of process and reaped children.
- * @cstime: Cumulative stime of process and reaped children.
- * @timeout: The time (in jiffies) of the process’s next timeout.
- * @it_real_value: The time (in jiffies) before the next <type>SIGALRM</type>
- * is sent to the process due to an interval timer.
- * @frequency: Tick frequency.
- * @xcpu_utime: SMP user-mode CPU time accumulated by process.
- * @xcpu_stime: SMP kernel-mode CPU time accumulated by process 
- *
- * Process time data filled by glibtop_get_proc_time().
- *
- * Under Linux the @start_time value may be wrong due to the information
- * available from the kernel.
- * 
- * The Linux kernel defines <type>INITIAL_JIFFIES</type> which implies a time
- * shift. Because <type>INITIAL_JIFFIES</type> is not user-space defined,
- * we cannot use it to compute an accurate @start_time. On Linux 2.6,
- * <type>INITIAL_JIFFIES</type> is 300 so @start_time is 
- * always 3s different from the real start time of the given process. You 
- * may also get shift results if your system clock is not synchronised 
- * with your hardware clock. See <command>man hwclock</command>.
- */
 struct _glibtop_proc_time
 {
-    /*< private >*/
 	guint64	flags;
-	/*< public >*/
+	guint64 start_time;	/* start time of process --
-	guint64 start_time;
+				 * seconds since 1-1-70 */
-	guint64 rtime;
+	guint64 rtime;		/* real time accumulated by process */
-	guint64 utime;
+	guint64 utime;		/* user-mode CPU time accumulated by process */
-	guint64 stime;
+	guint64 stime;		/* kernel-mode CPU time accumulated by process */
-	guint64 cutime;
+	guint64 cutime;		/* cumulative utime of process and
-	guint64 cstime;
+				 * reaped children */
-	guint64 timeout;
+	guint64 cstime;		/* cumulative stime of process and
-	guint64 it_real_value;
+				 * reaped children */
-	guint64 frequency;
+	guint64 timeout;	/* The time (in jiffies) of the process's
-	guint64 xcpu_utime [GLIBTOP_NCPU];
+				 * next timeout */
-	guint64 xcpu_stime [GLIBTOP_NCPU];
+	guint64 it_real_value;	/* The time (in jiffies) before the
+				 * next SIGALRM is sent to the process
+				 * due to an interval timer. */
+	guint64 frequency;	/* Tick frequency. */
+	guint64 xcpu_utime [GLIBTOP_NCPU];	/* utime and stime for all CPUs on */
+	guint64 xcpu_stime [GLIBTOP_NCPU];	/* SMP machines. */
 };
 
 

include/glibtop/procuid.h

@@ -15,8 +15,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #ifndef __GLIBTOP_PROCUID_H__

include/glibtop/procwd.h

@@ -13,8 +13,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #ifndef __GLIBTOP_PROCWD_H__
@@ -30,7 +30,7 @@ typedef struct _glibtop_proc_wd	glibtop_proc_wd;
 #define GLIBTOP_PROC_WD_NUMBER	0
 #define GLIBTOP_PROC_WD_ROOT	1
 #define GLIBTOP_PROC_WD_EXE	2
-#define GLIBTOP_MAX_PROC_WD	3
+#define GLIBTOP_PROC_WD_MAX	3
 
 #define GLIBTOP_PROC_WD_ROOT_LEN 215
 #define GLIBTOP_PROC_WD_EXE_LEN 215
@@ -44,13 +44,6 @@ struct _glibtop_proc_wd
 };
 
 
-/**
- * glibtop_get_proc_wd:
- * @buf:
- * @pid:
- *
- * Returns: (transfer full):
- */
 char ** glibtop_get_proc_wd(glibtop_proc_wd *buf, pid_t pid);
 char ** glibtop_get_proc_wd_l(glibtop *server, glibtop_proc_wd *buf, pid_t pid);
 

include/glibtop/read.h

@@ -15,8 +15,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #ifndef __GLIBTOP_READ_H__

include/glibtop/read_data.h

@@ -15,8 +15,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #ifndef __GLIBTOP_READ_DATA_H__

include/glibtop/sem_limits.h

@@ -15,8 +15,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #ifndef __GLIBTOP_SEM_LIMITS_H__

include/glibtop/shm_limits.h

@@ -15,8 +15,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #ifndef __GLIBTOP_SHM_LIMITS_H__
@@ -37,9 +37,6 @@ G_BEGIN_DECLS
 
 typedef struct _glibtop_shm_limits	glibtop_shm_limits;
 
-/**
- * glibtop_shm_limits:
- */
 struct _glibtop_shm_limits
 {
 	guint64	flags;
@@ -50,10 +47,6 @@ struct _glibtop_shm_limits
 	guint64 shmall;		/* GLIBTOP_IPC_SHMALL	*/
 };
 
-/**
- * glibtop_get_shm_limits:
- * @buf: a #glibtop_shm_limits
- */
 void glibtop_get_shm_limits(glibtop_shm_limits *buf);
 
 #if GLIBTOP_SUID_SHM_LIMITS
@@ -62,28 +55,13 @@ void glibtop_get_shm_limits(glibtop_shm_limits *buf);
 #define glibtop_get_shm_limits_r	glibtop_get_shm_limits_s
 #endif
 
-/**
- * glibtop_get_shm_limits_l:
- * @server: a #glibtop server
- * @buf: a #glibtop_shm_limits
- */
 void glibtop_get_shm_limits_l (glibtop *server, glibtop_shm_limits *buf);
 
 #if GLIBTOP_SUID_SHM_LIMITS
 void _glibtop_init_shm_limits_p (glibtop *server);
-/**
- * glibtop_get_shm_limits_p:
- * @server: a #glibtop server
- * @buf: a #glibtop_shm_limits
- */
 void glibtop_get_shm_limits_p (glibtop *, glibtop_shm_limits *buf);
 #else
 void _glibtop_init_shm_limits_s (glibtop *server);
-/**
- * glibtop_get_shm_limits_s:
- * @server: a #glibtop server
- * @buf: a #glibtop_shm_limits
- */
 void glibtop_get_shm_limits_s (glibtop *server, glibtop_shm_limits *buf);
 #endif
 

include/glibtop/signal.h

@@ -15,8 +15,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #ifndef __GLIBTOP_SIGNAL_H__

include/glibtop/swap.h

@@ -15,8 +15,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #ifndef __GLIBTOP_SWAP_H__

include/glibtop/sysdeps.h

@@ -15,8 +15,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #ifndef __GLIBTOP_SYSDEPS_H__
@@ -56,9 +56,6 @@ G_BEGIN_DECLS
 
 #define GLIBTOP_MAX_SYSDEPS		27
 
-/* The 'features' args to glibtop_init_* is an unsigned long */
-G_STATIC_ASSERT((1UL << (GLIBTOP_MAX_SYSDEPS - 1)) <= ULONG_MAX);
-
 #define GLIBTOP_SYSDEPS_ALL		((1 << GLIBTOP_MAX_SYSDEPS) - 1)
 
 typedef struct _glibtop_sysdeps	glibtop_sysdeps;

include/glibtop/sysinfo.h

@@ -15,8 +15,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #ifndef __GLIBTOP_SYSINFO_H__

include/glibtop/union.h

@@ -15,8 +15,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #ifndef __GLIBTOP_UNION_H__

include/glibtop/uptime.h

@@ -15,8 +15,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #ifndef __GLIBTOP_UPTIME_H__

include/glibtop/version.h

@@ -15,8 +15,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #ifndef __GLIBTOP_VERSION_H__

include/glibtop/write.h

@@ -15,8 +15,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #ifndef __GLIBTOP_WRITE_H__

lib/Makefile.am

@@ -1,13 +1,13 @@
 
-AM_CPPFLAGS			= @AM_CPPFLAGS@
+INCLUDES			= @INCLUDES@
 
 lib_LTLIBRARIES			= libgtop-2.0.la
 
 libgtop_2_0_la_SOURCES		= init.c open.c close.c command.c read.c \
 				  read_data.c write.c lib.c parameter.c \
-				  sysdeps.c boxed.c
+				  sysdeps.c
 
-libgtop_2_0_la_LDFLAGS		= $(LT_VERSION_INFO) -export-symbols $(srcdir)/libgtop.sym -no-undefined
+libgtop_2_0_la_LDFLAGS		= $(LT_VERSION_INFO) -export-symbols $(srcdir)/libgtop.sym
 libgtop_2_0_la_LIBADD		= $(GLIB_LIBS) $(top_builddir)/sysdeps/common/libgtop_common-2.0.la $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la $(sysdeps_suid_lib)
 
 BUILT_SOURCES			= lib.c
@@ -20,36 +20,3 @@ EXTRA_DIST			= lib.pl libgtop.sym
 
 CLEANFILES			= lib.c
 
--include $(INTROSPECTION_MAKEFILE)
-INTROSPECTION_GIRS =
-INTROSPECTION_SCANNER_ARGS = --accept-unprefixed --warn-all
-INTROSPECTION_COMPILER_ARGS =
-
-if HAVE_INTROSPECTION
-introspection_sources = $(libgtop_2_0_la_SOURCES) lib.c ../glibtop.h ../libgtopconfig.h \
-			../include/glibtop/close.h ../include/glibtop/loadavg.h ../include/glibtop/prockernel.h ../include/glibtop/procstate.h \
-			../include/glibtop/sem_limits.h ../include/glibtop/uptime.h ../include/glibtop/command.h ../include/glibtop/mem.h ../include/glibtop/proclist.h \
-			../include/glibtop/proctime.h ../include/glibtop/shm_limits.h ../include/glibtop/cpu.h ../include/glibtop/msg_limits.h \
-			../include/glibtop/procmem.h ../include/glibtop/procuid.h ../include/glibtop/swap.h \
-			../include/glibtop/procsegment.h ../include/glibtop/sysdeps.h ../include/glibtop/global.h \
-			../include/glibtop/procsignal.h ../include/glibtop/union.h ../include/glibtop/gnuserv.h \
-			../include/glibtop/parameter.h ../include/glibtop/mountlist.h ../include/glibtop/fsusage.h ../include/glibtop/procmap.h ../include/glibtop/signal.h \
-			../include/glibtop/sysinfo.h ../include/glibtop/ppp.h ../include/glibtop/procargs.h ../include/glibtop/netload.h \
-			../include/glibtop/procwd.h ../include/glibtop/procaffinity.h \
-			../include/glibtop/netlist.h ../include/glibtop/procopenfiles.h ../include/glibtop/open.h
-
-GTop-2.0.gir: libgtop-2.0.la
-GTop_2_0_gir_AM_CPPFLAGS = GObject-2.0
-GTop_2_0_gir_CFLAGS = $(AM_CPPFLAGS)
-GTop_2_0_gir_LIBS = libgtop-2.0.la
-GTop_2_0_gir_FILES = $(introspection_sources)
-INTROSPECTION_GIRS += GTop-2.0.gir
-
-girdir = $(datadir)/gir-1.0
-gir_DATA = $(INTROSPECTION_GIRS)
-
-typelibdir = $(libdir)/girepository-1.0
-typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
-
-CLEANFILES += $(gir_DATA) $(typelib_DATA)
-endif

lib/boxed.c

@@ -1,47 +0,0 @@
-/* Copyright (C) 2011 Red Hat
-   This file is part of LibGTop 1.0.
-
-   Contributed by Jasper St. Pierre <jstpierre@mecheye.net>, November 2011
-
-   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 <glibtop.h>
-#include <glibtop/mountlist.h>
-#include <glibtop/procmap.h>
-#include <glibtop/procopenfiles.h>
-
-#define DEFINE_BOXED(type)                              \
-    static type *                                       \
-    type##_copy (type *p)                               \
-    {                                                   \
-        type *n = g_new (type, 1);                      \
-        memcpy (n, p, sizeof (type));                   \
-        return n;                                       \
-    }                                                   \
-                                                        \
-    G_DEFINE_BOXED_TYPE (type,                          \
-                         type,                          \
-                         type##_copy,                   \
-                         g_free)
-
-DEFINE_BOXED (glibtop);
-DEFINE_BOXED (glibtop_map_entry);
-DEFINE_BOXED (glibtop_proc_map);
-DEFINE_BOXED (glibtop_open_files_entry);
-DEFINE_BOXED (glibtop_proc_open_files);
-DEFINE_BOXED (glibtop_mountentry);
-DEFINE_BOXED (glibtop_mountlist);

lib/close.c

@@ -15,8 +15,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #include <config.h>

lib/command.c

@@ -15,12 +15,11 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #include <config.h>
-#include <glibtop/error.h>
 #include <glibtop/read.h>
 #include <glibtop/write.h>
 #include <glibtop/read_data.h>
@@ -36,43 +35,6 @@ glibtop_call_l (glibtop *server, unsigned command, size_t send_size,
 
 	glibtop_init_r (&server, 0, 0);
 
-	g_assert(command >= GLIBTOP_CMND_QUIT && command < GLIBTOP_MAX_CMND);
-
-	switch (command) {
-#define CHECK_CMND(CMND) case (CMND): glibtop_debug("CALL: command %s sending %lu bytes", #CMND, (unsigned long)send_size); break
-	  CHECK_CMND(GLIBTOP_CMND_QUIT);
-	  CHECK_CMND(GLIBTOP_CMND_SYSDEPS);
-	  CHECK_CMND(GLIBTOP_CMND_CPU);
-	  CHECK_CMND(GLIBTOP_CMND_MEM);
-	  CHECK_CMND(GLIBTOP_CMND_SWAP);
-	  CHECK_CMND(GLIBTOP_CMND_UPTIME);
-	  CHECK_CMND(GLIBTOP_CMND_LOADAVG);
-	  CHECK_CMND(GLIBTOP_CMND_SHM_LIMITS);
-	  CHECK_CMND(GLIBTOP_CMND_MSG_LIMITS);
-	  CHECK_CMND(GLIBTOP_CMND_SEM_LIMITS);
-	  CHECK_CMND(GLIBTOP_CMND_PROCLIST);
-	  CHECK_CMND(GLIBTOP_CMND_PROC_STATE);
-	  CHECK_CMND(GLIBTOP_CMND_PROC_UID);
-	  CHECK_CMND(GLIBTOP_CMND_PROC_MEM);
-	  CHECK_CMND(GLIBTOP_CMND_PROC_TIME);
-	  CHECK_CMND(GLIBTOP_CMND_PROC_SIGNAL);
-	  CHECK_CMND(GLIBTOP_CMND_PROC_KERNEL);
-	  CHECK_CMND(GLIBTOP_CMND_PROC_SEGMENT);
-	  CHECK_CMND(GLIBTOP_CMND_PROC_ARGS);
-	  CHECK_CMND(GLIBTOP_CMND_PROC_MAP);
-	  CHECK_CMND(GLIBTOP_CMND_MOUNTLIST);
-	  CHECK_CMND(GLIBTOP_CMND_FSUSAGE);
-	  CHECK_CMND(GLIBTOP_CMND_NETLOAD);
-	  CHECK_CMND(GLIBTOP_CMND_PPP);
-	  CHECK_CMND(GLIBTOP_CMND_NETLIST);
-	  CHECK_CMND(GLIBTOP_CMND_PROC_OPEN_FILES);
-	  CHECK_CMND(GLIBTOP_CMND_PROC_WD);
-	  CHECK_CMND(GLIBTOP_CMND_PROC_AFFINITY);
-	default:
-	  glibtop_error_r(server, "CALL: command UNKNOWN(%d) sending %lu bytes", command, (unsigned long)send_size); break;
-	}
-#undef CHECK_CMND
-
 	cmnd.command = command;
 
 	/* If send_size is less than _GLIBTOP_PARAM_SIZE (normally 16 Bytes), we
@@ -90,8 +52,10 @@ glibtop_call_l (glibtop *server, unsigned command, size_t send_size,
 
 	glibtop_read_l (server, sizeof (glibtop_response), &response);
 
-	glibtop_debug ("RESPONSE: offset=%lu - data_size=%lu",
+#ifdef DEBUG
+	fprintf (stderr, "RESPONSE: %lu - %d\n",
 		 response.offset, response.data_size);
+#endif
 
 	if (recv_buf)
 		memcpy (recv_buf, ((char *) &response) + response.offset,

lib/init.c

@@ -15,8 +15,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #include <config.h>
@@ -26,14 +26,12 @@
 #include <glibtop/open.h>
 #include <glibtop/parameter.h>
 #include <glibtop/init_hooks.h>
-#include <glibtop/machine.h>
-
 
 #ifndef DEFAULT_PORT
 #define DEFAULT_PORT 42800
 #endif
 
-static glibtop _glibtop_global_server;
+static glibtop _glibtop_global_server = { 0 };
 glibtop *glibtop_global_server = &_glibtop_global_server;
 
 static void
@@ -143,7 +141,7 @@ _init_server (glibtop *server, const unsigned features)
 
 		/* Open pipe to server. */
 		server->method = GLIBTOP_METHOD_PIPE;
-		server->server_command = g_strdup(LIBGTOP_SERVER);
+
 	} else {
 
 		glibtop_error_r (server, "Unknown server method '%s'",
@@ -175,9 +173,6 @@ glibtop_init_r (glibtop **server_ptr, unsigned long features, unsigned flags)
 	/* Do the initialization, but only if not already initialized. */
 
 	if ((server->flags & _GLIBTOP_INIT_STATE_INIT) == 0) {
-
-		glibtop_machine_new (server);
-
 		if (flags & GLIBTOP_FEATURES_EXCEPT)
 			features = ~features & GLIBTOP_SYSDEPS_ALL;
 
@@ -214,7 +209,7 @@ glibtop_init_r (glibtop **server_ptr, unsigned long features, unsigned flags)
 	/* Open server, but only if not already opened. */
 
 	if ((server->flags & _GLIBTOP_INIT_STATE_OPEN) == 0)
-		glibtop_open_l (server, "glibtop",
+		glibtop_open_l (glibtop_global_server, "glibtop",
 				features, flags);
 
 	return server;
@@ -226,8 +221,6 @@ glibtop_init_s (glibtop **server_ptr, unsigned long features, unsigned flags)
 	glibtop *server;
 	const _glibtop_init_func_t *init_fkt;
 
-	glibtop_debug("init_s with features=%#0lx and flags=%#0x", features, flags);
-
 	if (server_ptr == NULL)
 		return NULL;
 

lib/lib.pl

@@ -88,7 +88,7 @@ sub output {
     @line_fields = split(/\|/, $line, 9999);
     $retval = $line_fields[1];
     $feature = $line_fields[2];
-    $param_def = $line_fields[3];
+    $param_def = $line_fields[4];
 
     $orig = $feature;
     $feature =~ s/^@//;
@@ -106,16 +106,16 @@ sub output {
     }
 
     if ($param_def eq 'string') {
-	$call_param = ', ' . $line_fields[4];
+	$call_param = ', ' . $line_fields[5];
 	$param_buf = '';
 	$buf_set = '';
 	$param_decl = ",\n            " . $space . '    const char *' .
 
-	  $line_fields[4];
+	  $line_fields[5];
-	$send_ptr = "\n\tconst void *send_ptr = " . $line_fields[4] . ';';
+	$send_ptr = "\n\tconst void *send_ptr = " . $line_fields[5] . ';';
 	$send_size = "\n\tconst size_t send_size =\n\t\tstrlen (" .
 
-	  $line_fields[4] . ') + 1;';
+	  $line_fields[5] . ') + 1;';
     }
     else {
 	$call_param = '';
@@ -126,7 +126,7 @@ sub output {
 	$buf_set = '';
 	$nr_params = (@params = split(/:/, $param_def, 9999));
 	if ($nr_params) {
-	    $param_buf = "\t\tstruct {\n";
+	    $param_buf = "\n\tstruct {\n";
 	}
 	for ($param = 1; $param <= $nr_params; $param++) {
 	    $list = $params[$param];
@@ -138,8 +138,8 @@ sub output {
 
 	    if ($count > 0) {
 		for ($field = 1; $field <= $count; $field++) {
-		    $param_buf .= "\t\t\t$convert{$type} buf_$fields[$field];\n";
+		    $param_buf .= "\t\t$convert{$type} buf_$fields[$field];\n";
-		    $buf_set .= "\t\tparam_buf.buf_$fields[$field] = $fields[$field];\n";
+		    $buf_set .= "\tparam_buf.buf_$fields[$field] = $fields[$field];\n";
 		}
 	    }
 
@@ -155,19 +155,19 @@ sub output {
 		  $fields[$field];
 		$call_param = $call_param . ', ' . $fields[$field];
 		if ($send_ptr eq '') {
-		    $send_ptr = "\t\tconst void *send_ptr = &param_buf;";
+		    $send_ptr = "\n\tconst void *send_ptr = &param_buf;";
 		}
 	    }
 	}
 	if ($nr_params) {
-	    $param_buf .= "\t\t} param_buf;\n";
+	    $param_buf .= "\t} param_buf;";
-	    $send_size  = "\t\tconst size_t send_size = sizeof param_buf;";
+	    $send_size  = "\n\tconst size_t send_size = sizeof param_buf;";
 	}
 	else {
-	    $send_size = "\t\tconst size_t send_size = 0;";
+	    $send_size = "\n\tconst size_t send_size = 0;";
 	}
 	if ($send_ptr eq '') {
-	    $send_ptr = "\t\tconst void *send_ptr = NULL;";
+	    $send_ptr = "\n\tconst void *send_ptr = NULL;";
 	}
     }
 
@@ -175,11 +175,13 @@ sub output {
 
       $feature . ' *buf' . $param_decl . ')';
 
-    print "{";
+    print "{" . $param_buf;
 
+    print $send_ptr . '' . $send_size;
     if ($retval !~ /^void$/) {
 	print "\t" . $retval . ' retval = (' . $retval . ') 0;';
     }
+    print $buf_set;
 
     print "\tglibtop_init_r (&server, (1 << GLIBTOP_SYSDEPS_" .
 
@@ -196,15 +198,6 @@ sub output {
       &toupper($feature) . ')))';
     print "\t{";
 
-    if ($param_buf) {
-        print $param_buf;
-        print $buf_set;
-    }
-
-    print $send_ptr;
-    print $send_size;
-    print '';
-
     print "\t\t" . $prefix . 'glibtop_call_l (server, GLIBTOP_CMND_' .
 
       &toupper($feature) . ',';

lib/libgtop.sym

@@ -68,10 +68,3 @@ glibtop_open_l
 glibtop_server_features
 glibtop_set_parameter_l
 glibtop_sys_siglist
-glibtop_mountlist_get_type
-glibtop_mountentry_get_type
-glibtop_open_files_entry_get_type
-glibtop_proc_open_files_get_type
-glibtop_map_entry_get_type
-glibtop_proc_map_get_type
-glibtop_get_type

lib/open.c

@@ -15,8 +15,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #include <config.h>
@@ -47,44 +47,56 @@ glibtop_open_l (glibtop *server, const char *program_name,
 
 	server->error_method = GLIBTOP_ERROR_METHOD_DEFAULT;
 
-	glibtop_debug ("SIZEOF: %zu - %zu - %zu - %zu - %zu - %zu",
+#ifdef DEBUG
+	fprintf (stderr, "SIZEOF: %u - %u - %u - %u - %u - %u\n",
 		 sizeof (glibtop_command), sizeof (glibtop_response),
 		 sizeof (glibtop_mountentry), sizeof (glibtop_union),
 		 sizeof (glibtop_sysdeps), sizeof (glibtop_response_union));
+#endif
 
 	switch (server->method) {
 	case GLIBTOP_METHOD_DIRECT:
 		server->features = 0;
 		break;
 	case GLIBTOP_METHOD_INET:
-		glibtop_debug ("Connecting to '%s' port %ld.",
+#ifdef DEBUG
+		fprintf (stderr, "Connecting to '%s' port %ld.\n",
 			 server->server_host, server->server_port);
+#endif
 
 		connect_type = glibtop_make_connection
 			(server->server_host, server->server_port,
 			 &server->socket);
 
-		glibtop_debug ("Connect Type is %d.", connect_type);
+#ifdef DEBUG
+		fprintf (stderr, "Connect Type is %d.\n", connect_type);
+#endif
 
 		server->flags |= _GLIBTOP_INIT_STATE_SERVER;
 
 		server->features = -1;
 		break;
 	case GLIBTOP_METHOD_UNIX:
-		glibtop_debug ("Connecting to Unix Domain Socket.");
+#ifdef DEBUG
+		fprintf (stderr, "Connecting to Unix Domain Socket.\n");
+#endif
 
 		connect_type = glibtop_make_connection
 			("unix", 0, &server->socket);
 
-		glibtop_debug ("Connect Type is %d.", connect_type);
+#ifdef DEBUG
+		fprintf (stderr, "Connect Type is %d.\n", connect_type);
+#endif
 
 		server->flags |= _GLIBTOP_INIT_STATE_SERVER;
 
 		server->features = -1;
 		break;
 	case GLIBTOP_METHOD_PIPE:
-		glibtop_debug ("Opening pipe to server (%s).",
+#ifdef DEBUG
-			 server->server_command);
+		fprintf (stderr, "Opening pipe to server (%s).\n",
+			 LIBGTOP_SERVER);
+#endif
 
 		if (pipe (server->input) || pipe (server->output))
 			glibtop_error_io_r (server, "cannot make a pipe");
@@ -98,9 +110,9 @@ glibtop_open_l (glibtop *server, const char *program_name,
 			close (server->input [0]); close (server->output [1]);
 			dup2 (server->input [1], 1);
 			dup2 (server->output [0], 0);
-			execl (server->server_command, "libgtop-server", NULL);
+			execl (LIBGTOP_SERVER, "libgtop-server", NULL);
 			glibtop_error_io_r (server, "execl (%s)",
-					    server->server_command);
+					    LIBGTOP_SERVER);
 			_exit (2);
 		}
 
@@ -153,14 +165,18 @@ glibtop_open_l (glibtop *server, const char *program_name,
 
 		memcpy (&server->sysdeps, &sysdeps, sizeof (glibtop_sysdeps));
 
-		glibtop_debug ("Server features are %#0lx.",
+#ifdef DEBUG
+		fprintf (stderr, "Server features are %lu.\n",
 			 server->features);
+#endif
 	}
 
 	/* In any case, we call the open functions of our own sysdeps
 	 * directory. */
 
-	glibtop_debug ("Calling sysdeps open function.");
+#ifdef DEBUG
+	fprintf (stderr, "Calling sysdeps open function.\n");
+#endif
 
 	glibtop_init_s (&server, features, flags);
 }

lib/parameter.c

@@ -15,8 +15,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #include <config.h>

lib/read.c

@@ -15,8 +15,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #include <config.h>
@@ -33,7 +33,9 @@ glibtop_read_l (glibtop *server, size_t size, void *buf)
 	int fd;
 	glibtop_init_r (&server, 0, 0);
 
-	glibtop_debug("LIBRARY: really reading %d bytes.", (int)size);
+#ifdef DEBUG
+	fprintf (stderr, "LIBRARY: really reading %d bytes.\n", (int)size);
+#endif
 
 	fd = server->socket ? server->socket : server->input[0];
 

lib/read_data.c

@@ -15,8 +15,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #include <config.h>
@@ -36,8 +36,10 @@ glibtop_read_data_l (glibtop *server)
 
 	glibtop_init_r (&server, 0, 0);
 
-	glibtop_debug ("LIBRARY: reading %lu data bytes.",
+#ifdef DEBUG
+	fprintf (stderr, "LIBRARY: reading %lu data bytes.\n",
 		 (unsigned long) sizeof (size_t));
+#endif
 
 	if (server->socket) {
 		ret = recv (server->socket, &size, sizeof (size_t), 0);
@@ -48,8 +50,10 @@ glibtop_read_data_l (glibtop *server)
 	if (ret < 0)
 		glibtop_error_io_r (server, _("read data size"));
 
-	glibtop_debug ("LIBRARY: really reading %lu data bytes (ret = %d).",
+#ifdef DEBUG
+	fprintf (stderr, "LIBRARY: really reading %lu data bytes (ret = %d).\n",
 		 (unsigned long) size, ret);
+#endif
 
 	if (!size) return NULL;
 

lib/sysdeps.c

@@ -15,8 +15,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #include <config.h>

lib/write.c

@@ -15,8 +15,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #include <config.h>
@@ -37,7 +37,9 @@ glibtop_write_l (glibtop *server, size_t size, void *buf)
 
 	if (size == 0) return;
 
-	glibtop_debug("LIBRARY: really writing %d bytes.", (int)size);
+#ifdef DEBUG
+	fprintf (stderr, "LIBRARY: really writing %d bytes.\n", (int)size);
+#endif
 
 	fd = server->socket ? server->socket : server->output[1];
 

libgtop-sysdeps.m4

@@ -4,13 +4,17 @@ dnl
 dnl It defines the following variables:
 dnl
 dnl * 'libgtop_sysdeps_dir'    - sysdeps dir for libgtop.
-dnl * 'libgtop_need_server'    - is the server really needed? Defines 'LIBGTOP_NEED_SERVER'
+dnl * 'libgtop_use_machine_h'  - some of system dependend parts of libgtop provide
-dnl                              if true; defines conditional 'LIBGTOP_NEED_SERVER'.
+dnl                              their own header file. In this case we need to
+dnl                              define 'HAVE_GLIBTOP_MACHINE_H'.
+dnl * 'libgtop_need_server'    - is the server really needed? Defines 'NEED_LIBGTOP'
+dnl                              if true; defines conditional 'NEED_LIBGTOP'.
 
 AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[
 	AC_REQUIRE([AC_CANONICAL_HOST])
 
 	AC_SUBST(libgtop_sysdeps_dir)
+	AC_SUBST(libgtop_use_machine_h)
 	AC_SUBST(libgtop_need_server)
 
 	AC_ARG_WITH(libgtop-examples,
@@ -27,30 +31,53 @@ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[
 
 	AM_CONDITIONAL(HACKER_MODE, test x"$hacker_mode" = xyes)
 
+	AC_ARG_WITH(libgtop-smp,
+	AS_HELP_STRING([--with-libgtop-smp],
+	[Enable SMP support @<:@default-auto@:>@]),[
+	libgtop_smp="$withval"],[libgtop_smp=auto])
+
+	if test $libgtop_smp = auto ; then
+	  AC_MSG_CHECKING(whether to enable SMP support)
+	  case "$host_os" in
+	  linux*)
+	    libgtop_smp=yes
+	    ;;
+	  aix*)
+	    libgtop_smp=yes
+	    ;;
+	  *)
+	    libgtop_smp=no
+	    ;;
+	  esac
+	  AC_MSG_RESULT($libgtop_smp)
+	fi
+
+	if test $libgtop_smp = yes ; then
+	  AC_DEFINE(HAVE_LIBGTOP_SMP, 1, [Define if libgtop supports SMP])
+	fi
+
+	AM_CONDITIONAL(LIBGTOP_SMP, test $libgtop_smp = yes)
+
 	AC_MSG_CHECKING(for libgtop sysdeps directory)
 
 	case "$host_os" in
 	linux*)
 	  libgtop_sysdeps_dir=linux
+	  libgtop_use_machine_h=no
 	  libgtop_have_sysinfo=yes
 	  libgtop_need_server=no
 	  libgtop_sysdeps_private_mountlist=yes
 	  libgtop_sysdeps_private_fsusage=yes
 	  ;;
-	netbsd*|bsdi*)
+	netbsd*|openbsd*|bsdi*)
 	  libgtop_sysdeps_dir=bsd
+	  libgtop_use_machine_h=yes
 	  libgtop_need_server=yes
 	  libgtop_postinstall='chgrp kmem $(bindir)/libgtop_server2 && chmod 2755 $(bindir)/libgtop_server2'
 	  ;;
-	openbsd*)
-	  libgtop_sysdeps_dir=openbsd
-	  libgtop_need_server=yes
-	  libgtop_sysdeps_private_mountlist=yes
-	  libgtop_sysdeps_private_fsusage=yes
-	  libgtop_postinstall='chgrp kmem $(bindir)/libgtop_server2 && chmod 2555 $(bindir)/libgtop_server2'
-	  ;;
 	freebsd*|kfreebsd*)
 	  libgtop_sysdeps_dir=freebsd
+	  libgtop_use_machine_h=yes
 	  libgtop_need_server=yes
 	  libgtop_sysdeps_private_mountlist=yes
 	  libgtop_sysdeps_private_fsusage=yes
@@ -58,27 +85,24 @@ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[
 	  ;;
 	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'
 	  ;;
 	aix*)
 	  libgtop_sysdeps_dir=aix
+	  libgtop_use_machine_h=yes
 	  libgtop_need_server=yes
 	  libgtop_have_sysinfo=yes
 	  libgtop_postinstall='chgrp system $(bindir)/libgtop_server && chmod g+s $(bindir)/libgtop_server2'
 	  ;;
 	darwin*)
 	  libgtop_sysdeps_dir=darwin
+	  libgtop_use_machine_h=yes
 	  libgtop_need_server=yes
 	  libgtop_have_sysinfo=yes
 	  libgtop_postinstall='chgrp kmem $(bindir)/libgtop_server2 && chmod g+s $(bindir)/libgtop_server2'
 	  ;;
-	cygwin*)
-	  libgtop_sysdeps_dir=cygwin
-	  libgtop_need_server=no
-	  libgtop_have_sysinfo=yes
-	  libgtop_sysdeps_private_mountlist=yes
-	  ;;
 	*)
 	  if test x$hacker_mode = xyes ; then
 	    case "$host_os" in
@@ -86,19 +110,23 @@ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[
 	      #Please note that this port is obsolete and not working at
 	      #all. It is only useful for people who want to fix it ... :-)
 	      libgtop_sysdeps_dir=sun4
+	      libgtop_use_machine_h=yes
 	      libgtop_need_server=yes
 	      ;;
 	    osf*)
 	      libgtop_sysdeps_dir=osf1
+	      libgtop_use_machine_h=yes
 	      libgtop_need_server=yes
 	      ;;
 	    *)
 	      libgtop_sysdeps_dir=stub
+	      libgtop_use_machine_h=no
 	      libgtop_need_server=no
 	      ;;
 	    esac
 	  else
 	    libgtop_sysdeps_dir=stub
+	    libgtop_use_machine_h=no
 	    libgtop_need_server=no
 	  fi
 	  ;;
@@ -114,13 +142,30 @@ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[
 
 	case "$host_os" in
 	*bsd*)
-	  AC_CHECK_LIB(kvm, kvm_open, KVM_LIBS=-lkvm, KVM_LIBS=)
+		case "$host_os" in
+		*kfreebsd*)
+		AC_CHECK_LIB(kvm, kvm_open, KVM_LIBS="-lkvm -lfreebsd -lbsd", KVM_LIBS=, -lfreebsd -lbsd);;
+		*) 
+	  	AC_CHECK_LIB(kvm, kvm_open, KVM_LIBS=-lkvm, KVM_LIBS=);;
+	  	esac
+	  
 	  AC_SUBST(KVM_LIBS)
 
-	  AC_CHECK_HEADERS(net/if_var.h,,, [
+	  case "$host_os" in
-#include <net/if.h>
+	  kfreebsd*)
-#include <sys/types.h>
+	  	EXTRA_SYSDEPS_LIBS="-lgeom -ldevstat"
-#include <sys/socket.h>])
+		;;
+	  freebsd*)
+	  	osreldate=`sysctl -n kern.osreldate 2>/dev/null`
+		if test -n "${osreldate}" && test ${osreldate} -ge 600000 ; then
+		    EXTRA_SYSDEPS_LIBS="-lgeom -ldevstat"
+		fi
+		;;
+          esac
+
+	  AC_SUBST(EXTRA_SYSDEPS_LIBS)
+
+	  AC_CHECK_HEADERS(net/if_var.h)
 	  AC_MSG_CHECKING([for I4B])
 	  AC_TRY_COMPILE([
 #include <sys/types.h>
@@ -185,10 +230,10 @@ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[
 	  fi
 
 	  AC_MSG_CHECKING(what we need to define to get struct msginfo)
-	  AC_CACHE_VAL(msginfo_cv_needs,
+	  AC_CACHE_VAL(msginfo_needs,
-	    msginfo_cv_needs=
+	    msginfo_needs=
 	    for def in nothing KERNEL _KERNEL; do
-	      AC_COMPILE_IFELSE([AC_LANG_SOURCE([#define $def
+	      AC_COMPILE_IFELSE([#define $def
 #include <sys/types.h>
 #include <sys/ipc.h>
 #include <sys/msg.h>
@@ -200,23 +245,23 @@ main (void)
   struct msginfo mi;
   mi.msgmax = 0;
   return 0;
-}])],
+}],
 	        [
-	          msginfo_cv_needs=$def
+	          msginfo_needs=$def
-	          if test ${msginfo_cv_needs} = KERNEL; then
+	          if test ${msginfo_needs} = KERNEL; then
 	            AC_DEFINE(STRUCT_MSGINFO_NEEDS_KERNEL, 1,
 	              [Define to 1 if we need to define KERNEL to get 'struct msginfo'])
-	          elif test ${msginfo_cv_needs} = _KERNEL; then
+	          elif test ${msginfo_needs} = _KERNEL; then
 	            AC_DEFINE(STRUCT_MSGINFO_NEEDS__KERNEL, 1,
 	              [Define to 1 if we need to define _KERNEL to get 'struct msginfo'])
 	          fi
 	        ]
 	      )
-	      test -n "${msginfo_cv_needs}" && break
+	      test -n "${msginfo_needs}" && break
 	    done
 	  )
-	  AC_MSG_RESULT($msginfo_cv_needs)
+	  AC_MSG_RESULT($msginfo_needs)
-	  if test -z "${msginfo_cv_needs}"; then
+	  if test -z "${msginfo_needs}"; then
 	    AC_MSG_ERROR([Could not find the definition of 'struct msginfo'])
 	  fi
 	  ;;
@@ -261,14 +306,22 @@ main (void)
 	  ;;
 	esac
 
+	AC_MSG_CHECKING(for machine.h in libgtop sysdeps dir)
+	AC_MSG_RESULT($libgtop_use_machine_h)
+
 	AC_MSG_CHECKING(whether we need libgtop)
 	AC_MSG_RESULT($libgtop_need_server)
 
 	if test x$libgtop_need_server = xyes ; then
-	  AC_DEFINE(LIBGTOP_NEED_SERVER, 1, [Define if libgtop server is required])
+	  AC_DEFINE(NEED_LIBGTOP, 1, [Define if libgtop is required])
 	fi
 
-	AM_CONDITIONAL(LIBGTOP_NEED_SERVER, test x$libgtop_need_server = xyes)
+	if test x$libgtop_use_machine_h = xyes ; then
+	  AC_DEFINE(HAVE_GLIBTOP_MACHINE_H, 1,
+                    [Define if machine.h in libgtop sysdeps dir])
+	fi
+
+	AM_CONDITIONAL(NEED_LIBGTOP, test x$libgtop_need_server = xyes)
 	AM_CONDITIONAL(LIBGTOP_SYSDEPS_PRIVATE_MOUNTLIST, test x$libgtop_sysdeps_private_mountlist = xyes)
 	AM_CONDITIONAL(LIBGTOP_SYSDEPS_PRIVATE_FSUSAGE, test x$libgtop_sysdeps_private_fsusage = xyes)
 ])

libgtop.doap

@@ -1,31 +0,0 @@
-<Project xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
-         xmlns:foaf="http://xmlns.com/foaf/0.1/"
-         xmlns:gnome="http://api.gnome.org/doap-extensions#"
-         xmlns="http://usefulinc.com/ns/doap#">
-
-  <name xml:lang="en">libgtop</name>
-  <shortdesc xml:lang="en">LibGTop2</shortdesc>
-  <download-page rdf:resource="http://download.gnome.org/sources/libgtop/" />
-  <bug-database rdf:resource="http://bugzilla.gnome.org/browse.cgi?product=libgtop" />
-  <category rdf:resource="http://api.gnome.org/doap-extensions#core" />
-  <programming-language>C</programming-language>
-
-  <maintainer>
-    <foaf:Person>
-      <foaf:name>Benoît Dejean</foaf:name>
-      <foaf:mbox rdf:resource="mailto:benoit@placenet.org" />
-      <gnome:userid>bdejean</gnome:userid>
-    </foaf:Person>
-  </maintainer>
-
-  <maintainer>
-    <foaf:Person>
-      <foaf:name>Robert Roth</foaf:name>
-      <foaf:mbox rdf:resource="mailto:robert.roth.off@gmail.com" />
-      <gnome:userid>robertroth</gnome:userid>
-    </foaf:Person>
-  </maintainer>
-
-</Project>
-

ltconfig

@@ -16,7 +16,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -2756,7 +2756,7 @@ case "$ltmain" in
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a

m4/introspection.m4

@@ -1,96 +0,0 @@
-dnl -*- mode: autoconf -*-
-dnl Copyright 2009 Johan Dahlin
-dnl
-dnl This file is free software; the author(s) gives unlimited
-dnl permission to copy and/or distribute it, with or without
-dnl modifications, as long as this notice is preserved.
-dnl
-
-# serial 1
-
-m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL],
-[
-    AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
-    AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
-    AC_BEFORE([LT_INIT],[$0])dnl setup libtool first
-
-    dnl enable/disable introspection
-    m4_if([$2], [require],
-    [dnl
-        enable_introspection=yes
-    ],[dnl
-        AC_ARG_ENABLE(introspection,
-                  AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]],
-                                 [Enable introspection for this build]),, 
-                                 [enable_introspection=auto])
-    ])dnl
-
-    AC_MSG_CHECKING([for gobject-introspection])
-
-    dnl presence/version checking
-    AS_CASE([$enable_introspection],
-    [no], [dnl
-        found_introspection="no (disabled, use --enable-introspection to enable)"
-    ],dnl
-    [yes],[dnl
-        PKG_CHECK_EXISTS([gobject-introspection-1.0],,
-                         AC_MSG_ERROR([gobject-introspection-1.0 is not installed]))
-        PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1],
-                         found_introspection=yes,
-                         AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME]))
-    ],dnl
-    [auto],[dnl
-        PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no)
-    ],dnl
-    [dnl	
-        AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@])
-    ])dnl
-
-    AC_MSG_RESULT([$found_introspection])
-
-    INTROSPECTION_SCANNER=
-    INTROSPECTION_COMPILER=
-    INTROSPECTION_GENERATE=
-    INTROSPECTION_GIRDIR=
-    INTROSPECTION_TYPELIBDIR=
-    if test "x$found_introspection" = "xyes"; then
-       INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
-       INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
-       INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
-       INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
-       INTROSPECTION_GIRDIR=`echo ${INTROSPECTION_GIRDIR} | sed -e "s|${datadir}|\\\$(datadir)|"`
-       INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
-       INTROSPECTION_TYPELIBDIR=`echo ${INTROSPECTION_TYPELIBDIR} | sed -e "s|${libdir}|\\\$(libdir)|"`
-       INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
-       INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
-       INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
-    fi
-    AC_SUBST(INTROSPECTION_SCANNER)
-    AC_SUBST(INTROSPECTION_COMPILER)
-    AC_SUBST(INTROSPECTION_GENERATE)
-    AC_SUBST(INTROSPECTION_GIRDIR)
-    AC_SUBST(INTROSPECTION_TYPELIBDIR)
-    AC_SUBST(INTROSPECTION_CFLAGS)
-    AC_SUBST(INTROSPECTION_LIBS)
-    AC_SUBST(INTROSPECTION_MAKEFILE)
-
-    AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes")
-])
-
-
-dnl Usage:
-dnl   GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version])
-
-AC_DEFUN([GOBJECT_INTROSPECTION_CHECK],
-[
-  _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1])
-])
-
-dnl Usage:
-dnl   GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version])
-
-
-AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE],
-[
-  _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require])
-])

po/ChangeLog

@@ -1,47 +1,3 @@
-2009-06-10  Manoj Kumar Giri <mgiri@redhat.com>
-
-	* hi.po: Committed Hindi Translation on behalf of Rajesh Ranjan.
-
-2009-03-18  Djihed Afifi <djihed@gmail.com>
-
-	* ar.po: Updated Arabic translation by Khaled Hosny.
-
-2009-03-16  Ignacio Casal Quinteiro  <icq@gnome.org>
-
-	 * gl.po: Updated Galician translation by Suso Baleato.
-
-2009-03-16  Amitakhya Phukan <amitakhya@svn.gnome.org>
-
-	* LINGUAS: Added as.
-	* as.po: Updated Assamese translations.
-
-2009-03-15  Shankar Prasad  <svenkate@redhat.com>
-
-        * kn.po: Added Kannada translations.
-	* LINGUAS: Added Kannad (kn) to the list
-
-2009-03-10  Manoj Kumar Giri  <mgiri@redhat.com>
-
-	* or.po: Updated Oriya Translation.
-
-2009-02-09  Chao-Hsiung Liao  <j_h_liau@yahoo.com.tw>
-
-        * zh_HK.po: Updated Traditional Chinese translation(Hong Kong).
-	* zh_TW.po: Updated Traditional Chinese translation(Taiwan).
-
-2009-01-29  Changwoo Ryu  <cwryu@debian.org>
-
-	* ko.po: Updated Korean translation.
-
-2009-01-25  Raivis Dejus  <orvils@gmail.com>
-
-	* lv.po: Updated Latvian translation.
-
-2008-11-14  Thomas Thurman  <tthurman@gnome.org>
-
-        * la.po: added Latin translation by Rafael Garcia.
-        * LINGUAS: added Latin.
-
 2008-10-19  Djihed Afifi <djihed@gmail.com> 
 
 	* ar.po: Updated Arabic Translation by Khaled Hosny.

po/LINGUAS

@@ -1,9 +1,7 @@
-#
 # please keep this list sorted alphabetically
+#
 am
 ar
-as
-ast
 az
 be
 bg
@@ -11,7 +9,6 @@ bn
 bn_IN
 bs
 ca
-ca@valencia
 cs
 cy
 da
@@ -20,7 +17,6 @@ dz
 el
 en_CA
 en_GB
-en@shaw
 eo
 es
 et
@@ -28,7 +24,6 @@ eu
 fa
 fi
 fr
-fur
 ga
 gl
 gu
@@ -40,14 +35,11 @@ id
 it
 ja
 ka
-kn
 ko
 ku
 ky
-la
 lt
 lv
-mai
 mg
 mi
 mk
@@ -76,10 +68,8 @@ sr@latin
 sv
 ta
 te
-tg
 th
 tr
-ug
 uk
 vi
 xh

po/ar.po

@@ -9,9 +9,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libgtop.HEAD\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"Report-Msgid-Bugs-To: \n"
-"product=libgtop&component=general\n"
+"POT-Creation-Date: 2008-01-12 01:07+0000\n"
-"POT-Creation-Date: 2009-03-16 22:15+0000\n"
 "PO-Revision-Date: 2008-07-28 19:26+0300\n"
 "Last-Translator: Khaled Hosny <khaledhosny@eglug.org>\n"
 "Language-Team: Arabic <doc@arabeyes.org>\n"
@@ -19,8 +18,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
 #: ../lib/read.c:51
 #, c-format
@@ -59,23 +57,23 @@ msgstr[3] "كتب %Id بايتات"
 msgstr[4] "كتب %Id بايت"
 msgstr[5] "كتب %Id بايت"
 
-#: ../src/daemon/gnuserv.c:455
+#: ../src/daemon/gnuserv.c:458
 msgid "Enable debugging"
 msgstr "فعّل التنقيح"
 
-#: ../src/daemon/gnuserv.c:457
+#: ../src/daemon/gnuserv.c:460
 msgid "Enable verbose output"
 msgstr "فعّل الخرْج المسهِب"
 
-#: ../src/daemon/gnuserv.c:459
+#: ../src/daemon/gnuserv.c:462
 msgid "Don't fork into background"
 msgstr "لا تشعّب إلى الخلفية"
 
-#: ../src/daemon/gnuserv.c:461
+#: ../src/daemon/gnuserv.c:464
 msgid "Invoked from inetd"
 msgstr "استُحضرت من inetd "
 
-#: ../src/daemon/gnuserv.c:495
+#: ../src/daemon/gnuserv.c:498
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options.\n"
 msgstr "شغّل '%s --help' لرؤية قائمة كاملة لخيارات سطر الأوامر.\n"
@@ -203,3 +201,4 @@ msgstr "إشارة 1 معرفة من طرف المستخدم"
 #: ../sysdeps/osf1/siglist.c:57 ../sysdeps/sun4/siglist.c:57
 msgid "User defined signal 2"
 msgstr "إشارة 2 معرفة من طرف المستخدم"
+

po/as.po

@@ -1,191 +0,0 @@
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-#
-# Amitakhya Phukan <aphukan@fedoraproject.org>, 2009.
-# Nilamdyuti Goswami <ngoswami@redhat.com>, 2011.
-msgid ""
-msgstr ""
-"Project-Id-Version: as\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug."
-"cgi?product=libgtop&component=general\n"
-"POT-Creation-Date: 2010-11-17 08:15+0000\n"
-"PO-Revision-Date: 2011-08-17 16:13+0530\n"
-"Last-Translator: Nilamdyuti Goswami <ngoswami@redhat.com>\n"
-"Language-Team: as_IN <kde-i18n-doc@kde.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Lokalize 1.0\n"
-
-#: ../lib/read.c:51
-#, c-format
-msgid "read %d byte"
-msgid_plural "read %d bytes"
-msgstr[0] "%d বাইট পঢ়া হল"
-msgstr[1] "%d বাইটসমূহ পঢ়া হল"
-
-#: ../lib/read_data.c:51
-msgid "read data size"
-msgstr "তথ্যৰ আকাৰ পঢ়া হল"
-
-#: ../lib/read_data.c:70
-#, c-format
-msgid "read %lu byte of data"
-msgid_plural "read %lu bytes of data"
-msgstr[0] "তথ্যৰ %lu বাইট  পঢ়া হল"
-msgstr[1] "তথ্যৰ %lu বাইটসমূহ  পঢ়া হল"
-
-#: ../lib/write.c:51
-#, c-format
-msgid "wrote %d byte"
-msgid_plural "wrote %d bytes"
-msgstr[0] "%d বাইট লিখা হল"
-msgstr[1] "%d বাইট লিখা হল"
-
-#: ../src/daemon/gnuserv.c:455
-msgid "Enable debugging"
-msgstr "ডিবাগিং সামৰ্থবান কৰক"
-
-#: ../src/daemon/gnuserv.c:457
-msgid "Enable verbose output"
-msgstr "ভাৰ্বোচ আউটপুট সামৰ্থবান কৰক"
-
-#: ../src/daemon/gnuserv.c:459
-msgid "Don't fork into background"
-msgstr "পটভূমিত fork নকৰিব"
-
-#: ../src/daemon/gnuserv.c:461
-msgid "Invoked from inetd"
-msgstr "inetd ৰ পৰা আৱাহন কৰা হৈছে"
-
-#: ../src/daemon/gnuserv.c:495
-#, c-format
-msgid "Run '%s --help' to see a full list of available command line options.\n"
-msgstr ""
-"উপলব্ধ কমান্ড শাৰী বিকল্পসমূহৰ এটা সম্পূৰ্ণ তালিকা চাবলে  '%s --help' চলাওক। \n"
-
-#: ../sysdeps/osf1/siglist.c:27 ../sysdeps/sun4/siglist.c:27
-msgid "Hangup"
-msgstr "বন্ধ কৰক"
-
-#: ../sysdeps/osf1/siglist.c:28 ../sysdeps/sun4/siglist.c:28
-msgid "Interrupt"
-msgstr "বাধা দিয়ক"
-
-#: ../sysdeps/osf1/siglist.c:29 ../sysdeps/sun4/siglist.c:29
-msgid "Quit"
-msgstr "প্ৰস্থান কৰক"
-
-#: ../sysdeps/osf1/siglist.c:30 ../sysdeps/sun4/siglist.c:30
-msgid "Illegal instruction"
-msgstr "অবৈধ নিৰ্দেশ"
-
-#: ../sysdeps/osf1/siglist.c:31 ../sysdeps/sun4/siglist.c:31
-msgid "Trace trap"
-msgstr "ট্ৰেইচ ট্ৰ্যাপ"
-
-#: ../sysdeps/osf1/siglist.c:32 ../sysdeps/sun4/siglist.c:32
-msgid "Abort"
-msgstr "বাদ দিয়ক"
-
-#: ../sysdeps/osf1/siglist.c:33 ../sysdeps/sun4/siglist.c:33
-msgid "EMT error"
-msgstr "EMT ত্ৰুটি"
-
-#: ../sysdeps/osf1/siglist.c:34 ../sysdeps/sun4/siglist.c:34
-msgid "Floating-point exception"
-msgstr "দশমিক-বিন্দু ব্যতিক্ৰম"
-
-#: ../sysdeps/osf1/siglist.c:35 ../sysdeps/sun4/siglist.c:35
-msgid "Kill"
-msgstr "Kill কৰক"
-
-#: ../sysdeps/osf1/siglist.c:36 ../sysdeps/sun4/siglist.c:36
-msgid "Bus error"
-msgstr "বাচ ত্ৰুটি"
-
-#: ../sysdeps/osf1/siglist.c:37 ../sysdeps/sun4/siglist.c:37
-msgid "Segmentation violation"
-msgstr "বিভাজন অমান্যকৰণ"
-
-#: ../sysdeps/osf1/siglist.c:38 ../sysdeps/sun4/siglist.c:38
-msgid "Bad argument to system call"
-msgstr "চিস্টেম কললে বেয়া তৰ্ক"
-
-#: ../sysdeps/osf1/siglist.c:39 ../sysdeps/sun4/siglist.c:39
-msgid "Broken pipe"
-msgstr "ভঙা পাইপ"
-
-#: ../sysdeps/osf1/siglist.c:40 ../sysdeps/sun4/siglist.c:40
-msgid "Alarm clock"
-msgstr "এলাৰ্ম ঘড়ি"
-
-#: ../sysdeps/osf1/siglist.c:41 ../sysdeps/sun4/siglist.c:41
-msgid "Termination"
-msgstr "সমাপ্তি"
-
-#: ../sysdeps/osf1/siglist.c:42 ../sysdeps/sun4/siglist.c:42
-msgid "Urgent condition on socket"
-msgstr "চকেটত গুৰুতৰ অবস্থা"
-
-#: ../sysdeps/osf1/siglist.c:43 ../sysdeps/sun4/siglist.c:43
-msgid "Stop"
-msgstr "বন্ধ কৰক"
-
-#: ../sysdeps/osf1/siglist.c:44 ../sysdeps/sun4/siglist.c:44
-msgid "Keyboard stop"
-msgstr "কিবৰ্ড বন্ধ কৰক"
-
-#: ../sysdeps/osf1/siglist.c:45 ../sysdeps/sun4/siglist.c:45
-msgid "Continue"
-msgstr "চলাই যাওক"
-
-#: ../sysdeps/osf1/siglist.c:46 ../sysdeps/sun4/siglist.c:46
-msgid "Child status has changed"
-msgstr "চাইল্ডৰ অবস্থা সলনি হৈছে"
-
-#: ../sysdeps/osf1/siglist.c:47 ../sysdeps/sun4/siglist.c:47
-msgid "Background read from tty"
-msgstr "tty ৰ পৰা পটভূমি পঢ়া"
-
-#: ../sysdeps/osf1/siglist.c:48 ../sysdeps/sun4/siglist.c:48
-msgid "Background write to tty"
-msgstr "tty ৰ পৰা পটভূমি লিখা"
-
-#: ../sysdeps/osf1/siglist.c:49 ../sysdeps/sun4/siglist.c:49
-msgid "I/O now possible"
-msgstr "I/O বৰ্তমানত সম্ভব"
-
-#: ../sysdeps/osf1/siglist.c:50 ../sysdeps/sun4/siglist.c:50
-msgid "CPU limit exceeded"
-msgstr "CPU ৰ সীমা পাৰ হৈছে"
-
-#: ../sysdeps/osf1/siglist.c:51 ../sysdeps/sun4/siglist.c:51
-msgid "File size limit exceeded"
-msgstr "ফাইলৰ আকাৰৰ সীমা পাৰ হৈছে"
-
-#: ../sysdeps/osf1/siglist.c:52 ../sysdeps/sun4/siglist.c:52
-msgid "Virtual alarm clock"
-msgstr "ভাৰ্ছুৱেল এলাৰ্ম ঘড়ি"
-
-#: ../sysdeps/osf1/siglist.c:53 ../sysdeps/sun4/siglist.c:53
-msgid "Profiling alarm clock"
-msgstr "এলাৰ্ম ঘড়ি আলেখ্যন কৰা হৈছে"
-
-#: ../sysdeps/osf1/siglist.c:54 ../sysdeps/sun4/siglist.c:54
-msgid "Window size change"
-msgstr "উইন্ডোৰ আকাৰত পৰিবৰ্তন"
-
-#: ../sysdeps/osf1/siglist.c:55 ../sysdeps/sun4/siglist.c:55
-msgid "Information request"
-msgstr "তথ্যৰ অনুৰোধ"
-
-#: ../sysdeps/osf1/siglist.c:56 ../sysdeps/sun4/siglist.c:56
-msgid "User defined signal 1"
-msgstr "ব্যবহাৰকাৰী নিৰ্ধাৰিত সংকেত ১"
-
-#: ../sysdeps/osf1/siglist.c:57 ../sysdeps/sun4/siglist.c:57
-msgid "User defined signal 2"
-msgstr "ব্যবহাৰকাৰী নিৰ্ধাৰিত সংকেত ২"
-

po/ast.po

@@ -1,220 +0,0 @@
-# Asturian translation for libgtop.
-# Copyright (C) 2010 libgtop's COPYRIGHT HOLDER
-# This file is distributed under the same license as the libgtop package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: libgtop master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop&component=general\n"
-"POT-Creation-Date: 2009-11-12 10:53+0000\n"
-"PO-Revision-Date: 2010-01-06 18:12+0100\n"
-"Last-Translator: astur <malditoastur@gmail.com>\n"
-"Language-Team: Asturian <alministradores@softastur.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Poedit-Language: asturian\n"
-
-#: ../lib/read.c:51
-#, c-format
-msgid "read %d byte"
-msgid_plural "read %d bytes"
-msgstr[0] "lleíu %d byte"
-msgstr[1] "lleíos %d bytes"
-
-#: ../lib/read_data.c:51
-msgid "read data size"
-msgstr "lleíu tamañu de datos"
-
-#: ../lib/read_data.c:70
-#, c-format
-msgid "read %lu byte of data"
-msgid_plural "read %lu bytes of data"
-msgstr[0] "lleíu %lu byte de datos"
-msgstr[1] "lleíos %lu bytes de datos"
-
-#: ../lib/write.c:51
-#, c-format
-msgid "wrote %d byte"
-msgid_plural "wrote %d bytes"
-msgstr[0] "escritu %d byte"
-msgstr[1] "escritos %d bytes"
-
-#: ../src/daemon/gnuserv.c:455
-msgid "Enable debugging"
-msgstr "Activar depuración"
-
-#: ../src/daemon/gnuserv.c:457
-msgid "Enable verbose output"
-msgstr "Activa salida detallada"
-
-#: ../src/daemon/gnuserv.c:459
-msgid "Don't fork into background"
-msgstr "Nun se pudo abrir un procesu en segundu planu"
-
-#: ../src/daemon/gnuserv.c:461
-msgid "Invoked from inetd"
-msgstr "Invocáu dende inetd"
-
-#: ../src/daemon/gnuserv.c:495
-#, c-format
-msgid "Run '%s --help' to see a full list of available command line options.\n"
-msgstr "Executa '%s --help' pa ver una llista ensembre de les opciones de llinia de comandos disponibles.\n"
-
-#: ../sysdeps/osf1/siglist.c:27
-#: ../sysdeps/sun4/siglist.c:27
-msgid "Hangup"
-msgstr "Terminar"
-
-#: ../sysdeps/osf1/siglist.c:28
-#: ../sysdeps/sun4/siglist.c:28
-msgid "Interrupt"
-msgstr "Interrupción"
-
-#: ../sysdeps/osf1/siglist.c:29
-#: ../sysdeps/sun4/siglist.c:29
-msgid "Quit"
-msgstr "Colar"
-
-#: ../sysdeps/osf1/siglist.c:30
-#: ../sysdeps/sun4/siglist.c:30
-msgid "Illegal instruction"
-msgstr "Instrucción illegal"
-
-#: ../sysdeps/osf1/siglist.c:31
-#: ../sysdeps/sun4/siglist.c:31
-msgid "Trace trap"
-msgstr "Atrapar traza"
-
-#: ../sysdeps/osf1/siglist.c:32
-#: ../sysdeps/sun4/siglist.c:32
-msgid "Abort"
-msgstr "Encaboxar"
-
-#: ../sysdeps/osf1/siglist.c:33
-#: ../sysdeps/sun4/siglist.c:33
-msgid "EMT error"
-msgstr "Fallu EMT"
-
-#: ../sysdeps/osf1/siglist.c:34
-#: ../sysdeps/sun4/siglist.c:34
-msgid "Floating-point exception"
-msgstr "Esceición de coma flotante"
-
-#: ../sysdeps/osf1/siglist.c:35
-#: ../sysdeps/sun4/siglist.c:35
-msgid "Kill"
-msgstr "Matar"
-
-#: ../sysdeps/osf1/siglist.c:36
-#: ../sysdeps/sun4/siglist.c:36
-msgid "Bus error"
-msgstr "Fallu de bus"
-
-#: ../sysdeps/osf1/siglist.c:37
-#: ../sysdeps/sun4/siglist.c:37
-msgid "Segmentation violation"
-msgstr "Violación de segmentu"
-
-#: ../sysdeps/osf1/siglist.c:38
-#: ../sysdeps/sun4/siglist.c:38
-msgid "Bad argument to system call"
-msgstr "Argumentu malu na llamada al sistema"
-
-#: ../sysdeps/osf1/siglist.c:39
-#: ../sysdeps/sun4/siglist.c:39
-msgid "Broken pipe"
-msgstr "Tubería rota"
-
-#: ../sysdeps/osf1/siglist.c:40
-#: ../sysdeps/sun4/siglist.c:40
-msgid "Alarm clock"
-msgstr "Alarma de reló"
-
-#: ../sysdeps/osf1/siglist.c:41
-#: ../sysdeps/sun4/siglist.c:41
-msgid "Termination"
-msgstr "Terminación"
-
-#: ../sysdeps/osf1/siglist.c:42
-#: ../sysdeps/sun4/siglist.c:42
-msgid "Urgent condition on socket"
-msgstr "Condición urxente en socket"
-
-#: ../sysdeps/osf1/siglist.c:43
-#: ../sysdeps/sun4/siglist.c:43
-msgid "Stop"
-msgstr "Parar"
-
-#: ../sysdeps/osf1/siglist.c:44
-#: ../sysdeps/sun4/siglist.c:44
-msgid "Keyboard stop"
-msgstr "Parada de tecláu"
-
-#: ../sysdeps/osf1/siglist.c:45
-#: ../sysdeps/sun4/siglist.c:45
-msgid "Continue"
-msgstr "Siguir"
-
-#: ../sysdeps/osf1/siglist.c:46
-#: ../sysdeps/sun4/siglist.c:46
-msgid "Child status has changed"
-msgstr "Cambiu d'estáu de fíu"
-
-#: ../sysdeps/osf1/siglist.c:47
-#: ../sysdeps/sun4/siglist.c:47
-msgid "Background read from tty"
-msgstr "Llectura en segundu planu de tty"
-
-#: ../sysdeps/osf1/siglist.c:48
-#: ../sysdeps/sun4/siglist.c:48
-msgid "Background write to tty"
-msgstr "Escritura en segundu planu a tty"
-
-#: ../sysdeps/osf1/siglist.c:49
-#: ../sysdeps/sun4/siglist.c:49
-msgid "I/O now possible"
-msgstr "E/S agora puédese"
-
-#: ../sysdeps/osf1/siglist.c:50
-#: ../sysdeps/sun4/siglist.c:50
-msgid "CPU limit exceeded"
-msgstr "Perpaseste la llende del CPU"
-
-#: ../sysdeps/osf1/siglist.c:51
-#: ../sysdeps/sun4/siglist.c:51
-msgid "File size limit exceeded"
-msgstr "Tamañu llende de ficheru perpasáu"
-
-#: ../sysdeps/osf1/siglist.c:52
-#: ../sysdeps/sun4/siglist.c:52
-msgid "Virtual alarm clock"
-msgstr "Alarma de reló virtual"
-
-#: ../sysdeps/osf1/siglist.c:53
-#: ../sysdeps/sun4/siglist.c:53
-msgid "Profiling alarm clock"
-msgstr "Alarma de reló perfilada"
-
-#: ../sysdeps/osf1/siglist.c:54
-#: ../sysdeps/sun4/siglist.c:54
-msgid "Window size change"
-msgstr "Cambéu del tamañu de ventana"
-
-#: ../sysdeps/osf1/siglist.c:55
-#: ../sysdeps/sun4/siglist.c:55
-msgid "Information request"
-msgstr "Solicitú d'información"
-
-#: ../sysdeps/osf1/siglist.c:56
-#: ../sysdeps/sun4/siglist.c:56
-msgid "User defined signal 1"
-msgstr "Señal 1 definida pol usuariu"
-
-#: ../sysdeps/osf1/siglist.c:57
-#: ../sysdeps/sun4/siglist.c:57
-msgid "User defined signal 2"
-msgstr "Señal 2 definida pol usuariu"
-

po/be.po

@@ -1,193 +1,213 @@
+# Беларускі пераклад libgtop.HEAD.
+# Беларускі пераклад libgtop.HEAD
+# Copyright (C) 1999, 2004 Free Software Foundation, Inc.
 # Vital Khilko <dojlid@mova.org>, 2003.
 # Ales Nyakhaychyk <nab@mail.by>, 2004.
-# Ihar Hrachyshka <ihar.hrachyshka@gmail.com>, 2011.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: libgtop.master\n"
+"Project-Id-Version: libgtop.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-24 19:42+0300\n"
+"POT-Creation-Date: 2006-04-07 13:38+0200\n"
-"PO-Revision-Date: 2011-07-24 19:41+0300\n"
+"PO-Revision-Date: 2004-03-13 14:28+0200\n"
-"Last-Translator: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>\n"
+"Last-Translator: Ales Nyakhaychyk <nab@mail.by>\n"
-"Language-Team: Belarusian <i18n-bel-gnome@googlegroups.com>\n"
+"Language-Team: Belarusian <i18n@mova.org>\n"
-"Language: be\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: KBabel 1.0.2\n"
 
-#: ../lib/read.c:51
+#: ../lib/read.c:65
 #, c-format
 msgid "read %d byte"
 msgid_plural "read %d bytes"
 msgstr[0] "прачытаны %d байт"
-msgstr[1] "прачытана %d байты"
+msgstr[1] "прачытаны %d байты"
 msgstr[2] "прачытана %d байтаў"
 
-#: ../lib/read_data.c:51
+#: ../lib/read_data.c:53
 msgid "read data size"
-msgstr "прачытаны памер даных"
+msgstr "памер прачытаных даньняў"
 
-#: ../lib/read_data.c:70
+#: ../lib/read_data.c:72
 #, c-format
 msgid "read %lu byte of data"
 msgid_plural "read %lu bytes of data"
 msgstr[0] "прачытаны %lu байт даных"
-msgstr[1] "прачытана %lu байты даных"
+msgstr[1] "прачытаны %lu байты даных"
 msgstr[2] "прачытана %lu байтаў даных"
 
-#: ../lib/write.c:51
+#: ../lib/write.c:52
 #, c-format
 msgid "wrote %d byte"
 msgid_plural "wrote %d bytes"
 msgstr[0] "запісаны %d байт"
-msgstr[1] "запісана %d байты"
+msgstr[1] "запісаны %d байты"
 msgstr[2] "запісана %d байтаў"
 
-#: ../src/daemon/gnuserv.c:455
+#: ../src/daemon/gnuserv.c:460
 msgid "Enable debugging"
-msgstr "Уключыць адладачны код"
+msgstr "Уключыць адладку"
 
-#: ../src/daemon/gnuserv.c:457
+#: ../src/daemon/gnuserv.c:460
+msgid "DEBUG"
+msgstr "АДЛАДКА"
+
+#: ../src/daemon/gnuserv.c:462
 msgid "Enable verbose output"
-msgstr "Уключыць падрабязны вывад"
+msgstr "Уключыць дэталёвы вывад"
 
-#: ../src/daemon/gnuserv.c:459
+#: ../src/daemon/gnuserv.c:462
+msgid "VERBOSE"
+msgstr "ПАДРАБЯЗНА"
+
+#: ../src/daemon/gnuserv.c:464
 msgid "Don't fork into background"
-msgstr "Не адгаліноўваць фонавы працэс"
+msgstr "Ня нараджаць у рэжыме тла"
 
-#: ../src/daemon/gnuserv.c:461
+#: ../src/daemon/gnuserv.c:464
+msgid "NO-DAEMON"
+msgstr "БЯЗ-ДЭМАНУ"
+
+#: ../src/daemon/gnuserv.c:466
 msgid "Invoked from inetd"
-msgstr "Запушчаны з дапамогай inetd"
+msgstr "Выкліканы з inetd"
 
-#: ../src/daemon/gnuserv.c:495
+#: ../src/daemon/gnuserv.c:466
+msgid "INETD"
+msgstr "INETD"
+
+#: ../src/daemon/gnuserv.c:500
 #, c-format
-msgid "Run '%s --help' to see a full list of available command line options.\n"
+msgid ""
+"Error on option %s: %s.\n"
+"Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
-"Каб убачыць спіс наяўных опцый загаднага радка, запусціце \"%s --help\".\n"
+"Памылка ў ключох %s: %s.\n"
-
+"Запусьціце '%s --help' каб убачыць поўны сьпіс даступных ключоў.\n"
-#: ../sysdeps/osf1/siglist.c:27 ../sysdeps/sun4/siglist.c:27
-msgid "Hangup"
-msgstr "Абрыў сувязі (HUP)"
-
-#: ../sysdeps/osf1/siglist.c:28 ../sysdeps/sun4/siglist.c:28
-msgid "Interrupt"
-msgstr "Перарыў (INT)"
 
 #: ../sysdeps/osf1/siglist.c:29 ../sysdeps/sun4/siglist.c:29
-msgid "Quit"
+msgid "Hangup"
-msgstr "Выхад (QUIT)"
+msgstr "Разарваць"
 
 #: ../sysdeps/osf1/siglist.c:30 ../sysdeps/sun4/siglist.c:30
-msgid "Illegal instruction"
+msgid "Interrupt"
-msgstr "Забароненая інструкцыя (ILL)"
+msgstr "Перарваць"
 
 #: ../sysdeps/osf1/siglist.c:31 ../sysdeps/sun4/siglist.c:31
-msgid "Trace trap"
+msgid "Quit"
-msgstr "Захоп трасіроўкі (TRAP)"
+msgstr "Выйсьці"
 
 #: ../sysdeps/osf1/siglist.c:32 ../sysdeps/sun4/siglist.c:32
-msgid "Abort"
+msgid "Illegal instruction"
-msgstr "Перарванне (ABRT)"
+msgstr "Недапушчальная інструкцыя"
 
 #: ../sysdeps/osf1/siglist.c:33 ../sysdeps/sun4/siglist.c:33
-msgid "EMT error"
+msgid "Trace trap"
-msgstr "Памылка (EMT)"
+msgstr "Захоп трасыроўкі"
 
 #: ../sysdeps/osf1/siglist.c:34 ../sysdeps/sun4/siglist.c:34
-msgid "Floating-point exception"
+msgid "Abort"
-msgstr "Выключэнне float (FPE)"
+msgstr "Перарываньне"
 
 #: ../sysdeps/osf1/siglist.c:35 ../sysdeps/sun4/siglist.c:35
-msgid "Kill"
+msgid "EMT error"
-msgstr "Забойства (KILL)"
+msgstr "Памылка EMT"
 
 #: ../sysdeps/osf1/siglist.c:36 ../sysdeps/sun4/siglist.c:36
-msgid "Bus error"
+msgid "Floating-point exception"
-msgstr "Памылка магістралі (BUS)"
+msgstr "Выключэньне пункту, які плавае"
 
 #: ../sysdeps/osf1/siglist.c:37 ../sysdeps/sun4/siglist.c:37
-msgid "Segmentation violation"
+msgid "Kill"
-msgstr "Парушэнне сегментацыі (SEGV)"
+msgstr "Забіць"
 
 #: ../sysdeps/osf1/siglist.c:38 ../sysdeps/sun4/siglist.c:38
-msgid "Bad argument to system call"
+msgid "Bus error"
-msgstr "Хібны аргумент сістэмнага выкліку (SYS)"
+msgstr "Памылка шыны"
 
 #: ../sysdeps/osf1/siglist.c:39 ../sysdeps/sun4/siglist.c:39
-msgid "Broken pipe"
+msgid "Segmentation violation"
-msgstr "Зламаны канал (PIPE)"
+msgstr "Парушэньне сэгментацыі"
 
 #: ../sysdeps/osf1/siglist.c:40 ../sysdeps/sun4/siglist.c:40
-msgid "Alarm clock"
+msgid "Bad argument to system call"
-msgstr "Таймер (ALRM)"
+msgstr "Кепскі аргумэнт у сыстэмным выкліку"
 
 #: ../sysdeps/osf1/siglist.c:41 ../sysdeps/sun4/siglist.c:41
-msgid "Termination"
+msgid "Broken pipe"
-msgstr "Знішчэнне (TERM)"
+msgstr "Парушаны канал"
 
 #: ../sysdeps/osf1/siglist.c:42 ../sysdeps/sun4/siglist.c:42
-msgid "Urgent condition on socket"
+msgid "Alarm clock"
-msgstr "Тэрміновыя даныя на сокеце (URG)"
+msgstr "Таймэр"
 
 #: ../sysdeps/osf1/siglist.c:43 ../sysdeps/sun4/siglist.c:43
-msgid "Stop"
+msgid "Termination"
-msgstr "Прыпыненне (STOP)"
+msgstr "Завяршэньне"
 
 #: ../sysdeps/osf1/siglist.c:44 ../sysdeps/sun4/siglist.c:44
-msgid "Keyboard stop"
+msgid "Urgent condition on socket"
-msgstr "Прыпыненне з клавіятуры (TSTP)"
+msgstr "Тэрміновыя умовы сокету"
 
 #: ../sysdeps/osf1/siglist.c:45 ../sysdeps/sun4/siglist.c:45
-msgid "Continue"
+msgid "Stop"
-msgstr "Працяг працы (CONT)"
+msgstr "Спыніць"
 
 #: ../sysdeps/osf1/siglist.c:46 ../sysdeps/sun4/siglist.c:46
-msgid "Child status has changed"
+msgid "Keyboard stop"
-msgstr "Змена стану нашчадка (CHLD)"
+msgstr "Спыненьне клявіятуры"
 
 #: ../sysdeps/osf1/siglist.c:47 ../sysdeps/sun4/siglist.c:47
-msgid "Background read from tty"
+msgid "Continue"
-msgstr "Фонавае чытанне з tty (TTIN)"
+msgstr "Працягнуць"
 
 #: ../sysdeps/osf1/siglist.c:48 ../sysdeps/sun4/siglist.c:48
-msgid "Background write to tty"
+msgid "Child status has changed"
-msgstr "Фонавы запіс у tty (TTOU)"
+msgstr "Стан нашчадку быў зьменены"
 
 #: ../sysdeps/osf1/siglist.c:49 ../sysdeps/sun4/siglist.c:49
-msgid "I/O now possible"
+msgid "Background read from tty"
-msgstr "Магчымасць уводу/вываду (IO)"
+msgstr "Чытаньне ў тле з tty"
 
 #: ../sysdeps/osf1/siglist.c:50 ../sysdeps/sun4/siglist.c:50
-msgid "CPU limit exceeded"
+msgid "Background write to tty"
-msgstr "Абмежаванне працэсара (XCPU)"
+msgstr "Запіс у тле ў tty"
 
 #: ../sysdeps/osf1/siglist.c:51 ../sysdeps/sun4/siglist.c:51
-msgid "File size limit exceeded"
+msgid "I/O now possible"
-msgstr "Абмежаванне памеру файла (XFSZ)"
+msgstr "Зараз магчымы ўвод/вывад"
 
 #: ../sysdeps/osf1/siglist.c:52 ../sysdeps/sun4/siglist.c:52
-msgid "Virtual alarm clock"
+msgid "CPU limit exceeded"
-msgstr "Віртуальны таймер (VTALRM)"
+msgstr "Перавышана мяжа ЦПУ"
 
 #: ../sysdeps/osf1/siglist.c:53 ../sysdeps/sun4/siglist.c:53
-msgid "Profiling alarm clock"
+msgid "File size limit exceeded"
-msgstr "Таймер прафілявання (PROF)"
+msgstr "Перавышана мяжа памеру файлу"
 
 #: ../sysdeps/osf1/siglist.c:54 ../sysdeps/sun4/siglist.c:54
-msgid "Window size change"
+msgid "Virtual alarm clock"
-msgstr "Змена памераў акна (WINCH)"
+msgstr "Віртуальны таймэр"
 
 #: ../sysdeps/osf1/siglist.c:55 ../sysdeps/sun4/siglist.c:55
-msgid "Information request"
+msgid "Profiling alarm clock"
-msgstr "Запыт інфармацыі (INFO)"
+msgstr "Прафіляваны таймэр"
 
 #: ../sysdeps/osf1/siglist.c:56 ../sysdeps/sun4/siglist.c:56
-msgid "User defined signal 1"
+msgid "Window size change"
-msgstr "Карыстальніцкі сігнал 1 (USR1)"
+msgstr "Зьмена памераў акна"
 
 #: ../sysdeps/osf1/siglist.c:57 ../sysdeps/sun4/siglist.c:57
+msgid "Information request"
+msgstr "Запыт інфармацыі"
+
+#: ../sysdeps/osf1/siglist.c:58 ../sysdeps/sun4/siglist.c:58
+msgid "User defined signal 1"
+msgstr "Сыгнал карыстальніку 1"
+
+#: ../sysdeps/osf1/siglist.c:59 ../sysdeps/sun4/siglist.c:59
 msgid "User defined signal 2"
-msgstr "Карыстальніцкі сігнал 2 (USR2)"
+msgstr "Сыгнал карыстальніку 2"

po/bg.po

@@ -3,22 +3,21 @@
 # Borislav Aleksandrov <B.Aleksandrov@cnsys.bg>, 2002.
 # Yanko Kaneti <yaneti@declera.com>, 2002.
 # Rostislav Raykov <zbrox@i-space.org>, 2004.
-# Vladimir Petkov <kaladan@gmail.com>, 2005.
+# Vladimir Petkov <vpetkov@i-space.org>, 2005.
-# Alexander Shopov <ash@kambanaria.org>, 2007.
+# Alexander Shopov <ash@contact.bg>, 2007.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: libgtop master\n"
+"Project-Id-Version: libgtop trunk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-04-01 18:21+0300\n"
+"POT-Creation-Date: 2007-09-18 10:43+0300\n"
-"PO-Revision-Date: 2012-04-01 18:20+0300\n"
+"PO-Revision-Date: 2007-09-18 10:43+0300\n"
-"Last-Translator: Alexander Shopov <ash@kambanaria.org>\n"
+"Last-Translator: Alexander Shopov <ash@contact.bg>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
-"Language: bg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #: ../lib/read.c:51
 #, c-format
@@ -45,23 +44,23 @@ msgid_plural "wrote %d bytes"
 msgstr[0] "записан %d байт"
 msgstr[1] "записани %d байта"
 
-#: ../src/daemon/gnuserv.c:455
+#: ../src/daemon/gnuserv.c:458
 msgid "Enable debugging"
 msgstr "Включване на изчистване на грешките"
 
-#: ../src/daemon/gnuserv.c:457
+#: ../src/daemon/gnuserv.c:460
 msgid "Enable verbose output"
 msgstr "Включване на подробен изход"
 
-#: ../src/daemon/gnuserv.c:459
+#: ../src/daemon/gnuserv.c:462
 msgid "Don't fork into background"
 msgstr "Не се поражда процес във фонов режим"
 
-#: ../src/daemon/gnuserv.c:461
+#: ../src/daemon/gnuserv.c:464
 msgid "Invoked from inetd"
 msgstr "Извикан от inetd"
 
-#: ../src/daemon/gnuserv.c:495
+#: ../src/daemon/gnuserv.c:498
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options.\n"
 msgstr "Изпълнете „%s --help“ за пълния списък от опции за командата.\n"

po/bn.po

@@ -4,23 +4,21 @@
 # Vat <vatzcar@yahoo.co.in>, 2003.
 # Mahay Alam Khan <makl10n@yahoo.com>, 2005.
 # Samia Niamatullah <mailsamia2001@yahoo.com>, 2005.
-# Israt Jahan <israt@ankur.org.bd>, 2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: bn\n"
+"Project-Id-Version: libgtop\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"Report-Msgid-Bugs-To: \n"
-"product=libgtop&component=general\n"
+"POT-Creation-Date: 2005-10-01 06:02+0200\n"
-"POT-Creation-Date: 2009-04-17 10:17+0000\n"
+"PO-Revision-Date: 2005-10-01 01:05+0600\n"
-"PO-Revision-Date: 2010-01-21 16:02+0600\n"
+"Last-Translator: Mahay Alam Khan <makl10n@yahoo.com>\n"
-"Last-Translator: Israt Jahan <israt@ankur.org.bd>\n"
+"Language-Team: Bengali <gnome-translation@bengalinux.org>\n"
-"Language-Team: Bengali <ankur-bd-l10n@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=0;\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ../lib/read.c:51
+#: ../lib/read.c:65
 #, c-format
 msgid "read %d byte"
 msgid_plural "read %d bytes"
@@ -31,11 +29,11 @@ msgstr[1] "%d বাইট পড়েছি"
 # #########################################
 # দয়া করে "গেছে" এর পরিবর্তে "গিয়েছে" লিখেন
 # #########################################
-#: ../lib/read_data.c:51
+#: ../lib/read_data.c:53
 msgid "read data size"
 msgstr "ডাটা সাইজ পড়ো"
 
-#: ../lib/read_data.c:70
+#: ../lib/read_data.c:72
 #, c-format
 msgid "read %lu byte of data"
 msgid_plural "read %lu bytes of data"
@@ -44,7 +42,7 @@ msgstr[1] "%lu বাইট তথ্য পড়েছি"
 
 # msgstr "%d বাইট তথ্য পড়া গেছে"
 # msgstr "%d বাইট তথ্য পড়া হোক"
-#: ../lib/write.c:51
+#: ../lib/write.c:52
 #, c-format
 msgid "wrote %d byte"
 msgid_plural "wrote %d bytes"
@@ -52,189 +50,195 @@ msgstr[0] "%d বাইট লিখেছি"
 msgstr[1] "%d বাইট লিখেছি"
 
 # msgstr "%d বাইট লেখা হয়েছে"
-#: ../src/daemon/gnuserv.c:455
+#: ../src/daemon/gnuserv.c:460
 msgid "Enable debugging"
 msgstr "ডিবাগিং চালু করুন"
 
+# msgstr "ডিবাগ প্রক্রিয়া সক্রিয় করা হোক"
+# ২ এটা কি বিবেচনা করা যায় না? অন্যান্য জায়গায় "ডিবাগ" লেখা হইছে, তাই এখানে অন্য রকম হয়ে যায়।
+# আপনার আপত্তি থাকলে অবশ্য কোন কথা নাই।
+#: ../src/daemon/gnuserv.c:460
+msgid "DEBUG"
+msgstr "ডিবাগ"
+
 # msgstr "ডিবাগ"
-#: ../src/daemon/gnuserv.c:457
+#: ../src/daemon/gnuserv.c:462
 msgid "Enable verbose output"
 msgstr "বর্ণনাযুক্ত আউটপুট সক্রিয় করো"
 
-#: ../src/daemon/gnuserv.c:459
+# msgstr "ভার্বোস (Verbose) ফলাফল চালু করুন"
+# msgstr "বর্ণনাযুক্ত ফলাফল দেখানো হোক"
+#: ../src/daemon/gnuserv.c:462
+msgid "VERBOSE"
+msgstr "বর্ণনাযুক্ত"
+
+#: ../src/daemon/gnuserv.c:464
 msgid "Don't fork into background"
 msgstr "পশ্চাতে ফর্ক করা হবে না"
 
-#: ../src/daemon/gnuserv.c:461
+#: ../src/daemon/gnuserv.c:464
+msgid "NO-DAEMON"
+msgstr "NO-DAEMON"
+
+#: ../src/daemon/gnuserv.c:466
 msgid "Invoked from inetd"
 msgstr "inetd এর থেকে নেওয়া হয়েছে"
 
-#: ../src/daemon/gnuserv.c:495
+#: ../src/daemon/gnuserv.c:466
-#| msgid ""
+msgid "INETD"
-#| "Error on option %s: %s.\n"
+msgstr "INETD"
-#| "Run '%s --help' to see a full list of available command line options.\n"
+
-msgid "Run '%s --help' to see a full list of available command line options.\n"
+#: ../src/daemon/gnuserv.c:500
-msgstr "কমান্ড লাইন অপশনের সম্পূর্ণ তালিকা দেখার জন্য  '%s --help' লিখুন।\n"
+#, c-format
+msgid ""
+"Error on option %s: %s.\n"
+"Run '%s --help' to see a full list of available command line options.\n"
+msgstr ""
+"অপশন %s এ ভুল হয়েছে: %s।\n"
+"কমান্ড লাইন অপশনের সম্পূর্ণ তালিকা দেখার জন্য '%s --help' লিখুন।\n"
 
 # msgstr "সিস্টেম বুট হবার পর থেকে নিষ্ক্রিয় কাজে অতিবাহিত সময় (সেকেন্ডে)"
-#: ../sysdeps/osf1/siglist.c:27 ../sysdeps/sun4/siglist.c:27
+#: ../sysdeps/osf1/siglist.c:28 ../sysdeps/sun4/siglist.c:28
 msgid "Hangup"
 msgstr "সংযোগ বিচ্ছিন্ন করুন"
 
-#: ../sysdeps/osf1/siglist.c:28 ../sysdeps/sun4/siglist.c:28
+#: ../sysdeps/osf1/siglist.c:29 ../sysdeps/sun4/siglist.c:29
 msgid "Interrupt"
 msgstr "ইন্টেরাপ্ট"
 
-#: ../sysdeps/osf1/siglist.c:29 ../sysdeps/sun4/siglist.c:29
+#: ../sysdeps/osf1/siglist.c:30 ../sysdeps/sun4/siglist.c:30
 msgid "Quit"
 msgstr "প্রস্থান"
 
 # msgstr "প্রস্থান"
-#: ../sysdeps/osf1/siglist.c:30 ../sysdeps/sun4/siglist.c:30
+#: ../sysdeps/osf1/siglist.c:31 ../sysdeps/sun4/siglist.c:31
 msgid "Illegal instruction"
 msgstr "অবৈধ ইনস্ট্রাকশন"
 
 # msgstr "অবৈধ ইনস্ট্রাকশন"
 # Instruction এখানে Technical term।
-#: ../sysdeps/osf1/siglist.c:31 ../sysdeps/sun4/siglist.c:31
+#: ../sysdeps/osf1/siglist.c:32 ../sysdeps/sun4/siglist.c:32
 msgid "Trace trap"
 msgstr "ট্রেস ট্র্যাপ"
 
 # ২ এটা আসলে ঠিক বোঝা যাচ্ছে না। তাই মনে হয় বাদ রাখাই ভাল
-#: ../sysdeps/osf1/siglist.c:32 ../sysdeps/sun4/siglist.c:32
+#: ../sysdeps/osf1/siglist.c:33 ../sysdeps/sun4/siglist.c:33
 msgid "Abort"
 msgstr "বাতিল করো"
 
 # msgstr "বন্ধ করা"
-#: ../sysdeps/osf1/siglist.c:33 ../sysdeps/sun4/siglist.c:33
+#: ../sysdeps/osf1/siglist.c:34 ../sysdeps/sun4/siglist.c:34
 msgid "EMT error"
 msgstr "EMT সংক্রান্ত ভুল"
 
-#: ../sysdeps/osf1/siglist.c:34 ../sysdeps/sun4/siglist.c:34
+#: ../sysdeps/osf1/siglist.c:35 ../sysdeps/sun4/siglist.c:35
 msgid "Floating-point exception"
 msgstr "দশমিক সংক্রান্ত ব্যতিক্রম"
 
 # msgstr "ভগ্নাংশ সংক্রান্ত ব্যতীক্রম" <-- বানান ভুল
-#: ../sysdeps/osf1/siglist.c:35 ../sysdeps/sun4/siglist.c:35
+#: ../sysdeps/osf1/siglist.c:36 ../sysdeps/sun4/siglist.c:36
 msgid "Kill"
 msgstr "কিল"
 
 # msgstr "শেষ করা (Kill)"
-#: ../sysdeps/osf1/siglist.c:36 ../sysdeps/sun4/siglist.c:36
+#: ../sysdeps/osf1/siglist.c:37 ../sysdeps/sun4/siglist.c:37
 msgid "Bus error"
 msgstr "বাস সংক্রান্ত ভুল"
 
 # msgstr "বাস (Bus) সংক্রান্ত সমস্যা"
-#: ../sysdeps/osf1/siglist.c:37 ../sysdeps/sun4/siglist.c:37
+#: ../sysdeps/osf1/siglist.c:38 ../sysdeps/sun4/siglist.c:38
 msgid "Segmentation violation"
 msgstr "সেগমেন্ট সীমা লঙ্ঘন"
 
-#: ../sysdeps/osf1/siglist.c:38 ../sysdeps/sun4/siglist.c:38
+#: ../sysdeps/osf1/siglist.c:39 ../sysdeps/sun4/siglist.c:39
 msgid "Bad argument to system call"
 msgstr "সিস্টেম call এ ভুল মান প্রেরিত হয়েছে"
 
 # msgstr "সিস্টেম call এ ভুল মান প্রেরিত হয়েছে"
-#: ../sysdeps/osf1/siglist.c:39 ../sysdeps/sun4/siglist.c:39
+#: ../sysdeps/osf1/siglist.c:40 ../sysdeps/sun4/siglist.c:40
 msgid "Broken pipe"
 msgstr "অচল পাইপ"
 
 # msgstr "অচল পাইপ"
-#: ../sysdeps/osf1/siglist.c:40 ../sysdeps/sun4/siglist.c:40
+#: ../sysdeps/osf1/siglist.c:41 ../sysdeps/sun4/siglist.c:41
 msgid "Alarm clock"
 msgstr "এলার্ম ঘড়ি"
 
-#: ../sysdeps/osf1/siglist.c:41 ../sysdeps/sun4/siglist.c:41
+#: ../sysdeps/osf1/siglist.c:42 ../sysdeps/sun4/siglist.c:42
 msgid "Termination"
 msgstr "সমাপন"
 
-#: ../sysdeps/osf1/siglist.c:42 ../sysdeps/sun4/siglist.c:42
+#: ../sysdeps/osf1/siglist.c:43 ../sysdeps/sun4/siglist.c:43
 msgid "Urgent condition on socket"
 msgstr "সকেটে জরুরি অবস্থা"
 
-#: ../sysdeps/osf1/siglist.c:43 ../sysdeps/sun4/siglist.c:43
+#: ../sysdeps/osf1/siglist.c:44 ../sysdeps/sun4/siglist.c:44
 msgid "Stop"
 msgstr "বন্ধ করুন"
 
-#: ../sysdeps/osf1/siglist.c:44 ../sysdeps/sun4/siglist.c:44
+#: ../sysdeps/osf1/siglist.c:45 ../sysdeps/sun4/siglist.c:45
 msgid "Keyboard stop"
 msgstr "কিবোর্ড বন্ধ করুন"
 
 # ২ কীবোর্ড 
-#: ../sysdeps/osf1/siglist.c:45 ../sysdeps/sun4/siglist.c:45
+#: ../sysdeps/osf1/siglist.c:46 ../sysdeps/sun4/siglist.c:46
 msgid "Continue"
 msgstr "চালিয়ে যান"
 
-#: ../sysdeps/osf1/siglist.c:46 ../sysdeps/sun4/siglist.c:46
+#: ../sysdeps/osf1/siglist.c:47 ../sysdeps/sun4/siglist.c:47
 msgid "Child status has changed"
 msgstr "Child এর অবস্থা পরিবর্তিত হয়েছে"
 
-#: ../sysdeps/osf1/siglist.c:47 ../sysdeps/sun4/siglist.c:47
+#: ../sysdeps/osf1/siglist.c:48 ../sysdeps/sun4/siglist.c:48
 msgid "Background read from tty"
 msgstr "পশ্চাত থেকে tty পড়া"
 
 # ভাল হইলো না
-#: ../sysdeps/osf1/siglist.c:48 ../sysdeps/sun4/siglist.c:48
+#: ../sysdeps/osf1/siglist.c:49 ../sysdeps/sun4/siglist.c:49
 msgid "Background write to tty"
 msgstr "পশ্চাত থেকে tty এ লেখা"
 
-#: ../sysdeps/osf1/siglist.c:49 ../sysdeps/sun4/siglist.c:49
+#: ../sysdeps/osf1/siglist.c:50 ../sysdeps/sun4/siglist.c:50
 msgid "I/O now possible"
 msgstr "এখন I/O সম্ভব"
 
-#: ../sysdeps/osf1/siglist.c:50 ../sysdeps/sun4/siglist.c:50
+#: ../sysdeps/osf1/siglist.c:51 ../sysdeps/sun4/siglist.c:51
 msgid "CPU limit exceeded"
 msgstr "CPU সীমা ছাড়িয়ে গেছে"
 
-#: ../sysdeps/osf1/siglist.c:51 ../sysdeps/sun4/siglist.c:51
+#: ../sysdeps/osf1/siglist.c:52 ../sysdeps/sun4/siglist.c:52
 msgid "File size limit exceeded"
 msgstr "ফাইলের সাইজ সীমা ছাড়িয়ে গেছে"
 
 # msgstr "ফাইলের আয়তন সীমা ছাড়িয়ে গেছে"
-#: ../sysdeps/osf1/siglist.c:52 ../sysdeps/sun4/siglist.c:52
+#: ../sysdeps/osf1/siglist.c:53 ../sysdeps/sun4/siglist.c:53
 msgid "Virtual alarm clock"
 msgstr "কাল্পনিক এলার্ম ঘড়ি"
 
 # msgstr "কাল্পনিক এলার্ম ঘড়ি"
-#: ../sysdeps/osf1/siglist.c:53 ../sysdeps/sun4/siglist.c:53
+#: ../sysdeps/osf1/siglist.c:54 ../sysdeps/sun4/siglist.c:54
 msgid "Profiling alarm clock"
 msgstr "এলার্ম ঘড়ি প্রোফাইল করা হচ্ছে"
 
-#: ../sysdeps/osf1/siglist.c:54 ../sysdeps/sun4/siglist.c:54
+#: ../sysdeps/osf1/siglist.c:55 ../sysdeps/sun4/siglist.c:55
 msgid "Window size change"
 msgstr "উইন্ডোর সাইজ পরিবর্তন"
 
 # msgstr "উইন্ডো'র আয়তন পরিবর্তন"
 # Window এর বাংলা করার দরকার নাই
-#: ../sysdeps/osf1/siglist.c:55 ../sysdeps/sun4/siglist.c:55
+#: ../sysdeps/osf1/siglist.c:56 ../sysdeps/sun4/siglist.c:56
 msgid "Information request"
 msgstr "তথ্যের আবেদন"
 
 # msgstr "তথ্যের আবেদন"
-#: ../sysdeps/osf1/siglist.c:56 ../sysdeps/sun4/siglist.c:56
+#: ../sysdeps/osf1/siglist.c:57 ../sysdeps/sun4/siglist.c:57
 msgid "User defined signal 1"
 msgstr "ব্যবহারকারী নির্ধারিত সিগনাল ১"
 
-#: ../sysdeps/osf1/siglist.c:57 ../sysdeps/sun4/siglist.c:57
+#: ../sysdeps/osf1/siglist.c:58 ../sysdeps/sun4/siglist.c:58
 msgid "User defined signal 2"
 msgstr "ব্যবহারকারী নির্ধারিত সিগনাল ২"
 
-# msgstr "ডিবাগ প্রক্রিয়া সক্রিয় করা হোক"
-# ২ এটা কি বিবেচনা করা যায় না? অন্যান্য জায়গায় "ডিবাগ" লেখা হইছে, তাই এখানে অন্য রকম হয়ে যায়।
-# আপনার আপত্তি থাকলে অবশ্য কোন কথা নাই।
-#~ msgid "DEBUG"
-#~ msgstr "ডিবাগ"
-
-# msgstr "ভার্বোস (Verbose) ফলাফল চালু করুন"
-# msgstr "বর্ণনাযুক্ত ফলাফল দেখানো হোক"
-#~ msgid "VERBOSE"
-#~ msgstr "বর্ণনাযুক্ত"
-
-#~ msgid "NO-DAEMON"
-#~ msgstr "NO-DAEMON"
-
-#~ msgid "INETD"
-#~ msgstr "INETD"
-
 #~ msgid "Ticks (%ld per second):"
 #~ msgstr "টিক (প্রতি সেকেন্ডে %ld সংখ্যক):"
 

po/bs.po

@@ -1,22 +1,25 @@
+# translation of libgtop.HEAD.po to Bosnian
+# This file is distributed under the same license as the libgtop package.
+# Copyright (C) 2004 Free Software Foundation, Inc.
+# Vedran Ljubovic <vljubovic@smartnet.ba>, 2004.
+# Kemal Šanjta <gomez@lugzdk.ba>, 2004.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: libgtop.HEAD\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"Report-Msgid-Bugs-To: \n"
-"product=libgtop&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2005-09-25 18:15+0200\n"
-"POT-Creation-Date: 2015-02-26 22:47+0000\n"
+"PO-Revision-Date: 2004-09-05 16:54+0200\n"
-"PO-Revision-Date: 2013-01-30 21:42+0000\n"
+"Last-Translator: Kemal Šanjta <gomez@lugzdk.ba>\n"
-"Last-Translator: Samir Ribić <Unknown>\n"
 "Language-Team: Bosnian <lokal@linux.org.ba>\n"
-"Language: bs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Launchpad-Export-Date: 2014-10-23 07:17+0000\n"
+"X-Generator: KBabel 1.3\n"
-"X-Generator: Launchpad (build 17203)\n"
 
-#: ../lib/read.c:51
+#: lib/read.c:65
 #, c-format
 msgid "read %d byte"
 msgid_plural "read %d bytes"
@@ -24,169 +27,188 @@ msgstr[0] "čitaj %d bajt"
 msgstr[1] "čitaj %d bajta"
 msgstr[2] "čitaj %d bajtova"
 
-#: ../lib/read_data.c:51
+#: lib/read_data.c:53
 msgid "read data size"
 msgstr "veličina pročitanih podataka"
 
-#: ../lib/read_data.c:70
+#: lib/read_data.c:72
-#, c-format
+#, fuzzy, c-format
 msgid "read %lu byte of data"
 msgid_plural "read %lu bytes of data"
-msgstr[0] "pročitaj %lu bajt podataka"
+msgstr[0] "čitaj %d bajt"
-msgstr[1] "pročitaj %lu bajta podataka"
+msgstr[1] "čitaj %d bajta"
-msgstr[2] "pročitano %lu bajtova podataka"
+msgstr[2] "čitaj %d bajtova"
 
-#: ../lib/write.c:51
+#: lib/write.c:52
-#, c-format
+#, fuzzy, c-format
 msgid "wrote %d byte"
 msgid_plural "wrote %d bytes"
-msgstr[0] "upisan %d bajt"
+msgstr[0] "piši %d bajt"
-msgstr[1] "upisana %d bajta"
+msgstr[1] "piši %d bajta"
-msgstr[2] "upisano %d bajtova"
+msgstr[2] "piši %d bajtova"
 
-#: ../src/daemon/gnuserv.c:455
+#: src/daemon/gnuserv.c:460
 msgid "Enable debugging"
 msgstr "Uključi debugging"
 
-#: ../src/daemon/gnuserv.c:457
+#: src/daemon/gnuserv.c:460
+msgid "DEBUG"
+msgstr "DEBUG"
+
+#: src/daemon/gnuserv.c:462
 msgid "Enable verbose output"
 msgstr "Uključi rječiti izlaz"
 
-#: ../src/daemon/gnuserv.c:459
+#: src/daemon/gnuserv.c:462
+msgid "VERBOSE"
+msgstr "VERBOSE"
+
+#: src/daemon/gnuserv.c:464
 msgid "Don't fork into background"
 msgstr "Ne fork-uj u pozadinu"
 
-#: ../src/daemon/gnuserv.c:461
+#: src/daemon/gnuserv.c:464
+msgid "NO-DAEMON"
+msgstr "NO-DAEMON"
+
+#: src/daemon/gnuserv.c:466
 msgid "Invoked from inetd"
 msgstr "Pozvan iz inetd"
 
-#: ../src/daemon/gnuserv.c:495
+#: src/daemon/gnuserv.c:466
-#, c-format
+msgid "INETD"
-msgid "Run '%s --help' to see a full list of available command line options.\n"
+msgstr "INETD"
-msgstr ""
-"Pokrenite „%s --help“ da biste vidjeli cijelu listu dostupnih opcija "
-"komandne linije.\n"
 
-#: ../sysdeps/osf1/siglist.c:27 ../sysdeps/sun4/siglist.c:27
+#: src/daemon/gnuserv.c:500
+#, c-format
+msgid ""
+"Error on option %s: %s.\n"
+"Run '%s --help' to see a full list of available command line options.\n"
+msgstr ""
+"Greška u opciji %s: %s.\n"
+"Pokrenite '%s --help' da vidite punu listu dostupnih opcija na komandnoj "
+"liniji.\n"
+
+#: sysdeps/osf1/siglist.c:28 sysdeps/sun4/siglist.c:28
 msgid "Hangup"
 msgstr "Prekidanje veze"
 
-#: ../sysdeps/osf1/siglist.c:28 ../sysdeps/sun4/siglist.c:28
+#: sysdeps/osf1/siglist.c:29 sysdeps/sun4/siglist.c:29
 msgid "Interrupt"
 msgstr "Prekid"
 
-#: ../sysdeps/osf1/siglist.c:29 ../sysdeps/sun4/siglist.c:29
+#: sysdeps/osf1/siglist.c:30 sysdeps/sun4/siglist.c:30
 msgid "Quit"
 msgstr "Izađi"
 
-#: ../sysdeps/osf1/siglist.c:30 ../sysdeps/sun4/siglist.c:30
+#: sysdeps/osf1/siglist.c:31 sysdeps/sun4/siglist.c:31
 msgid "Illegal instruction"
 msgstr "Nedopuštena instrukcija"
 
-#: ../sysdeps/osf1/siglist.c:31 ../sysdeps/sun4/siglist.c:31
+#: sysdeps/osf1/siglist.c:32 sysdeps/sun4/siglist.c:32
 msgid "Trace trap"
 msgstr "Prati trap"
 
-#: ../sysdeps/osf1/siglist.c:32 ../sysdeps/sun4/siglist.c:32
+#: sysdeps/osf1/siglist.c:33 sysdeps/sun4/siglist.c:33
 msgid "Abort"
 msgstr "Odustani"
 
-#: ../sysdeps/osf1/siglist.c:33 ../sysdeps/sun4/siglist.c:33
+#: sysdeps/osf1/siglist.c:34 sysdeps/sun4/siglist.c:34
 msgid "EMT error"
 msgstr "EMT greška"
 
-#: ../sysdeps/osf1/siglist.c:34 ../sysdeps/sun4/siglist.c:34
+#: sysdeps/osf1/siglist.c:35 sysdeps/sun4/siglist.c:35
 msgid "Floating-point exception"
 msgstr "Floating-point exception"
 
-#: ../sysdeps/osf1/siglist.c:35 ../sysdeps/sun4/siglist.c:35
+#: sysdeps/osf1/siglist.c:36 sysdeps/sun4/siglist.c:36
 msgid "Kill"
 msgstr "Ubij"
 
-#: ../sysdeps/osf1/siglist.c:36 ../sysdeps/sun4/siglist.c:36
+#: sysdeps/osf1/siglist.c:37 sysdeps/sun4/siglist.c:37
 msgid "Bus error"
 msgstr "Sabirnička greška"
 
-#: ../sysdeps/osf1/siglist.c:37 ../sysdeps/sun4/siglist.c:37
+#: sysdeps/osf1/siglist.c:38 sysdeps/sun4/siglist.c:38
 msgid "Segmentation violation"
 msgstr "Povreda segmenta"
 
-#: ../sysdeps/osf1/siglist.c:38 ../sysdeps/sun4/siglist.c:38
+#: sysdeps/osf1/siglist.c:39 sysdeps/sun4/siglist.c:39
 msgid "Bad argument to system call"
 msgstr "Neispravan argument za sistemski poziv"
 
-#: ../sysdeps/osf1/siglist.c:39 ../sysdeps/sun4/siglist.c:39
+#: sysdeps/osf1/siglist.c:40 sysdeps/sun4/siglist.c:40
 msgid "Broken pipe"
 msgstr "Prekinut kanal"
 
-#: ../sysdeps/osf1/siglist.c:40 ../sysdeps/sun4/siglist.c:40
+#: sysdeps/osf1/siglist.c:41 sysdeps/sun4/siglist.c:41
 msgid "Alarm clock"
 msgstr "Alarm"
 
-#: ../sysdeps/osf1/siglist.c:41 ../sysdeps/sun4/siglist.c:41
+#: sysdeps/osf1/siglist.c:42 sysdeps/sun4/siglist.c:42
 msgid "Termination"
 msgstr "Završavanje"
 
-#: ../sysdeps/osf1/siglist.c:42 ../sysdeps/sun4/siglist.c:42
+#: sysdeps/osf1/siglist.c:43 sysdeps/sun4/siglist.c:43
 msgid "Urgent condition on socket"
 msgstr "Hitno stanje na socketu"
 
-#: ../sysdeps/osf1/siglist.c:43 ../sysdeps/sun4/siglist.c:43
+#: sysdeps/osf1/siglist.c:44 sysdeps/sun4/siglist.c:44
 msgid "Stop"
 msgstr "Zaustavi"
 
-#: ../sysdeps/osf1/siglist.c:44 ../sysdeps/sun4/siglist.c:44
+#: sysdeps/osf1/siglist.c:45 sysdeps/sun4/siglist.c:45
 msgid "Keyboard stop"
 msgstr "Zaustavljanje tastature"
 
-#: ../sysdeps/osf1/siglist.c:45 ../sysdeps/sun4/siglist.c:45
+#: sysdeps/osf1/siglist.c:46 sysdeps/sun4/siglist.c:46
 msgid "Continue"
 msgstr "Nastavi"
 
-#: ../sysdeps/osf1/siglist.c:46 ../sysdeps/sun4/siglist.c:46
+#: sysdeps/osf1/siglist.c:47 sysdeps/sun4/siglist.c:47
 msgid "Child status has changed"
 msgstr "Status djeteta je promijenjen"
 
-#: ../sysdeps/osf1/siglist.c:47 ../sysdeps/sun4/siglist.c:47
+#: sysdeps/osf1/siglist.c:48 sysdeps/sun4/siglist.c:48
 msgid "Background read from tty"
 msgstr "Pozadinsko čitanje iz tty-a"
 
-#: ../sysdeps/osf1/siglist.c:48 ../sysdeps/sun4/siglist.c:48
+#: sysdeps/osf1/siglist.c:49 sysdeps/sun4/siglist.c:49
 msgid "Background write to tty"
 msgstr "Pozadinsko pisanje na tty"
 
-#: ../sysdeps/osf1/siglist.c:49 ../sysdeps/sun4/siglist.c:49
+#: sysdeps/osf1/siglist.c:50 sysdeps/sun4/siglist.c:50
 msgid "I/O now possible"
 msgstr "U/I je sada moguć"
 
-#: ../sysdeps/osf1/siglist.c:50 ../sysdeps/sun4/siglist.c:50
+#: sysdeps/osf1/siglist.c:51 sysdeps/sun4/siglist.c:51
 msgid "CPU limit exceeded"
 msgstr "CPU granica iskorištena"
 
-#: ../sysdeps/osf1/siglist.c:51 ../sysdeps/sun4/siglist.c:51
+#: sysdeps/osf1/siglist.c:52 sysdeps/sun4/siglist.c:52
 msgid "File size limit exceeded"
 msgstr "Prekoračeno ograničenje veličine spisa"
 
-#: ../sysdeps/osf1/siglist.c:52 ../sysdeps/sun4/siglist.c:52
+#: sysdeps/osf1/siglist.c:53 sysdeps/sun4/siglist.c:53
 msgid "Virtual alarm clock"
 msgstr "Virtualni alarmni sat"
 
-#: ../sysdeps/osf1/siglist.c:53 ../sysdeps/sun4/siglist.c:53
+#: sysdeps/osf1/siglist.c:54 sysdeps/sun4/siglist.c:54
 msgid "Profiling alarm clock"
 msgstr "Profiliranje sata alarma"
 
-#: ../sysdeps/osf1/siglist.c:54 ../sysdeps/sun4/siglist.c:54
+#: sysdeps/osf1/siglist.c:55 sysdeps/sun4/siglist.c:55
 msgid "Window size change"
 msgstr "Promjena veličine prozora"
 
-#: ../sysdeps/osf1/siglist.c:55 ../sysdeps/sun4/siglist.c:55
+#: sysdeps/osf1/siglist.c:56 sysdeps/sun4/siglist.c:56
 msgid "Information request"
 msgstr "Zahtjev za informacijom"
 
-#: ../sysdeps/osf1/siglist.c:56 ../sysdeps/sun4/siglist.c:56
+#: sysdeps/osf1/siglist.c:57 sysdeps/sun4/siglist.c:57
 msgid "User defined signal 1"
 msgstr "Korisnički definisan signal 1"
 
-#: ../sysdeps/osf1/siglist.c:57 ../sysdeps/sun4/siglist.c:57
+#: sysdeps/osf1/siglist.c:58 sysdeps/sun4/siglist.c:58
 msgid "User defined signal 2"
 msgstr "Korisnički definisan signal 2"

po/ca.po

@@ -2,15 +2,13 @@
 # Copyright © 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 # Softcatalà <gnome@softcatala.net>, 2000, 2001, 2002.
 # Jordi Mallach <jordi@sindominio.net>, 2002, 2003, 2004, 2005.
-# Jordi Serratosa <jordis@softcatala.cat>, 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: libgtop 2.9.91\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"Report-Msgid-Bugs-To: \n"
-"product=libgtop&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2007-09-16 22:33+0200\n"
-"POT-Creation-Date: 2011-04-04 20:06+0000\n"
+"PO-Revision-Date: 2005-09-04 01:16+0200\n"
-"PO-Revision-Date: 2011-04-04 22:04+0200\n"
 "Last-Translator: Jordi Mallach <jordi@sindominio.net>\n"
 "Language-Team: Catalan <tradgnome@softcatala.org>\n"
 "MIME-Version: 1.0\n"
@@ -43,27 +41,27 @@ msgid_plural "wrote %d bytes"
 msgstr[0] "s'ha escrit %d octet"
 msgstr[1] "s'ha escrit %d octets"
 
-#: ../src/daemon/gnuserv.c:455
+#: ../src/daemon/gnuserv.c:458
 msgid "Enable debugging"
 msgstr "Activa la depuració"
 
-#: ../src/daemon/gnuserv.c:457
+#: ../src/daemon/gnuserv.c:460
 msgid "Enable verbose output"
 msgstr "Activa la sortida detallada"
 
-#: ../src/daemon/gnuserv.c:459
+#: ../src/daemon/gnuserv.c:462
 msgid "Don't fork into background"
 msgstr "No bifurquis al segon pla"
 
-#: ../src/daemon/gnuserv.c:461
+#: ../src/daemon/gnuserv.c:464
 msgid "Invoked from inetd"
 msgstr "Ha estat cridat des d'inetd"
 
-#: ../src/daemon/gnuserv.c:495
+#: ../src/daemon/gnuserv.c:498
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
-"Executeu «%s --help»  per veure una llista completa de les opcions "
+"Executeu «%s --help»  per a veure una llista completa de les opcions "
 "disponibles de la línia d'ordres.\n"
 
 #: ../sysdeps/osf1/siglist.c:27 ../sysdeps/sun4/siglist.c:27
@@ -88,7 +86,7 @@ msgstr "Captura traça"
 
 #: ../sysdeps/osf1/siglist.c:32 ../sysdeps/sun4/siglist.c:32
 msgid "Abort"
-msgstr "Interromp"
+msgstr "Avorta"
 
 #: ../sysdeps/osf1/siglist.c:33 ../sysdeps/sun4/siglist.c:33
 msgid "EMT error"
@@ -180,7 +178,7 @@ msgstr "Canvi de la mida de la finestra"
 
 #: ../sysdeps/osf1/siglist.c:55 ../sysdeps/sun4/siglist.c:55
 msgid "Information request"
-msgstr "Sol·licitud d'informació"
+msgstr "Petició d'informació"
 
 #: ../sysdeps/osf1/siglist.c:56 ../sysdeps/sun4/siglist.c:56
 msgid "User defined signal 1"

po/ca@valencia.po

@@ -1,203 +0,0 @@
-# Catalan translation of libgtop.
-# Copyright © 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-# Softcatalà <gnome@softcatala.net>, 2000, 2001, 2002.
-# Jordi Mallach <jordi@sindominio.net>, 2002, 2003, 2004, 2005.
-# Jordi Serratosa <jordis@softcatala.cat>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: libgtop 2.9.91\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-04-10 21:12+0200\n"
-"PO-Revision-Date: 2011-04-04 22:04+0200\n"
-"Last-Translator: Jordi Mallach <jordi@sindominio.net>\n"
-"Language-Team: Catalan <tradgnome@softcatala.org>\n"
-"Language: ca-XV\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n!=1;\n"
-
-#: ../lib/read.c:51
-#, c-format
-msgid "read %d byte"
-msgid_plural "read %d bytes"
-msgstr[0] "s'ha llegit %d byte"
-msgstr[1] "s'ha llegit %d octets"
-
-#: ../lib/read_data.c:51
-msgid "read data size"
-msgstr "llig la mida de les dades"
-
-#: ../lib/read_data.c:70
-#, c-format
-msgid "read %lu byte of data"
-msgid_plural "read %lu bytes of data"
-msgstr[0] "s'ha llegit %lu byte de dades"
-msgstr[1] "s'ha llegit %lu octets de dades"
-
-#: ../lib/write.c:51
-#, c-format
-msgid "wrote %d byte"
-msgid_plural "wrote %d bytes"
-msgstr[0] "s'ha escrit %d byte"
-msgstr[1] "s'ha escrit %d octets"
-
-#: ../src/daemon/gnuserv.c:455
-msgid "Enable debugging"
-msgstr "Activa la depuració"
-
-#: ../src/daemon/gnuserv.c:457
-msgid "Enable verbose output"
-msgstr "Activa l'eixida detallada"
-
-#: ../src/daemon/gnuserv.c:459
-msgid "Don't fork into background"
-msgstr "No bifurquis al segon pla"
-
-#: ../src/daemon/gnuserv.c:461
-msgid "Invoked from inetd"
-msgstr "Ha estat cridat des d'inetd"
-
-#: ../src/daemon/gnuserv.c:495
-#, c-format
-msgid "Run '%s --help' to see a full list of available command line options.\n"
-msgstr ""
-"Executeu «%s --help»  per veure una llista completa de les opcions "
-"disponibles de la línia d'ordes.\n"
-
-#: ../sysdeps/osf1/siglist.c:27 ../sysdeps/sun4/siglist.c:27
-msgid "Hangup"
-msgstr "Termina"
-
-#: ../sysdeps/osf1/siglist.c:28 ../sysdeps/sun4/siglist.c:28
-msgid "Interrupt"
-msgstr "Interromp"
-
-#: ../sysdeps/osf1/siglist.c:29 ../sysdeps/sun4/siglist.c:29
-msgid "Quit"
-msgstr "Ix"
-
-#: ../sysdeps/osf1/siglist.c:30 ../sysdeps/sun4/siglist.c:30
-msgid "Illegal instruction"
-msgstr "Instrucció il·legal"
-
-#: ../sysdeps/osf1/siglist.c:31 ../sysdeps/sun4/siglist.c:31
-msgid "Trace trap"
-msgstr "Captura traça"
-
-#: ../sysdeps/osf1/siglist.c:32 ../sysdeps/sun4/siglist.c:32
-msgid "Abort"
-msgstr "Interromp"
-
-#: ../sysdeps/osf1/siglist.c:33 ../sysdeps/sun4/siglist.c:33
-msgid "EMT error"
-msgstr "Error EMT"
-
-#: ../sysdeps/osf1/siglist.c:34 ../sysdeps/sun4/siglist.c:34
-msgid "Floating-point exception"
-msgstr "Excepció de coma flotant"
-
-#: ../sysdeps/osf1/siglist.c:35 ../sysdeps/sun4/siglist.c:35
-msgid "Kill"
-msgstr "Mata"
-
-#: ../sysdeps/osf1/siglist.c:36 ../sysdeps/sun4/siglist.c:36
-msgid "Bus error"
-msgstr "Error de bus"
-
-#: ../sysdeps/osf1/siglist.c:37 ../sysdeps/sun4/siglist.c:37
-msgid "Segmentation violation"
-msgstr "Violació de segment"
-
-#: ../sysdeps/osf1/siglist.c:38 ../sysdeps/sun4/siglist.c:38
-msgid "Bad argument to system call"
-msgstr "Argument erroni a una crida al sistema"
-
-#: ../sysdeps/osf1/siglist.c:39 ../sysdeps/sun4/siglist.c:39
-msgid "Broken pipe"
-msgstr "Conducte trencat"
-
-#: ../sysdeps/osf1/siglist.c:40 ../sysdeps/sun4/siglist.c:40
-msgid "Alarm clock"
-msgstr "Alarma del rellotge"
-
-#: ../sysdeps/osf1/siglist.c:41 ../sysdeps/sun4/siglist.c:41
-msgid "Termination"
-msgstr "Terminació"
-
-#: ../sysdeps/osf1/siglist.c:42 ../sysdeps/sun4/siglist.c:42
-msgid "Urgent condition on socket"
-msgstr "Condició urgent en socket"
-
-#: ../sysdeps/osf1/siglist.c:43 ../sysdeps/sun4/siglist.c:43
-msgid "Stop"
-msgstr "Parada"
-
-#: ../sysdeps/osf1/siglist.c:44 ../sysdeps/sun4/siglist.c:44
-msgid "Keyboard stop"
-msgstr "Parada de teclat"
-
-#: ../sysdeps/osf1/siglist.c:45 ../sysdeps/sun4/siglist.c:45
-msgid "Continue"
-msgstr "Continua"
-
-#: ../sysdeps/osf1/siglist.c:46 ../sysdeps/sun4/siglist.c:46
-msgid "Child status has changed"
-msgstr "L'estat del fill ha canviat"
-
-#: ../sysdeps/osf1/siglist.c:47 ../sysdeps/sun4/siglist.c:47
-msgid "Background read from tty"
-msgstr "Lectura de tty en segon pla"
-
-#: ../sysdeps/osf1/siglist.c:48 ../sysdeps/sun4/siglist.c:48
-msgid "Background write to tty"
-msgstr "Escriptura a tty en segon pla"
-
-#: ../sysdeps/osf1/siglist.c:49 ../sysdeps/sun4/siglist.c:49
-msgid "I/O now possible"
-msgstr "E/S ara és possible"
-
-#: ../sysdeps/osf1/siglist.c:50 ../sysdeps/sun4/siglist.c:50
-msgid "CPU limit exceeded"
-msgstr "Límit de CPU excedit"
-
-#: ../sysdeps/osf1/siglist.c:51 ../sysdeps/sun4/siglist.c:51
-msgid "File size limit exceeded"
-msgstr "Límit de mida de fitxer excedit"
-
-#: ../sysdeps/osf1/siglist.c:52 ../sysdeps/sun4/siglist.c:52
-msgid "Virtual alarm clock"
-msgstr "Alarma del rellotge virtual"
-
-#: ../sysdeps/osf1/siglist.c:53 ../sysdeps/sun4/siglist.c:53
-msgid "Profiling alarm clock"
-msgstr "Alarma del rellotge perfilada"
-
-#: ../sysdeps/osf1/siglist.c:54 ../sysdeps/sun4/siglist.c:54
-msgid "Window size change"
-msgstr "Canvi de la mida de la finestra"
-
-#: ../sysdeps/osf1/siglist.c:55 ../sysdeps/sun4/siglist.c:55
-msgid "Information request"
-msgstr "Sol·licitud d'informació"
-
-#: ../sysdeps/osf1/siglist.c:56 ../sysdeps/sun4/siglist.c:56
-msgid "User defined signal 1"
-msgstr "Senyal 1 definit per l'usuari"
-
-#: ../sysdeps/osf1/siglist.c:57 ../sysdeps/sun4/siglist.c:57
-msgid "User defined signal 2"
-msgstr "Senyal 2 definit per l'usuari"
-
-#~ msgid "DEBUG"
-#~ msgstr "DEPURACIÓ"
-
-#~ msgid "VERBOSE"
-#~ msgstr "DETALLA"
-
-#~ msgid "NO-DAEMON"
-#~ msgstr "SENSE DIMONI"
-
-#~ msgid "INETD"
-#~ msgstr "INETD"