Updated so people can find the ChangeLogs.

* README: Updated so people can find the ChangeLogs.

ChangeLog

@@ -1,3 +1,117 @@
+2005-06-05  Benoît Dejean  <TazForEver@dlfp.org>
+
+	* README: Updated so people can find the ChangeLogs.
+
+2005-04-27  Benoît Dejean  <TazForEver@dlfp.org>
+
+	* configure.in: 2.10.2 post release bump.
+
+	* include/glibtop/Makefile.am:
+	* include/glibtop/parameter.h:
+	* lib/init.c: Re-install open.h to please GTop (libgtop perl wrapper).
+
+2005-04-10  Benoît Dejean  <TazForEver@dlfp.org>
+
+	* NEWS: Released 2.10.1.
+
+2005-04-01  Adi Attar  <aattar@cvs.gnome.org>
+
+	* configure.in: Added "xh" to ALL_LINGUAS.
+
+2005-03-31  Steve Murphy  <murf@e-tools.com>
+
+        * configure.in: Added "rw" to ALL_LINGUAS.
+
+2005-03-31  Benoît Dejean  <TazForEver@dlfp.org>
+
+	* libgtop-2.0.pc.in: Fixed.
+
+2005-03-29  Benoît Dejean  <TazForEver@dlfp.org>
+
+	* lib/read_data.c: (glibtop_read_data_l): Fixed warning.
+
+2005-03-25  Benoît Dejean  <TazForEver@dlfp.org>
+
+	* lib/error.c: (glibtop_error_io_vr), (glibtop_warn_io_vr):
+	s/strerror/g_strerror.
+
+2005-03-11  Benoît Dejean  <TazForEver@dlfp.org>
+
+	* configure.in: Post release version bump.
+
+2005-03-07  Benoît Dejean  <TazForEver@dlfp.org>
+
+	* NEWS:
+	* configure.in: Released 2.10.0.
+
+2005-02-28  Benoît Dejean  <TazForEver@dlfp.org>
+
+	* NEWS: Released 2.9.92.
+
+2005-02-25  Benoît Dejean  <TazForEver@dlfp.org>
+
+	* configure.in: /me stupid. I've already post-bumped version.
+
+2005-02-24  Benoît Dejean  <TazForEver@dlfp.org>
+
+	* configure.in: post release bump 2.9.93.
+
+2005-02-22  Benoît Dejean  <TazForEver@dlfp.org>
+
+	* src/Makefile.am: Build and install libgtop2_daemon only if needed.
+
+2005-02-21  Benoît Dejean  <TazForEver@dlfp.org>
+
+	* lib/Makefile.am: don't export private symbols.
+
+2005-02-15  Benoît Dejean  <TazForEver@dlfp.org>
+
+	* backends/server/server.h:
+	* configure.in:
+	* glibtop.h:
+	* include/glibtop/Makefile.am:
+	* include/glibtop/gnuserv.h:
+	* include/glibtop/open.h:
+	* include/glibtop/read.h:
+	* include/glibtop/read_data.h:
+	* include/glibtop/types.h:
+	* include/glibtop/write.h:
+	* lib/close.c:
+	* lib/init.c:
+	* lib/lib.pl:
+	* lib/open.c:
+	* lib/parameter.c:
+	* lib/read.c:
+	* lib/read_data.c:
+	* lib/write.c:
+	* src/daemon/daemon.h:
+	* src/daemon/io.c:
+	* src/daemon/main.c: (handle_parent_connection):
+	* src/daemon/slave.c: (handle_slave_connection),
+	(handle_slave_command):
+	* sysdeps/common/gnuslib.c:
+	* sysdeps/solaris/glibtop_private.h: Removed some dead files.
+	Don't install private headers.
+	
+	Depends on glib-2.6.
+	Post-release bump : 2.9.92
+
+2005-02-15  Benoît Dejean  <TazForEver@dlfp.org>
+
+	* include/glibtop/error.h: Don't export private symbols.
+
+2005-02-15  Benoît Dejean  <TazForEver@dlfp.org>
+
+	* include/glibtop/error.h: G_GNUC_NORETURN love.
+
+	* include/glibtop/errors.h:
+	* lib/errors.c: Bye bye dead code.
+
+2005-02-06  Benoît Dejean  <TazForEver@dlfp.org>
+
+	* NEWS:
+	* configure.in: Released 2.9.91.
+
 2005-01-24  Benoît Dejean  <TazForEver@dlfp.org>
 
 	* NEWS:

NEWS

@@ -1,3 +1,26 @@
+April 10, 2005: Overview of changes from 2.10.0 to 2.10.1
+=========================================================
+* Updated i18n.
+* Little cleanup and fixed gcc-4.0 compilation.
+* linux: fixed loadavg and uptime if locale != C.
+  Updated siglist.
+* Tighter libgtop-2.0.pc.
+
+Mars 7, 2005: Overview of Changes from 2.9.92 to 2.10.0
+=======================================================
+* Updated i18n.
+
+February 28, 2005: Overview of Changes from 2.9.90 to 2.9.92
+============================================================
+* *BSD updated by marcus@freebsd.org (Joe Marcus Clarke).
+* Removed a lot of dead files :)
+* Don't build&install libgtop_daemon when it's never used.
+
+February 6, 2004: Overview of Changes from 2.9.90 to 2.9.91
+==========================================================
+* Fixed typo in stub.
+* Updated i18n.
+
 January 24, 2004: Overview of Changes from 2.9.4 to 2.9.90
 ==========================================================
 * Updated Linux support.

README

@@ -1,8 +1,20 @@
-$Id$
-
 LATEST NEWS:
 ===========
 
 Please look also in the file 'NEWS' for latest news.
  
 Martin
+
+
+ChangeLogs:
+==========
+
+LibGTop has many ChangeLogs files. The following files are the the
+most important :
+
+- ChangeLog is the main ChangeLog.
+- sysdeps/<arch>/ChangeLog is the ChangeLog for arch specific changes.
+- sysdeps/common/ChangeLog is the ChangeLog for common changes (shared
+  implementation between archs).
+
+Benoît

backends/server/server.h

@@ -27,7 +27,6 @@
 #define __GLIBTOP_DAEMON_H__
 
 #include <glibtop.h>
-#include <glibtop/error.h>
 
 #include <glibtop/open.h>
 #include <glibtop/union.h>

configure.in

@@ -7,8 +7,8 @@ AM_CONFIG_HEADER(config.h)
 AC_CANONICAL_SYSTEM
 
 LIBGTOP_MAJOR_VERSION=2
-LIBGTOP_MINOR_VERSION=9
-LIBGTOP_MICRO_VERSION=90
+LIBGTOP_MINOR_VERSION=10
+LIBGTOP_MICRO_VERSION=2
 LIBGTOP_VERSION=$LIBGTOP_MAJOR_VERSION.$LIBGTOP_MINOR_VERSION.$LIBGTOP_MICRO_VERSION
 AM_INIT_AUTOMAKE(libgtop, $LIBGTOP_VERSION)
 
@@ -133,7 +133,7 @@ AM_CONDITIONAL(ENABLE_SHARED, test x$enable_static = xyes)
 AC_SUBST(static_targets)
 AC_SUBST(smp_examples)
 
-GLIB_REQUIRED=2.4.0
+GLIB_REQUIRED=2.6.0
 
 PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED)
 AC_SUBST(GLIB_CFLAGS)
@@ -254,7 +254,7 @@ AC_TYPE_SIGNAL
 AC_FUNC_STRFTIME
 AC_CHECK_FUNCS(getcwd gettimeofday getwd putenv strdup strtoul uname)
 
-ALL_LINGUAS="am ar az be bg bn bs ca cs cy da de el en_CA en_GB es et eu fa fi fr ga gl gu he hi hr hu id it ja ko lt lv mi mk ml mn ms nb ne nl nn no or pa pl pt pt_BR ro ru sk sl sq sr sr@Latn sv ta tr uk vi zh_CN zh_TW"
+ALL_LINGUAS="am ar az be bg bn bs ca cs cy da de el en_CA en_GB es et eu fa fi fr ga gl gu he hi hr hu id it ja ko lt lv mi mk ml mn ms nb ne nl nn no or pa pl pt pt_BR ro ru rw sk sl sq sr sr@Latn sv ta tr uk vi xh zh_CN zh_TW"
 
 GETTEXT_PACKAGE=libgtop-2.0
 AC_SUBST(GETTEXT_PACKAGE)

glibtop.h

@@ -51,7 +51,6 @@ LIBGTOP_MICRO_VERSION >= (micro)))
 #include <glibtop/global.h>
 
 #include <glibtop_server.h>
-#include <glibtop/types.h>
 
 #ifdef HAVE_GLIBTOP_MACHINE_H
 #include <glibtop_machine.h>

include/glibtop/Makefile.am

@@ -3,9 +3,11 @@ 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 version.h cpu.h msg_limits.h \
-			  procmem.h procuid.h swap.h write.h error.h open.h \
-			  procsegment.h read.h sysdeps.h global.h \
-			  procsignal.h read_data.h union.h types.h gnuserv.h \
+			  procmem.h procuid.h swap.h \
+			  procsegment.h sysdeps.h global.h \
+			  procsignal.h union.h gnuserv.h \
 			  parameter.h mountlist.h fsusage.h procmap.h signal.h \
 			  inodedb.h sysinfo.h ppp.h procargs.h netload.h \
-			  netlist.h procopenfiles.h
+			  netlist.h procopenfiles.h open.h
+
+noinst_HEADERS		= error.h write.h read_data.h read.h

include/glibtop/error.h

@@ -21,6 +21,11 @@
    Boston, MA 02111-1307, USA.
 */
 
+
+/*
+ * This is private API
+ */
+
 #ifndef __GLIBTOP_ERROR_H__
 #define __GLIBTOP_ERROR_H__
 
@@ -28,20 +33,20 @@
 
 G_BEGIN_DECLS
 
-void glibtop_error_vr (glibtop *server, const char *format, va_list args);
-void glibtop_warn_vr (glibtop *server, const char *format, va_list args);
-void glibtop_error_io_vr (glibtop *server, const char *format, int, va_list args);
-void glibtop_warn_io_vr (glibtop *server, const char *format, int, va_list args);
+void glibtop_error_vr (glibtop *server, const char *format, va_list args) G_GNUC_INTERNAL G_GNUC_NORETURN;
+void glibtop_warn_vr (glibtop *server, const char *format, va_list args) G_GNUC_INTERNAL;
+void glibtop_error_io_vr (glibtop *server, const char *format, int, va_list args) G_GNUC_INTERNAL G_GNUC_NORETURN;
+void glibtop_warn_io_vr (glibtop *server, const char *format, int, va_list args) G_GNUC_INTERNAL;
 
-void glibtop_error_r (glibtop *server, const char *format, ...) G_GNUC_PRINTF(2, 3);
-void glibtop_warn_r (glibtop *server, const char *format, ...) G_GNUC_PRINTF(2, 3);
-void glibtop_error_io_r (glibtop *server, const char *format, ...) G_GNUC_PRINTF(2, 3);
-void glibtop_warn_io_r (glibtop *server, const char *format, ...) G_GNUC_PRINTF(2, 3);
+void glibtop_error_r (glibtop *server, const char *format, ...) G_GNUC_INTERNAL G_GNUC_PRINTF(2, 3) G_GNUC_NORETURN;
+void glibtop_warn_r (glibtop *server, const char *format, ...) G_GNUC_INTERNAL G_GNUC_PRINTF(2, 3);
+void glibtop_error_io_r (glibtop *server, const char *format, ...) G_GNUC_INTERNAL G_GNUC_PRINTF(2, 3) G_GNUC_NORETURN;
+void glibtop_warn_io_r (glibtop *server, const char *format, ...) G_GNUC_INTERNAL G_GNUC_PRINTF(2, 3);
 
-void glibtop_error (const char *format, ...) G_GNUC_PRINTF(1, 2);
-void glibtop_warn (const char *format, ...) G_GNUC_PRINTF(1, 2);
-void glibtop_error_io (const char *format, ...) G_GNUC_PRINTF(1, 2);
-void glibtop_warn_io (const char *format, ...) G_GNUC_PRINTF(1, 2);
+void glibtop_error (const char *format, ...) G_GNUC_INTERNAL G_GNUC_PRINTF(1, 2) G_GNUC_NORETURN;
+void glibtop_warn (const char *format, ...) G_GNUC_INTERNAL G_GNUC_PRINTF(1, 2);
+void glibtop_error_io (const char *format, ...) G_GNUC_INTERNAL G_GNUC_PRINTF(1, 2) G_GNUC_NORETURN;
+void glibtop_warn_io (const char *format, ...) G_GNUC_INTERNAL G_GNUC_PRINTF(1, 2);
 
 G_END_DECLS
 

include/glibtop/errors.h

@@ -1,95 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
-/* $Id$ */
-
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __GLIBTOP_ERRORS_H__
-#define __GLIBTOP_ERRORS_H__
-
-#include <glibtop.h>
-
-#include <glib/gerror.h>
-
-G_BEGIN_DECLS
-
-#define GLIBTOP_ERROR glibtop_error_quark ()
-
-GQuark glibtop_error_quark (void) G_GNUC_CONST;
-
-typedef enum {
-    GLIBTOP_ERROR_NO_ERROR = 0,
-    GLIBTOP_ERROR_UNKNOWN,
-    GLIBTOP_ERROR_INVALID_ARGUMENT,
-    GLIBTOP_ERROR_NO_SUCH_PARAMETER,
-    GLIBTOP_ERROR_READONLY_VALUE,
-    GLIBTOP_ERROR_SIZE_MISMATCH,
-
-    GLIBTOP_ERROR_SERVER_COMM_FAILURE,
-
-    GLIBTOP_ERROR_NO_SUCH_PROCESS,
-
-    GLIBTOP_ERROR_NO_KERNEL_SUPPORT,
-    GLIBTOP_ERROR_INCOMPATIBLE_KERNEL,
-
-    GLIBTOP_ERROR_NO_SUCH_BACKEND,
-    GLIBTOP_ERROR_NOT_IMPLEMENTED,
-    GLIBTOP_ERROR_NO_BACKEND_OPENED,
-
-    GLIBTOP_ERROR_DEMARSHAL_ERROR
-} glibtop_error;
-
-void
-glibtop_error_vl (glibtop_client *client, glibtop_error code,
-		  const char *format, va_list args);
-
-void
-glibtop_error_io_vl (glibtop_client *client, glibtop_error code,
-		     int io_errno, const char *format, va_list args);
-
-void
-glibtop_warn_vl (glibtop_client *client, glibtop_error code,
-		 const char *format, va_list args);
-
-void
-glibtop_warn_io_vl (glibtop_client *client, glibtop_error code,
-		    int io_errno, const char *format, va_list args);
-
-void
-glibtop_error_l (glibtop_client *client, glibtop_error code,
-		 char *format, ...);
-
-void
-glibtop_warn_l (glibtop_client *client, glibtop_error code,
-		char *format, ...);
-
-void
-glibtop_error_io_l (glibtop_client *client, glibtop_error code,
-		    char *format, ...);
-
-void
-glibtop_warn_io_l (glibtop_client *client, glibtop_error code,
-		   char *format, ...);
-
-G_END_DECLS
-
-#endif

