Compare commits

...

6 Commits

Author SHA1 Message Date
Robert Roth
7e3e4b6860 Prepared release 3.19.3 2015-12-14 19:40:21 +02:00
Jasper Lievisse Adriaanse
02070b7170 Add various headers to unbreak compilation 2015-12-11 15:03:49 +01:00
Jasper Lievisse Adriaanse
fcfacf3213 PROT_EXECUTE -> PROT_EXEC 2015-12-11 14:59:11 +01:00
Jasper Lievisse Adriaanse
7925f83b57 Fix compilation because glibtop_machine definition has moved. 2015-12-11 14:57:34 +01:00
Cédric Valmary
68104bdde1 Updated Occitan translation 2015-11-10 14:02:39 +00:00
Robert Roth
ac2aef0f47 Prepared release 3.18.0 2015-09-21 20:10:23 +03:00
9 changed files with 78 additions and 61 deletions

9
NEWS
View File

@@ -1,3 +1,12 @@
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 14 September 2015: Overview of changes in 2.31.91
================================================ ================================================
* Darwin: * Darwin:

View File

@@ -3,8 +3,8 @@ dnl Configure script for the Gnome library
dnl dnl
m4_define([libgtop_major_version], [2]) m4_define([libgtop_major_version], [2])
m4_define([libgtop_minor_version], [31]) m4_define([libgtop_minor_version], [33])
m4_define([libgtop_micro_version], [91]) m4_define([libgtop_micro_version], [3])
m4_define([libgtop_version], [libgtop_major_version.libgtop_minor_version.libgtop_micro_version]) m4_define([libgtop_version], [libgtop_major_version.libgtop_minor_version.libgtop_micro_version])
dnl increment if the interface has additions, changes, removals. dnl increment if the interface has additions, changes, removals.

115
po/oc.po
View File