include/glibtop/gnuserv.h

@@ -42,7 +42,6 @@ static char header_rcsid [] = "!Header: gnuserv.h,v 2.4 95/02/16 11:58:11 arup a
 /* gnuserv should not be compiled using SOCKS */
 #define DO_NOT_SOCKSIFY
 #include <glibtop.h>
-#include <glibtop/error.h>
 #undef read
 #undef write
 #undef open

include/glibtop/open.h

@@ -23,8 +23,6 @@
 #define __GLIBTOP_OPEN_H__
 
 #include <glibtop.h>
-#include <glibtop/read.h>
-#include <glibtop/error.h>
 
 G_BEGIN_DECLS
 

include/glibtop/parameter.h

@@ -23,7 +23,6 @@
 #define __GLIBTOP_PARAMETER_H__
 
 #include <glibtop.h>
-#include <glibtop/open.h>
 
 G_BEGIN_DECLS
 

include/glibtop/read.h

@@ -25,7 +25,6 @@
 #define __GLIBTOP_READ_H__
 
 #include <glibtop.h>
-#include <glibtop/error.h>
 
 G_BEGIN_DECLS
 

include/glibtop/read_data.h

@@ -25,7 +25,6 @@
 #define __GLIBTOP_READ_DATA_H__
 
 #include <glibtop.h>
-#include <glibtop/error.h>
 
 G_BEGIN_DECLS
 

include/glibtop/write.h

@@ -25,7 +25,6 @@
 #define __GLIBTOP_WRITE_H__
 
 #include <glibtop.h>
-#include <glibtop/error.h>
 
 G_BEGIN_DECLS
 

lib/Makefile.am

@@ -7,7 +7,7 @@ libgtop_2_0_la_SOURCES		= init.c open.c close.c command.c read.c \
 				  read_data.c write.c lib.c parameter.c \
 				  sysdeps.c
 
-libgtop_2_0_la_LDFLAGS		= $(LT_VERSION_INFO)
+libgtop_2_0_la_LDFLAGS		= $(LT_VERSION_INFO) -export-symbols-regex "^[^_].*"
 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

lib/close.c

@@ -23,6 +23,7 @@
 
 #include <glibtop.h>
 #include <glibtop/open.h>
+#include <glibtop/error.h>
 #include <glibtop/close.h>
 #include <glibtop/command.h>
 

lib/error.c

@@ -23,8 +23,13 @@
    Boston, MA 02111-1307, USA.
 */
 
+#include <config.h>
+
 #include <glibtop/error.h>
 
+#include <glib/gstrfuncs.h>
+#include <errno.h>
+
 #define DEFAULT_NAME	"LibGTop-Server"
 
 /* Prints error message and exits. */
@@ -56,7 +61,7 @@ glibtop_error_io_vr (glibtop_server *server, char *format, int error, va_list ar
 {
     print_server_name (server);
     vfprintf (stderr, format, args);
-    fprintf (stderr, ": %s\n", strerror (error));
+    fprintf (stderr, ": %s\n", g_strerror (error));
 
 #ifdef LIBGTOP_ENABLE_DEBUG
     abort ();
@@ -82,7 +87,7 @@ glibtop_warn_io_vr (glibtop_server *server, char *format, int error, va_list arg
 {
     print_server_name (server);
     vfprintf (stderr, format, args);
-    fprintf (stderr, ": %s\n", strerror (error));
+    fprintf (stderr, ": %s\n", g_strerror (error));
 
 #ifdef LIBGTOP_FATAL_WARNINGS
     abort ();

lib/errors.c

@@ -1,156 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
-/* $Id$ */
-
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#include <glibtop.h>
-#include <glibtop/global.h>
-#include <glibtop/errors.h>
-
-/* Error quark */
-GQuark
-glibtop_error_quark (void)
-{
-    static GQuark q = 0;
-    if (G_UNLIKELY(q == 0))
-	q = g_quark_from_static_string ("glibtop-error-quark");
-
-    return q;
-}
-
-void
-glibtop_error_vl (glibtop_client *client, glibtop_error code,
-		  const char *format, va_list args)
-{
-    gchar *message;
-    GError *error;
-
-    g_return_if_fail (GLIBTOP_IS_CLIENT (client));
-    message = g_strdup_vprintf (format, args);
-
-    error = g_error_new_literal (GLIBTOP_ERROR, code, message);
-    glibtop_client_propagate_error (client, error);
-
-    g_error_free (error);
-    g_free (message);
-}
-
-void
-glibtop_error_io_vl (glibtop_client *client, glibtop_error code,
-		     int io_errno, const char *format, va_list args)
-{
-    gchar *message, *fullmessage;
-    GError *error;
-
-    g_return_if_fail (GLIBTOP_IS_CLIENT (client));
-    message = g_strdup_vprintf (format, args);
-    fullmessage = g_strdup_printf ("%s: %s", message, strerror (io_errno));
-
-    error = g_error_new_literal (GLIBTOP_ERROR, code, message);
-    glibtop_client_propagate_error (client, error);
-
-    g_error_free (error);
-    g_free (fullmessage);
-    g_free (message);
-}
-
-void
-glibtop_warn_vl (glibtop_client *client, glibtop_error code,
-		 const char *format, va_list args)
-{
-    gchar *message;
-    GError *error;
-
-    g_return_if_fail (GLIBTOP_IS_CLIENT (client));
-    message = g_strdup_vprintf (format, args);
-
-    error = g_error_new_literal (GLIBTOP_ERROR, code, message);
-    glibtop_client_propagate_warning (client, error);
-
-    g_error_free (error);
-    g_free (message);
-}
-
-void
-glibtop_warn_io_vl (glibtop_client *client, glibtop_error code,
-		    int io_errno, const char *format, va_list args)
-{
-    gchar *message, *fullmessage;
-    GError *error;
-
-    g_return_if_fail (GLIBTOP_IS_CLIENT (client));
-    message = g_strdup_vprintf (format, args);
-    fullmessage = g_strdup_printf ("%s: %s", message, strerror (io_errno));
-
-    error = g_error_new_literal (GLIBTOP_ERROR, code, message);
-    glibtop_client_propagate_warning (client, error);
-
-    g_error_free (error);
-    g_free (fullmessage);
-    g_free (message);
-}
-
-void
-glibtop_error_l (glibtop_client *client, glibtop_error code,
-		 char *format, ...)
-{
-    va_list args;
-
-    va_start (args, format);
-    glibtop_error_vl (client, code, format, args);
-    va_end (args);
-}
-
-void
-glibtop_warn_l (glibtop_client *client, glibtop_error code,
-		char *format, ...)
-{
-    va_list args;
-
-    va_start (args, format);
-    glibtop_warn_vl (client, code, format, args);
-    va_end (args);
-}
-
-void
-glibtop_error_io_l (glibtop_client *client, glibtop_error code,
-		    char *format, ...)
-{
-    va_list args;
-
-    va_start (args, format);
-    glibtop_error_io_vl (client, code, errno, format, args);
-    va_end (args);
-}
-
-void
-glibtop_warn_io_l (glibtop_client *client, glibtop_error code,
-		   char *format, ...)
-{
-    va_list args;
-
-    va_start (args, format);
-    glibtop_warn_io_vl (client, code, errno, format, args);
-    va_end (args);
-}
-

lib/init.c

@@ -22,7 +22,9 @@
 */
 
 #include <glibtop.h>
+#include <glibtop/error.h>
 #include <glibtop/sysdeps.h>
+#include <glibtop/open.h>
 #include <glibtop/parameter.h>
 
 #ifndef DEFAULT_PORT

lib/lib.pl

@@ -23,6 +23,7 @@ print '';
 print '#include <config.h>';
 print '';
 print '#include <glibtop.h>';
+print '#include <glibtop/error.h>';
 print '#include <glibtop/open.h>';
 print '';
 print '#include <glibtop/sysdeps.h>';

lib/open.c

@@ -23,6 +23,8 @@
 
 #include <glibtop.h>
 #include <glibtop/open.h>
+#include <glibtop/read.h>
+#include <glibtop/error.h>
 #include <glibtop/version.h>
 #include <glibtop/sysdeps.h>
 #include <glibtop/command.h>

lib/parameter.c

@@ -23,6 +23,7 @@
 
 #include <glibtop.h>
 #include <glibtop/parameter.h>
+#include <glibtop/error.h>
 
 #define _write_data(ptr,size)	\
 	if ((data_ptr == NULL) || (data_size < size)) return -size; \

lib/read.c

@@ -23,6 +23,7 @@
 
 #include <config.h>
 #include <glibtop/read.h>
+#include <glibtop/error.h>
 #include "libgtop-i18n.h"
 
 

lib/read_data.c

@@ -23,6 +23,7 @@
 
 #include <config.h>
 
+#include <glibtop/error.h>
 #include <glibtop/read_data.h>
 #include "libgtop-i18n.h"
 
@@ -70,7 +71,8 @@ glibtop_read_data_l (glibtop *server)
 		glibtop_error_io_r (server,
 				    ngettext ("read %lu byte of data",
 					      "read %lu bytes of data",
-					      (unsigned long) size));
+					      (unsigned long) size),
+				    (unsigned long) size);
 
 	return ptr;
 }

lib/write.c

@@ -24,6 +24,7 @@
 #include <config.h>
 
 #include <glibtop/write.h>
+#include <glibtop/error.h>
 #include "libgtop-i18n.h"
 
 /* Writes some data to server. */

libgtop-2.0.pc.in

@@ -7,7 +7,7 @@ Name: libgtop
 Description: Portable System Access Library
 Requires: glib-2.0
 Version: @VERSION@
-Libs: -L${libdir} @LIBGTOP_LIBS@ @LIBGTOP_EXTRA_LIBS@ -lgtop-2.0
+Libs: -L${libdir} -lgtop-2.0
 Cflags: -I${includedir}/libgtop-2.0
 
 

po/ChangeLog

@@ -1,3 +1,140 @@
+2005-04-01  Adi Attar  <aattar@cvs.gnome.org>
+
+	* xh.po: Added Xhosa translation.
+
+2005-03-31  Steve Murphy  <murf@e-tools.com>
+
+        * rw.po: Added Kinyarwanda translation.
+
+2005-03-19  Priit Laes  <plaes@cvs.gnome.org>
+
+	* et.po: Translation updated by Ivar Smolin.
+
+2005-03-17  Adam Weinberger  <adamw@gnome.org>
+
+	* en_CA.po: Updated Canadian English translation.
+
+2005-03-12  Baris Cicek <baris@teamforce.name.tr>
+
+	* tr.po: Updated Turkish Translation
+
+2005-03-07  Dan Damian  <dand@gnome.ro>
+
+	* ro.po: Updated Romanian translation by
+	Mişu Moldovan <dumol@go.ro>.
+
+2005-03-06  Danilo Šegan  <dsegan@gmx.net>
+
+	* sr.po, sr@Latn.po: Updated Serbian translation.
+
+2005-03-05  Abel Cheung  <maddog@linuxhall.org>
+
+	* zh_TW.po: Updated traditional Chinese translation from GNOME HK Team
+	* bg.po: Mark wrong entry as fuzzy (msgfmt check failed).
+
+2005-03-04  Laszlo Dvornik  <dvornik@gnome.hu>
+
+	* hu.po: Hungarian translation updated by Gabor Kelemen.
+
+2005-03-03  Alessio Frusciante  <algol@firenze.linux.it>
+
+	* it.po: Updated Italian translation.
+
+2005-02-24  Artur Flinta  <aflinta@cvs.gnome.org>
+
+	* pl.po: Updated Polish translation by GNOME PL Team.
+
+2004-02-24  Ankit Patel <ankit644@yahoo.com>
+
+	* gu.po: Updated Gujarati Translation.
+
+2004-02-22  Roozbeh Pournader  <roozbeh@farsiweb.info>
+
+	* fa.po: Updated Persian translation by
+	  Azin Azadi <aazadi@gmail.com>.
+
+2005-02-22  Priit Laes  <plaes@cvs.gnome.org>
+
+	* et.po: Translation updated by Ivar Smolin.
+
+2005-02-20  Raphael Higino  <raphaelh@cvs.gnome.org>
+
+	* pt_BR.po: Updated Brazilian Portuguese translation.
+
+2005-02-18  Changwoo Ryu  <cwryu@debian.org>
+
+	* ko.po: Updated Korean translation.
+
+2005-02-18  Kostas Papadimas <pkst@gnome.org>
+
+	* el.po: Updated Greek translation.
+
+2005-02-17  Vincent van Adrighem  <adrighem@gnome.org>
+
+	* nl.po: Translation updated by Tino Meinen.
+
+2005-02-16  Jordi Mallach  <jordi@sindominio.net>
+
+	* ca.po: Updated Catalan translation.
+
+2005-02-15  Maxim Dziumanenko <mvd@mylinux.com.ua>
+
+	* uk.po: Updated Ukrainian translation.
+
+2005-02-14  Christophe Merlet  <redfox@redfoxcenter.org>
+
+	* fr.po: Updated French translation.
+
+2005-02-14  Laurent Dhima  <laurenti@alblinux.net>
+
+	* sq.po: Updated Albanian translation.
+
+2005-02-14  Benoît Dejean  <TazForEver@dlfp.org>
+
+	* fr.po: Updated French translation.
+
+2005-02-08  Leonid Kanter <leon@asplinux.ru>
+
+	* ru.po: Updated Russian translation
+
+2005-02-07  David Lodge <dave@cirt.net>
+                                                                                
+        * en_GB.po: Updated British translation.
+                                                                                
+2005-02-06  Ole Laursen  <olau@hardworking.dk>
+
+	* da.po: Updated Danish translation.
+
+2005-02-06  Pauli Virtanen <pauli.virtanen@hut.fi>
+
+	* fi.po: Updated Finnish translation.
+
+2005-02-04  Priit Laes  <plaes@cvs.gnome.org>
+
+	* et.po: Translation updated by Tõivo Leedjärv.
+
+2005-01-30  Žygimantas Beručka  <uid0@akl.lt>
+
+	* lt.po: Updated Lithuanian translation.
+
+2005-01-28  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* nb.po: Update
+	* no.po: Update
+
+2005-01-27  Alexander Shopov  <ash@contact.bg>
+
+	* bg.po: Updated Bulgarian translation by
+	Iassen Pramatarov <turin@fsa-bg.org>
+
+2005-01-26  Duarte Loreto <happyguy_pt@hotmail.com>
+
+	* pt.po: Updated Portuguese translation.
+
+2005-01-24  Funda Wang  <fundawang@linux.net.cn>
+
+	* zh_CN.po: Updated Simplified Chinese translation.
+
 2005-01-24  Alexander Shopov  <ash@contact.bg>
 
 	* bg.po: Updated Bulgarian translation by

po/bg.po

@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libgtop\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-24 12:33+0200\n"
-"PO-Revision-Date: 2005-01-24 12:33+0200\n"
+"POT-Creation-Date: 2005-01-27 12:05+0200\n"
+"PO-Revision-Date: 2005-03-05 16:34+0800\n"
 "Last-Translator: Rostislav Raykov <zbrox@i-space.org>\n"
 "Language-Team: Bulgarian <dict@linux.zonebg.com>\n"
 "MIME-Version: 1.0\n"
@@ -30,7 +30,7 @@ msgid "read data size"
 msgstr "размер прочетени данни"
 
 #: lib/read_data.c:71
-#, c-format
+#, fuzzy, c-format
 msgid "read %lu byte of data"
 msgid_plural "read %lu bytes of data"
 msgstr[0] "прочетен %d байт от данните"
@@ -103,7 +103,7 @@ msgstr "Недопустима инструкция"
 
 #: sysdeps/osf1/siglist.c:32 sysdeps/sun4/siglist.c:32
 msgid "Trace trap"
-msgstr "Захваща трасировка"
+msgstr "Точка на прекъсване"
 
 #: sysdeps/osf1/siglist.c:33 sysdeps/sun4/siglist.c:33
 msgid "Abort"
@@ -115,11 +115,11 @@ msgstr "EMT грешка"
 
 #: sysdeps/osf1/siglist.c:35 sysdeps/sun4/siglist.c:35
 msgid "Floating-point exception"
-msgstr "'Изключение' на плаваща точка"
+msgstr "Изключение с плаваща запетая"
 
 #: sysdeps/osf1/siglist.c:36 sysdeps/sun4/siglist.c:36
 msgid "Kill"
-msgstr "Убива"
+msgstr "Убиване"
 
 #: sysdeps/osf1/siglist.c:37 sysdeps/sun4/siglist.c:37
 msgid "Bus error"
@@ -127,11 +127,11 @@ msgstr "Грешка в шината"
 
 #: sysdeps/osf1/siglist.c:38 sysdeps/sun4/siglist.c:38
 msgid "Segmentation violation"
-msgstr "Нарушена сегментация"
+msgstr "Сегментация"
 
 #: sysdeps/osf1/siglist.c:39 sysdeps/sun4/siglist.c:39
 msgid "Bad argument to system call"
-msgstr "Лош аргумент за системно повикване"
+msgstr "Грешен аргумент на системно извикване"
 
 #: sysdeps/osf1/siglist.c:40 sysdeps/sun4/siglist.c:40
 msgid "Broken pipe"
@@ -139,7 +139,7 @@ msgstr "Нарушен програмен канал"
 
 #: sysdeps/osf1/siglist.c:41 sysdeps/sun4/siglist.c:41
 msgid "Alarm clock"
-msgstr "Часовник на аларма"
+msgstr "Алармен часовник"
 
 #: sysdeps/osf1/siglist.c:42 sysdeps/sun4/siglist.c:42
 msgid "Termination"
@@ -155,7 +155,7 @@ msgstr "Стоп"
 
 #: sysdeps/osf1/siglist.c:45 sysdeps/sun4/siglist.c:45
 msgid "Keyboard stop"
-msgstr "Стоп на клавиатура"
+msgstr "Стоп от клавиатурата"
 
 #: sysdeps/osf1/siglist.c:46 sysdeps/sun4/siglist.c:46
 msgid "Continue"
@@ -163,7 +163,7 @@ msgstr "Продължаване"
 
 #: sysdeps/osf1/siglist.c:47 sysdeps/sun4/siglist.c:47
 msgid "Child status has changed"
-msgstr "Статуса на потомството е променено"
+msgstr "Промяна в състоянието на дъщерни процеси"
 
 #: sysdeps/osf1/siglist.c:48 sysdeps/sun4/siglist.c:48
 msgid "Background read from tty"
@@ -175,15 +175,15 @@ msgstr "Фонов запис в tty"
 
 #: sysdeps/osf1/siglist.c:50 sysdeps/sun4/siglist.c:50
 msgid "I/O now possible"
-msgstr "I/O не е възможно"
+msgstr "I/O сега е възможно"
 
 #: sysdeps/osf1/siglist.c:51 sysdeps/sun4/siglist.c:51
 msgid "CPU limit exceeded"
-msgstr "Надхвърлен лимит на CPU"
+msgstr "Превишено ограничение за CPU"
 
 #: sysdeps/osf1/siglist.c:52 sysdeps/sun4/siglist.c:52
 msgid "File size limit exceeded"
-msgstr "Надхвърлен лимит за размер на файл"
+msgstr "Превишено ограничение за размер на файл"
 
 #: sysdeps/osf1/siglist.c:53 sysdeps/sun4/siglist.c:53
 msgid "Virtual alarm clock"
@@ -199,7 +199,7 @@ msgstr "Променяне размера на прозорец"
 
 #: sysdeps/osf1/siglist.c:56 sysdeps/sun4/siglist.c:56
 msgid "Information request"
-msgstr "Заявена информация"
+msgstr "Заявка за данни"
 
 #: sysdeps/osf1/siglist.c:57 sysdeps/sun4/siglist.c:57
 msgid "User defined signal 1"

po/en_CA.po

@@ -11,7 +11,7 @@ msgstr ""
 "POT-Creation-Date: 2004-12-29 03:12-0500\n"
 "PO-Revision-Date: 2004-12-29 15:51-0400\n"
 "Last-Translator: Adam Weinberger <adamw@gnome.org>\n"
-"Language-Team: English/Canada <adamw@FreeBSD.org>\n"
+"Language-Team: Canadian English <adamw@gnome.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

po/nb.po

@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libgtop 2.5.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-12-28 11:39+0100\n"
-"PO-Revision-Date: 2004-12-28 11:40+0100\n"
+"POT-Creation-Date: 2005-01-28 17:04+0100\n"
+"PO-Revision-Date: 2005-01-28 17:05+0100\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <i18n-nb@lister.ping.uio.no>\n"
 "MIME-Version: 1.0\n"
@@ -15,87 +15,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8-bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: examples/smp.c:76
-#, c-format
-msgid "Ticks (%ld per second):"
-msgstr "Tikk (%ld per sekund):"
-
-#: examples/smp.c:79
-msgid "Total"
-msgstr "Totalt"
-
-#: examples/smp.c:79
-msgid "User"
-msgstr "Bruker"
-
-#: examples/smp.c:79
-msgid "Nice"
-msgstr "Nice"
-
-#: examples/smp.c:79
-msgid "Sys"
-msgstr "Sys"
-
-#: examples/smp.c:79
-msgid "Idle"
-msgstr "Idle"
-
-#: examples/smp.c:81
-#, c-format
-msgid ""
-"CPU          (0x%08lx): %12.0f %12.0f %12.0f %12.0f %12.0f\n"
-"\n"
-msgstr ""
-"CPU          (0x%08lx): %12.0f %12.0f %12.0f %12.0f %12.0f\n"
-"\n"
-
-#: examples/smp.c:85
-#, c-format
-msgid "CPU %3d      (0x%08lx): %12lu %12lu %12lu %12lu %12lu\n"
-msgstr "CPU %3d      (0x%08lx): %12lu %12lu %12lu %12lu %12lu\n"
-
-#: examples/smp.c:102
-msgid "Percent:"
-msgstr "Prosent:"
-
-#: examples/smp.c:103
-msgid "Total (%)"
-msgstr "Total (%)"
-
-#: examples/smp.c:103
-msgid "User (%)"
-msgstr "Bruker (%)"
-
-#: examples/smp.c:103
-msgid "Nice (%)"
-msgstr "Nice (%)"
-
-#: examples/smp.c:103
-msgid "Sys (%)"
-msgstr "Sys (%)"
-
-#: examples/smp.c:104
-msgid "Idle (%)"
-msgstr "Idle (%)"
-
-#: examples/smp.c:106
-#, c-format
-msgid ""
-"CPU          (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
-"\n"
-msgstr ""
-"CPU          (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
-"\n"
-
-#: examples/smp.c:122
-#, c-format
-msgid "CPU %3d      (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
-msgstr "CPU %3d      (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
-
-#: examples/smp.c:128
-msgid "Spin:"
-msgstr "Spinn:"
-
 #: lib/read.c:64
 #, c-format
 msgid "read %d byte"
@@ -109,17 +28,17 @@ msgstr "les størrelse på data"
 
 #: lib/read_data.c:71
 #, c-format
-msgid "read data %lu byte"
-msgid_plural "read data %lu bytes"
-msgstr[0] "les data %lu byte"
-msgstr[1] "les data %lu bytes"
+msgid "read %lu byte of data"
+msgid_plural "read %lu bytes of data"
+msgstr[0] "leste %lu byte med data"
+msgstr[1] "leste %lu bytes med data"
 
 #: lib/write.c:51
 #, c-format
-msgid "write %d byte"
-msgid_plural "write %d bytes"
-msgstr[0] "skriv %d byte"
-msgstr[1] "skriv %d bytes"
+msgid "wrote %d byte"
+msgid_plural "wrote %d bytes"
+msgstr[0] "skrev %d byte"
+msgstr[1] "skrev %d bytes"
 
 #: src/daemon/gnuserv.c:461
 msgid "Enable debugging"
@@ -287,6 +206,65 @@ msgstr "Brukerdefinert signal 1"
 msgid "User defined signal 2"
 msgstr "Brukerdefinert signal 2"
 
+#~ msgid "Ticks (%ld per second):"
+#~ msgstr "Tikk (%ld per sekund):"
+
+#~ msgid "Total"
+#~ msgstr "Totalt"
+
+#~ msgid "User"
+#~ msgstr "Bruker"
+
+#~ msgid "Nice"
+#~ msgstr "Nice"
+
+#~ msgid "Sys"
+#~ msgstr "Sys"
+
+#~ msgid "Idle"
+#~ msgstr "Idle"
+
+#~ msgid ""
+#~ "CPU          (0x%08lx): %12.0f %12.0f %12.0f %12.0f %12.0f\n"
+#~ "\n"
+#~ msgstr ""
+#~ "CPU          (0x%08lx): %12.0f %12.0f %12.0f %12.0f %12.0f\n"
+#~ "\n"
+
+#~ msgid "CPU %3d      (0x%08lx): %12lu %12lu %12lu %12lu %12lu\n"
+#~ msgstr "CPU %3d      (0x%08lx): %12lu %12lu %12lu %12lu %12lu\n"
+
+#~ msgid "Percent:"
+#~ msgstr "Prosent:"
+
+#~ msgid "Total (%)"
+#~ msgstr "Total (%)"
+
+#~ msgid "User (%)"
+#~ msgstr "Bruker (%)"
+
+#~ msgid "Nice (%)"
+#~ msgstr "Nice (%)"
+
+#~ msgid "Sys (%)"
+#~ msgstr "Sys (%)"
+
+#~ msgid "Idle (%)"
+#~ msgstr "Idle (%)"
+
+#~ msgid ""
+#~ "CPU          (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
+#~ "\n"
+#~ msgstr ""
+#~ "CPU          (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
+#~ "\n"
+
+#~ msgid "CPU %3d      (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
+#~ msgstr "CPU %3d      (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
+
+#~ msgid "Spin:"
+#~ msgstr "Spinn:"
+
 #~ msgid "Total CPU Time"
 #~ msgstr "Total prosessortid"
 

po/no.po

@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libgtop 2.5.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-12-28 11:39+0100\n"
-"PO-Revision-Date: 2004-12-28 11:40+0100\n"
+"POT-Creation-Date: 2005-01-28 17:04+0100\n"
+"PO-Revision-Date: 2005-01-28 17:05+0100\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <i18n-nb@lister.ping.uio.no>\n"
 "MIME-Version: 1.0\n"
@@ -15,87 +15,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8-bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: examples/smp.c:76
-#, c-format
-msgid "Ticks (%ld per second):"
-msgstr "Tikk (%ld per sekund):"
-
-#: examples/smp.c:79
-msgid "Total"
-msgstr "Totalt"
-
-#: examples/smp.c:79
-msgid "User"
-msgstr "Bruker"
-
-#: examples/smp.c:79
-msgid "Nice"
-msgstr "Nice"
-
-#: examples/smp.c:79
-msgid "Sys"
-msgstr "Sys"
-
-#: examples/smp.c:79
-msgid "Idle"
-msgstr "Idle"
-
-#: examples/smp.c:81
-#, c-format
-msgid ""
-"CPU          (0x%08lx): %12.0f %12.0f %12.0f %12.0f %12.0f\n"
-"\n"
-msgstr ""
-"CPU          (0x%08lx): %12.0f %12.0f %12.0f %12.0f %12.0f\n"
-"\n"
-
-#: examples/smp.c:85
-#, c-format
-msgid "CPU %3d      (0x%08lx): %12lu %12lu %12lu %12lu %12lu\n"
-msgstr "CPU %3d      (0x%08lx): %12lu %12lu %12lu %12lu %12lu\n"
-
-#: examples/smp.c:102
-msgid "Percent:"
-msgstr "Prosent:"
-
-#: examples/smp.c:103
-msgid "Total (%)"
-msgstr "Total (%)"
-
-#: examples/smp.c:103
-msgid "User (%)"
-msgstr "Bruker (%)"
-
-#: examples/smp.c:103
-msgid "Nice (%)"
-msgstr "Nice (%)"
-
-#: examples/smp.c:103
-msgid "Sys (%)"
-msgstr "Sys (%)"
-
-#: examples/smp.c:104
-msgid "Idle (%)"
-msgstr "Idle (%)"
-
-#: examples/smp.c:106
-#, c-format
-msgid ""
-"CPU          (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
-"\n"
-msgstr ""
-"CPU          (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
-"\n"
-
-#: examples/smp.c:122
-#, c-format
-msgid "CPU %3d      (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
-msgstr "CPU %3d      (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
-
-#: examples/smp.c:128
-msgid "Spin:"
-msgstr "Spinn:"
-
 #: lib/read.c:64
 #, c-format
 msgid "read %d byte"
@@ -109,17 +28,17 @@ msgstr "les størrelse på data"
 
 #: lib/read_data.c:71
 #, c-format
-msgid "read data %lu byte"
-msgid_plural "read data %lu bytes"
-msgstr[0] "les data %lu byte"
-msgstr[1] "les data %lu bytes"
+msgid "read %lu byte of data"
+msgid_plural "read %lu bytes of data"
+msgstr[0] "leste %lu byte med data"
+msgstr[1] "leste %lu bytes med data"
 
 #: lib/write.c:51
 #, c-format
-msgid "write %d byte"
-msgid_plural "write %d bytes"
-msgstr[0] "skriv %d byte"
-msgstr[1] "skriv %d bytes"
+msgid "wrote %d byte"
+msgid_plural "wrote %d bytes"
+msgstr[0] "skrev %d byte"
+msgstr[1] "skrev %d bytes"
 
 #: src/daemon/gnuserv.c:461
 msgid "Enable debugging"
@@ -287,6 +206,65 @@ msgstr "Brukerdefinert signal 1"
 msgid "User defined signal 2"
 msgstr "Brukerdefinert signal 2"
 
+#~ msgid "Ticks (%ld per second):"
+#~ msgstr "Tikk (%ld per sekund):"
+
+#~ msgid "Total"
+#~ msgstr "Totalt"
+
+#~ msgid "User"
+#~ msgstr "Bruker"
+
+#~ msgid "Nice"
+#~ msgstr "Nice"
+
+#~ msgid "Sys"
+#~ msgstr "Sys"
+
+#~ msgid "Idle"
+#~ msgstr "Idle"
+
+#~ msgid ""
+#~ "CPU          (0x%08lx): %12.0f %12.0f %12.0f %12.0f %12.0f\n"
+#~ "\n"
+#~ msgstr ""
+#~ "CPU          (0x%08lx): %12.0f %12.0f %12.0f %12.0f %12.0f\n"
+#~ "\n"
+
+#~ msgid "CPU %3d      (0x%08lx): %12lu %12lu %12lu %12lu %12lu\n"
+#~ msgstr "CPU %3d      (0x%08lx): %12lu %12lu %12lu %12lu %12lu\n"
+
+#~ msgid "Percent:"
+#~ msgstr "Prosent:"
+
+#~ msgid "Total (%)"
+#~ msgstr "Total (%)"
+
+#~ msgid "User (%)"
+#~ msgstr "Bruker (%)"
+
+#~ msgid "Nice (%)"
+#~ msgstr "Nice (%)"
+
+#~ msgid "Sys (%)"
+#~ msgstr "Sys (%)"
+
+#~ msgid "Idle (%)"
+#~ msgstr "Idle (%)"
+
+#~ msgid ""
+#~ "CPU          (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
+#~ "\n"
+#~ msgstr ""
+#~ "CPU          (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
+#~ "\n"
+
+#~ msgid "CPU %3d      (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
+#~ msgstr "CPU %3d      (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
+
+#~ msgid "Spin:"
+#~ msgstr "Spinn:"
+
 #~ msgid "Total CPU Time"
 #~ msgstr "Total prosessortid"
 

po/rw.po

@@ -0,0 +1,233 @@
+# translation of libgtop to Kinyarwanda.
+# Copyright (C) 2005 Free Software Foundation, Inc.
+# This file is distributed under the same license as the libgtop package.
+# Steve Murphy <murf@e-tools.com>, 2005
+# Steve performed initial rough translation from compendium built from translations provided by the following translators:
+# Philibert Ndandali  <ndandali@yahoo.fr>, 2005.
+# Viateur MUGENZI <muvia1@yahoo.fr>, 2005.
+# Noëlla Mupole <s24211045@tuks.co.za>, 2005.
+# Carole Karema <karemacarole@hotmail.com>, 2005.
+# JEAN BAPTISTE NGENDAHAYO <ngenda_denis@yahoo.co.uk>, 2005.
+# Augustin KIBERWA  <akiberwa@yahoo.co.uk>, 2005.
+# Donatien NSENGIYUMVA <ndonatienuk@yahoo.co.uk>, 2005..
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: libgtop 2.12\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-03-31 18:21-0700\n"
+"PO-Revision-Date: 2005-03-28 19:35-0700\n"
+"Last-Translator: Steve Murphy <murf@e-tools.com>\n"
+"Language-Team: Kinyarwanda <translation-team-rw@lists.sourceforge.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: lib/read.c:65
+#, fuzzy, c-format
+msgid "read %d byte"
+msgid_plural "read %d bytes"
+msgstr[0] "Gusoma Bayite"
+
+#: lib/read_data.c:53
+#, fuzzy
+msgid "read data size"
+msgstr "Gusoma Ibyatanzwe Ingano"
+
+#: lib/read_data.c:72
+#, fuzzy, c-format
+msgid "read %lu byte of data"
+msgid_plural "read %lu bytes of data"
+msgstr[0] "Gusoma Bayite Bya Ibyatanzwe"
+
+#: lib/write.c:52
+#, fuzzy, c-format
+msgid "wrote %d byte"
+msgid_plural "wrote %d bytes"
+msgstr[0] "Bayite"
+
+#: src/daemon/gnuserv.c:460
+msgid "Enable debugging"
+msgstr ""
+
+# Debug menu items
+#: src/daemon/gnuserv.c:460
+#, fuzzy
+msgid "DEBUG"
+msgstr "Kosora amakosa"
+
+#: src/daemon/gnuserv.c:462
+#, fuzzy
+msgid "Enable verbose output"
+msgstr "Ibisohoka"
+
+#: src/daemon/gnuserv.c:462
+msgid "VERBOSE"
+msgstr ""
+
+#: src/daemon/gnuserv.c:464
+#, fuzzy
+msgid "Don't fork into background"
+msgstr "Mbuganyuma"
+
+#: src/daemon/gnuserv.c:464
+msgid "NO-DAEMON"
+msgstr ""
+
+#: src/daemon/gnuserv.c:466
+#, fuzzy
+msgid "Invoked from inetd"
+msgstr "Bivuye"
+
+#: src/daemon/gnuserv.c:466
+msgid "INETD"
+msgstr ""
+
+#: src/daemon/gnuserv.c:500
+#, fuzzy, c-format
+msgid ""
+"Error on option %s: %s.\n"
+"Run '%s --help' to see a full list of available command line options.\n"
+msgstr "ku Ihitamo Kuri a Urutonde Bya Bihari Komandi: Umurongo Amahitamo"
+
+#: sysdeps/osf1/siglist.c:28 sysdeps/sun4/siglist.c:28
+msgid "Hangup"
+msgstr ""
+
+# 3225
+#: sysdeps/osf1/siglist.c:29 sysdeps/sun4/siglist.c:29
+msgid "Interrupt"
+msgstr "Hagarikira aho"
+
+#: sysdeps/osf1/siglist.c:30 sysdeps/sun4/siglist.c:30
+msgid "Quit"
+msgstr "Kuvamo"
+
+#: sysdeps/osf1/siglist.c:31 sysdeps/sun4/siglist.c:31
+msgid "Illegal instruction"
+msgstr ""
+
+#: sysdeps/osf1/siglist.c:32 sysdeps/sun4/siglist.c:32
+msgid "Trace trap"
+msgstr ""
+
+#: sysdeps/osf1/siglist.c:33 sysdeps/sun4/siglist.c:33
+msgid "Abort"
+msgstr "Ntibyakunze"
+
+#: sysdeps/osf1/siglist.c:34 sysdeps/sun4/siglist.c:34
+#, fuzzy
+msgid "EMT error"
+msgstr "Ikosa"
+
+#: sysdeps/osf1/siglist.c:35 sysdeps/sun4/siglist.c:35
+#, fuzzy
+msgid "Floating-point exception"
+msgstr "Akadomo Irengayobora(-)"
+
+#: sysdeps/osf1/siglist.c:36 sysdeps/sun4/siglist.c:36
+msgid "Kill"
+msgstr ""
+
+#: sysdeps/osf1/siglist.c:37 sysdeps/sun4/siglist.c:37
+#, fuzzy
+msgid "Bus error"
+msgstr "Ikosa"
+
+#: sysdeps/osf1/siglist.c:38 sysdeps/sun4/siglist.c:38
+msgid "Segmentation violation"
+msgstr ""
+
+#: sysdeps/osf1/siglist.c:39 sysdeps/sun4/siglist.c:39
+#, fuzzy
+msgid "Bad argument to system call"
+msgstr "Kuri Sisitemu"
+
+#: sysdeps/osf1/siglist.c:40 sysdeps/sun4/siglist.c:40
+msgid "Broken pipe"
+msgstr ""
+
+#: sysdeps/osf1/siglist.c:41 sysdeps/sun4/siglist.c:41
+msgid "Alarm clock"
+msgstr ""
+
+#: sysdeps/osf1/siglist.c:42 sysdeps/sun4/siglist.c:42
+msgid "Termination"
+msgstr ""
+
+#: sysdeps/osf1/siglist.c:43 sysdeps/sun4/siglist.c:43
+#, fuzzy
+msgid "Urgent condition on socket"
+msgstr "Ibisabwa ku"
+
+# basctl/source\basicide\basidesh.src:RID_BASICIDE_OBJECTBAR.SID_BASICSTOP.text
+#: sysdeps/osf1/siglist.c:44 sysdeps/sun4/siglist.c:44
+msgid "Stop"
+msgstr "Guhagarara"
+
+#: sysdeps/osf1/siglist.c:45 sysdeps/sun4/siglist.c:45
+#, fuzzy
+msgid "Keyboard stop"
+msgstr "Guhagarara"
+
+#: sysdeps/osf1/siglist.c:46 sysdeps/sun4/siglist.c:46
+msgid "Continue"
+msgstr "Gukomeza"
+
+#: sysdeps/osf1/siglist.c:47 sysdeps/sun4/siglist.c:47
+#, fuzzy
+msgid "Child status has changed"
+msgstr "Imimerere Byahinduwe"
+
+#: sysdeps/osf1/siglist.c:48 sysdeps/sun4/siglist.c:48
+#, fuzzy
+msgid "Background read from tty"
+msgstr "Gusoma Bivuye"
+
+#: sysdeps/osf1/siglist.c:49 sysdeps/sun4/siglist.c:49
+#, fuzzy
+msgid "Background write to tty"
+msgstr "Kuri"
+
+#: sysdeps/osf1/siglist.c:50 sysdeps/sun4/siglist.c:50
+#, fuzzy
+msgid "I/O now possible"
+msgstr "NONEAHA"
+
+#: sysdeps/osf1/siglist.c:51 sysdeps/sun4/siglist.c:51
+msgid "CPU limit exceeded"
+msgstr ""
+
+#: sysdeps/osf1/siglist.c:52 sysdeps/sun4/siglist.c:52
+#, fuzzy
+msgid "File size limit exceeded"
+msgstr "Idosiye Ingano"
+
+#: sysdeps/osf1/siglist.c:53 sysdeps/sun4/siglist.c:53
+msgid "Virtual alarm clock"
+msgstr ""
+
+#: sysdeps/osf1/siglist.c:54 sysdeps/sun4/siglist.c:54
+msgid "Profiling alarm clock"
+msgstr ""
+
+#: sysdeps/osf1/siglist.c:55 sysdeps/sun4/siglist.c:55
+#, fuzzy
+msgid "Window size change"
+msgstr "Ingano Guhindura>>"
+
+#: sysdeps/osf1/siglist.c:56 sysdeps/sun4/siglist.c:56
+#, fuzzy
+msgid "Information request"
+msgstr "Kubaza..."
+
+#: sysdeps/osf1/siglist.c:57 sysdeps/sun4/siglist.c:57
+#, fuzzy
+msgid "User defined signal 1"
+msgstr "1."
+
+#: sysdeps/osf1/siglist.c:58 sysdeps/sun4/siglist.c:58
+#, fuzzy
+msgid "User defined signal 2"
+msgstr "2."

po/xh.po

@@ -0,0 +1,209 @@
+# Xhosa translation of libgtop
+# Copyright (C) 2005 Canonical Ltd.
+# This file is distributed under the same license as the libgtop package.
+# Translation by Canonical Ltd <translations@canonical.com> with thanks to
+# Translation World CC in South Africa, 2005.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: libgtop\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-04-01 11:20+0200\n"
+"PO-Revision-Date: 2005-03-30 22:54+0200\n"
+"Last-Translator: Canonical Ltd <translations@canonical.com>\n"
+"Language-Team: Xhosa <xh-translate@ubuntu.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=n!=1;\n"
+
+#: ../lib/read.c:65
+#, c-format
+msgid "read %d byte"
+msgid_plural "read %d bytes"
+msgstr[0] "funda %d ye byte"
+msgstr[1] "funda %d yee-byte"
+
+#: ../lib/read_data.c:53
+msgid "read data size"
+msgstr "funda ubungakanani bee-data"
+
+#: ../lib/read_data.c:72
+#, c-format
+msgid "read %lu byte of data"
+msgid_plural "read %lu bytes of data"
+msgstr[0] "funda %lu byte ye-data"
+msgstr[1] "funda %lu ii-byte ze-data"
+
+#: ../lib/write.c:52
+#, c-format
+msgid "wrote %d byte"
+msgid_plural "wrote %d bytes"
+msgstr[0] "ibhale %d ye byte"
+msgstr[1] "ibhale %d yee-byte"
+
+#: ../src/daemon/gnuserv.c:460
+msgid "Enable debugging"
+msgstr "Yenza ibe nako ukulungisa isiphene kwinkqubo"
+
+#: ../src/daemon/gnuserv.c:460
+msgid "DEBUG"
+msgstr "LUNGISA ISIPHENE KWINKQUBO"
+
+#: ../src/daemon/gnuserv.c:462
+msgid "Enable verbose output"
+msgstr "Yenza ukuba kubekho iziphumo ezingumlembelele"
+
+#: ../src/daemon/gnuserv.c:462
+msgid "VERBOSE"
+msgstr "UMLEMBELELE"
+
+#: ../src/daemon/gnuserv.c:464
+msgid "Don't fork into background"
+msgstr "Musa ukujika-jikisa kokungasemva"
+
+#: ../src/daemon/gnuserv.c:464
+msgid "NO-DAEMON"
+msgstr "i-NO-DAEMON"
+
+#: ../src/daemon/gnuserv.c:466
+msgid "Invoked from inetd"
+msgstr "Ibizwe isuswa kwi inetd"
+
+#: ../src/daemon/gnuserv.c:466
+msgid "INETD"
+msgstr "i-INETD"
+
+#: ../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 ""
+"Impazamo kokungakhethwa kuko i %s: %s.\n"
+"Phumeza i '%s --help' ukwenzela ukuba ubone uluhlu oluzeleyo lwezinto "
+"ekungakhethwa kuzo ezifumanekayo zomgca womyalelo.\n"
+
+#: ../sysdeps/osf1/siglist.c:28 ../sysdeps/sun4/siglist.c:28
+msgid "Hangup"
+msgstr "Beka umnxeba"
+
+#: ../sysdeps/osf1/siglist.c:29 ../sysdeps/sun4/siglist.c:29
+msgid "Interrupt"
+msgstr "Phazamisa"
+
+#: ../sysdeps/osf1/siglist.c:30 ../sysdeps/sun4/siglist.c:30
+msgid "Quit"
+msgstr "Phuma"
+
+#: ../sysdeps/osf1/siglist.c:31 ../sysdeps/sun4/siglist.c:31
+msgid "Illegal instruction"
+msgstr "Umyalelo ongekho semthethweni"
+
+#: ../sysdeps/osf1/siglist.c:32 ../sysdeps/sun4/siglist.c:32
+msgid "Trace trap"
+msgstr "Khuphela umjelo wenkqubo"
+
+#: ../sysdeps/osf1/siglist.c:33 ../sysdeps/sun4/siglist.c:33
+msgid "Abort"
+msgstr "Yeka"
+
+#: ../sysdeps/osf1/siglist.c:34 ../sysdeps/sun4/siglist.c:34
+msgid "EMT error"
+msgstr "Impazamo ye EMT"
+
+#: ../sysdeps/osf1/siglist.c:35 ../sysdeps/sun4/siglist.c:35
+msgid "Floating-point exception"
+msgstr "Incam-etshintsha-tshintshayo ekhethekileyo"
+
+#: ../sysdeps/osf1/siglist.c:36 ../sysdeps/sun4/siglist.c:36
+msgid "Kill"
+msgstr "Bulala"
+
+#: ../sysdeps/osf1/siglist.c:37 ../sysdeps/sun4/siglist.c:37
+msgid "Bus error"
+msgstr "Impazamo yebhasi"
+
+#: ../sysdeps/osf1/siglist.c:38 ../sysdeps/sun4/siglist.c:38
+msgid "Segmentation violation"
+msgstr "Ukwaphulwa kwenkqubo"
+
+#: ../sysdeps/osf1/siglist.c:39 ../sysdeps/sun4/siglist.c:39
+msgid "Bad argument to system call"
+msgstr "Isiphumezi-miyalelo esingalunganga kubizo lwenkqubo"
+
+#: ../sysdeps/osf1/siglist.c:40 ../sysdeps/sun4/siglist.c:40
+msgid "Broken pipe"
+msgstr "Umbhobho wothungelwano owophukileyo"
+
+#: ../sysdeps/osf1/siglist.c:41 ../sysdeps/sun4/siglist.c:41
+msgid "Alarm clock"
+msgstr "Iwotshi enkulu yokuvusa"
+
+#: ../sysdeps/osf1/siglist.c:42 ../sysdeps/sun4/siglist.c:42
+msgid "Termination"
+msgstr "Ukuphelisa"
+
+#: ../sysdeps/osf1/siglist.c:43 ../sysdeps/sun4/siglist.c:43
+msgid "Urgent condition on socket"
+msgstr "Imeko engxamisekileyo kwisokhethi"
+
+#: ../sysdeps/osf1/siglist.c:44 ../sysdeps/sun4/siglist.c:44
+msgid "Stop"
+msgstr "Yima"
+
+#: ../sysdeps/osf1/siglist.c:45 ../sysdeps/sun4/siglist.c:45
+msgid "Keyboard stop"
+msgstr "Ukuma kwe-keyboard"
+
+#: ../sysdeps/osf1/siglist.c:46 ../sysdeps/sun4/siglist.c:46
+msgid "Continue"
+msgstr "Qhubeka"
+
+#: ../sysdeps/osf1/siglist.c:47 ../sysdeps/sun4/siglist.c:47
+msgid "Child status has changed"
+msgstr "Ubume benkqubo engumntwana butshintshile"
+
+#: ../sysdeps/osf1/siglist.c:48 ../sysdeps/sun4/siglist.c:48
+msgid "Background read from tty"
+msgstr "Okungasemva kufundwe kwi-tty"
+
+#: ../sysdeps/osf1/siglist.c:49 ../sysdeps/sun4/siglist.c:49
+msgid "Background write to tty"
+msgstr "Ukukhuphela ulwazi lokungasemva kwi-tty"
+
+#: ../sysdeps/osf1/siglist.c:50 ../sysdeps/sun4/siglist.c:50
+msgid "I/O now possible"
+msgstr "i-I/O ingenzeka ngoku"
+
+#: ../sysdeps/osf1/siglist.c:51 ../sysdeps/sun4/siglist.c:51
+msgid "CPU limit exceeded"
+msgstr "Umda we CPU ugqithisiwe"
+
+#: ../sysdeps/osf1/siglist.c:52 ../sysdeps/sun4/siglist.c:52
+msgid "File size limit exceeded"
+msgstr "Umda wobungakanani befayili ugqithisiwe"
+
+#: ../sysdeps/osf1/siglist.c:53 ../sysdeps/sun4/siglist.c:53
+msgid "Virtual alarm clock"
+msgstr "Iwotshi enkulu yokuvusa eyelelanisiweyo"
+
+#: ../sysdeps/osf1/siglist.c:54 ../sysdeps/sun4/siglist.c:54
+msgid "Profiling alarm clock"
+msgstr "Iwotshi enkulu yokuvusa yenkangeleko"
+
+#: ../sysdeps/osf1/siglist.c:55 ../sysdeps/sun4/siglist.c:55
+msgid "Window size change"
+msgstr "Utshintsho lobungakanani befestile"
+
+#: ../sysdeps/osf1/siglist.c:56 ../sysdeps/sun4/siglist.c:56
+msgid "Information request"
+msgstr "Isicelo senkcazelo"
+
+#: ../sysdeps/osf1/siglist.c:57 ../sysdeps/sun4/siglist.c:57
+msgid "User defined signal 1"
+msgstr "Umqondiso ochazwa ngumsebenzi woku 1"
+
+#: ../sysdeps/osf1/siglist.c:58 ../sysdeps/sun4/siglist.c:58
+msgid "User defined signal 2"
+msgstr "Umqondiso ochazwa ngumsebenzi wesi 2"

src/Makefile.am

@@ -4,7 +4,13 @@ else
 inodedb_SUBDIRS		=
 endif
 
-SUBDIRS			= daemon $(inodedb_SUBDIRS)
+if NEED_LIBGTOP
+daemon_SUBDIRS		= daemon
+else
+daemon_SUBDIRS		=
+endif
+
+SUBDIRS			= $(daemon_SUBDIRS) $(inodedb_SUBDIRS)
 
 DIST_SUBDIRS		= daemon inodedb
 

src/daemon/ChangeLog

@@ -1,3 +1,14 @@
+2005-03-25  Benoît Dejean  <TazForEver@dlfp.org>
+
+	* gnuserv.c: (syslog_io_message): s/strerror/g_strerror.
+
+2005-02-15  Benoît Dejean  <TazForEver@dlfp.org>
+
+	* daemon.h:
+	* gnuserv.c: (syslog_message), (syslog_io_message):
+	* main.c: (handle_parent_connection):
+	* slave.c: (handle_slave_connection), (handle_slave_command): Misc. cleanups.
+
 2004-09-19  Benoît Dejean  <tazforever@dlfp.org>
 
 	* gnuserv.c: (setup_table): 'screen' is only defined when AUTH_MAGIC_COOKIE

src/daemon/daemon.h

@@ -25,7 +25,6 @@
 #define __GLIBTOP_DAEMON_H__
 
 #include <glibtop.h>
-#include <glibtop/error.h>
 #include <glibtop/gnuserv.h>
 
 #include <glibtop/open.h>
@@ -60,17 +59,17 @@ G_BEGIN_DECLS
 #define MSG_BUFSZ		sizeof (struct _glibtop_ipc_message)
 #define MSG_MSGSZ		(MSG_BUFSZ - sizeof (long))
 
-void handle_parent_connection (int s);
-void handle_slave_connection (int input, int output);
+void handle_parent_connection (int s) G_GNUC_INTERNAL;
+void handle_slave_connection (int input, int output) G_GNUC_INTERNAL;
 void handle_slave_command (glibtop_command *cmnd, glibtop_response *resp,
-			   const void *parameter);
+			   const void *parameter) G_GNUC_INTERNAL ;
 
 void do_output (int s, glibtop_response *resp, off_t offset,
-		size_t data_size, const void *data);
-int do_read (int s, void *ptr, size_t total_size);
+		size_t data_size, const void *data) G_GNUC_INTERNAL;
+int do_read (int s, void *ptr, size_t total_size) G_GNUC_INTERNAL;
 