@@ -1,194 +1,193 @@
# Occitan translation of libgtop. # Occitan translation of libgtop.
# Copyright (C) 1998-2004 Free Software Foundation, Inc. # Copyright (C) 1998-2004 Free Software Foundation, Inc.
# This file is distributed under the GNU General Public License Version 2. # This file is distributed under the GNU General Public License Version 2.
# # Cédric Valmary <cvalmary@yahoo.fr>, 2015.
# # Cédric Valmary (Tot en òc) <cvalmary@yahoo.fr>, 2015.
#
# Cédric Valmary (Tot en Òc) <cvalmary@yahoo.fr>, 2015.
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: libgtop 2.9.91\n" "Project-Id-Version: libgtop 2.9.91\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=libgto" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop"
"p&keywords=I18N+L10N&component=general\n" "&keywords=I18N+L10N&component=general\n"
"POT-Creation-Date: 2013-12-19 14:39+0000\n" "POT-Creation-Date: 2015-04-30 07:47+0000\n"
"PO-Revision-Date: 2015-04-30 09:46+0200\n" "PO-Revision-Date: 2015-10-31 08:15+0200\n"
"Last-Translator: Cédric Valmary (Tot en Òc) <cvalmary@yahoo.fr>\n" "Last-Translator: Cédric Valmary (Tot en òc) <cvalmary@yahoo.fr>\n"
"Language-Team: www.totenoc.eu\n" "Language-Team: Tot en òc (totenoc.eu)\n"
"Language: oc\n" "Language: oc\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n"
"X-Generator: Virtaal 0.7.0\n" "X-Generator: Virtaal 0.7.1\n"
"X-Project-Style: gnome\n" "X-Project-Style: gnome\n"
#: ../lib/read.c:51 #: ../lib/read.c:51
#, c-format #, c-format
msgid "read %d byte" msgid "read %d byte"
msgid_plural "read %d bytes" msgid_plural "read %d bytes"
msgstr[0] "%d octet legit" msgstr[0] "%d octet legit"
msgstr[1] "%d octets legits" msgstr[1] "%d octets legits"
#: ../lib/read_data.c:51 #: ../lib/read_data.c:51
msgid "read data size" msgid "read data size"
msgstr "talha de las donadas legidas" msgstr "talha de las donadas legidas"
#: ../lib/read_data.c:70 #: ../lib/read_data.c:70
#, c-format #, c-format
msgid "read %lu byte of data" msgid "read %lu byte of data"
msgid_plural "read %lu bytes of data" msgid_plural "read %lu bytes of data"
msgstr[0] "lectura de %lu octet de donadas" msgstr[0] "lectura de %lu octet de donadas"
msgstr[1] "lectura de %lu octets de donadas" msgstr[1] "lectura de %lu octets de donadas"
#: ../lib/write.c:51 #: ../lib/write.c:51
#, c-format #, c-format
msgid "wrote %d byte" msgid "wrote %d byte"
msgid_plural "wrote %d bytes" msgid_plural "wrote %d bytes"
msgstr[0] "escritura de %d octet" msgstr[0] "escritura de %d octet"
msgstr[1] "escritura de %d octets" msgstr[1] "escritura de %d octets"
#: ../src/daemon/gnuserv.c:455 #: ../src/daemon/gnuserv.c:455
msgid "Enable debugging" msgid "Enable debugging"
msgstr "Activa lo desbugatge" msgstr "Activa lo desbugatge"
#: ../src/daemon/gnuserv.c:457 #: ../src/daemon/gnuserv.c:457
msgid "Enable verbose output" msgid "Enable verbose output"
msgstr "Activa la sortida charraira" msgstr "Activa la sortida verbosa"
#: ../src/daemon/gnuserv.c:459 #: ../src/daemon/gnuserv.c:459
msgid "Don't fork into background" msgid "Don't fork into background"
msgstr "Aviar pas en prètzfach de fons" msgstr "Aviar pas en prètzfach de fons"
#: ../src/daemon/gnuserv.c:461 #: ../src/daemon/gnuserv.c:461
msgid "Invoked from inetd" msgid "Invoked from inetd"
msgstr "Invocat a partir de inetd" msgstr "Invocat a partir d'inetd"
#: ../src/daemon/gnuserv.c:495 #: ../src/daemon/gnuserv.c:495
#, c-format #, c-format
msgid "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"
msgstr "Aviar « %s --help » per afichar la lista de las opcions de la linha de " msgstr ""
"Aviar « %s --help » per afichar la lista de las opcions de la linha de "
"comanda.\n" "comanda.\n"
#: ../sysdeps/osf1/siglist.c:27 ../sysdeps/sun4/siglist.c:27 #: ../sysdeps/osf1/siglist.c:27 ../sysdeps/sun4/siglist.c:27
msgid "Hangup" msgid "Hangup"
msgstr "Hangup" msgstr "Hangup"
#: ../sysdeps/osf1/siglist.c:28 ../sysdeps/sun4/siglist.c:28 #: ../sysdeps/osf1/siglist.c:28 ../sysdeps/sun4/siglist.c:28
msgid "Interrupt" msgid "Interrupt"
msgstr "Interrupcion" msgstr "Interrupcion"
#: ../sysdeps/osf1/siglist.c:29 ../sysdeps/sun4/siglist.c:29 #: ../sysdeps/osf1/siglist.c:29 ../sysdeps/sun4/siglist.c:29
msgid "Quit" msgid "Quit"
msgstr "Quitar" msgstr "Quitar"
#: ../sysdeps/osf1/siglist.c:30 ../sysdeps/sun4/siglist.c:30 #: ../sysdeps/osf1/siglist.c:30 ../sysdeps/sun4/siglist.c:30
msgid "Illegal instruction" msgid "Illegal instruction"
msgstr "Instruccion illegala" msgstr "Instruccion illegala"
#: ../sysdeps/osf1/siglist.c:31 ../sysdeps/sun4/siglist.c:31 #: ../sysdeps/osf1/siglist.c:31 ../sysdeps/sun4/siglist.c:31
msgid "Trace trap" msgid "Trace trap"
msgstr "Punt d'arrèst rencontrat" msgstr "Punt d'arrèst rencontrat"
#: ../sysdeps/osf1/siglist.c:32 ../sysdeps/sun4/siglist.c:32 #: ../sysdeps/osf1/siglist.c:32 ../sysdeps/sun4/siglist.c:32
msgid "Abort" msgid "Abort"
msgstr "Anullacion" msgstr "Anullacion"
#: ../sysdeps/osf1/siglist.c:33 ../sysdeps/sun4/siglist.c:33 #: ../sysdeps/osf1/siglist.c:33 ../sysdeps/sun4/siglist.c:33
msgid "EMT error" msgid "EMT error"
msgstr "Error EMT" msgstr "Error EMT"
#: ../sysdeps/osf1/siglist.c:34 ../sysdeps/sun4/siglist.c:34 #: ../sysdeps/osf1/siglist.c:34 ../sysdeps/sun4/siglist.c:34
msgid "Floating-point exception" msgid "Floating-point exception"
msgstr "Excepcion virgula flotanta" msgstr "Excepcion virgula flotanta"
#: ../sysdeps/osf1/siglist.c:35 ../sysdeps/sun4/siglist.c:35 #: ../sysdeps/osf1/siglist.c:35 ../sysdeps/sun4/siglist.c:35
msgid "Kill" msgid "Kill"
msgstr "Tuar" msgstr "Tuar"
#: ../sysdeps/osf1/siglist.c:36 ../sysdeps/sun4/siglist.c:36 #: ../sysdeps/osf1/siglist.c:36 ../sysdeps/sun4/siglist.c:36
msgid "Bus error" msgid "Bus error"
msgstr "Error bus" msgstr "Error bus"
#: ../sysdeps/osf1/siglist.c:37 ../sysdeps/sun4/siglist.c:37 #: ../sysdeps/osf1/siglist.c:37 ../sysdeps/sun4/siglist.c:37
msgid "Segmentation violation" msgid "Segmentation violation"
msgstr "Violacion de segmentacion" msgstr "Violacion de segmentacion"
#: ../sysdeps/osf1/siglist.c:38 ../sysdeps/sun4/siglist.c:38 #: ../sysdeps/osf1/siglist.c:38 ../sysdeps/sun4/siglist.c:38
msgid "Bad argument to system call" msgid "Bad argument to system call"
msgstr "Marrit argument d'apèl sistèma" msgstr "Marrit argument d'apèl sistèma"
#: ../sysdeps/osf1/siglist.c:39 ../sysdeps/sun4/siglist.c:39 #: ../sysdeps/osf1/siglist.c:39 ../sysdeps/sun4/siglist.c:39
msgid "Broken pipe" msgid "Broken pipe"
msgstr "Tub copat" msgstr "Tub copat"
#: ../sysdeps/osf1/siglist.c:40 ../sysdeps/sun4/siglist.c:40 #: ../sysdeps/osf1/siglist.c:40 ../sysdeps/sun4/siglist.c:40
msgid "Alarm clock" msgid "Alarm clock"
msgstr "Alarma de relòtge" msgstr "Alarma de relòtge"
#: ../sysdeps/osf1/siglist.c:41 ../sysdeps/sun4/siglist.c:41 #: ../sysdeps/osf1/siglist.c:41 ../sysdeps/sun4/siglist.c:41
msgid "Termination" msgid "Termination"
msgstr "Senhal de fin" msgstr "Senhal de fin"
#: ../sysdeps/osf1/siglist.c:42 ../sysdeps/sun4/siglist.c:42 #: ../sysdeps/osf1/siglist.c:42 ../sysdeps/sun4/siglist.c:42
msgid "Urgent condition on socket" msgid "Urgent condition on socket"
msgstr "Condicion urgenta sus socket" msgstr "Condicion urgenta sus socket"
#: ../sysdeps/osf1/siglist.c:43 ../sysdeps/sun4/siglist.c:43 #: ../sysdeps/osf1/siglist.c:43 ../sysdeps/sun4/siglist.c:43
msgid "Stop" msgid "Stop"
msgstr "Arrèst" msgstr "Arrèst"
#: ../sysdeps/osf1/siglist.c:44 ../sysdeps/sun4/siglist.c:44 #: ../sysdeps/osf1/siglist.c:44 ../sysdeps/sun4/siglist.c:44
msgid "Keyboard stop" msgid "Keyboard stop"
msgstr "Arrèst dempuèi lo clavièr" msgstr "Arrèst dempuèi lo clavièr"
#: ../sysdeps/osf1/siglist.c:45 ../sysdeps/sun4/siglist.c:45 #: ../sysdeps/osf1/siglist.c:45 ../sysdeps/sun4/siglist.c:45
msgid "Continue" msgid "Continue"
msgstr "Contunhar" msgstr "Contunhar"
#: ../sysdeps/osf1/siglist.c:46 ../sysdeps/sun4/siglist.c:46 #: ../sysdeps/osf1/siglist.c:46 ../sysdeps/sun4/siglist.c:46
msgid "Child status has changed" msgid "Child status has changed"
msgstr "L'estat del filh a cambiat" msgstr "L'estat del filh a cambiat"
#: ../sysdeps/osf1/siglist.c:47 ../sysdeps/sun4/siglist.c:47 #: ../sysdeps/osf1/siglist.c:47 ../sysdeps/sun4/siglist.c:47
msgid "Background read from tty" msgid "Background read from tty"
msgstr "Lectura sus tty en rèire plan" msgstr "Lectura sus tty en rèire plan"
#: ../sysdeps/osf1/siglist.c:48 ../sysdeps/sun4/siglist.c:48 #: ../sysdeps/osf1/siglist.c:48 ../sysdeps/sun4/siglist.c:48
msgid "Background write to tty" msgid "Background write to tty"
msgstr "Escritura sus tty en rèire plan" msgstr "Escritura sus tty en rèire plan"
#: ../sysdeps/osf1/siglist.c:49 ../sysdeps/sun4/siglist.c:49 #: ../sysdeps/osf1/siglist.c:49 ../sysdeps/sun4/siglist.c:49
msgid "I/O now possible" msgid "I/O now possible"
msgstr "E/S ara possibla" msgstr "E/S ara possibla"
#: ../sysdeps/osf1/siglist.c:50 ../sysdeps/sun4/siglist.c:50 #: ../sysdeps/osf1/siglist.c:50 ../sysdeps/sun4/siglist.c:50
msgid "CPU limit exceeded" msgid "CPU limit exceeded"
msgstr "Limit de temps CPU depassat" msgstr "Limit de temps CPU depassat"
#: ../sysdeps/osf1/siglist.c:51 ../sysdeps/sun4/siglist.c:51 #: ../sysdeps/osf1/siglist.c:51 ../sysdeps/sun4/siglist.c:51
msgid "File size limit exceeded" msgid "File size limit exceeded"
msgstr "Talha de fichièr excessiva" msgstr "Talha de fichièr excessiva"
#: ../sysdeps/osf1/siglist.c:52 ../sysdeps/sun4/siglist.c:52 #: ../sysdeps/osf1/siglist.c:52 ../sysdeps/sun4/siglist.c:52
msgid "Virtual alarm clock" msgid "Virtual alarm clock"
msgstr "Alarma virtuala" msgstr "Alarma virtuala"
#: ../sysdeps/osf1/siglist.c:53 ../sysdeps/sun4/siglist.c:53 #: ../sysdeps/osf1/siglist.c:53 ../sysdeps/sun4/siglist.c:53
msgid "Profiling alarm clock" msgid "Profiling alarm clock"
msgstr "Perfil de l'alarma" msgstr "Perfil de l'alarma"
#: ../sysdeps/osf1/siglist.c:54 ../sysdeps/sun4/siglist.c:54 #: ../sysdeps/osf1/siglist.c:54 ../sysdeps/sun4/siglist.c:54
msgid "Window size change" msgid "Window size change"
msgstr "Redimensionament de la fenèstra" msgstr "Redimensionament de la fenèstra"
#: ../sysdeps/osf1/siglist.c:55 ../sysdeps/sun4/siglist.c:55 #: ../sysdeps/osf1/siglist.c:55 ../sysdeps/sun4/siglist.c:55
msgid "Information request" msgid "Information request"
msgstr "Demanda d'informacion" msgstr "Demanda d'informacion"
#: ../sysdeps/osf1/siglist.c:56 ../sysdeps/sun4/siglist.c:56 #: ../sysdeps/osf1/siglist.c:56 ../sysdeps/sun4/siglist.c:56
msgid "User defined signal 1" msgid "User defined signal 1"
msgstr "Senhal utilizaire 1" msgstr "Senhal utilizaire 1"
#: ../sysdeps/osf1/siglist.c:57 ../sysdeps/sun4/siglist.c:57 #: ../sysdeps/osf1/siglist.c:57 ../sysdeps/sun4/siglist.c:57
msgid "User defined signal 2" msgid "User defined signal 2"
msgstr "Senhal utilizaire 2" msgstr "Senhal utilizaire 2"