-void syslog_message (int priority, char *format, ...);
-void syslog_io_message (int priority, char *format, ...);
+void syslog_message (int priority, const char *format, ...) G_GNUC_INTERNAL G_GNUC_PRINTF(2, 3);
+void syslog_io_message (int priority, const char *format, ...) G_GNUC_INTERNAL G_GNUC_PRINTF(2, 3);
 
 extern int enable_debug;
 extern int verbose_output;

src/daemon/gnuserv.c

@@ -37,6 +37,7 @@
 #include <glibtop/close.h>
 #include <glibtop/command.h>
 
+#include <glib/gstrfuncs.h>
 
 #include <glibtop/parameter.h>
 
@@ -65,8 +66,6 @@ char *program_invocation_short_name;
 char *program_invocation_name;
 #endif
 
-void handle_parent_connection (int s);
-void handle_slave_connection (int input, int output);
 
 #if !defined(INTERNET_DOMAIN_SOCKETS)
 #error "Internet Domain sockets are required"
@@ -87,7 +86,7 @@ static int invoked_from_inetd = 0;
 static int changed_uid = 0;
 
 void
-syslog_message (int priority, char *format, ...)
+syslog_message (int priority, const char *format, ...)
 {
     va_list ap;
     char buffer [BUFSIZ];
@@ -100,7 +99,7 @@ syslog_message (int priority, char *format, ...)
 }
 
 void