View File

@@ -28,6 +28,8 @@ G_BEGIN_DECLS
#include <sys/param.h> #include <sys/param.h>
#endif #endif
#include <glibtop_machine.h>
#define KI_PROC(ki) (&(ki))->kp_proc) #define KI_PROC(ki) (&(ki))->kp_proc)
#define KI_EPROC(ki) (&(ki))->kp_eproc) #define KI_EPROC(ki) (&(ki))->kp_eproc)

View File

@@ -21,6 +21,7 @@
#include <config.h> #include <config.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/sysctl.h>
#include <glibtop.h> #include <glibtop.h>
#include <glibtop/open.h> #include <glibtop/open.h>
#include <glibtop/cpu.h> #include <glibtop/cpu.h>

View File

@@ -284,7 +284,7 @@ glibtop_get_proc_map_p (glibtop *server, glibtop_proc_map *buf,
mentry->perm |= GLIBTOP_MAP_PERM_READ; mentry->perm |= GLIBTOP_MAP_PERM_READ;
if (entry->protection & PROT_WRITE) if (entry->protection & PROT_WRITE)
mentry->perm |= GLIBTOP_MAP_PERM_WRITE; mentry->perm |= GLIBTOP_MAP_PERM_WRITE;
if (entry->protection & PROT_EXECUTE) if (entry->protection & PROT_EXEC)
mentry->perm |= GLIBTOP_MAP_PERM_EXECUTE; mentry->perm |= GLIBTOP_MAP_PERM_EXECUTE;
} }