-syslog_io_message (int priority, char *format, ...)
+syslog_io_message (int priority, const char *format, ...)
 {
     va_list ap;
     char buffer [BUFSIZ];
@@ -110,7 +109,7 @@ syslog_io_message (int priority, char *format, ...)
     vsnprintf (buffer, BUFSIZ-1, format, ap);
     va_end (ap);
 
-    snprintf (buffer2, BUFSIZ-1, "%s: %s", buffer, strerror (errno));
+    snprintf (buffer2, BUFSIZ-1, "%s: %s", buffer, g_strerror (errno));
     syslog (priority, "%s", buffer2);
 }
 

src/daemon/io.c

@@ -22,6 +22,7 @@
 */
 
 #include "daemon.h"
+#include <glibtop/error.h>
 
 void
 do_output (int s, glibtop_response *resp, off_t offset,

src/daemon/main.c

@@ -62,13 +62,13 @@ handle_parent_connection (int s)
     while (do_read (s, cmnd, sizeof (glibtop_command))) {
 	if (enable_debug)
 	    syslog_message (LOG_DEBUG,
-			    "Parent (%d) received command %d from client.",
-			    getpid (), (int) cmnd->command);
+			    "Parent (%d) received command %llu from client.",
+			    getpid (), cmnd->command);
 
 	if (cmnd->data_size >= BUFSIZ) {
 	    syslog_message (LOG_WARNING,
-			    "Client sent %d bytes, but buffer is %d",
-			    cmnd->data_size, BUFSIZ);
+			    "Client sent %llu bytes, but buffer is %lu",
+			    cmnd->data_size, (unsigned long)BUFSIZ);
 	    return;
 	}
 
@@ -78,8 +78,8 @@ handle_parent_connection (int s)
 
 	if (cmnd->data_size) {
 	    if (enable_debug)
-		syslog_message (LOG_DEBUG, "Client has %d bytes of data.",
-				(int) cmnd->data_size);
+		syslog_message (LOG_DEBUG, "Client has %llu bytes of data.",
+				cmnd->data_size);
 
 	    do_read (s, parameter, cmnd->data_size);
 
@@ -229,7 +229,7 @@ handle_parent_connection (int s)
 		       0, NULL);
 	    break;
 	default:
-	    syslog_message (LOG_ERR, "Parent received unknown command %u.",
+	    syslog_message (LOG_ERR, "Parent received unknown command %llu.",
 			    cmnd->command);
 	    break;
 	}

src/daemon/slave.c

@@ -22,6 +22,7 @@
 */
 
 #include "daemon.h"
+#include <glibtop/error.h>
 
 void
 handle_slave_connection (int input, int output)
@@ -42,13 +43,13 @@ handle_slave_connection (int input, int output)
 	while (do_read (input, cmnd, sizeof (glibtop_command))) {
 #ifdef SLAVE_DEBUG
 		fprintf (stderr, "Slave %d received command "
-			 "%d from client.\n", getpid (), cmnd->command);
+			 "%llu from client.\n", getpid (), cmnd->command);
 #endif
 
 		if (cmnd->data_size >= BUFSIZ)
-			glibtop_error ("Client sent %d bytes, "
-				       "but buffer is %d",
-				       cmnd->size, BUFSIZ);
+			glibtop_error ("Client sent %llu bytes, "
+				       "but buffer is %lu",
+				       cmnd->size, (unsigned long)BUFSIZ);
 
 		memset (resp, 0, sizeof (glibtop_response));
 
@@ -56,7 +57,7 @@ handle_slave_connection (int input, int output)
 
 		if (cmnd->data_size) {
 #ifdef SLAVE_DEBUG
-			fprintf (stderr, "Client has %d bytes of data.\n",
+			fprintf (stderr, "Client has %llu bytes of data.\n",
 				 cmnd->data_size);
 #endif
 
@@ -249,7 +250,7 @@ handle_slave_command (glibtop_command *cmnd, glibtop_response *resp,
 		break;
 #endif
 	default:
-		glibtop_error ("Child received unknown command %u",
+		glibtop_error ("Child received unknown command %llu",
 			       cmnd->command);
 		break;
 	}

sysdeps/common/ChangeLog

@@ -1,3 +1,33 @@
+2005-04-26  Jörgen Scheibengruber  <mfcn@gmx.de>
+
+	* mountlist.c: (ignore_mount_entry): Added tmpfs to ignore list.
+
+2005-03-25  Benoît Dejean  <TazForEver@dlfp.org>
+
+	* error.c: (glibtop_error_io_vr), (glibtop_warn_io_vr):
+	* error_suid.c: (glibtop_error_io_vr), (glibtop_warn_io_vr):
+	s/strerror/g_strerror/g.
+
+2005-03-11  Benoît Dejean  <TazForEver@dlfp.org>
+
+	* mountlist.c: (ignore_mount_entry): Added mqueue to ignore list.
+
+2005-02-28  Benoît Dejean  <TazForEver@dlfp.org>
+
+	* fsusage.c: * Add support for file system read and write counting
+	(needed for the disk load feature of the multiload applet).
+
+2005-02-23  Benoît Dejean  <TazForEver@dlfp.org>
+
+	* fsusage.c: (glibtop_get_fsusage_s): Correct file system size calculations.
+	Patch from marcus@freebsd.org (Joe Marcus Clarke).
+	Closes #168232.
+
+2005-02-15  Benoît Dejean  <TazForEver@dlfp.org>
+
+	* fsusage.c: (_glibtop_get_fsusage_read_write): Fixed G_GNUC attribute usage.
+	Replaced macro by inline function.
+
 2005-01-18  Benoît Dejean  <TazForEver@dlfp.org>
 
 	* mountlist.c: (ignore_mount_entry): Re-worked with bsearch.

sysdeps/common/error.c

@@ -21,6 +21,11 @@
    Boston, MA 02111-1307, USA.
 */
 
+#include <config.h>
+
+#include <glib/gstrfuncs.h>
+#include <errno.h>
+
 #include <glibtop/error.h>
 
 #define DEFAULT_NAME	"LibGTop-Server"
@@ -54,7 +59,7 @@ glibtop_error_io_vr (glibtop *server, const char *format, int error, va_list arg
 {
 	print_server_name (server);
 	vfprintf (stderr, format, args);
-	fprintf (stderr, ": %s\n", strerror (error));
+	fprintf (stderr, ": %s\n", g_strerror (error));
 
 #ifdef LIBGTOP_ENABLE_DEBUG
 	abort ();
@@ -80,7 +85,7 @@ glibtop_warn_io_vr (glibtop *server, const char *format, int error, va_list args
 {
 	print_server_name (server);
 	vfprintf (stderr, format, args);
-	fprintf (stderr, ": %s\n", strerror (error));
+	fprintf (stderr, ": %s\n", g_strerror (error));
 
 #ifdef LIBGTOP_FATAL_WARNINGS
 	abort ();

sysdeps/common/error_suid.c

@@ -23,6 +23,11 @@
    Boston, MA 02111-1307, USA.
 */
 
+#include <config.h>
+
+#include <glib/gstrfuncs.h>
+#include <errno.h>
+
 #include <glibtop/error.h>
 
 #define DEFAULT_NAME	"LibGTop-Server"
@@ -56,7 +61,7 @@ glibtop_error_io_vr (glibtop_server *server, char *format, int error, va_list ar
 {
     print_server_name (server);
     vfprintf (stderr, format, args);
-    fprintf (stderr, ": %s\n", strerror (error));
+    fprintf (stderr, ": %s\n", g_strerror (error));
 
 #ifdef LIBGTOP_ENABLE_DEBUG
     abort ();
@@ -82,7 +87,7 @@ glibtop_warn_io_vr (glibtop_server *server, char *format, int error, va_list arg
 {
     print_server_name (server);
     vfprintf (stderr, format, args);
-    fprintf (stderr, ": %s\n", strerror (error));
+    fprintf (stderr, ": %s\n", g_strerror (error));
 
 #ifdef LIBGTOP_FATAL_WARNINGS
     abort ();

sysdeps/common/fsusage.c

@@ -126,13 +126,28 @@ static const unsigned long _glibtop_sysdeps_fsusage =
  */
 
 #ifdef linux
-void G_GNUC_INTERNAL
+void
 _glibtop_linux_get_fsusage_read_write(glibtop *server,
 				      glibtop_fsusage *buf,
-				      const char *path);
+				      const char *path) G_GNUC_INTERNAL;
+
+static inline void
+_glibtop_get_fsusage_read_write(glibtop *server,
+				glibtop_fsusage *buf,
+				const char *path)
+{
+	_glibtop_linux_get_fsusage_read_write(server, buf, path);
+}
+
+
+#elif defined(__FreeBSD__)
+void G_GNUC_INTERNAL
+_glibtop_freebsd_get_fsusage_read_write(glibtop *server,
+					glibtop_fsusage *buf,
+					const char *path);
 
 #define _glibtop_get_fsusage_read_write(S, B, P) \
-        _glibtop_linux_get_fsusage_read_write(S, B, P)
+	_glibtop_freebsd_get_fsusage_read_write(S, B, P)
 
 #else /* default fallback */
 #warning glibtop_get_fsusage .read .write are not implemented.
@@ -143,7 +158,7 @@ _glibtop_get_fsusage_read_write(glibtop *server,
 {
   /* NOOP */
 }
-#endif
+#endif /* default fallback */
 
 /* end _glibtop_get_fsusage_read_write */
 
@@ -254,8 +269,9 @@ glibtop_get_fsusage_s (glibtop *server, glibtop_fsusage *buf,
   if (statvfs (path, &fsd) < 0)
     return;
 
-#if (defined(sun) || defined(__sun)) && (defined(__SVR4) || defined(__svr4__))
-  /* Solaris but not SunOS */
+#if (defined(sun) || defined(__sun)) && (defined(__SVR4) || defined(__svr4__)) \
+	|| defined(__FreeBSD__)
+  /* Solaris but not SunOS and FreeBSD */
   buf->block_size = fsd.f_frsize;
 #else
   /* else, including Linux */

sysdeps/common/gnuslib.c

@@ -30,6 +30,7 @@
  */
 
 #include <glibtop.h>
+#include <glibtop/error.h>
 #include <glibtop/gnuserv.h>
 
 #include <fcntl.h>

sysdeps/common/mountlist.c

@@ -542,12 +542,14 @@ static gboolean ignore_mount_entry(const struct mount_entry *me)
 		"binfmt_misc",
 		"devpts",
 		"mntfs",
+		"mqueue",
 		"none",
 		"openpromfs",
 		"proc",
 		"procfs",
 		"supermount",
 		"sysfs",
+		"tmpfs",
 		"unknown",
 		"usbdevfs",
 		"usbfs"

sysdeps/freebsd/ChangeLog

@@ -1,3 +1,51 @@
+2005-02-28  Benoît Dejean  <TazForEver@dlfp.org>
+
+	* fsusage.c: (_glibtop_freebsd_get_fsusage_read_write): Forgot to add
+	this file :)
+
+2005-02-28  Benoît Dejean  <TazForEver@dlfp.org>
+
+	* Makefile.am:
+	* cpu.c: (glibtop_get_cpu_p):
+	* netlist.c: (glibtop_get_netlist_s):
+	* netload.c: (glibtop_get_netload_p):
+	* procmem.c: (glibtop_get_proc_mem_p):
+	
+	Fix a bug in netlist where glibtop_netlist.number was never initialized to 0
+	(this resulted in a NULL pointer dereference in the network load feature
+	of the multiload applet)
+
+	* Add support for getting interface flags and packet counts even on interfaces
+	without IP addresses (needed for the network load feature of the multiload applet)
+
+	* Restore per-process limits in the !FreeBSD or __FreeBSD_version < 500013
+	case
+
+	* Add CPU interrupt time as IOWAIT to get support for the cpu load feature of
+	the multiload applet.
+	
+	Patch from marcus@freebsd.org (Joe Marcus Clarke).
+	Closes #168704.
+
+2005-02-23  Benoît Dejean  <TazForEver@dlfp.org>
+
+	* Makefile.am:
+	* netlist.c: (glibtop_get_netlist_s):
+	* procmap.c: (glibtop_get_proc_map_p):
+	* procmem.c: (glibtop_get_proc_mem_p):
+	* procopenfiles.c: (glibtop_init_proc_open_files_s),
+	(glibtop_get_proc_open_files_s):
+	* proctime.c:
+	
+	Add support for FreeBSD 6-CURRENT.
+	Use the more portable getrlimit to obtain process memory limits.
+	Correctly determine process time.
+	Stub out the procopenfiles() function (this is not yet implemented, however).
+	Fix a nasty infinite loop and memory leak due to a forgot pointer increment.
+	
+	Patch from marcus@freebsd.org (Joe Marcus Clarke).
+	Closes #168232.
+
 2004-12-05  Benoît Dejean  <tazforever@dlfp.org>
 
 	* Makefile.am:

sysdeps/freebsd/Makefile.am

@@ -12,7 +12,7 @@ libgtop_sysdeps_suid_2_0_la_SOURCES	= open.c close.c cpu.c mem.c swap.c \
 				  sem_limits.c proclist.c procstate.c procuid.c \
 				  proctime.c procmem.c procsignal.c prockernel.c \
 				  procsegment.c procargs.c procmap.c netlist.c \
-				  netload.c ppp.c
+				  netload.c ppp.c procopenfiles.c fsusage.c
 
 libgtop_sysdeps_suid_2_0_la_LDFLAGS	= $(LT_VERSION_INFO)
 

sysdeps/freebsd/cpu.c

@@ -34,7 +34,8 @@
 static const unsigned long _glibtop_sysdeps_cpu =
 (1L << GLIBTOP_CPU_TOTAL) + (1L << GLIBTOP_CPU_USER) +
 (1L << GLIBTOP_CPU_NICE) + (1L << GLIBTOP_CPU_SYS) +
-(1L << GLIBTOP_CPU_IDLE) + (1L << GLIBTOP_CPU_FREQUENCY);
+(1L << GLIBTOP_CPU_IDLE) + (1L << GLIBTOP_CPU_FREQUENCY) +
+(1L << GLIBTOP_CPU_IOWAIT);
 
 #ifndef KERN_CP_TIME
 /* nlist structure for kernel access */
@@ -122,6 +123,8 @@ glibtop_get_cpu_p (glibtop *server, glibtop_cpu *buf)
 	buf->sys = cpts [CP_SYS];
 	/* set idle time */
 	buf->idle = cpts [CP_IDLE];
+	/* set iowait (really just interrupt) time */
+	buf->iowait = cpts [CP_INTR];
 
 	/* set frequency */
 	/*

sysdeps/freebsd/fsusage.c

@@ -0,0 +1,41 @@
+#include <glibtop.h>
+#include <glibtop/error.h>
+#include <glibtop/fsusage.h>
+
+#include <glibtop_suid.h>
+
+#include <glib.h>
+
+#include <unistd.h>
+#include <sys/param.h>
+#include <sys/mount.h>
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+
+void
+G_GNUC_INTERNAL
+_glibtop_freebsd_get_fsusage_read_write(glibtop *server,
+				      glibtop_fsusage *buf,
+				      const char *path);
+
+void G_GNUC_INTERNAL
+_glibtop_freebsd_get_fsusage_read_write(glibtop *server,
+				      glibtop_fsusage *buf,
+				      const char *path)
+{
+	int result;
+	struct statfs sfs;
+
+	result = statfs (path, &sfs);
+
+	if (result == -1) {
+		return;
+	}
+
+	buf->read = sfs.f_syncreads + sfs.f_asyncreads;
+	buf->write = sfs.f_syncwrites + sfs.f_asyncwrites;
+
+	buf->flags |= (1 << GLIBTOP_FSUSAGE_READ) | (1 << GLIBTOP_FSUSAGE_WRITE);
+}

sysdeps/freebsd/netlist.c

@@ -43,6 +43,10 @@ glibtop_get_netlist_s (glibtop *server, glibtop_netlist *buf)
 	struct if_nameindex *ifstart, *ifs;
 	GPtrArray *devices;
 
+	glibtop_init_s (&server, GLIBTOP_SYSDEPS_NETLIST, 0);
+
+	memset (buf, 0, sizeof (glibtop_netlist));
+
 	ifs = ifstart = if_nameindex();
 
 	devices = g_ptr_array_new();
@@ -50,6 +54,7 @@ glibtop_get_netlist_s (glibtop *server, glibtop_netlist *buf)
 	while(ifs && ifs->if_name) {
 		g_ptr_array_add(devices, g_strdup(ifs->if_name));
 		buf->number++;
+		ifs++;
 	}
 
 	if_freenameindex(ifstart);

sysdeps/freebsd/netload.c

@@ -40,11 +40,6 @@
 
 static const unsigned long _glibtop_sysdeps_netload =
 (1L << GLIBTOP_NETLOAD_IF_FLAGS) +
-(1L << GLIBTOP_NETLOAD_MTU) +
-#if !defined(__bsdi__)
-(1L << GLIBTOP_NETLOAD_SUBNET) +
-#endif
-(1L << GLIBTOP_NETLOAD_ADDRESS) +
 (1L << GLIBTOP_NETLOAD_PACKETS_IN) +
 (1L << GLIBTOP_NETLOAD_PACKETS_OUT) +
 (1L << GLIBTOP_NETLOAD_PACKETS_TOTAL) +
@@ -56,6 +51,13 @@ static const unsigned long _glibtop_sysdeps_netload =
 (1L << GLIBTOP_NETLOAD_ERRORS_TOTAL) +
 (1L << GLIBTOP_NETLOAD_COLLISIONS);
 
+static const unsigned _glibtop_sysdeps_netload_data =
+(1L << GLIBTOP_NETLOAD_ADDRESS) +
+#if !defined(__bsdi__)
+(1L << GLIBTOP_NETLOAD_SUBNET) +
+#endif
+(1L << GLIBTOP_NETLOAD_MTU);
+
 /* nlist structure for kernel access */
 static struct nlist nlst [] = {
     { "_ifnet" },
@@ -81,9 +83,9 @@ glibtop_get_netload_p (glibtop *server, glibtop_netload *buf,
 {
     struct ifnet ifnet;
     u_long ifnetaddr, ifnetfound, ifaddraddr;
-    struct sockaddr *sa;
+    struct sockaddr *sa = NULL;
     char tname [16];
-    char temp [16];
+    char name [32];
 
     union {
 	struct ifaddr ifa;
@@ -114,12 +116,21 @@ glibtop_get_netload_p (glibtop *server, glibtop_netload *buf,
 	    if (kvm_read (server->machine.kd, (u_long) ifnet.if_name,
 			  tname, 16) != 16)
 		    glibtop_error_io_r (server, "kvm_read (if_name)");
-	    snprintf(temp, (15 - strlen(tname)), "%d", ifnet.if_unit);
-	    strcat(tname, temp);
-	    tname [15] = 0;
+	    tname[15] = '\0';
+	    snprintf (name, 32, "%s%d", tname, ifnet.if_unit);
 #else
-	    g_strlcpy (tname, ifnet.if_xname, sizeof tname);
+	    g_strlcpy (name, ifnet.if_xname, sizeof(name));
 #endif
+#if defined(__FreeBSD__) && (__FreeBSD_version >= 300000)
+	    ifnetaddr = (u_long) ifnet.if_link.tqe_next;
+#elif defined(__FreeBSD__) || defined(__bsdi__)
+	    ifnetaddr = (u_long) ifnet.if_next;
+#else
+	    ifnetaddr = (u_long) ifnet.if_list.tqe_next;
+#endif
+
+	    if (strcmp (name, interface) != 0)
+		    continue;
 
 #if defined(__FreeBSD__) && (__FreeBSD_version >= 300000)
 	    ifaddraddr = (u_long) ifnet.if_addrhead.tqh_first;
@@ -129,6 +140,55 @@ glibtop_get_netload_p (glibtop *server, glibtop_netload *buf,
 	    ifaddraddr = (u_long) ifnet.if_addrlist.tqh_first;
 #endif
 	}
+	if (ifnet.if_flags & IFF_UP)
+		buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_UP);
+	if (ifnet.if_flags & IFF_BROADCAST)
+		buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_BROADCAST);
+	if (ifnet.if_flags & IFF_DEBUG)
+		buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_DEBUG);
+	if (ifnet.if_flags & IFF_LOOPBACK)
+		buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_LOOPBACK);
+	if (ifnet.if_flags & IFF_POINTOPOINT)
+		buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_POINTOPOINT);
+	if (ifnet.if_flags & IFF_RUNNING)
+		buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_RUNNING);
+	if (ifnet.if_flags & IFF_NOARP)
+		buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_NOARP);
+	if (ifnet.if_flags & IFF_PROMISC)
+		buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_PROMISC);
+	if (ifnet.if_flags & IFF_ALLMULTI)
+		buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_ALLMULTI);
+	if (ifnet.if_flags & IFF_OACTIVE)
+		buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_OACTIVE);
+	if (ifnet.if_flags & IFF_SIMPLEX)
+		buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_SIMPLEX);
+	if (ifnet.if_flags & IFF_LINK0)
+		buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_LINK0);
+	if (ifnet.if_flags & IFF_LINK1)
+		buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_LINK1);
+	if (ifnet.if_flags & IFF_LINK2)
+		buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_LINK2);
+#ifdef __FreeBSD__
+	if (ifnet.if_flags & IFF_ALTPHYS)
+		buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_ALTPHYS);
+#endif
+	if (ifnet.if_flags & IFF_MULTICAST)
+		buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_MULTICAST);
+
+	buf->packets_in = ifnet.if_ipackets;
+	buf->packets_out = ifnet.if_opackets;
+	buf->packets_total = buf->packets_in + buf->packets_out;
+
+	buf->bytes_in = ifnet.if_ibytes;
+	buf->bytes_out = ifnet.if_obytes;
+	buf->bytes_total = buf->bytes_in + buf->bytes_out;
+
+	buf->errors_in = ifnet.if_ierrors;
+	buf->errors_out = ifnet.if_oerrors;
+	buf->errors_total = buf->errors_in + buf->errors_out;
+
+	buf->collisions = ifnet.if_collisions;
+	buf->flags = _glibtop_sysdeps_netload;
 
 	if (ifaddraddr) {
 	    if ((kvm_read (server->machine.kd, ifaddraddr, &ifaddr,
@@ -137,86 +197,22 @@ glibtop_get_netload_p (glibtop *server, glibtop_netload *buf,
 
 #define CP(x) ((char *)(x))
 	    cp = (CP(ifaddr.ifa.ifa_addr) - CP(ifaddraddr)) +
-		CP(&ifaddr); sa = (struct sockaddr *)cp;
+		CP(&ifaddr);
+	    sa = (struct sockaddr *)cp;
 
-	    if (!strcmp (interface, tname) && (sa->sa_family == AF_INET)) {
+	    if (sa->sa_family == AF_INET) {
 		sin = (struct sockaddr_in *)sa;
-
-		if (ifnet.if_flags & IFF_UP)
-			buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_UP);
-		if (ifnet.if_flags & IFF_BROADCAST)
-			buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_BROADCAST);
-		if (ifnet.if_flags & IFF_DEBUG)
-			buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_DEBUG);
-		if (ifnet.if_flags & IFF_LOOPBACK)
-			buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_LOOPBACK);
-		if (ifnet.if_flags & IFF_POINTOPOINT)
-			buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_POINTOPOINT);
-		if (ifnet.if_flags & IFF_RUNNING)
-			buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_RUNNING);
-		if (ifnet.if_flags & IFF_NOARP)
-			buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_NOARP);
-		if (ifnet.if_flags & IFF_PROMISC)
-			buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_PROMISC);
-		if (ifnet.if_flags & IFF_ALLMULTI)
-			buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_ALLMULTI);
-		if (ifnet.if_flags & IFF_OACTIVE)
-			buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_OACTIVE);
-		if (ifnet.if_flags & IFF_SIMPLEX)
-			buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_SIMPLEX);
-		if (ifnet.if_flags & IFF_LINK0)
-			buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_LINK0);
-		if (ifnet.if_flags & IFF_LINK1)
-			buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_LINK1);
-		if (ifnet.if_flags & IFF_LINK2)
-			buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_LINK2);
-#ifdef __FreeBSD__
-		if (ifnet.if_flags & IFF_ALTPHYS)
-			buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_ALTPHYS);
-#endif
-		if (ifnet.if_flags & IFF_MULTICAST)
-			buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_MULTICAST);
-
 #if !defined(__bsdi__)
 		/* Commenting out to "fix" #13345. */
 		buf->subnet = htonl (ifaddr.in.ia_subnet);
 #endif
 		buf->address = sin->sin_addr.s_addr;