View File

@@ -42,6 +42,7 @@
#include <arpa/inet.h> #include <arpa/inet.h>
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include <kvm.h>
#include "glibtop_private.h" #include "glibtop_private.h"

View File

@@ -25,7 +25,10 @@
#include <glibtop/cpu.h> #include <glibtop/cpu.h>
#include <glibtop/open.h> #include <glibtop/open.h>
#include <glibtop/init_hooks.h> #include <glibtop/init_hooks.h>
#include <glibtop/machine.h>
#include <fcntl.h>
#include <kvm.h>
/* !!! THIS FUNCTION RUNS SUID ROOT - CHANGE WITH CAUTION !!! */ /* !!! THIS FUNCTION RUNS SUID ROOT - CHANGE WITH CAUTION !!! */

View File

@@ -26,6 +26,8 @@
#include <glibtop/cpu.h> #include <glibtop/cpu.h>
#include <sys/sysctl.h>
static const unsigned long _glibtop_sysdeps_uptime = static const unsigned long _glibtop_sysdeps_uptime =
(1L << GLIBTOP_UPTIME_UPTIME) + (1L << GLIBTOP_UPTIME_IDLETIME) + (1L << GLIBTOP_UPTIME_UPTIME) + (1L << GLIBTOP_UPTIME_IDLETIME) +
(1UL << GLIBTOP_UPTIME_BOOT_TIME); (1UL << GLIBTOP_UPTIME_BOOT_TIME);