-
 		buf->mtu = ifnet.if_mtu;
 
-		buf->packets_in = ifnet.if_ipackets;
-		buf->packets_out = ifnet.if_opackets;
-		buf->packets_total = buf->packets_in + buf->packets_out;
+		buf->flags |= _glibtop_sysdeps_netload_data;
 
-		buf->bytes_in = ifnet.if_ibytes;
-		buf->bytes_out = ifnet.if_obytes;
-		buf->bytes_total = buf->bytes_in + buf->bytes_out;
-
-		buf->errors_in = ifnet.if_ierrors;
-		buf->errors_out = ifnet.if_oerrors;
-		buf->errors_total = buf->errors_in + buf->errors_out;
-
-		buf->collisions = ifnet.if_collisions;
-		buf->flags = _glibtop_sysdeps_netload;
-		return;
 	    }
-
-#if defined(__FreeBSD__) && (__FreeBSD_version >= 300000)
-	    ifaddraddr = (u_long)ifaddr.ifa.ifa_link.tqe_next;
-#elif defined(__FreeBSD__) || defined(__bsdi__)
-	    ifaddraddr = (u_long)ifaddr.ifa.ifa_next;
-#else
-	    ifaddraddr = (u_long)ifaddr.ifa.ifa_list.tqe_next;
-#endif
 	}
-
-#if defined(__FreeBSD__) && (__FreeBSD_version >= 300000)
-	ifnetaddr = (u_long) ifnet.if_link.tqe_next;
-#elif defined(__FreeBSD__) || defined(__bsdi__)
-	ifnetaddr = (u_long) ifnet.if_next;
-#else
-	ifnetaddr = (u_long) ifnet.if_list.tqe_next;
-#endif
+	return;
     }
 }

sysdeps/freebsd/procmap.c

@@ -47,7 +47,13 @@
 #endif
 #endif
 
+#ifdef __FreeBSD__
+#define _KVM_VNODE
+#endif
 #include <sys/vnode.h>
+#ifdef __FreeBSD__
+#undef _KVM_VNODE
+#endif
 #include <sys/mount.h>
 #include <ufs/ufs/quota.h>
 #include <ufs/ufs/inode.h>
@@ -104,7 +110,7 @@ glibtop_get_proc_map_p (glibtop *server, glibtop_proc_map *buf,
 	glibtop_map_entry *maps;
 #if defined __FreeBSD__
 	struct vnode vnode;
-#if __FreeBSD_version >= 500039
+#if __FreeBSD_version < 500039
 	struct inode inode;
 #endif
 #endif
@@ -122,8 +128,10 @@ glibtop_get_proc_map_p (glibtop *server, glibtop_proc_map *buf,
 
 	/* Get the process data */
 	pinfo = kvm_getprocs (server->machine.kd, KERN_PROC_PID, pid, &count);
-	if ((pinfo == NULL) || (count < 1))
+	if ((pinfo == NULL) || (count < 1)) {
 		glibtop_error_io_r (server, "kvm_getprocs (%d)", pid);
+		return NULL;
+	}
 
 	/* Now we get the memory maps. */
 
@@ -264,8 +272,10 @@ glibtop_get_proc_map_p (glibtop *server, glibtop_proc_map *buf,
 #if defined(__FreeBSD__) && (__FreeBSD_version >= 500039)
                switch (vnode.v_type) {
                    case VREG:
+#if __FreeBSD_version < 600006
                        maps [i-1].inode = vnode.v_cachedid;
                        maps [i-1].device = vnode.v_cachedfs;
+#endif
                    default:
                    continue;
                }
@@ -278,13 +288,9 @@ glibtop_get_proc_map_p (glibtop *server, glibtop_proc_map *buf,
 			      &inode, sizeof (inode)) != sizeof (inode))
 			glibtop_error_io_r (server, "kvm_read (inode)");
 
-		if (kvm_read (server->machine.kd,
-			      (unsigned long) vnode.v_mount,
-			      &mount, sizeof (mount)) != sizeof (mount))
-			glibtop_error_io_r (server, "kvm_read (mount)");
-#endif
 		maps [i-1].inode  = inode.i_number;
 		maps [i-1].device = inode.i_dev;
+#endif
 #endif
 	} while (entry.next != first);
 

sysdeps/freebsd/procmem.c

@@ -31,7 +31,7 @@
 #include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/resource.h>
-#ifdef __NetBSD__ && (__NetBSD_Version__ >= 105020000)
+#if defined(__NetBSD__) && (__NetBSD_Version__ >= 105020000)
 #include <uvm/uvm_extern.h>
 #else
 #include <vm/vm_object.h>
@@ -47,7 +47,7 @@
 #include <sys/user.h>
 #endif
 #include <sys/sysctl.h>
-#ifdef __NetBSD__ && (__NetBSD_Version__ >= 105020000)
+#if defined(__NetBSD__) && (__NetBSD_Version__ >= 105020000)
 #include <uvm/uvm.h>
 #else
 #include <vm/vm.h>
@@ -125,7 +125,9 @@ glibtop_get_proc_mem_p (glibtop *server, glibtop_proc_mem *buf,
 #else
 	struct vm_object object;
 #endif
+#if !defined(__FreeBSD__) || (__FreeBSD_version < 500013)
 	struct plimit plimit;
+#endif
 	int count;
 
 	glibtop_init_p (server, (1L << GLIBTOP_SYSDEPS_PROC_MEM), 0);

sysdeps/freebsd/procopenfiles.c

@@ -1,8 +1,11 @@
 /* $Id$ */
 
 /* Copyright (C) 1998-99 Martin Baulig
+   Copyright (C) 2004 Nicolás Lichtmaier
    This file is part of LibGTop 1.0.
 
+   Modified by Nicolás Lichtmaier to give a process open files.
+
    Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
 
    LibGTop is free software; you can redistribute it and/or modify it
@@ -21,18 +24,29 @@
    Boston, MA 02111-1307, USA.
 */
 
-#ifndef __GLIBTOP_TYPES_H__
-#define __GLIBTOP_TYPES_H__
+#include <glibtop.h>
+#include <glibtop/error.h>
+#include <glibtop/procopenfiles.h>
 
-G_BEGIN_DECLS
+#include <glibtop_suid.h>
 
-#define GLIBTOP_TYPE_LONG	1
-#define GLIBTOP_TYPE_ULONG	2
-#define GLIBTOP_TYPE_DOUBLE	3
-#define GLIBTOP_TYPE_INT	4
-#define GLIBTOP_TYPE_CHAR	5
-#define GLIBTOP_TYPE_STRING	6
+static const unsigned long _glibtop_sysdeps_proc_open_files =
+(1L << GLIBTOP_PROC_OPEN_FILES_NUMBER)|
+(1L << GLIBTOP_PROC_OPEN_FILES_TOTAL)|
+(1L << GLIBTOP_PROC_OPEN_FILES_SIZE);
 
-G_END_DECLS
+/* Init function. */
 
-#endif
+void
+glibtop_init_proc_open_files_s (glibtop *server)
+{
+	server->sysdeps.proc_open_files = _glibtop_sysdeps_proc_open_files;
+}
+
+
+/* XXX Unimplemented on FreeBSD */
+glibtop_open_files_entry *
+glibtop_get_proc_open_files_s (glibtop *server, glibtop_proc_open_files *buf,	pid_t pid)
+{
+	return NULL;
+}

sysdeps/freebsd/proctime.c

@@ -59,6 +59,7 @@ glibtop_init_proc_time_p (glibtop *server)
 
 #ifndef __FreeBSD__
 
+#ifndef __FreeBSD__
 static void
 calcru(p, up, sp, ip)
      struct proc *p;
@@ -81,19 +82,10 @@ calcru(p, up, sp, ip)
 		tot = 1;
 	}
 
-#if (defined __FreeBSD__) && (__FreeBSD_version >= 300003)
-
-	/* This was changed from a `struct timeval' into a `guint64'
-	 * on FreeBSD 3.0 and renamed p_rtime -> p_runtime.
-	 */
-
-	totusec = (u_quad_t) p->p_runtime;
-#else
 	sec = p->p_rtime.tv_sec;
 	usec = p->p_rtime.tv_usec;
 
 	totusec = (quad_t)sec * 1000000 + usec;
-#endif
 
 	if (totusec < 0) {
 		/* XXX no %qd in kernel.  Truncate. */
@@ -116,6 +108,7 @@ calcru(p, up, sp, ip)
 		ip->tv_usec = it % 1000000;
 	}
 }
+#endif
 
 #endif /* !__FreeBSD__ */
 
@@ -134,9 +127,6 @@ glibtop_get_proc_time_p (glibtop *server, glibtop_proc_time *buf,
 	struct pstats pstats;
 	int count;
 
-	char filename [BUFSIZ];
-	struct stat statb;
-
 	glibtop_init_p (server, (1L << GLIBTOP_SYSDEPS_PROC_TIME), 0);
 
 	memset (buf, 0, sizeof (glibtop_proc_time));

sysdeps/linux/ChangeLog

@@ -1,3 +1,34 @@
+2005-05-26  Benoît Dejean  <TazForEver@dlfp.org>
+
+	* siglist.c: Fixed compilation on mips. Closes #304570.
+
+2005-04-01  Benoît Dejean  <TazForEver@dlfp.org>
+
+	* glibtop_private.h: Fixed gcc-4.0 warnings.
+
+2005-03-29  Benoît Dejean  <TazForEver@dlfp.org>
+
+	* fsusage.c: (get_partition): Removed a g_return_if_fail.
+
+2005-03-27  Benoît Dejean  <TazForEver@dlfp.org>
+
+	* loadavg.c: (glibtop_get_loadavg_s):
+	* uptime.c: (glibtop_get_uptime_s): Fixed behaviour when locale is not C
+	s/strtod/g_ascii_strod/. (strtod behaviour is locale specific, which is bad
+	because linux /proc is always C.)
+
+2005-03-25  Benoît Dejean  <TazForEver@dlfp.org>
+
+	* netload.c: (get_ipv6): s/strerror/g_strerror/
+
+2005-03-25  Benoît Dejean  <TazForEver@dlfp.org>
+
+	* siglist.c: Updated.
+
+2005-02-15  Benoît Dejean  <TazForEver@dlfp.org>
+
+	* fsusage.c: Fixed G_GNUC attribute usage.
+
 2005-01-22  Benoît Dejean  <TazForEver@dlfp.org>
 
 	* procopenfiles.c: (parse_file), (get_all), (inet_socket_parser),

sysdeps/linux/fsusage.c

@@ -15,10 +15,9 @@
 #include <stdlib.h>
 
 void
-G_GNUC_INTERNAL
 _glibtop_linux_get_fsusage_read_write(glibtop *server,
 				      glibtop_fsusage *buf,
-				      const char *path);
+				      const char *path) G_GNUC_INTERNAL;
 
 /*
  * Linux 2.6.x
@@ -39,7 +38,8 @@ get_partition(const char *mountpoint)
 	if(stat(mountpoint, &statb) == -1)
 		return NULL;
 
-	g_return_val_if_fail((partitions = fopen("/proc/partitions", "r")), NULL);
+	if((partitions = fopen("/proc/partitions", "r")) == NULL)
+		return NULL;
 
 	while(fgets(line, sizeof line, partitions))
 	{

sysdeps/linux/glibtop_private.h

@@ -40,8 +40,8 @@ next_token(const char *p)
 	return (char*) p;
 }
 
-char * G_GNUC_INTERNAL
-skip_token (const char *p);
+char *
+skip_token (const char *p) G_GNUC_INTERNAL;
 
 static inline char *
 skip_multiple_token (const char *p, size_t count)
@@ -61,8 +61,8 @@ skip_line (const char *p)
 }
 
 
-unsigned long long G_GNUC_INTERNAL
-get_scaled(const char *buffer, const char *key);
+unsigned long long
+get_scaled(const char *buffer, const char *key) G_GNUC_INTERNAL;
 
 
 /* aborts on error */

sysdeps/linux/loadavg.c

@@ -58,9 +58,9 @@ glibtop_get_loadavg_s (glibtop *server, glibtop_loadavg *buf)
 
 	file_to_buffer(server, buffer, FILENAME);
 
-	buf->loadavg [0] = strtod (buffer, &p);
-	buf->loadavg [1] = strtod (p, &p);
-	buf->loadavg [2] = strtod (p, &p);
+	buf->loadavg [0] = g_ascii_strtod (buffer, &p);
+	buf->loadavg [1] = g_ascii_strtod (p, &p);
+	buf->loadavg [2] = g_ascii_strtod (p, &p);
 
 	buf->flags = _glibtop_sysdeps_loadavg;
 

sysdeps/linux/netload.c

@@ -21,6 +21,8 @@
    Boston, MA 02111-1307, USA.
 */
 
+#include <config.h>
+
 #include <glibtop.h>
 #include <glibtop/error.h>
 #include <glibtop/netload.h>
@@ -131,7 +133,7 @@ static void get_ipv6(glibtop *server, glibtop_netload *buf,
 
 	if(getifaddrs (&ifa0) != 0)
 	{
-		glibtop_warn_r(server, "getifaddrs failed : %s", strerror(errno));
+		glibtop_warn_r(server, "getifaddrs failed : %s", g_strerror(errno));
 		return;
 	}
 

sysdeps/linux/siglist.c

@@ -21,40 +21,124 @@
    Boston, MA 02111-1307, USA.
 */
 
-#include <glibtop.h>
+
 #include <glibtop/signal.h>
 
+#include <signal.h>
+
+
+#if 0 /* comment */
+perl -nle 'print "{$1,\t\"$1\",\t\"$2\"}," if m|^#define\s*(SIG[A-Z0-9]+).*?/\*\s*(.*?)\s*\*/|'
+	< /usr/include/bits/signum.h
+#endif
+
+
 const glibtop_signame glibtop_sys_siglist [] =
-{ {  1, "SIGHUP",    NULL },	/* Hangup (POSIX).  */
-  {  2, "SIGINT",    NULL },	/* Interrupt (ANSI).  */
-  {  3, "SIGQUIT",   NULL },	/* Quit (POSIX).  */
-  {  4, "SIGILL",    NULL },	/* Illegal instruction (ANSI).  */
-  {  5, "SIGTRAP",   NULL },	/* Trace trap (POSIX).  */
-  {  6, "SIGABRT",   NULL },	/* Abort (ANSI).  */
-  {  7, "SIGBUS",    NULL },	/* BUS error (4.2 BSD).  */
-  {  8, "SIGFPE",    NULL },	/* Floating-point exception (ANSI).  */
-  {  9, "SIGKILL",   NULL },	/* Kill, unblockable (POSIX).  */
-  { 10, "SIGUSR1",   NULL },	/* User-defined signal 1 (POSIX).  */
-  { 11, "SIGSEGV",   NULL },	/* Segmentation violation (ANSI).  */
-  { 12, "SIGUSR2",   NULL },	/* User-defined signal 2 (POSIX).  */
-  { 13, "SIGPIPE",   NULL },	/* Broken pipe (POSIX).  */
-  { 14, "SIGALRM",   NULL },	/* Alarm clock (POSIX).  */
-  { 15, "SIGTERM",   NULL },	/* Termination (ANSI).  */
-  { 16, "SIGSTKFLT", NULL },	/* ??? */
-  { 17, "SIGCHLD",   NULL },	/* Child status has changed (POSIX).  */
-  { 18, "SIGCONT",   NULL },	/* Continue (POSIX).  */
-  { 19, "SIGSTOP",   NULL },	/* Stop, unblockable (POSIX).  */
-  { 20, "SIGTSTP",   NULL },	/* Keyboard stop (POSIX).  */
-  { 21, "SIGTTIN",   NULL },	/* Background read from tty (POSIX).  */
-  { 22, "SIGTTOU",   NULL },	/* Background write to tty (POSIX).  */
-  { 23, "SIGURG",    NULL },	/* Urgent condition on socket (4.2 BSD).  */
-  { 24, "SIGXCPU",   NULL },	/* CPU limit exceeded (4.2 BSD).  */
-  { 25, "SIGXFSZ",   NULL },	/* File size limit exceeded (4.2 BSD).  */
-  { 26, "SIGVTALRM", NULL },	/* Virtual alarm clock (4.2 BSD).  */
-  { 27, "SIGPROF",   NULL },	/* Profiling alarm clock (4.2 BSD).  */
-  { 28, "SIGWINCH",  NULL },	/* Window size change (4.3 BSD, Sun).  */
-  { 29, "SIGIO",     NULL },	/* I/O now possible (4.2 BSD).  */
-  { 30, "SIGPWR",    NULL },	/* Power failure restart (System V).  */
-  { 31, "SIGUNUSED", NULL },
-  {  0, NULL,        NULL },
+{
+#ifdef SIGHUP
+	{SIGHUP,	"SIGHUP",       "Hangup (POSIX)."},
+#endif
+#ifdef SIGINT
+	{SIGINT,	"SIGINT",       "Interrupt (ANSI)."},
+#endif
+#ifdef SIGQUIT
+	{SIGQUIT,       "SIGQUIT",      "Quit (POSIX)."},
+#endif
+#ifdef SIGILL
+	{SIGILL,	"SIGILL",       "Illegal instruction (ANSI)."},
+#endif
+#ifdef SIGTRAP
+	{SIGTRAP,       "SIGTRAP",      "Trace trap (POSIX)."},
+#endif
+#ifdef SIGABRT
+	{SIGABRT,       "SIGABRT",      "Abort (ANSI)."},
+#endif
+#ifdef SIGIOT
+	{SIGIOT,	"SIGIOT",       "IOT trap (4.2 BSD)."},
+#endif
+#ifdef SIGBUS
+	{SIGBUS,	"SIGBUS",       "BUS error (4.2 BSD)."},
+#endif
+#ifdef SIGFPE
+	{SIGFPE,	"SIGFPE",       "Floating-point exception (ANSI)."},
+#endif
+#ifdef SIGKILL
+	{SIGKILL,       "SIGKILL",      "Kill, unblockable (POSIX)."},
+#endif
+#ifdef SIGUSR1
+	{SIGUSR1,	"SIGUSR1",      "User-defined signal 1 (POSIX)."},
+#endif
+#ifdef SIGSEGV
+	{SIGSEGV,	"SIGSEGV",      "Segmentation violation (ANSI)."},
+#endif
+#ifdef SIGUSR2
+	{SIGUSR2,	"SIGUSR2",      "User-defined signal 2 (POSIX)."},
+#endif
+#ifdef SIGPIPE
+	{SIGPIPE,       "SIGPIPE",      "Broken pipe (POSIX)."},
+#endif
+#ifdef SIGALRM
+	{SIGALRM,       "SIGALRM",      "Alarm clock (POSIX)."},
+#endif
+#ifdef SIGTERM
+	{SIGTERM,       "SIGTERM",      "Termination (ANSI)."},
+#endif
+#ifdef SIGSTKFLT
+	{SIGSTKFLT,     "SIGSTKFLT",    "Stack fault."},
+#endif
+#ifdef SIGCLD
+	{SIGCLD,	"SIGCLD",       "Same as SIGCHLD (System V)."},
+#endif
+#ifdef SIGCHLD
+	{SIGCHLD,       "SIGCHLD",      "Child status has changed (POSIX)."},
+#endif
+#ifdef SIGCONT
+	{SIGCONT,       "SIGCONT",      "Continue (POSIX)."},
+#endif
+#ifdef SIGSTOP
+	{SIGSTOP,       "SIGSTOP",      "Stop, unblockable (POSIX)."},
+#endif
+#ifdef SIGTSTP
+	{SIGTSTP,       "SIGTSTP",      "Keyboard stop (POSIX)."},
+#endif
+#ifdef SIGTTIN
+	{SIGTTIN,       "SIGTTIN",      "Background read from tty (POSIX)."},
+#endif
+#ifdef SIGTTOU
+	{SIGTTOU,       "SIGTTOU",      "Background write to tty (POSIX)."},
+#endif
+#ifdef SIGURG
+	{SIGURG,	"SIGURG",       "Urgent condition on socket (4.2 BSD)."},
+#endif
+#ifdef SIGXCPU
+	{SIGXCPU,       "SIGXCPU",      "CPU limit exceeded (4.2 BSD)."},
+#endif
+#ifdef SIGXFSZ
+	{SIGXFSZ,       "SIGXFSZ",      "File size limit exceeded (4.2 BSD)."},
+#endif
+#ifdef SIGVTALRM
+	{SIGVTALRM,     "SIGVTALRM",    "Virtual alarm clock (4.2 BSD)."},
+#endif
+#ifdef SIGPROF
+	{SIGPROF,       "SIGPROF",      "Profiling alarm clock (4.2 BSD)."},
+#endif
+#ifdef SIGWINCH
+	{SIGWINCH,      "SIGWINCH",     "Window size change (4.3 BSD, Sun)."},
+#endif
+#ifdef SIGPOLL
+	{SIGPOLL,       "SIGPOLL",      "Pollable event occurred (System V)."},
+#endif
+#ifdef SIGIO
+	{SIGIO,		"SIGIO",	"I/O now possible (4.2 BSD)."},
+#endif
+#ifdef SIGPWR
+	{SIGPWR,	"SIGPWR",       "Power failure restart (System V)."},
+#endif
+#ifdef SIGSYS
+	{SIGSYS,	"SIGSYS",       "Bad system call."},
+#endif
+#ifdef SIGUNUSED
+	{SIGUNUSED,	"SIGUNUSED",	""},
+#endif
+	{0,		NULL,		NULL}
 };

sysdeps/linux/uptime.c

@@ -55,8 +55,8 @@ glibtop_get_uptime_s (glibtop *server, glibtop_uptime *buf)
 
 	file_to_buffer(server, buffer, FILENAME);
 
-	buf->uptime   = strtod (buffer, &p);
-	buf->idletime = strtod (p, &p);
+	buf->uptime   = g_ascii_strtod (buffer, &p);
+	buf->idletime = g_ascii_strtod (p, &p);
 	buf->boot_time = (guint64) time(NULL) - (guint64) buf->uptime;
 
 	buf->flags = _glibtop_sysdeps_uptime;

sysdeps/solaris/glibtop_private.h

@@ -25,7 +25,6 @@
 #define __GLIBTOP_PRIVATE_H__
 
 #include <glibtop.h>
-#include <glibtop/error.h>
 
 #include <sys/param.h>
 #include <kstat.h>

sysdeps/stub/ChangeLog

@@ -1,3 +1,7 @@
+2005-02-02  Benoît Dejean  <TazForEver@dlfp.org>
+
+	* procopenfiles.c: Fixed typo. Closes #166090
+
 2004-12-23  Benoît Dejean  <tazforever@dlfp.org>
 
 	* netlist.c: (glibtop_get_netlist_s): Fixed.

sysdeps/stub/procopenfiles.c

@@ -37,7 +37,7 @@ glibtop_init_proc_open_files_s (glibtop *server)
 
 /* Provides detailed information about a process. */
 
-glibtop_open_file_entry *
+glibtop_open_files_entry *
 glibtop_get_proc_open_files_s (glibtop *server, glibtop_proc_open_files *buf,	pid_t pid)
 {
 	glibtop_init_s (&server, GLIBTOP_SYSDEPS_PROC_MAP, 0);

sysdeps/sun4/ChangeLog

@@ -1,3 +1,7 @@
+2005-03-25  Benoît Dejean  <TazForEver@dlfp.org>
+
+	* open.c: (_glibtop_getkval): s/strerror/g_strerror/.
+
 2004-05-25  Benoît Dejean  <tazforever@dlfp.org>
 
 	* uptime.c: (glibtop_get_uptime_p): Added boot_time.

sysdeps/sun4/open.c

@@ -21,6 +21,10 @@
    Boston, MA 02111-1307, USA.
 */
 
+#include <config.h>
+#include <glib/gstrfuncs.h>
+#include <errno.h>
+
 #include <glibtop.h>
 #include <glibtop/open.h>
 
@@ -257,7 +261,7 @@ _glibtop_getkval (void *void_server, unsigned long offset, int *ptr,
 			if (*refstr == '!') return 0;
 
 			glibtop_error_r (server, "kvm_read(%s): %s",
-					 refstr, strerror (errno));
+					 refstr, g_strerror (errno));
 		}
 
 	return 1;